From 09b6ca0c60b882d6ba13bd7f7b37576203d93d3f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 24 十二月 2022 11:41:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 148 ++++++++++---------------------------------------
src/main/java/com/lf/server/service/show/ApplyService.java | 7 ++
src/main/java/com/lf/server/controller/data/MetaController.java | 6 +-
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 2
src/main/java/com/lf/server/controller/other/FlowController.java | 2
src/main/java/com/lf/server/service/data/DownloadService.java | 4
src/main/java/com/lf/server/controller/show/DataLibController.java | 6 +-
7 files changed, 46 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index f42128a..eb44e88 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -412,7 +412,7 @@
if (StringHelper.isEmpty(reqEntity.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!downloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 0508b12..f703d99 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -358,7 +358,7 @@
if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
}
- if (!downloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
@@ -395,7 +395,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
@@ -434,7 +434,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "瀵嗙爜瑙ｅ瘑澶辫触", res);
}
diff --git a/src/main/java/com/lf/server/controller/show/FlowController.java b/src/main/java/com/lf/server/controller/other/FlowController.java
similarity index 99%
rename from src/main/java/com/lf/server/controller/show/FlowController.java
rename to src/main/java/com/lf/server/controller/other/FlowController.java
index b47b578..c9be9b3 100644
--- a/src/main/java/com/lf/server/controller/show/FlowController.java
+++ b/src/main/java/com/lf/server/controller/other/FlowController.java
@@ -1,4 +1,4 @@
-package com.lf.server.controller.show;
+package com.lf.server.controller.other;
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
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 6909320..56c88de 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -3,8 +3,12 @@
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.ctrl.DownloadReqEntity;
import com.lf.server.entity.show.ApplyEntity;
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.sys.TokenService;
import io.swagger.annotations.Api;
@@ -32,38 +36,38 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
+ @ApiOperation(value = "鎻掑叆鏁版嵁鐢宠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐢ㄦ埛ID", dataType = "Integer", paramType = "query", required = false, example = "")
+ @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(Integer userid) {
+ @ResponseBody
+ @PostMapping(value = "/insertApply")
+ public ResponseMsg<Object> insertApply(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req) {
try {
- int count = applyService.selectCount(userid);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐢ㄦ埛ID", dataType = "Integer", paramType = "query", example = ""),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<ApplyEntity>> selectByPage(Integer userid, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
+ }
+ if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
+ }
+ 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);
+ }
+ if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<ApplyEntity> rs = applyService.selectByPage(userid, pageSize, pageSize * (pageIndex - 1));
+ UserEntity ue = tokenService.getCurrentUser(req);
+ //
- return success(rs);
+ return success(null);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -97,35 +101,6 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<ApplyEntity>> selectAll() {
- try {
- List<ApplyEntity> list = applyService.selectAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectById")
- public ResponseMsg<ApplyEntity> selectById(int id) {
- try {
- ApplyEntity entity = applyService.selectById(id);
-
- return success(entity);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ApplyEntity", paramType = "body")
@@ -139,45 +114,6 @@
}
int count = applyService.insert(entity);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ApplyEntity", paramType = "body")
- })
- @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<ApplyEntity> list, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- for (ApplyEntity entity : list) {
- entity.setCreateUser(ue.getId());
- }
- }
-
- int count = applyService.inserts(list);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/delete")
- public ResponseMsg<Integer> delete(int id) {
- try {
- int count = applyService.delete(id);
return success(count);
} catch (Exception ex) {
@@ -220,30 +156,6 @@
}
int count = applyService.update(entity);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏇存柊澶氭潯")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ApplyEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<ApplyEntity> list, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- for (ApplyEntity entity : list) {
- entity.setUpdateUser(ue.getId());
- }
- }
-
- int count = applyService.updates(list);
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 8551801..ac1ca88 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -149,7 +149,7 @@
if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
}
- if (!downloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
@@ -186,7 +186,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
@@ -225,7 +225,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "瀵嗙爜瑙ｅ瘑澶辫触", res);
}
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 9d24f27..b5f380c 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -122,7 +122,7 @@
* @param reqEntity 璇锋眰涓嬭浇瀹炰綋绫�
* @return 鏄�/鍚﹁В瀵嗘垚鍔�
*/
- public boolean decryptPwd(DownloadReqEntity reqEntity) {
+ public static boolean decryptPwd(DownloadReqEntity reqEntity) {
try {
String pwd = RsaHelper.decrypt(reqEntity.getPwd());
if (StringHelper.isEmpty(pwd)) {
@@ -144,7 +144,7 @@
* @param pwd 鍔犲瘑瀵嗙爜
* @return 鍘熷瀵嗙爜
*/
- public String decryptPwd(String pwd) {
+ public static String decryptPwd(String pwd) {
try {
return RsaHelper.decrypt(pwd);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 97d604a..4ce705e 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -1,7 +1,6 @@
package com.lf.server.service.show;
import com.lf.server.entity.show.ApplyEntity;
-import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.show.ApplyMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,4 +65,10 @@
public Integer updates(List<ApplyEntity> list) {
return applyMapper.updates(list);
}
+
+ public Integer insertApply(){
+
+
+ return 0;
+ }
}
--
Gitblit v1.9.3