From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 137 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 28 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 cbefd1c..745cd45 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -3,14 +3,15 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.show.ApplyEntity;
import com.lf.server.entity.show.FlowEntity;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -27,12 +28,15 @@
* 鏁版嵁鐢宠
* @author WWW
*/
-@Api(tags = "杩愮淮绠＄悊\\鏁版嵁鐢宠")
+@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠")
@RestController
@RequestMapping("/apply")
public class ApplyController extends BaseController {
@Autowired
ApplyService applyService;
+
+ @Autowired
+ FlowService flowService;
@Autowired
TokenService tokenService;
@@ -52,17 +56,17 @@
if (null == reqEntity.getTabs() || null == reqEntity.getEntities() || reqEntity.getTabs().size() != reqEntity.getEntities().size()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
- return fail("璇烽�夋嫨鍗曚綅ID");
+ if (null == reqEntity.getDepcodes() || reqEntity.getDepcodes().isEmpty()) {
+ return fail("璇烽�夋嫨鍗曚綅缂栫爜");
}
+
reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
if (StringHelper.isEmpty(reqEntity.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
- return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
- }
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+
+ reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
@@ -71,7 +75,7 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -81,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")
})
@@ -102,7 +106,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -116,39 +120,73 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鏌ヨ娴佺▼")
@ApiImplicitParams({
- @ApiImplicitParam(name = "applyId", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectFlows")
- public ResponseMsg<Object> selectFlows(Integer applyId) {
+ public ResponseMsg<Object> selectFlows(Integer applyid) {
try {
- List<FlowEntity> rs = applyService.selectFlows(applyId);
+ List<FlowEntity> rs = applyService.selectFlows(applyid);
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "搴熷純鐢宠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "applyId", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/deleteForDiscard")
- public ResponseMsg<Object> deleteForDiscard(Integer applyId) {
+ @GetMapping(value = "/updateForDiscard")
+ public ResponseMsg<Object> updateForDiscard(Integer applyid, HttpServletRequest req) {
try {
- //
+ ApplyEntity applyEntity = applyService.selectById(applyid);
+ if (null == applyEntity) {
+ return fail("鎵句笉鍒版暟鎹敵璇�");
+ }
+ if (!(applyEntity.getStatus() >= -1 && applyEntity.getStatus() <= StaticData.NINE)) {
+ return fail("璇ユ暟鎹敵璇锋棤娉曞簾寮�");
+ }
- return success(null);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForDiscard(ue.getId(), applyid);
+
+ return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "閲嶆柊鎻愪氦")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/updateForResubmit")
+ public ResponseMsg<Object> updateForResubmit(Integer applyid, HttpServletRequest req) {
+ try {
+ ApplyEntity applyEntity = applyService.selectById(applyid);
+ if (null == applyEntity) {
+ return fail("鎵句笉鍒版暟鎹敵璇�");
+ }
+ if (-1 != applyEntity.getStatus()) {
+ return fail("璇ユ暟鎹敵璇锋棤闇�閲嶆柊鎻愪氦");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForResubmit(ue.getId(), applyid);
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -157,12 +195,36 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
})
- public ResponseMsg<Object> updateForSubmit(Integer flowId) {
+ @GetMapping(value = "/updateForSubmit")
+ public ResponseMsg<Object> updateForSubmit(Integer flowId, HttpServletRequest req) {
try {
+ FlowEntity flowEntity = flowService.selectById(flowId);
+ if (null == flowEntity) {
+ return fail("鎵句笉鍒扮敵璇锋祦绋�");
+ }
+ if (flowEntity.getStatus() != 0) {
+ return fail("璇ョ敵璇锋祦绋嬫棤闇�鎻愪氦");
+ }
- return success(null);
+ ApplyEntity applyEntity = applyService.selectById(flowEntity.getApplyid());
+ if (null == applyEntity) {
+ return fail("鎵句笉鍒版暟鎹敵璇�");
+ }
+ if (!(applyEntity.getStatus() >= 0 && applyEntity.getStatus() <= StaticData.NINE)) {
+ return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
+ }
+
+ 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()) {
+ applyService.zipDbData(ue, applyEntity);
+ }
+
+ return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -171,12 +233,31 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
})
- public ResponseMsg<Object> updateForReject(Integer flowId) {
+ @GetMapping(value = "/updateForReject")
+ public ResponseMsg<Object> updateForReject(Integer flowId, HttpServletRequest req) {
try {
+ FlowEntity flowEntity = flowService.selectById(flowId);
+ if (null == flowEntity) {
+ return fail("鎵句笉鍒扮敵璇锋祦绋�");
+ }
+ if (flowEntity.getStatus() != 0) {
+ return fail("璇ョ敵璇锋祦绋嬫棤闇�鎵撳洖");
+ }
- return success(null);
+ ApplyEntity applyEntity = applyService.selectById(flowEntity.getApplyid());
+ if (null == applyEntity) {
+ return fail("鎵句笉鍒版暟鎹敵璇�");
+ }
+ if (!(applyEntity.getStatus() >= 0 && applyEntity.getStatus() <= StaticData.NINE)) {
+ return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer rows = applyService.updateForReject(ue.getId(), applyEntity.getId(), flowEntity.getId());
+
+ return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3