From 0091dd076ed7d6dfb06fa820dabd9cf5e738514c Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:13 +0800
Subject: [PATCH] 仿真评估检查模型时，总体工况模型里未使用的节点，不检查其模型是否存在。

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |   48 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index b71e115..7f07865 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -6,6 +6,7 @@
 import com.zt.common.annotation.QueryParam;
 import com.zt.common.db.query.QueryFilter;
 import com.zt.common.servlet.Result;
+import com.zt.common.utils.CacheUtils;
 import com.zt.common.utils.UUIDUtil;
 import com.zt.common.validator.AssertUtils;
 import com.zt.common.validator.ValidatorUtils;
@@ -34,6 +35,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -74,6 +76,7 @@
     public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow, Long productId) {
         List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow, productId);
 
+
         return Result.ok(list);
     }
 
@@ -93,9 +96,23 @@
         return Result.ok(data);
     }
 
+    @GetMapping("getImg")
+    @ApiOperation("淇℃伅")
+    public void getImg(HttpServletResponse response, Long id) {
+        xhProductModelService.getImg(response, id);
+    }
+
+
     @GetMapping("getProductList")
-    public Result<List<XhProductModel>> getProductList() {
-        List<XhProductModel> list = xhProductModelService.getProductList();
+    public Result<List<XhProductModel>> getProductList(Long shipId, Integer productType) {
+        if(productType==2){
+            shipId =null;
+        }
+        List<XhProductModel> list = xhProductModelService.getProductList(shipId, productType - 1);
+        if(productType == 5){
+            List<XhProductModel> list2 =  xhProductModelService.getProductList(shipId, productType - 2);
+            list.addAll(list2);
+        }
         return Result.ok(list);
     }
 
@@ -125,8 +142,8 @@
     @GetMapping("exportData")
     @ApiOperation("瀵煎嚭浜у搧妯″瀷")
     @LogOperation("瀵煎嚭浜у搧妯″瀷")
-    public Result exportDataExcel(HttpServletRequest request, HttpServletResponse response, Long shipId,String fileName) {
-        xhProductModelService.exportDataExcel(request,response,shipId,fileName);
+    public Result exportDataExcel(HttpServletRequest request, HttpServletResponse response, Long shipId, String fileName) {
+        xhProductModelService.exportDataExcel(request, response, shipId, fileName);
 
         return null;
     }
@@ -156,7 +173,9 @@
         }
 
         xhProductModelService.insert(xhProductModel);
-
+        Map<Long, XhProductModel> imgMap = new HashMap<>();
+        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
+        imgMap.put(xhProductModel.getId(), xhProductModel);
         return Result.ok();
     }
 
@@ -184,6 +203,9 @@
         //鏁堥獙鏁版嵁
         ValidatorUtils.validateEntity(xhProductModel, UpdateGroup.class, DefaultGroup.class);
         xhProductModelService.update(xhProductModel);
+        Map<Long, XhProductModel> imgMap = new HashMap<>();
+        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
+        imgMap.put(xhProductModel.getId(), xhProductModel);
 
         return Result.ok();
     }
@@ -200,19 +222,15 @@
     }
 
     private void deleteByProduct(Long[] ids) {
+        Map<Long, XhProductModel> imgMap = new HashMap<>();
+        imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
         for (Long id : ids) {
-            XhProductModel data = xhProductModelService.get(id);
-            if (data.getProductType().equals("1") || data.getProductType().equals("3") || data.getProductType().equals("4")) {
-                xhProductModelService.deleteLogic(id);
-              /*  List<Long> list =xhProductModelService.getByPid(id);
-                Long[] L = list.stream().toArray(Long[]::new);*/
-                Long[] list = xhProductModelService.getByPid(id);
+            Long[] list = xhProductModelService.getByPid(id);
+            if (list.length > 0){
                 this.deleteByProduct(list);
-            } else if (data.getProductType().equals("2")) {
-                xhProductModelService.deleteByShipId(data.getShipId());
-            } else if (data.getProductType().equals("5")) {
-                xhProductModelService.deleteLogic(id);
             }
+            imgMap.remove(id);
+            xhProductModelService.deleteLogic(id);
         }
     }
 }

--
Gitblit v1.9.1