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/DataLibController.java | 157 +++++++++++++++++++--------------------------------
1 files changed, 59 insertions(+), 98 deletions(-)
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 cebc837..e15d9c8 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -10,16 +10,16 @@
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.DictEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
+import com.lf.server.service.data.VerService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -34,7 +34,7 @@
import java.io.File;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.*;
/**
* 璧勬枡棣�
@@ -54,36 +54,63 @@
DataLibService dataLibService;
@Autowired
- DownloadService downloadService;
+ BaseQueryService baseQueryService;
@Autowired
- BaseQueryService baseQueryService;
+ VerService verService;
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+ })
+ @GetMapping(value = "/selectVerByDirid")
+ public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+ try {
+ if (null == dirid || dirid < 0) {
+ dirid = 0;
+ }
+
+ List<VerEntity> list = verService.selectByDirid(dirid);
+ if (null == list || list.isEmpty()) {
+ list = verService.selectByDirid(0);
+ }
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "types", value = "璧勬枡绫诲埆", dataType = "String", paramType = "query", example = "鍩虹娴嬬粯,鍩虹鍦扮伨,鍩虹鍕樺療,鍚堣鏁版嵁,绠＄悊鏁版嵁,娴嬬粯锛圗SV锛�,鍕樺療锛圗GE锛�,鍦扮伨锛圗GD锛�,娲炲簱锛圗GD锛�"),
+ @ApiImplicitParam(name = "dirs", value = "椤圭洰缂栫爜", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", 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 = "/selectByPageForMeta")
- public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectMetasForPage")
+ public ResponseMsg<Object> selectMetasForPage(String depcode, String types, String dirs, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
+ // dirs = DataLibService.copeCodes(dirs, "dircode")
+ dirs = dataLibService.getDirsByTypes(types, dirs, "dircode");
- int count = metaService.selectCount(dirid, name);
+ int count = metaService.selectMetasForCount(depcode, dirs, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectMetasForPage(depcode, dirs, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -114,76 +141,46 @@
}
QueryWrapper wrapper = new QueryWrapper();
- //wrapper.eq("dirid", meta.getDirid());
- //wrapper.eq("depid", meta.getDepid());
- //wrapper.eq("verid", meta.getVerid());
- wrapper.eq("createuser", meta.getCreateUser());
- wrapper.eq("createtime", meta.getCreateTime());
+ wrapper.eq("parentid", meta.getEventid());
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
- @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg25wAanp")
- })
- @GetMapping(value = "/selectTabFields")
- public ResponseMsg<List<DictEntity>> selectTabFields(String ns, String tab) {
- try {
- if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(tab)) {
- return fail("鍚嶇О绌洪棿鍜岃〃鍚嶄笉鑳戒负绌�", null);
- }
-
- List<DictEntity> list = baseQueryService.selectFields(ns, tab);
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/downloadReq")
- public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
+ if (null == dr.getIds() || dr.getIds().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢ID");
}
- if (!downloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
- }
-
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = downloadService.zipFiles(ue, list, reqEntity.getPwd());
+ String guid = metaService.downloadMeteReq(ue, dr);
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -203,7 +200,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);
}
@@ -221,7 +218,7 @@
return success(file.exists());
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -233,73 +230,37 @@
})
@ResponseBody
@GetMapping(value = "/downloadFile")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public void downloadFile(String guid, String pwd, HttpServletRequest req, HttpServletResponse res) {
try {
- if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
+ /*if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鏂囦欢ID鍜屽瘑鐮佷笉鑳戒负绌�", res);
}
if (!pwd.endsWith(StaticData.EQ)) {
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);
- }
+ }*/
DownloadEntity de = downloadService.selectByGuid(guid);
if (null == de) {
WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
return;
}
- if (!StringHelper.isNull(de.getPwd()) && !Md5Helper.validatePassword(password, de.getPwd())) {
+ /*if (!StringHelper.isNull(de.getPwd()) && !Md5Helper.validatePassword(password, de.getPwd())) {
WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "瀵嗙爜涓嶆纭�", res);
- }
+ }*/
UserEntity ue = tokenService.getCurrentUser(req);
- de.setDcount(de.getDcount() + 1);
- de.setDownloadUser(ue.getId());
- int rows = downloadService.update(de);
+ 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);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/downloadDbReq")
- public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
- try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- if (null == reqEntity.getEntities() || reqEntity.getEntities().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())) {
- return fail("瀵嗙爜涓嶇鍚堣姹�");
- }
-
- UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
-
- return success(guid);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
}
}
}
--
Gitblit v1.9.3