From d12b5b41ee33e7eb57f3c3fe00f4fae53eb93388 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 06 一月 2023 09:25:44 +0800 Subject: [PATCH] 1.6 --- src/main/java/com/lf/server/controller/data/MetaController.java | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) 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..49a4110 100644 --- a/src/main/java/com/lf/server/controller/data/MetaController.java +++ b/src/main/java/com/lf/server/controller/data/MetaController.java @@ -13,7 +13,6 @@ 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.sys.UserEntity; import com.lf.server.helper.ClassHelper; import com.lf.server.helper.Md5Helper; @@ -133,11 +132,11 @@ } MetaEntity meta = metaService.selectById(id); - if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) { + if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) { return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null); } - String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase(); + String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase(); BasicMapper baseMapper = ClassHelper.getBasicMapper(entity); if (null == baseMapper) { return null; @@ -234,8 +233,7 @@ @GetMapping(value = "/delete") public ResponseMsg<Integer> delete(int id) { try { - // int count = metaService.delete(id) - int count = metaService.deleteCascade(String.valueOf(id)); + int count = metaService.delete(id); return success(count); } catch (Exception ex) { @@ -255,9 +253,7 @@ 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) { @@ -312,7 +308,7 @@ } @SysLog() - @ApiOperation(value = "鍒嗛〉鏌ヨ涓嬭浇璁板綍骞惰繑鍥炶褰曟暟") + @ApiOperation(value = "鍒嗛〉鏌ヨ涓嬭浇鏂囦欢") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""), @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"), @@ -358,14 +354,14 @@ if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) { return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢"); } - if (!downloadService.decryptPwd(reqEntity)) { + if (!DownloadService.decryptPwd(reqEntity)) { return fail("瀵嗙爜瑙e瘑澶辫触", null); } - if (!StringHelper.checkPwdValid(reqEntity.getPwd())) { + if (StringHelper.isPwdInvalid(reqEntity.getPwd())) { return fail("瀵嗙爜涓嶇鍚堣姹�"); } - List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds()); + List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds()); if (null == list || list.isEmpty()) { return fail("娌℃湁鎵惧埌鍏冩暟鎹�"); } @@ -395,7 +391,7 @@ pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name()); } - String password = downloadService.decryptPwd(pwd); + String password = DownloadService.decryptPwd(pwd); if (null == password) { return fail("瀵嗙爜瑙e瘑澶辫触", null); } @@ -434,7 +430,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, "瀵嗙爜瑙e瘑澶辫触", res); } -- Gitblit v1.9.3