提交代码

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

@@ -133,39 +133,6 @@ public class ZEngineeringIndustryController extends BaseController {
         return R.ok(iZEngineeringIndustryService.query(id, type));
     }
 
-    @Value("${filePath}")
-    private String filePath;
-
-    @GetMapping(value = "/downloadZip/{type}/{name}")
-    public void downloadZip(@PathVariable String type,@PathVariable String name,HttpServletResponse response) {
-//        File file = new File(zipPath);//创建指定目录和文件名称的文件对象
-        try {
-            // 创建最外层文件夹
-            byte[] fileNameBytes = filePath.getBytes("UTF-8");
-            // 使用UTF-8编码创建文件
-            File file = new File(new String(fileNameBytes, "UTF-8"));
-            if (!file.exists()) {
-                file.mkdirs();
-            }
-            byte[] typeFileNameBytes = (file.getPath() + "/" + type).getBytes("UTF-8");
-            // 使用UTF-8编码创建文件
-            File typeFile = new File(new String(typeFileNameBytes, "UTF-8"));
-            if (!typeFile.exists()) {
-                typeFile.mkdirs();
-            }
-            byte[] enginNameFileNameBytes = (typeFile.getPath() + "/" + name).getBytes("UTF-8");
-            // 使用UTF-8编码创建文件
-            File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
-            if (!enginNameFile.exists()) {
-                enginNameFile.mkdirs();
-            }
-            System.out.println(enginNameFile.getPath());
-            FolderToZipUtil.toZip(filePath+"/"+type+"/"+name,response.getOutputStream(),true);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * 工业工程|市政工程根据工程类型查询工程名称
      */

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

@@ -311,6 +311,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
 
     @Override
     @DynamicName(spel = "#bo.createTime")
+    @Async
     public void writeImg(List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
         Map<String, String> objInfo = baseMapper.getObjInfo(bo.getEngInfoId());
         System.out.println("-------------节点信息-------------");

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

@@ -1041,7 +1041,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Override
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int insertReview(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
-//        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
+        //        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
         //        if (zEngineeringReviewBo.getReviewStatus().equals("1"))
         //        {
         //        infoIdList.getDelInfoIdList().stream().forEach(item -> {
@@ -1060,23 +1060,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 MonthTableNameHandler.setData(format.format(item.getCreateTime()));
                 zEngineeringInfoMapper.update(lqw);
                 MonthTableNameHandler.removeData();
-                try {
-                    threadPoolTaskExecutor.execute(()->{
-                        izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item);
-                    });
-                }catch (Exception e){
-                    e.getStackTrace();
-                }finally {
-                }
+                izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item);
             });
-            threadPoolTaskExecutor.shutdown();
-
             izEngineeringReviewService.insert(zEngineeringReviewBo);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return 0;
     }
+
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;