From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/controller/SysAssembleParamsController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysAssembleParamsController.java b/src/main/java/com/highdatas/mdm/controller/SysAssembleParamsController.java
index db5215b..32da650 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysAssembleParamsController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysAssembleParamsController.java
@@ -2,9 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.highdatas.mdm.entity.SysAssemble;
-import com.highdatas.mdm.entity.SysAssembleDb;
import com.highdatas.mdm.entity.SysAssembleParams;
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.Result;
@@ -14,10 +12,8 @@
import com.highdatas.mdm.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
@@ -25,7 +21,7 @@
* <p>
* 鍓嶇鎺у埗鍣�
* </p>
- *
+ * @description 姹囬泦鍙傛暟鎺ュ彛
* @author kimi
* @since 2020-02-20
*/
@@ -37,8 +33,16 @@
@Autowired
ISysAssembleParamsService paramsService;
+ /**
+ *
+ * @description: 娣诲姞鎴栬�呮洿鏂� 姹囬泦鍙傛暟
+ * @param id 姹囬泦浠诲姟id
+ * @return: 鏄惁鏇存柊鎴愬姛
+ *
+ */
@RequestMapping(value = "/addOrUpdate/{id}", method = RequestMethod.POST)
public Result get(@PathVariable String id, @RequestBody SysAssembleParams params) {
+ //鑾峰彇姹囬泦浠诲姟淇℃伅
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
@@ -49,6 +53,7 @@
}else {
params.setUpdateTime(new Date());
}
+ //娣诲姞/鏇存柊鍙傛暟
boolean update = params.insertOrUpdate();
if (update) {
@@ -59,16 +64,32 @@
}
+ /**
+ *
+ * @description: 鑾峰彇褰撳墠浠诲姟鐢ㄥ埌鐨勬眹闆嗗弬鏁發ist
+ * @param id 姹囬泦浠诲姟id
+ * @return: 姹囬泦鍙傛暟list
+ *
+ */
@RequestMapping(value = "/list/{id}", method = RequestMethod.GET)
public Result list(@PathVariable String id) {
+ //鑾峰彇姹囬泦淇℃伅
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
+ //By id 鑾峰彇姹囬泦鍙傛暟list
List<SysAssembleParams> paramsList = paramsService.selectList(new EntityWrapper<SysAssembleParams>().eq(Constant.PARENT_ID, id));
return Result.success(paramsList);
}
+ /**
+ *
+ * @description: 鍒犻櫎姹囬泦鍙傛暟
+ * @param id 姹囬泦鍙傛暟id
+ * @return: 鏄惁鍒犻櫎鎴愬姛
+ *
+ */
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
public Result delete(@PathVariable String id) {
SysAssembleParams sysAssembleParams = paramsService.selectById(id);
--
Gitblit v1.8.0