From 5c3482e853299bcc786a244ca22a05a3a8d380fe Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 06 一月 2023 17:18:43 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/controller/all/BaseUploadController.java | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lf/server/controller/all/BaseUploadController.java b/src/main/java/com/lf/server/controller/all/BaseUploadController.java index af09edc..2703a21 100644 --- a/src/main/java/com/lf/server/controller/all/BaseUploadController.java +++ b/src/main/java/com/lf/server/controller/all/BaseUploadController.java @@ -3,13 +3,14 @@ import com.lf.server.annotation.SysLog; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.DirEntity; -import com.lf.server.entity.data.MetaFileEntity; +import com.lf.server.entity.data.MetaEntity; import com.lf.server.entity.data.VerEntity; import com.lf.server.entity.sys.DepEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.all.BaseUploadService; import com.lf.server.service.data.DirService; +import com.lf.server.service.data.FmeService; import com.lf.server.service.data.MetaService; import com.lf.server.service.data.VerService; import com.lf.server.service.sys.DepService; @@ -40,6 +41,9 @@ @Autowired MetaService metaService; + + @Autowired + FmeService fmeService; @Autowired protected TokenService tokenService; @@ -123,7 +127,7 @@ return fail("鐢ㄦ埛鏈櫥褰�", null); } - List<MetaFileEntity> list = baseUploadService.uploadData(null, path, req, res); + List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res); if (null == list || list.isEmpty()) { return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null); } @@ -137,11 +141,11 @@ @SysLog() @ApiOperation(value = "鍒犻櫎鏂囦欢") @ApiImplicitParams({ - @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaEntity", paramType = "body") }) @ResponseBody @PostMapping(value = "/deleteFiles") - public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) { + public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaEntity> list, HttpServletRequest req) { try { UserEntity ue = tokenService.getCurrentUser(req); if (ue == null) { @@ -171,13 +175,33 @@ return fail("id鏁扮粍涓嶈兘涓虹┖", -1); } - // int count = metaService.deletes(ids) - String idStr = StringHelper.join(ids, ","); - int count = metaService.deleteCascade(idStr); + int count = metaService.deletes(ids); return success(count); } catch (Exception ex) { return fail(ex.getMessage(), -1); } } + + @SysLog() + @ApiOperation(value = "鏌ヨ鏁版嵁鏈夋晥鎬�") + @GetMapping(value = "/selectDataValid") + public ResponseMsg<Object> selectDataValid(HttpServletRequest req) { + try { + String taskGuid = StringHelper.getGuid(); + String xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�"; + // 娴嬮噺涓撲笟|鍕樺療涓撲笟|鍦扮伨涓撲笟|娲炲簱涓撲笟 + String sjzy = "娴嬮噺涓撲笟"; + String filePath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip"; + + String rs = fmeService.checkMath(taskGuid, xmmc, sjzy, filePath, req); + if (StringHelper.isEmpty(rs)) { + return fail("妫�鏌ュけ璐�"); + } + + return success(rs); + } catch (Exception ex) { + return fail(ex.getMessage(), null); + } + } } -- Gitblit v1.9.3