From 9f58ccbd8ed371f8e20b37b45b412c33a7f0dfcc Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 22 十月 2024 14:43:20 +0800 Subject: [PATCH] 关于修改可靠性产品重复 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 3 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..b71e115 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.UUIDUtil; import com.zt.common.validator.AssertUtils; import com.zt.common.validator.ValidatorUtils; import com.zt.common.validator.group.AddGroup; @@ -13,8 +14,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 +32,8 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -49,6 +54,9 @@ @Autowired private SysPictureBaseService sysPictureBaseService; + @Autowired + private ParamDataService paramDataService; + @GetMapping("page") @ApiOperation("鍒嗛〉") @ApiImplicitParams({ @@ -63,8 +71,8 @@ } @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); } @@ -114,6 +122,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,6 +143,18 @@ if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) { xhProductModel.setSort(no + 1); } + 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); + } + xhProductModelService.insert(xhProductModel); return Result.ok(); @@ -138,6 +167,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(); @@ -160,9 +194,25 @@ public Result delete(@RequestBody Long[] ids) { //鏁堥獙鏁版嵁 AssertUtils.isArrayEmpty(ids, "id"); - xhProductModelService.delete(ids); + this.deleteByProduct(ids); return Result.ok(); } + private void deleteByProduct(Long[] ids) { + 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); + this.deleteByProduct(list); + } else if (data.getProductType().equals("2")) { + xhProductModelService.deleteByShipId(data.getShipId()); + } else if (data.getProductType().equals("5")) { + xhProductModelService.deleteLogic(id); + } + } + } } -- Gitblit v1.9.1