From af5762fdb87b6adfe07fbdb491cd684931afc652 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 15 十月 2024 15:07:25 +0800
Subject: [PATCH] 修改报错信息
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 f2df87c..9c43884 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;
@@ -49,6 +52,9 @@
@Autowired
private SysPictureBaseService sysPictureBaseService;
+ @Autowired
+ private ParamDataService paramDataService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -63,8 +69,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);
}
@@ -100,10 +106,10 @@
@PostMapping("importProductExcel")
@ApiOperation("瀵煎叆浜у搧妯″瀷")
@LogOperation("瀵煎叆浜у搧妯″瀷")
- public Result importProductExcel(MultipartFile file, String progressId,Long pid) {
+ public Result importProductExcel(MultipartFile file, String progressId, Long pid) {
Result<List<ImportErrDto>> result = Result.ok();
try {
- List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file,progressId,pid);
+ List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file, progressId, pid);
StringBuilder str = new StringBuilder();
ImportUtil.importResult(result, importResults, str);
ImportUtil.ImportErrResult(result, importResults, str);
@@ -114,6 +120,15 @@
return result;
}
+ @GetMapping("exportData")
+ @ApiOperation("瀵煎嚭浜у搧妯″瀷")
+ @LogOperation("瀵煎嚭浜у搧妯″瀷")
+ public Result exportDataExcel(Long shipId) {
+ xhProductModelService.exportDataExcel(shipId);
+
+ return null;
+ }
+
@PostMapping
@ApiOperation("鏂板")
@@ -122,10 +137,22 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);
- Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
- if (xhProductModel.getSort() < no) {
+ Integer no = xhProductModelService.getNo(xhProductModel.getPid(), xhProductModel.getProductType());
+ 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 +165,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 +192,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