From b04b1f186c4250e6894823f990189950508d877d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 三月 2024 14:47:33 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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 a8ad858..6325f6f 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
@@ -57,7 +57,7 @@
@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 = "productType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "product_type^EQ"),
@ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
})
public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
@@ -83,22 +83,8 @@
@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);
}
@@ -106,6 +92,12 @@
@GetMapping("getProductList")
public Result<List<XhProductModel>> getProductList() {
List<XhProductModel> list = xhProductModelService.getProductList();
+ return Result.ok(list);
+ }
+
+ @GetMapping("getTaskProductList")
+ public Result<List<XhProductModel>> getTaskProductList() {
+ List<XhProductModel> list = xhProductModelService.getTaskProductList();
return Result.ok(list);
}
@@ -128,6 +120,7 @@
for(XhProductModel xhProductModel:list){
xhProductModel.setSrcId(xhProductModel.getId());
xhProductModel.setId(null);
+ xhProductModel.setProductType(xhProductModel.getNodeType());
this.insert(xhProductModel);
}
return Result.ok();
--
Gitblit v1.9.1