权限修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -45,7 +45,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 查询危险工程列表
      */
-    @SaCheckPermission("system:engineeringDangerous:list")
+    @SaCheckPermission("zdsz:engineeringDangerous:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringDangerousVo> list(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
         return iZEngineeringDangerousService.queryPageList(bo, pageQuery);
@@ -54,7 +54,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 导出危险工程列表
      */
-    @SaCheckPermission("system:engineeringDangerous:export")
+    @SaCheckPermission("zdsz:engineeringDangerous:export")
     @Log(title = "危险工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringDangerousBo bo, HttpServletResponse response) {
@@ -67,7 +67,7 @@ public class ZEngineeringDangerousController extends BaseController {
      *
      * @param
      */
-    @SaCheckPermission("system:engineeringDangerous:query")
+    @SaCheckPermission("zdsz:engineeringDangerous:query")
     @GetMapping("/query/{id}")
     public R<ZEngineeringDangerousVo> query(@NotNull(message = "主键不能为空")
                                                 @PathVariable String id) {
@@ -77,7 +77,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 新增危险工程
      */
-    @SaCheckPermission("system:engineeringDangerous:add")
+    @SaCheckPermission("zdsz:engineeringDangerous:add")
     @Log(title = "危险工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -89,7 +89,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 修改危险工程
      */
-    @SaCheckPermission("system:engineeringDangerous:edit")
+    @SaCheckPermission("zdsz:engineeringDangerous:edit")
     @Log(title = "危险工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -102,7 +102,7 @@ public class ZEngineeringDangerousController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:engineeringDangerous:remove")
+    @SaCheckPermission("zdsz:engineeringDangerous:remove")
     @Log(title = "危险工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -124,7 +124,7 @@ public class ZEngineeringDangerousController extends BaseController {
      * 危险工程-下拉
      *
      */
-    @SaCheckPermission("system:engineeringDangerous:list")
+    @SaCheckPermission("zdsz:engineeringDangerous:list")
     @GetMapping("/nameAndIdList")
     public R<List<Map<String, Object>>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
         return R.ok(iZEngineeringDangerousService.selectEnginNameAndId(bo));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -109,7 +109,7 @@ public class ZEngineeringIndustryController extends BaseController {
      * 工业工程|市政工程历史
      *
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:query")
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}/{type}")
     public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringIndustryService.query(id));
@@ -119,7 +119,7 @@ public class ZEngineeringIndustryController extends BaseController {
      * 工业工程|市政工程根据工程类型查询工程名称
      */
     @GetMapping("/queryNameByType")
-    @SaCheckPermission("zdsz:engineeringIndustry:type")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
     public R<List<ZEngineeringIndustryTypeVo>> queryNameByType(ZEngineeringIndustryBo bo) {
         return R.ok(iZEngineeringIndustryService.queryNameByType(bo));
     }
@@ -130,7 +130,7 @@ public class ZEngineeringIndustryController extends BaseController {
     @PutMapping("/updateNodeByBo")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
+//    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
     public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryBo bo) {
         return toAjax(iZEngineeringIndustryService.updateNodeByBo(bo));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfrastructureController.java

@@ -94,7 +94,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
+//    @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}/{type}")
     public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
         return R.ok(iZEngineeringInfrastructureService.queryByIdType(id,type));

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -84,41 +84,40 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
         if (!LoginHelper.isAdmin())
             lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
-        ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
-//        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
-        if (zEngineeringNode==null)
-        {
-            return  null;
+        ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
+        //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
+        if (zEngineeringNode == null) {
+            return null;
         }
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-//        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
-        BeanUtil.copyProperties(zEngineeringNode,zEngineeringNodeBo,"id");
+        //        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        BeanUtil.copyProperties(zEngineeringNode, zEngineeringNodeBo, "id");
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
-        List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+        List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.query(zEngineeringNodeBo);
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
+
     @Override
     @DynamicName(spel = "#bo.createTime")
     //    @Async("threadPoolTaskExecutor")
-    public ZEngineeringNodeBo Userquery(ZEngineeringNodeBo bo,String username) {
+    public ZEngineeringNodeBo Userquery(ZEngineeringNodeBo bo, String username) {
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
-//        if (!LoginHelper.isAdmin())
-//            lqw.eq(ZEngineeringNode::getCreateBy, username);
-        ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
-//        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
-        if (zEngineeringNode==null)
-        {
-            return  null;
+        //        if (!LoginHelper.isAdmin())
+        //            lqw.eq(ZEngineeringNode::getCreateBy, username);
+        ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
+        //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
+        if (zEngineeringNode == null) {
+            return null;
         }
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-//        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
-        BeanUtil.copyProperties(zEngineeringNode,zEngineeringNodeBo,"id");
+        //        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        BeanUtil.copyProperties(zEngineeringNode, zEngineeringNodeBo, "id");
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
-        List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+        List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.query(zEngineeringNodeBo);
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
@@ -128,13 +127,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     @DynamicName(spel = "#bo.createTime")
     public List<ZEngineeringNodeBo> queryListDetails(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringNode> lqw = buildQueryWrapper(bo);
-        List<ZEngineeringNode> zEngineeringNode=baseMapper.selectList(lqw);
-        List<ZEngineeringNodeBo> zEngineeringNodeBoList=new ArrayList<>();
-        zEngineeringNode.stream().forEach(item->{
+        List<ZEngineeringNode> zEngineeringNode = baseMapper.selectList(lqw);
+        List<ZEngineeringNodeBo> zEngineeringNodeBoList = new ArrayList<>();
+        zEngineeringNode.stream().forEach(item -> {
             ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-            BeanUtil.copyProperties(item,zEngineeringNodeBo,"id");
+            BeanUtil.copyProperties(item, zEngineeringNodeBo, "id");
             zEngineeringNodeBo.setId(item.getId());
-            List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+            List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.query(zEngineeringNodeBo);
             zEngineeringNodeBo.setId(item.getId());
             zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
             zEngineeringNodeBoList.add(zEngineeringNodeBo);
@@ -168,14 +167,18 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public List<ZEngineeringNodeBo> queryNodeList(ZEngineeringCivil bo) {
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringNode::getCivliId, bo.getId());
-         List<ZEngineeringNode> zEngineeringNodeList= baseMapper.selectList(lqw);
-         List<ZEngineeringNodeBo>zEngineeringNodeBoList=new ArrayList<>();
-         zEngineeringNodeList.stream().forEach(item->{
-             ZEngineeringNodeBo zEngineeringNodeBo=BeanUtil.copyProperties(item,ZEngineeringNodeBo.class);
-              ZEngineeringReviewBo zEngineeringReviewBo=izEngineeringReviewService.query(zEngineeringNodeBo);
-             zEngineeringNodeBo.setReviewStatus(zEngineeringReviewBo.getReviewStatus());
-             zEngineeringNodeBoList.add(zEngineeringNodeBo);
-         });
+        List<ZEngineeringNode> zEngineeringNodeList = baseMapper.selectList(lqw);
+        List<ZEngineeringNodeBo> zEngineeringNodeBoList = new ArrayList<>();
+        zEngineeringNodeList.stream().forEach(item -> {
+            ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(item, ZEngineeringNodeBo.class);
+            ZEngineeringReviewBo zEngineeringReviewBo = izEngineeringReviewService.query(zEngineeringNodeBo);
+            if (!ObjectUtils.isEmpty(zEngineeringReviewBo)) {
+                zEngineeringNodeBo.setReviewStatus(zEngineeringReviewBo.getReviewStatus());
+            }else {
+                zEngineeringNodeBo.setReviewStatus("0");
+            }
+            zEngineeringNodeBoList.add(zEngineeringNodeBo);
+        });
         return zEngineeringNodeBoList;
     }
 
@@ -213,43 +216,43 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-     @Async
-    public int batchReview(List<ZEngineeringCivil> zEngineeringCivilList,ZEngineeringNodeBo bo,String userId) {
-        zEngineeringCivilList.forEach(item->{
+    @Async
+    public int batchReview(List<ZEngineeringCivil> zEngineeringCivilList, ZEngineeringNodeBo bo, String userId) {
+        zEngineeringCivilList.forEach(item -> {
             SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
-            lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId,item.getId());
-            lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType,bo.getType());
+            lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
+            lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
             format.format(item.getCreateTime());
             MonthTableNameHandler.setData(format.format(item.getCreateTime()));
-            ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
-           List<ZEngineeringReview> zEngineeringReviewList =new ArrayList<>();
-           if (null!=zEngineeringNode)
-           {
-            ZEngineeringReview zEngineeringReview =new ZEngineeringReview();
-            zEngineeringReview.setReviewTime( new Date());
-            zEngineeringReview.setReviewContent(bo.getReviewContent());
-            zEngineeringReview.setReviewStatus(bo.getReviewStatus());
-            zEngineeringReview.setReviewUser(userId);
-            zEngineeringReview.setCreateTime(item.getCreateTime());
-            zEngineeringReview.setEngInfoId(zEngineeringNode.getId());
-            zEngineeringReviewList.add(zEngineeringReview);
-            izEngineeringReviewService.Bacthinsert(zEngineeringReview);
-             ZEngineeringReviewBo zEngineeringReviewBo=BeanUtil.copyProperties(zEngineeringReview, ZEngineeringReviewBo.class);
-            izEngineeringReviewService.updateCivilStatus(item);
-             //Civilinsert(zEngineeringReviewBo);
-
-           }
+            ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
+            List<ZEngineeringReview> zEngineeringReviewList = new ArrayList<>();
+            if (null != zEngineeringNode) {
+                ZEngineeringReview zEngineeringReview = new ZEngineeringReview();
+                zEngineeringReview.setReviewTime(new Date());
+                zEngineeringReview.setReviewContent(bo.getReviewContent());
+                zEngineeringReview.setReviewStatus(bo.getReviewStatus());
+                zEngineeringReview.setReviewUser(userId);
+                zEngineeringReview.setCreateTime(item.getCreateTime());
+                zEngineeringReview.setEngInfoId(zEngineeringNode.getId());
+                zEngineeringReviewList.add(zEngineeringReview);
+                izEngineeringReviewService.Bacthinsert(zEngineeringReview);
+                ZEngineeringReviewBo zEngineeringReviewBo = BeanUtil.copyProperties(zEngineeringReview, ZEngineeringReviewBo.class);
+                izEngineeringReviewService.updateCivilStatus(item);
+                //Civilinsert(zEngineeringReviewBo);
+
+            }
             MonthTableNameHandler.removeData();
         });
 
         return 0;
     }
+
     @Override
     @Async
     @DynamicName(spel = "#zEngineeringCivilList[0].createTime")
-    public int Civilinsert(List<ZEngineeringCivil> zEngineeringCivilList,ZEngineeringNodeBo bo, String UserId) {
-        zEngineeringCivilList.forEach(item2-> {
+    public int Civilinsert(List<ZEngineeringCivil> zEngineeringCivilList, ZEngineeringNodeBo bo, String UserId) {
+        zEngineeringCivilList.forEach(item2 -> {
             SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
             lqw.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringNode::getCivliId, item2.getId());
@@ -258,14 +261,14 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             MonthTableNameHandler.setData(format.format(item2.getCreateTime()));
             ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
             //ZEngineeringNode zEngineeringNode = baseMapper.selectById(zEngineeringReviewBo.getEngInfoId());
-//        ZEngineeringCivil zEngineeringCivil= zEngineeringCivilMapper.selectById(zEngineeringNode.getCivliId());
+            //        ZEngineeringCivil zEngineeringCivil= zEngineeringCivilMapper.selectById(zEngineeringNode.getCivliId());
             ZEngineeringCivilBo zEngineeringCivilBo = BeanUtil.copyProperties(item2, ZEngineeringCivilBo.class);
             ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(zEngineeringNode, ZEngineeringNodeBo.class);
             MonthTableNameHandler.setData(new SimpleDateFormat("yyyy_MM").format(item2.getCreateTime()));
-            zEngineeringCivilBo.setzEngineeringNodeBo(Userquery(zEngineeringNodeBo,UserId));
+            zEngineeringCivilBo.setzEngineeringNodeBo(Userquery(zEngineeringNodeBo, UserId));
             MonthTableNameHandler.removeData();
-//        zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
-//        izEngineeringReviewService.Civilinsert(zEngineeringCivil,zEngineeringReviewBo);
+            //        zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
+            //        izEngineeringReviewService.Civilinsert(zEngineeringCivil,zEngineeringReviewBo);
             areaMessageVo areaMessageVo=new areaMessageVo();
             if (zEngineeringCivilBo.getEnginClassification().equals("courtyard")||zEngineeringCivilBo.getEnginClassification().equals("overhead "))
             {
@@ -286,13 +289,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                  areaMessageVo = zEngineeringCivilMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
             }
             if (!ObjectUtils.isEmpty(areaMessageVo))
-            BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
+                BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
             Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
-//            sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
-//                if (item.getDictValue().equals(zEngineeringCivilBo.getCompletionStatus())) {
-//                    zEngineeringCivilBo.setCompletionStatus(item.getDictLabel());
-//                }
-//            });
+            //            sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
+            //                if (item.getDictValue().equals(zEngineeringCivilBo.getCompletionStatus())) {
+            //                    zEngineeringCivilBo.setCompletionStatus(item.getDictLabel());
+            //                }
+            //            });
             sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
                 if (item.getDictValue().equals(zEngineeringCivilBo.getEnginClassification())) {
                     zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
@@ -303,8 +306,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     zEngineeringCivilBo.setEnginCycle(item.getDictLabel());
                 }
             });
-//        zEngineeringCivilBo.getzEngineeringNodeBo().setType(type);
-//        zEngineeringCivilBo.setEnginClassification(completionStatus);
+            //        zEngineeringCivilBo.getzEngineeringNodeBo().setType(type);
+            //        zEngineeringCivilBo.setEnginClassification(completionStatus);
             if (zEngineeringCivilBo.getEnginType().equals("old_renovation")) {
                 zEngineeringCivilBo.setEnginType("旧改");
             } else if (zEngineeringCivilBo.getEnginType().equals("new_built")) {
@@ -422,12 +425,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         }
         return baseMapper.updateById(update) > 0;
     }
+
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateMuch(ZEngineeringNodeBo bo) {
         ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
-        bo.getzEngineeringInfoBoList().stream().forEach(item->{
+        bo.getzEngineeringInfoBoList().stream().forEach(item -> {
             item.setCreateTime(bo.getCreateTime());
             izEngineeringInfoService.update(item);
         });