From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index 506f622..549ba52 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -10,7 +10,6 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
-import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.ApplyService;
import com.lf.server.service.show.FlowService;
import com.lf.server.service.sys.TokenService;
@@ -29,7 +28,7 @@
* 鏁版嵁鐢宠
* @author WWW
*/
-@Api(tags = "杩愮淮绠＄悊\\鏁版嵁鐢宠")
+@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠")
@RestController
@RequestMapping("/apply")
public class ApplyController extends BaseController {
@@ -60,13 +59,13 @@
if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
return fail("璇烽�夋嫨鍗曚綅ID");
}
+
reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
if (StringHelper.isEmpty(reqEntity.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
- return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
- }
+
+ reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
@@ -86,7 +85,7 @@
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "鍛�"),
@ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-12-09 09:00:00"),
- @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-25 17:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-31 23:00:00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@@ -147,7 +146,7 @@
@ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForDiscard")
- public ResponseMsg<Object> updateForDiscard(Integer applyid) {
+ public ResponseMsg<Object> updateForDiscard(Integer applyid, HttpServletRequest req) {
try {
ApplyEntity applyEntity = applyService.selectById(applyid);
if (null == applyEntity) {
@@ -157,7 +156,8 @@
return fail("璇ユ暟鎹敵璇锋棤娉曞簾寮�");
}
- int rows = applyService.updateForDiscard(applyid);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForDiscard(ue.getId(), applyid);
return success(rows);
} catch (Exception ex) {
@@ -171,7 +171,7 @@
@ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForResubmit")
- public ResponseMsg<Object> updateForResubmit(Integer applyid) {
+ public ResponseMsg<Object> updateForResubmit(Integer applyid, HttpServletRequest req) {
try {
ApplyEntity applyEntity = applyService.selectById(applyid);
if (null == applyEntity) {
@@ -181,7 +181,8 @@
return fail("璇ユ暟鎹敵璇锋棤闇�閲嶆柊鎻愪氦");
}
- int rows = applyService.updateForResubmit(applyid);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForResubmit(ue.getId(), applyid);
return success(rows);
} catch (Exception ex) {
@@ -213,11 +214,11 @@
return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
- int rows = applyService.updateForSubmit(applyEntity.getId(), flowEntity.getId());
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForSubmit(ue.getId(), applyEntity.getId(), flowEntity.getId());
applyEntity = applyService.selectById(applyEntity.getId());
if (StaticData.TEN == applyEntity.getStatus()) {
- UserEntity ue = tokenService.getCurrentUser(req);
applyService.zipDbData(ue, applyEntity);
}
@@ -233,7 +234,7 @@
@ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForReject")
- public ResponseMsg<Object> updateForReject(Integer flowId) {
+ public ResponseMsg<Object> updateForReject(Integer flowId, HttpServletRequest req) {
try {
FlowEntity flowEntity = flowService.selectById(flowId);
if (null == flowEntity) {
@@ -251,7 +252,8 @@
return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
- Integer rows = applyService.updateForReject(applyEntity.getId(), flowEntity.getId());
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer rows = applyService.updateForReject(ue.getId(), applyEntity.getId(), flowEntity.getId());
return success(rows);
} catch (Exception ex) {
--
Gitblit v1.9.3