From 3cdd0dd684052517ee0e90daf4b03ad41b8f2771 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 15:04:47 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ApplyController.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 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 6e9c262..92c71e5 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -10,6 +10,7 @@
 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;
@@ -48,34 +49,36 @@
     @SysLog()
     @ApiOperation(value = "鎻掑叆鏁版嵁鐢宠")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+            @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
     })
     @ResponseBody
     @PostMapping(value = "/insertApply")
-    public ResponseMsg<Object> insertApply(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req) {
+    public ResponseMsg<Object> insertApply(@RequestBody DownloadReqEntity dr, HttpServletRequest req) {
         try {
-            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
-                return fail("瀵嗙爜涓嶈兘涓虹┖");
-            }
-            if (null == reqEntity.getTabs() || null == reqEntity.getEntities() || reqEntity.getTabs().size() != reqEntity.getEntities().size()) {
+            if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
                 return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
             }
-            if (null == reqEntity.getDepcodes() || reqEntity.getDepcodes().isEmpty()) {
-                return fail("璇烽�夋嫨鍗曚綅缂栫爜");
+            if (StringHelper.isEmpty(dr.getPwd())) {
+                return fail("瀵嗙爜涓嶈兘涓虹┖");
             }
-
-            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
-            if (StringHelper.isEmpty(reqEntity.getWkt())) {
-                return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+            if (!DownloadService.decryptPwd(dr)) {
+                return fail("瀵嗙爜瑙e瘑澶辫触", null);
             }
-
-            reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
-            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+            if (StringHelper.isPwdInvalid(dr.getPwd())) {
                 return fail("瀵嗙爜涓嶇鍚堣姹�");
+            }
+            if (!StringHelper.isEmpty(dr.getWkt())) {
+                dr.setWkt(AesHelper.decrypt(dr.getWkt()));
+            }
+            if (null == dr.getTabs() || dr.getTabs().isEmpty()) {
+                return fail("璇烽�夋嫨瑕佷笅杞界殑琛ㄥ悕");
+            }
+            if (null == dr.getDepcodes() || dr.getDepcodes().isEmpty()) {
+                return fail("璇烽�夋嫨寰呯敵璇风殑鍗曚綅缂栫爜(澶氫釜浠ラ�楀彿闅斿紑)");
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            int rows = applyService.insertApply(ue, reqEntity);
+            int rows = applyService.insertApply(ue, dr);
 
             return success(rows);
         } catch (Exception ex) {

--
Gitblit v1.9.3