自动注入修改更新时间

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -150,8 +151,8 @@ public class ZEngineeringCivilController extends BaseController {
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @GetMapping("/batchReview")
-    public R BatchReview(ZEngineeringCivilBo bo) {
-        return R.ok(iZEngineeringCivilService.getsumStatus(bo));
+    public R BatchReview(ZEngineeringCivilBo bo, ZEngineeringNodeBo zEngineeringNodeBo) {
+        return R.ok(iZEngineeringCivilService.batchReview(bo,zEngineeringNodeBo));
     }
 
 

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

@@ -68,4 +68,5 @@ public interface IZEngiineeringPhotoService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     Boolean deleteWithValidByurls(String url);
+    Boolean deleteWithValid(ZEngiineeringPhoto bo);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -60,5 +61,5 @@ public interface IZEngineeringCivilService {
 
     TableDataInfo<areaStatusVo> getAreaCompletionInformationList(ZEngineeringCivilBo bo,PageQuery po);
     areaStatusVo getsumStatus(ZEngineeringCivilBo bo);
-    int   batchReview (ZEngineeringCivilBo bo);
+    int   batchReview (ZEngineeringCivilBo bo, ZEngineeringNodeBo zEngineeringNodeBo);
 }

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

@@ -86,5 +86,5 @@ public interface IZEngineeringNodeService {
      * @param zEngineeringCivilList
      * @return
      */
-     int batchReview(List<ZEngineeringCivil> zEngineeringCivilList);
+     int batchReview(List<ZEngineeringCivil> zEngineeringCivilList,ZEngineeringNodeBo zEngineeringNodeBo);
 }

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

@@ -232,4 +232,14 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         return baseMapper.deleteByUrls(url) > 0;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public Boolean deleteWithValid(ZEngiineeringPhoto bo) {
+        try {
+            obsService.deleteFiles(Collections.singletonList(bo.getPicUrl()));
+        } catch (Exception e) {
+
+        }
+        return baseMapper.deleteByUrls(bo.getPicUrl()) > 0;
+    }
 }

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

@@ -14,11 +14,13 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.mapper.ZAreaMapper;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import com.ruoyi.zdsz.service.IZMaterialStatisticsService;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
@@ -29,6 +31,8 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 /**
@@ -49,7 +53,6 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     private IZEngineeringNodeService izEngineeringNodeService;
     @Resource
     private IZMaterialStatisticsService izMaterialStatisticsService;
-
     /**
      * 查询民用工程
      */
@@ -322,7 +325,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
     @Override
-    public int batchReview(ZEngineeringCivilBo bo) {
+    public int batchReview(ZEngineeringCivilBo bo,ZEngineeringNodeBo zEngineeringNodeBo) {
         ZEngineeringCivil add = BeanUtil.toBean(bo, ZEngineeringCivil.class);
         validEntityBeforeSave(add);
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
@@ -335,6 +338,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         List<ZEngineeringCivil> zEngineeringCivilList=baseMapper.selectList(lqw);
 
+        if (zEngineeringCivilList.size()>0)
+        {
+            ScheduledThreadPoolExecutor threadPoolTaskExecutor=new ScheduledThreadPoolExecutor((zEngineeringCivilList.size()/50)+1);
+            CountDownLatch countDownLatch = new CountDownLatch((zEngineeringCivilList.size()/50)+1);
+
+            izEngineeringNodeService.batchReview(zEngineeringCivilList,zEngineeringNodeBo);
+        }
+
         return 0;
     }
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
@@ -153,6 +154,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
             zEngiineeringPhotoBo.setParentId(update.getId());
+            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
             List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream()
                 .map(ZEngiineeringPhotoVo::getPicUrl)
                 .collect(Collectors.toList());
@@ -165,7 +167,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                         newPhoto.setPicUrl(pic.getUrl());
                         newPhoto.setFileName(pic.getName());
                         newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                        newPhoto.setCreateTime(new Date());
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(new Date());
                         list.add(newPhoto);
                     }
                 }
@@ -175,7 +178,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     .collect(Collectors.toList());
                 if (!photosToDelete.isEmpty()) {
                     photosToDelete.forEach(item->{
-                        photoService.deleteWithValidByurls(item);
+                        ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
                     });
                 }
                 // 批量插入新图片
@@ -222,7 +228,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     newPhoto.setPicUrl(pic.getUrl());
                     newPhoto.setFileName(pic.getName());
                     newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                    newPhoto.setCreateTime(new Date());
+                    newPhoto.setCreateTime(bo.getCreateTime());
+                    newPhoto.setUpdateTime(new Date());
                     list.add(newPhoto);
                 }
             }
@@ -232,7 +239,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
                 photosToDelete.forEach(item->{
-                    photoService.deleteWithValidByurls(item);
+                    ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+                    zEngiineeringPhoto.setPicUrl(item);
+                    zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                    photoService.deleteWithValid(zEngiineeringPhoto);
                 });
             }
             // 批量插入新图片

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

@@ -150,12 +150,24 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-    public int batchReview(List<ZEngineeringCivil> zEngineeringCivilList) {
-
+    public int batchReview(List<ZEngineeringCivil> zEngineeringCivilList,ZEngineeringNodeBo bo) {
         zEngineeringCivilList.stream().forEach(item->{
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
-           // MonthTableNameHandler.setData();
-
+            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());
+            format.format(item.getCreateTime());
+            MonthTableNameHandler.setData(format.format(item.getCreateTime()));
+           ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
+            ZEngineeringReviewBo zEngineeringReview =new ZEngineeringReviewBo();
+            zEngineeringReview.setReviewTime( new Date());
+            zEngineeringReview.setReviewContent("批量审核");
+            zEngineeringReview.setReviewStatus("1");
+            zEngineeringReview.setReviewUser(LoginHelper.getLoginUser().getUserId().toString());
+            zEngineeringReview.setCreateTime(item.getCreateTime());
+            zEngineeringReview.setEngInfoId(zEngineeringNode.getId());
+            izEngineeringReviewService.insert(zEngineeringReview);
+            MonthTableNameHandler.removeData();
         });
         return 0;
     }