From 3c2e46fef0e866901cbb5de889166b6fda748e5d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:39:09 +0800
Subject: [PATCH] 同类设备有多个的修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java | 36 ++++++++++++------------------------
1 files changed, 12 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 84387dc..06c55fe 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
@@ -6,7 +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.servlet.PageResult;
+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;
@@ -14,21 +14,17 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.TyProductModelService;
-import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
-import com.zt.modules.sys.model.SysMenu;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
-import java.util.Objects;
/**
@@ -68,7 +64,6 @@
@GetMapping("tree")
public Result<List<TyProductModel>> getTreeList() {
List<TyProductModel> list = tyProductModelService.getAllTree();
-
return Result.ok(list);
}
@@ -76,22 +71,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);
}
@@ -108,7 +89,7 @@
public Result insert(@RequestBody TyProductModel tyProductModel){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(tyProductModel, AddGroup.class, DefaultGroup.class);
- Integer no = tyProductModelService.getNo(tyProductModel.getPid());
+ Integer no = tyProductModelService.getNo(tyProductModel.getPid(),tyProductModel.getNodeType());
tyProductModel.setSort(no + 1);
tyProductModelService.insert(tyProductModel);
@@ -139,4 +120,11 @@
return Result.ok();
}
+ @GetMapping("getUuid")
+ @ApiOperation("淇℃伅")
+ public Result<Long> getUuid() {
+ Long uuid = UUIDUtil.generateId();
+ return Result.ok(uuid);
+ }
+
}
--
Gitblit v1.9.1