From be63b5c4b3fd231a5d25ce5434cc24c9a8e285b7 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期一, 23 十月 2023 16:28:53 +0800
Subject: [PATCH] fix:物品分类 代码完善
---
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 50 ++++++++++++------------
consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java | 16 ++++---
2 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index c75352f..6e03ebd 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -44,34 +44,33 @@
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
//鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(),param.getFatherCategoryId());
+ BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(), param.getFatherCategoryId());
if (category != null) {
return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
}
-// int result = this.baseCategoryService.add(param,this.getCurrentUser());
- int result = this.baseCategoryService.add(param);
- if(result>0) return ResponseValue.success(1);
+ int result = this.baseCategoryService.add(param, this.getCurrentUser());
+ if (result > 0) return ResponseValue.success(1);
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
- * @Description 鐗╁搧鍒嗙被鍒楄〃鏌ヨ
+ * @Description 鐗╁搧鍒嗙被鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@GetMapping("/list")
public ResponseValue queryBaseCategoryList(BaseCategoryParam param) {
-// S_user_core currentUser = this.getCurrentUser();
-// if (currentUser == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
GenericPager<BaseCategory> pager = this.baseCategoryService.queryBaseCategoryList(param);
return ResponseValue.success(pager);
}
/**
- * @Description 缂栬緫
+ * @Description 缂栬緫
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@@ -88,27 +87,28 @@
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
//鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(baseCategory.getCategoryName(),baseCategory.getFatherCategoryId());
+ BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(baseCategory.getCategoryName(), baseCategory.getFatherCategoryId());
if (category != null) {
return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
}
- // S_user_core currentUser = this.getCurrentUser();
-// if (currentUser == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
int num = this.baseCategoryService.updateBaseCategory(baseCategory);
- return num>0 ? ResponseValue.success(1):ResponseValue.error("缂栬緫澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/9/27
*/
//鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
- public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory){
- if (baseCategory==null || baseCategory.getId() ==null || baseCategory.getStates() == null) {
+ public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory) {
+ if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
//鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
@@ -118,7 +118,7 @@
}
int num = this.baseCategoryService.updateStatus(baseCategory);
- return num>0 ? ResponseValue.success(1):ResponseValue.error("淇敼澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�");
}
/**
@@ -127,29 +127,29 @@
* @Date 2023/10/23
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseCategory baseCategory){
+ public ResponseValue updateById(@RequestBody BaseCategory baseCategory) {
if (baseCategory.getId() == null) {
return ResponseValue.error("鍒嗙被id涓虹┖");
}
- //S_user_core currentUser = this.getCurrentUser();
- int num = this.baseCategoryService.updateById(baseCategory);
+ int num = this.baseCategoryService.updateById(baseCategory,this.getCurrentUser());
- return num>0 ? ResponseValue.success(1):ResponseValue.error("鍒犻櫎澶辫触锛�");
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
/**
* 鏍规嵁鑺傜偣id鏌ヨ鑺傜偣璇︽儏
+ *
* @author 鍗㈠簡闃�
* @date 2023/9/26
*/
@GetMapping("/detail")
- public ResponseValue getById(Long id){
+ public ResponseValue getById(Long id) {
if (id == null) {
return ResponseValue.error("鍒嗙被id涓虹┖");
}
BaseCategory baseCategory = this.baseCategoryService.getById(id);
if (baseCategory == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
- return ResponseValue.success("鏌ヨ鎴愬姛!",baseCategory);
+ return ResponseValue.success("鏌ヨ鎴愬姛!", baseCategory);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index 8813bbd..0e79236 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -4,6 +4,7 @@
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.util.IdUtil;
import com.consum.model.po.BaseCategory;
+import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
@@ -26,8 +27,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
-// public int add(BaseCategoryParam param, S_user_core currentUser) {
- public int add(BaseCategoryParam param) {
+ public int add(BaseCategoryParam param, S_user_core currentUser) {
BaseCategory baseCategory = new BaseCategory();
BeanUtils.copyProperties(param, baseCategory);
baseCategory.setId(IdUtil.generateId());
@@ -43,9 +43,9 @@
baseCategory.setLevels(Constants.LEVELS_THREE);
}
}
- //TODO 鍒涘缓浜篿d鍜屽垱寤轰汉濮撳悕
-// baseCategory.setCreateUserId(currentUser.getId());
-// baseCategory.setCreateUserName(currentUser.getUser_name());
+ //鍒涘缓浜篿d鍜屽垱寤轰汉濮撳悕
+ baseCategory.setCreateUserId(currentUser.getId());
+ baseCategory.setCreateUserName(currentUser.getUser_name());
//鍒涘缓鏃堕棿
baseCategory.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
@@ -124,11 +124,13 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
- public int updateById(BaseCategory baseCategory) {
+ public int updateById(BaseCategory baseCategory, S_user_core currentUser) {
baseCategory.setStates(Constants.CATEGORY_DELETED);
//鍒犻櫎鏃堕棿
baseCategory.setDTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- //TODO 鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ //鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ baseCategory.setDUserId(currentUser.getId());
+ baseCategory.setDUserName(currentUser.getUser_name());
return this.update(baseCategory);
}
--
Gitblit v1.9.1