修改对外报告提示文字

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.extRepo.entity.ExtRepoData;
@@ -66,13 +67,12 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         LambdaQueryWrapper<ExtRepoData> queryWrapper = new LambdaQueryWrapper<>();
-        Page<ExtRepoData> page = new Page<ExtRepoData>(pageNo, pageSize);
+        Page<ExtRepoData> page = new Page<>(pageNo, pageSize);
         // 文件名称模糊查询
         String fileName = req.getParameter("fileName");
         if (StringUtils.isNotBlank(fileName)) {
             queryWrapper.like(ExtRepoData::getFileName, fileName);
         }
-
         // 上传人模糊查询
         String createBy = req.getParameter("createBy");
         if (StringUtils.isNotBlank(createBy)) {
@@ -88,10 +88,6 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         }
         queryWrapper.eq(ExtRepoData::getSupFolder, extRepoData.getSupFolder());
         IPage<ExtRepoData> pageList = extRepoDataService.page(page, queryWrapper);
-        log.info("查询当前页：" + pageList.getCurrent());
-        log.info("查询当前页数量：" + pageList.getSize());
-        log.info("查询结果数量：" + pageList.getRecords().size());
-        log.info("数据总数：" + pageList.getTotal());
         ExtRepoDataPage res = new ExtRepoDataPage(extRepoFolderService.haveManageAuth(extRepoData.getSupFolder()), pageList);
         return Result.OK(res);
     }
@@ -118,13 +114,22 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
     @AutoLog(value = "对外报告数据表-添加")
     @ApiOperation(value = "对外报告数据表-添加", notes = "对外报告数据表-添加")
     @PostMapping(value = "/add")
-    public Result<?> add(@Validated @RequestBody ExtRepoData extRepoData) {
+    public Result<?> add(@Validated @RequestBody ExtRepoData extRepoData,
+                         @RequestParam("cut") String cut) {
         if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) {
             log.info("对外报告数据表收到文件添加请求，开始处理文件:【" + sdf.format(new Date()) + "】");
             int res = extRepoDataService.add(extRepoData);
-            return Result.OK("添加成功" + res + "条数据！");
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.OK("添加成功:" + res + "条数据！");
+            } else {
+                return Result.OK("success:" + res + "data！");
+            }
         } else {
-            return Result.error("没有权限！");
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("没有权限！");
+            } else {
+                return Result.error("No Permission！");
+            }
         }
     }
 
@@ -138,15 +143,24 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
     @AutoLog(value = "对外报告数据表-编辑")
     @ApiOperation(value = "对外报告数据表-编辑", notes = "对外报告数据表-编辑")
     @PutMapping(value = "/edit")
-    public Result<?> edit(@Validated @RequestBody ExtRepoData extRepoData) {
+    public Result<?> edit(@Validated @RequestBody ExtRepoData extRepoData,
+                          @RequestParam("cut") String cut) {
         ExtRepoData erd = extRepoDataService.queryById(extRepoData.getId());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) {
             extRepoData.setSupFolder(erd.getSupFolder());
             extRepoDataService.editById(extRepoData);
-            return Result.OK("添加成功！");
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.OK("添加成功！");
+            } else {
+                return Result.OK("success！");
+            }
         } else {
-            return Result.error("没有权限！");
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("没有权限！");
+            } else {
+                return Result.error("No Permission！");
+            }
         }
     }
 
@@ -159,18 +173,27 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
     @AutoLog(value = "对外报告数据表-通过id删除")
     @ApiOperation(value = "对外报告数据表-通过id删除", notes = "对外报告数据表-通过id删除")
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam("id") String id) {
+    public Result<?> delete(@RequestParam("id") String id,
+                            @RequestParam("cut") String cut) {
         ExtRepoData erd = extRepoDataService.queryById(id);
         if (null != erd) {
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) {
                 extRepoDataService.deleteById(id);
-                return Result.OK("删除成功!");
+                if (CutEnum.CN.getValue().equals(cut)) {
+                    return Result.OK("删除成功!");
+                } else {
+                    return Result.OK("Delete success!");
+                }
             } else {
-                return Result.error("没有权限！");
+                if (CutEnum.CN.getValue().equals(cut)) {
+                    return Result.error("没有权限！");
+                } else {
+                    return Result.error("No Permission！");
+                }
             }
         } else {
-            return Result.error("没有此数据！");
+            return Result.error("Delete Error！");
         }
     }
 
@@ -183,17 +206,26 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
     @AutoLog(value = "对外报告数据表-批量删除")
     @ApiOperation(value = "对外报告数据表-批量删除", notes = "对外报告数据表-批量删除")
     @DeleteMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam("ids") String ids) {
+    public Result<?> deleteBatch(@RequestParam("ids") String ids,
+                                 @RequestParam("cut") String cut) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> idsList = Arrays.asList(ids.split(","));
         for (String id : idsList) {
             ExtRepoData erd = extRepoDataService.queryById(id);
             if (null != erd && !extRepoFolderService.isManager() && !sysUser.getUsername().equals(erd.getCreateBy())) {
-                return Result.error("没有权限!");
+                if (CutEnum.CN.getValue().equals(cut)) {
+                    return Result.error("没有权限！");
+                } else {
+                    return Result.error("No Permission！");
+                }
             }
         }
         this.extRepoDataService.deleteByIds(idsList);
-        return Result.OK("批量删除成功!");
+        if (CutEnum.CN.getValue().equals(cut)) {
+            return Result.OK("删除成功!");
+        } else {
+            return Result.OK("Delete success!");
+        }
     }
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java

@@ -2,6 +2,7 @@ package com.jero.modules.extRepo.controller;
 
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.extRepo.entity.ERFTreeData;
 import com.jero.modules.extRepo.entity.ExtRepoFolder;
@@ -52,9 +53,22 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
     @AutoLog(value = "对外报告文件夹表-添加")
     @ApiOperation(value = "对外报告文件夹表-添加", notes = "对外报告文件夹表-添加")
     @PostMapping(value = "/add")
-    public Result<?> add(@Validated @RequestBody ExtRepoFolder extRepoFolder) {
+    public Result<?> add(@Validated @RequestBody ExtRepoFolder extRepoFolder,
-        extRepoFolderService.add(extRepoFolder);
+                         @RequestParam("cut") String cut) {
-        return Result.OK("添加成功！");
+        if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) {
+            extRepoFolderService.add(extRepoFolder);
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.OK("添加成功！");
+            } else {
+                return Result.OK("success！");
+            }
+        } else {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("没有权限！");
+            } else {
+                return Result.error("No Permission！");
+            }
+        }
     }
 
     /**
@@ -66,9 +80,22 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
     @AutoLog(value = "对外报告文件夹表-编辑")
     @ApiOperation(value = "对外报告文件夹表-编辑", notes = "对外报告文件夹表-编辑")
     @PutMapping(value = "/edit")
-    public Result<?> edit(@Validated @RequestBody ExtRepoFolder extRepoFolder) {
+    public Result<?> edit(@Validated @RequestBody ExtRepoFolder extRepoFolder,
-        extRepoFolderService.editById(extRepoFolder);
+                          @RequestParam("cut") String cut) {
-        return Result.OK("编辑成功!");
+        if (extRepoFolderService.haveManageAuth(extRepoFolder.getId())) {
+            extRepoFolderService.editById(extRepoFolder);
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.OK("编辑成功!");
+            } else {
+                return Result.OK("success！");
+            }
+        } else {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("没有权限！");
+            } else {
+                return Result.error("No Permission！");
+            }
+        }
     }
 
     /**
@@ -80,9 +107,31 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
     @AutoLog(value = "对外报告文件夹表-通过id删除")
     @ApiOperation(value = "对外报告文件夹表-通过id删除", notes = "对外报告文件夹表-通过id删除")
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id,
-        extRepoFolderService.deleteById(id);
+                            @RequestParam("cut") String cut) {
-        return Result.OK("删除成功!");
+        if (extRepoFolderService.haveManageAuth(id)) {
+            List<ExtRepoFolder> resList = extRepoFolderService.getListBySupFolder(id);
+            if (resList.isEmpty()) {
+                extRepoFolderService.deleteById(id);
+            } else {
+                if (CutEnum.CN.getValue().equals(cut)) {
+                    return Result.error("请先删除子文件夹！");
+                } else {
+                    return Result.error("Please Delete Subfolder First！");
+                }
+            }
+        } else {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("没有权限！");
+            } else {
+                return Result.error("No Permission！");
+            }
+        }
+        if (CutEnum.CN.getValue().equals(cut)) {
+            return Result.OK("删除成功!");
+        } else {
+            return Result.OK("success！");
+        }
     }
 
     /**
@@ -94,10 +143,15 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
     @AutoLog(value = "对外报告文件夹表-通过id查询")
     @ApiOperation(value = "对外报告文件夹表-通过id查询", notes = "对外报告文件夹表-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id,
+                               @RequestParam("cut") String cut) {
         ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id);
         if (extRepoFolder == null) {
-            return Result.error("未找到对应数据");
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return Result.error("未找到对应数据");
+            } else {
+                return Result.error("No Data！");
+            }
         }
         return Result.OK(extRepoFolder);
     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java

@@ -4,9 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public enum ExtRepoMamagerRoleIdEnum {
-    MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",1),
+    MANAGER_ID("系统管理员", "Administrator", "admin", "f6817f48af4fb3af11b9e8bf182f618b", 1),
-    ERMANAGER_ID("对外报告管理员","ExternalReportsManager","ExternalReportsManager","1552536424587862017",2);
+    ERMANAGER_ID("对外报告管理员", "ExternalReportsManager", "ExternalReportsManager", "1552536424587862017", 2);
-
 
     String name;
     String enName;
@@ -68,6 +67,6 @@ public enum ExtRepoMamagerRoleIdEnum {
         for (ExtRepoMamagerRoleIdEnum ermriEnum : values) {
             idList.add(ermriEnum.getId());
         }
-        return  idList;
+        return idList;
     }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java

@@ -8,55 +8,55 @@ import java.util.List;
 /**
  * @Description: 对外报告数据表
  * @Author: jero-boot
- * @Date:   2022-07-25
+ * @Date: 2022-07-25
  * @Version: V1.0
  */
 public interface IExtRepoDataService extends IService<ExtRepoData> {
 
-	/**
+    /**
-	 * 保存
+     * 保存
-	 *
+     *
-	 * @param extRepoData
+     * @param extRepoData
-	 * @return
+     * @return
-	 */
+     */
-	int add(ExtRepoData extRepoData);
+    int add(ExtRepoData extRepoData);
 
-	/**
+    /**
-	 * 更新
+     * 更新
-	 *
+     *
-	 * @param extRepoData
+     * @param extRepoData
-	 * @return
+     * @return
-	 */
+     */
     void editById(ExtRepoData extRepoData);
 
-	/**
+    /**
-	 * 通过id删除
+     * 通过id删除
-	 *
+     *
-	 * @param id
+     * @param id
-	 * @return
+     * @return
-	 */
+     */
     void deleteById(String id);
 
-	/**
+    /**
-	 * 批量删除
+     * 批量删除
-	 *
+     *
-	 * @param ids
+     * @param ids
-	 * @return
+     * @return
-	 */
+     */
     void deleteByIds(List<String> ids);
 
-	/**
+    /**
-	 * 通过id查询
+     * 通过id查询
-	 *
+     *
-	 * @param id
+     * @param id
-	 * @return
+     * @return
-	 */
+     */
     ExtRepoData queryById(String id);
 
     /**
-	 * 列表查询
+     * 列表查询
-	 *
+     *
-	 * @return
+     * @return
-	 */
+     */
     List<ExtRepoData> queryList();
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java

@@ -83,4 +83,12 @@ public interface IExtRepoFolderService extends IService<ExtRepoFolder> {
      * @return
      */
     boolean isManager();
+
+    /**
+     * 查找子文件夹
+     *
+     * @param supFolder
+     * @return
+     */
+    List<ExtRepoFolder> getListBySupFolder(String supFolder);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java

@@ -34,7 +34,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
     /**
      * 一级文件夹的supFolder统一存root
      */
-    private static String superFolder = "root";
+    private static final String superFolder = "root";
 
     /**
      * 保存
@@ -49,20 +49,16 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
                 //一级文件夹的supFolder统一存root，方便以后查找
                 extRepoFolder.setSupFolder(superFolder);
             }
-            if (haveManageAuth(extRepoFolder.getSupFolder())) {
+            Date now = new Date();
-                Date now = new Date();
+            extRepoFolder.setCreateTime(now);
-                extRepoFolder.setCreateTime(now);
+            extRepoFolder.setUpdateTime(now);
-                extRepoFolder.setUpdateTime(now);
 //                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 //                extRepoFolder.setAuthManageName(extRepoFolder.getAuthManageName() + "," + sysUser.getUsername());
 //                extRepoFolder.setAuthManageIds(extRepoFolder.getAuthManageIds() + "," + sysUser.getId());
-                extRepoFolder.setAuthManageIdsName(extRepoFolder.getAuthManageIdsName());
+            extRepoFolder.setAuthManageIdsName(extRepoFolder.getAuthManageIdsName());
-                extRepoFolder.setAuthManageIds(extRepoFolder.getAuthManageIds());
+            extRepoFolder.setAuthManageIds(extRepoFolder.getAuthManageIds());
-                save(extRepoFolder);
+            save(extRepoFolder);
-                editOrderId(extRepoFolder);
+            editOrderId(extRepoFolder);
-            } else {
-                throw new JeroBootException("没有权限！");
-            }
         } catch (Exception ex) {
             log.error("添加对外报告文件夹失败：" + ex.getMessage());
             throw new JeroBootException("添加文件夹失败！");
@@ -84,7 +80,8 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
         }
     }
 
-    private List<ExtRepoFolder> getListBySupFolder(String supFolder) {
+    @Override
+    public List<ExtRepoFolder> getListBySupFolder(String supFolder) {
         ExtRepoFolder erf = new ExtRepoFolder();
         erf.setSupFolder(supFolder);
         QueryWrapper<ExtRepoFolder> queryWrapper = QueryGenerator.initQueryWrapper(erf, new HashMap<>());
@@ -100,17 +97,13 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
     @Override
     public void editById(ExtRepoFolder extRepoFolder) {
         try {
-            if (haveManageAuth(extRepoFolder.getId())) {
+            //原有的记录
-                //原有的记录
+            ExtRepoFolder erf_orig = queryById(extRepoFolder.getId());
-                ExtRepoFolder erf_orig = queryById(extRepoFolder.getId());
+            Date now = new Date();
-                Date now = new Date();
+            extRepoFolder.setUpdateTime(now);
-                extRepoFolder.setUpdateTime(now);
+            saveOrUpdate(extRepoFolder);
-                saveOrUpdate(extRepoFolder);
+            editOrderId(extRepoFolder);
-                editOrderId(extRepoFolder);
+            editAuth(erf_orig, extRepoFolder);
-                editAuth(erf_orig, extRepoFolder);
-            } else {
-                throw new JeroBootException("没有权限！");
-            }
         } catch (Exception ex) {
             log.error("修改对外报告文件夹失败：" + ex.getMessage());
             throw new JeroBootException("修改文件夹失败！");
@@ -220,16 +213,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
     @Override
     public void deleteById(String id) {
         try {
-            if (haveManageAuth(id)) {
+            removeById(id);
-                List<ExtRepoFolder> resList = getListBySupFolder(id);
-                if (resList.isEmpty()) {
-                    removeById(id);
-                } else {
-                    throw new JeroBootException("请先删除子文件夹！");
-                }
-            } else {
-                throw new JeroBootException("没有权限！");
-            }
         } catch (Exception ex) {
             log.error("删除对外报告文件夹失败：" + ex.getMessage());
             throw new JeroBootException("删除文件夹失败！");