Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngiineeringPhotoMapper.java

@@ -19,5 +19,8 @@ public interface ZEngiineeringPhotoMapper extends BaseMapperPlus<ZEngiineeringPh
     int deleteByUrl( @Param("list") List<String> list);
 
     List<Map<String,Object>> getlist(String id);
+
+    Map<String,String> getObjInfo(String nodeId);
+
     int deleteByUrls(String url);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngiineeringPhotoService.java

@@ -6,9 +6,11 @@ import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -82,4 +84,5 @@ public interface IZEngiineeringPhotoService {
     Boolean deleteWithValidByurls(String url);
     Boolean deleteWithValid(ZEngiineeringPhoto bo);
     void write(ZEngineeringCivilBo zEngineeringCivilBo);
+    void writeImg(String id, List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo);
 }

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

@@ -13,6 +13,7 @@ import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
@@ -307,6 +308,15 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     }
 
     @Override
+    @DynamicName(spel = "#bo.createTime")
+    public void writeImg(String id, List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
+        Map<String, String> objInfo = baseMapper.getObjInfo(id);
+        System.out.println("-------------节点信息-------------");
+        System.out.println(objInfo);
+        System.out.println("--------------------------------");
+    }
+
+    @Override
     @Async
     public void write(ZEngineeringCivilBo zEngineeringCivilBo) {
         zEngineeringCivilBo.getzEngineeringNodeBo().getzEngineeringInfoBoList().forEach(zEngineeringInfoBo -> {

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

@@ -274,7 +274,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getCorrosionLevel())) {
                     zEngineeringCivilExportVos.setCorrosionLevel("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType())&& zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
                 else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
@@ -304,7 +304,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality())&&"切断阀".equals(zEngineeringCivilExportVo.getType()))
+                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality()) && "切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getBrand());
                 else if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
@@ -658,7 +658,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
         if ("indoor_engin".equals(bo.getEnginClassification()) || "courtyard".equals(bo.getEnginClassification()) || "overhead".equals(bo.getEnginClassification())) {
-           if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
                 izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
@@ -852,7 +852,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         IdList.stream().forEach(item -> {
             Id.add(item.getId());
         });
-        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList(Id, bo.getEnginCycle(),bo.getEnginType());
+        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList(Id, bo.getEnginCycle(), bo.getEnginType());
         Map<String, List<areaWillDoneVo>> stringListMap = hourseList.stream().collect(Collectors.groupingBy(item -> item.getAreaId()));
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
@@ -878,7 +878,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     public List<areaStatusVo> getAreaCompletionInformationList2(ZEngineeringCivilBo bo) {
-        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2( bo.getEnginCycle(),bo.getEnginType());
+        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2(bo.getEnginCycle(), bo.getEnginType());
         Map<String, List<areaWillDoneVo>> stringListMap = hourseList.stream().collect(Collectors.groupingBy(item -> item.getAreaId()));
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
@@ -967,19 +967,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
         ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
-        if (zEngineeringReviewBo.getReviewStatus().equals("1"))
-        {
-        infoIdList.getDelInfoIdList().stream().forEach(item -> {
-            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
-            zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
-            zEngineeringInfoBo.setId(item);
-            izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
-        });}
+        if (zEngineeringReviewBo.getReviewStatus().equals("1")) {
+            infoIdList.getDelInfoIdList().stream().forEach(item -> {
+                ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
+                zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
+                zEngineeringInfoBo.setId(item);
+                izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
+            });
+        }
         infoIdList.getInfoIdList().stream().forEach(item -> {
             item.setState(zEngineeringReviewBo.getReviewStatus());
-            SimpleDateFormat format=new SimpleDateFormat("yyyy_MM");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
             UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
-            lqw.eq("id",item.getId()).set("state",zEngineeringReviewBo.getReviewStatus());
+            lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus());
             MonthTableNameHandler.setData(format.format(item.getCreateTime()));
             zEngineeringInfoMapper.update(lqw);
             MonthTableNameHandler.removeData();
@@ -1040,26 +1040,32 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Override
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int insertReview(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
-        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
-//        if (zEngineeringReviewBo.getReviewStatus().equals("1"))
-//        {
-//        infoIdList.getDelInfoIdList().stream().forEach(item -> {
-//            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
-//            zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
-//            zEngineeringInfoBo.setId(item);
-//            izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
-//        });
-//        }
-        infoIdList.getInfoIdList().stream().forEach(item -> {
-            item.setState(zEngineeringReviewBo.getReviewStatus());
-            SimpleDateFormat format=new SimpleDateFormat("yyyy_MM");
-            UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
-            lqw.eq("id",item.getId()).set("state",zEngineeringReviewBo.getReviewStatus());
-            MonthTableNameHandler.setData(format.format(item.getCreateTime()));
-            zEngineeringInfoMapper.update(lqw);
-            MonthTableNameHandler.removeData();
-        });
-        izEngineeringReviewService.insert(zEngineeringReviewBo);
+//        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
+        //        if (zEngineeringReviewBo.getReviewStatus().equals("1"))
+        //        {
+        //        infoIdList.getDelInfoIdList().stream().forEach(item -> {
+        //            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
+        //            zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
+        //            zEngineeringInfoBo.setId(item);
+        //            izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
+        //        });
+        //        }
+        try {
+            infoIdList.getInfoIdList().stream().forEach(item -> {
+                item.setState(zEngineeringReviewBo.getReviewStatus());
+                SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
+                UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
+                lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus());
+                MonthTableNameHandler.setData(format.format(item.getCreateTime()));
+                zEngineeringInfoMapper.update(lqw);
+                MonthTableNameHandler.removeData();
+                izEngiineeringPhotoService.writeImg(zEngineeringReviewBo.getEngInfoId(),infoIdList.getInfoIdList(), item);
+            });
+
+            izEngineeringReviewService.insert(zEngineeringReviewBo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return 0;
     }
 

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngiineeringPhotoMapper.xml

@@ -36,4 +36,8 @@
         select id,parent_id as parentId,pic_url as url ,del_flag as delFlag,create_by as creatBy,create_time as createTime from z_engiineering_photo where del_flag = '0' and parent_id = #{id}
     </select>
 
+    <select id="getObjInfo" resultType="java.util.Map">
+        SELECT * FROM `z_engineering_node` WHERE id = #{nodeId}
+    </select>
+
 </mapper>