From b09b6361f6348c22d2d02f99391ca76350b45102 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 14 三月 2024 14:41:14 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 8b4b488..4716cef 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
@@ -12,9 +12,11 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
+import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
@@ -31,14 +33,14 @@
/**
- * xh_product_model
+ * product_model
*
* @author zt generator
* @since 1.0.0 2024-02-29
*/
@RestController
@RequestMapping("/basicInfo/XhProductModel/")
-@Api(tags="xh_product_model")
+@Api(tags="product_model")
public class XhProductModelController {
@Autowired
private XhProductModelService xhProductModelService;
@@ -52,16 +54,14 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
@ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "node_type^EQ"),
- @ApiImplicitParam(name = "id", value = "涓婄骇ID", dataType = Constant.QT.STRING)
+ @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
})
- public PageResult<XhProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(xhProductModelService.page(queryFilter));
+ public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ return Result.ok(xhProductModelService.page(queryFilter));
}
@GetMapping("tree")
@@ -71,26 +71,20 @@
return Result.ok(list);
}
+ @GetMapping("getProduct")
+ public Result<List<ProductImg>> getProduct(Long productId) {
+
+ List<ProductImg> list = xhProductModelService.getProduct(productId);
+
+ return Result.ok(list);
+ }
+
@GetMapping("{id}")
@ApiOperation("淇℃伅")
public Result<XhProductModel> get(@PathVariable("id") Long id){
XhProductModel data = xhProductModelService.get(id);
- Long busid = null;
- String fileName = "";
- if (StringUtils.isNotBlank(data.getOperationalStatus())&&sysOssService.get(Long.parseLong(data.getOperationalStatus()))!=null){
- busid =sysOssService.get(Long.parseLong(data.getOperationalStatus())).getBusiId();
- fileName =sysPictureBaseService.get(busid).getName();
- data.setOperationalStatus(fileName);
- }
- if (StringUtils.isNotBlank(data.getStandbyState())&&sysOssService.get(Long.parseLong(data.getStandbyState()))!=null){
- busid =sysOssService.get(Long.parseLong(data.getStandbyState())).getBusiId();
- fileName =sysPictureBaseService.get(busid).getName();
- data.setStandbyState(fileName);
- }
- if (StringUtils.isNotBlank(data.getFaultState())&&sysOssService.get(Long.parseLong(data.getFaultState()))!=null){
- busid =sysOssService.get(Long.parseLong(data.getFaultState())).getBusiId();
- fileName =sysPictureBaseService.get(busid).getName();
- data.setFaultState(fileName);
+ if (data.getOperatImg() != null) {
+ data.setOperatImgName(sysPictureBaseService.get(data.getOperatImg()).getName());
}
return Result.ok(data);
}
@@ -115,6 +109,16 @@
return Result.ok();
}
+ @PostMapping("get")
+ public Result getSelect(@RequestBody List<XhProductModel> list){
+ for(XhProductModel xhProductModel:list){
+ xhProductModel.setSrcId(xhProductModel.getId());
+ xhProductModel.setId(null);
+ this.insert(xhProductModel);
+ }
+ return Result.ok();
+ }
+
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
--
Gitblit v1.9.1