From 5ef47212d7a7d5d8fa2b02674c1f1263b07826d0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十一月 2024 17:45:41 +0800
Subject: [PATCH] 修改工况bug，新增产品节点时存在
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 84 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 6 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 1d709b7..1285419 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,8 @@
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;
import com.zt.common.validator.group.AddGroup;
@@ -13,8 +15,10 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.core.service.ZtProductService;
import com.zt.life.dto.ImportErrDto;
+import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.mainPart.basicInfo.service.ParamDataService;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.util.ImportUtil;
@@ -29,6 +33,9 @@
import springfox.documentation.annotations.ApiIgnore;
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;
@@ -49,6 +56,9 @@
@Autowired
private SysPictureBaseService sysPictureBaseService;
+ @Autowired
+ private ParamDataService paramDataService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -63,8 +73,9 @@
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow) {
- List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow);
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow, Long productId) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow, productId);
+
return Result.ok(list);
}
@@ -85,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);
}
@@ -114,6 +139,15 @@
return result;
}
+ @GetMapping("exportData")
+ @ApiOperation("瀵煎嚭浜у搧妯″瀷")
+ @LogOperation("瀵煎嚭浜у搧妯″瀷")
+ public Result exportDataExcel(HttpServletRequest request, HttpServletResponse response, Long shipId, String fileName) {
+ xhProductModelService.exportDataExcel(request, response, shipId, fileName);
+
+ return null;
+ }
+
@PostMapping
@ApiOperation("鏂板")
@@ -126,8 +160,26 @@
if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
xhProductModel.setSort(no + 1);
}
- xhProductModelService.insert(xhProductModel);
+ if (xhProductModel.getProductType().equals("2")) {
+ Long id = UUIDUtil.generateId();
+ xhProductModel.setId(id);
+ xhProductModel.setShipId(id);
+ ParamData data = new ParamData();
+ data.setShipId(id);
+ data.setProductId(id);
+
+ paramDataService.insert(data);
+ }
+ xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
+ xhProductModelService.insert(xhProductModel);
+ ParamData data = new ParamData();
+ data.setShipId(xhProductModel.getShipId());
+ data.setProductId(xhProductModel.getId());
+ paramDataService.insert(data);
+ Map<Long, XhProductModel> imgMap = new HashMap<>();
+ imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
+ imgMap.put(xhProductModel.getId(), xhProductModel);
return Result.ok();
}
@@ -138,6 +190,11 @@
xhProductModel.setId(null);
xhProductModel.setSort(xhProductModel.getSort());
xhProductModel.setProductType(xhProductModel.getNodeType());
+ if (xhProductModel.getNamePath() == null) {
+ xhProductModel.setNamePath(xhProductModel.getName());
+ } else {
+ xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
+ }
this.insert(xhProductModel);
}
return Result.ok();
@@ -150,6 +207,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();
}
@@ -160,9 +220,21 @@
public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
- xhProductModelService.delete(ids);
+ this.deleteByProduct(ids);
return Result.ok();
}
+ private void deleteByProduct(Long[] ids) {
+ Map<Long, XhProductModel> imgMap = new HashMap<>();
+ imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
+ for (Long id : ids) {
+ Long[] list = xhProductModelService.getByPid(id);
+ if (list.length > 0){
+ this.deleteByProduct(list);
+ }
+ imgMap.remove(id);
+ xhProductModelService.deleteLogic(id);
+ }
+ }
}
--
Gitblit v1.9.1