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/TyProductModelController.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
index 3bf2c60..dca2ce2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
@@ -32,14 +32,14 @@
/**
- * ty_product_model
+ * product_model_common
*
* @author zt generator
* @since 1.0.0 2024-02-28
*/
@RestController
@RequestMapping("/basicInfo/TyProductModel/")
-@Api(tags="ty_product_model")
+@Api(tags="product_model_common")
public class TyProductModelController {
@Autowired
private TyProductModelService tyProductModelService;
@@ -53,16 +53,16 @@
@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_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 = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "reliabDistrib", value = "鍙潬鎬у垎甯�", dataType = Constant.QT.STRING, format = "reliab_distrib^EQ"),
- @ApiImplicitParam(name = "repairDistrib", value = "缁翠慨鍒嗗竷", dataType = Constant.QT.STRING, format = "repair_distrib^EQ") })
- public PageResult<TyProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ @ApiImplicitParam(name = "repairDistrib", value = "缁翠慨鍒嗗竷", dataType = Constant.QT.STRING, format = "repair_distrib^EQ"),
+ @ApiImplicitParam(name = "pid", value = "涓婄骇鑺傜偣", dataType = Constant.QT.STRING)
+ })
+ public Result<List<TyProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(tyProductModelService.page(queryFilter));
+ return Result.ok(tyProductModelService.page(queryFilter));
}
@GetMapping("tree")
@@ -76,22 +76,8 @@
@ApiOperation("淇℃伅")
public Result<TyProductModel> get(@PathVariable("id") Long id){
TyProductModel data = tyProductModelService.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);
}
--
Gitblit v1.9.1