From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 118 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 37 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..3d6f7c2 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -2,18 +2,23 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
+import com.lf.server.entity.all.HttpStatus;
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.data.DownloadEntity;
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.helper.WebHelper;
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.DownlogService;
import com.lf.server.service.sys.TokenService;
+import com.lf.server.service.sys.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.sql.Timestamp;
import java.util.List;
@@ -29,7 +35,7 @@
* 鏁版嵁鐢宠
* @author WWW
*/
-@Api(tags = "杩愮淮绠＄悊\\鏁版嵁鐢宠")
+@Api(tags = "缁煎悎灞曠ず\\鏁版嵁鐢宠")
@RestController
@RequestMapping("/apply")
public class ApplyController extends BaseController {
@@ -42,41 +48,50 @@
@Autowired
TokenService tokenService;
+ @Autowired
+ UserService userService;
+
+ @Autowired
+ DownlogService downlogService;
+
+ @Autowired
+ DownloadService downloadService;
+
@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.getIds() || reqEntity.getIds().isEmpty()) {
- return fail("璇烽�夋嫨鍗曚綅ID");
+ if (StringHelper.isEmpty(dr.getPwd())) {
+ 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())) {
+ dr.setPwd(AesHelper.decrypt(dr.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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -86,7 +101,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")
})
@@ -107,7 +122,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -121,7 +136,7 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -137,7 +152,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -147,7 +162,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,11 +172,12 @@
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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -171,7 +187,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,11 +197,12 @@
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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -213,17 +230,18 @@
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);
+ if (StaticData.I10 == applyEntity.getStatus()) {
+ UserEntity user = userService.selectUser(applyEntity.getUserid());
+ applyService.zipDbData(user, applyEntity);
}
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -233,7 +251,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,11 +269,37 @@
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) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "鏂囦欢GUID", dataType = "String", paramType = "query")
+ })
+ @ResponseBody
+ @GetMapping(value = "/downloadFile")
+ public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ DownloadEntity de = downloadService.selectByGuid(guid);
+ if (null == de) {
+ WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+ return;
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ downlogService.updateInfos(ue, de, req);
+
+ String filePath = downloadService.getDownloadFilePath(de);
+ WebHelper.download(filePath, de.getName(), res);
+ } catch (Exception ex) {
+ WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
}
--
Gitblit v1.9.3