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/SysBusinessOperateController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysBusinessOperateController.java b/src/main/java/com/highdatas/mdm/controller/SysBusinessOperateController.java
index 248164c..ccd7ad3 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysBusinessOperateController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysBusinessOperateController.java
@@ -7,7 +7,6 @@
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.ISysBusinessOperateService;
-import com.highdatas.mdm.service.ITUserService;
import com.highdatas.mdm.service.act.RepositoryService;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
@@ -27,7 +26,7 @@
* <p>
* 鍓嶇鎺у埗鍣�
* </p>
- *
+ * @description 鏆傛湭鐢ㄥ埌锛屼笖瑕佸簾寮冿紝 璁剧疆鍖归厤缁存姢
* @author kimi
* @since 2020-01-13
*/
@@ -40,9 +39,8 @@
@Autowired
RepositoryService repositoryService;
- @Autowired
- ITUserService userService;
+ @Deprecated
@RequestMapping(value = "delete/{id}", method = RequestMethod.GET)
public Result delete(@PathVariable String id, HttpServletRequest request) {
boolean delete = businessOperateService.deleteById(id);
@@ -53,9 +51,10 @@
}
}
+ @Deprecated
@RequestMapping(value = "/add", method = RequestMethod.GET)
public Result add(HttpServletRequest request) {
- TUser user = (TUser) request.getSession().getAttribute(Constant.USER);
+ TUser user = DbUtils.getUser(request);
String modelId = request.getParameter("modelId");
String businessType = request.getParameter("businessType");
@@ -69,20 +68,21 @@
}
}
+ @Deprecated
@RequestMapping(value = "/update", method = RequestMethod.GET)
public Result update(HttpServletRequest request) {
String id = request.getParameter("id");
if (StringUtils.isEmpty(id)) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
- TUser user = (TUser) request.getSession().getAttribute(Constant.USER);
+ TUser user = DbUtils.getUser(request);
String modelId = request.getParameter("modelId");
String businessType = request.getParameter("businessType");
SysBusinessOperate businessOperate = businessOperateService.selectById(id);
- businessOperate.setCreateTime(new Date()).setId(DbUtils.getUUID()).setChageId(user.getUserId()).setModelId(modelId).setBusinessType(businessType);
+ businessOperate.setCreateTime(new Date()).setChageId(user.getUserId()).setModelId(modelId).setBusinessType(businessType);
businessOperate.setUpdateTime(new Date());
boolean update = businessOperate.updateById();
@@ -94,6 +94,7 @@
}
+ @Deprecated
@RequestMapping(value = "/all/{pageno}", method = RequestMethod.GET)
public Result status(@PathVariable Integer pageno, HttpServletRequest request) {
String pageSizeStr = request.getParameter("pageSize");
@@ -116,7 +117,7 @@
if (StringUtils.isEmpty(chageId)) {
continue;
}
- TUser user = userService.selectById(chageId);
+ TUser user = DbUtils.getUserById(chageId);
if (user == null) {
continue;
}
--
Gitblit v1.8.0