Skip to content

A
amos-boot-biz
Commit 849f8cdd authored by taabe's avatar taabe
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents b8695bcf b9bad5d4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceController.java
View file @ 849f8cdd
...@@ -64,8 +64,10 @@ public class WaterResourceController extends BaseController { ...@@ -64,8 +64,10 @@ public class WaterResourceController extends BaseController {
Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class, Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
e -> e.getCode().equals(resourceType)); e -> e.getCode().equals(resourceType));
model.setResourceTypeName(resourceTypeEnum.get().getName()); model.setResourceTypeName(resourceTypeEnum.get().getName());
model.setRealityImg(JSONArray.fromObject(model.getRealityImgList()).toString()); model.setRealityImg(model.getRealityImgList() == null ? "" :
model.setOrientationImg(JSONArray.fromObject(model.getOrientationImgList()).toString()); JSONArray.fromObject(model.getRealityImgList()).toString());
model.setOrientationImg(model.getRealityImgList() == null ? "" :
JSONArray.fromObject(model.getOrientationImgList()).toString());
if (!StringUtils.isEmpty(resourceType)) { if (!StringUtils.isEmpty(resourceType)) {
switch (resourceType) { switch (resourceType) {
case "hydrant": case "hydrant":
...@@ -241,8 +243,10 @@ public class WaterResourceController extends BaseController { ...@@ -241,8 +243,10 @@ public class WaterResourceController extends BaseController {
public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long sequenceNbr) {
// 查询基本信息 // 查询基本信息
WaterResourceDto waterResourceDto = waterResourceServiceImpl.queryBySeq(sequenceNbr); WaterResourceDto waterResourceDto = waterResourceServiceImpl.queryBySeq(sequenceNbr);
waterResourceDto.setRealityImgList(JSONArray.fromObject(waterResourceDto.getRealityImg())); waterResourceDto.setRealityImgList(StringUtils.isEmpty(waterResourceDto.getRealityImg()) ? null :
waterResourceDto.setOrientationImgList(JSONArray.fromObject(waterResourceDto.getOrientationImg())); JSONArray.fromObject(waterResourceDto.getRealityImg()));
waterResourceDto.setOrientationImgList(StringUtils.isEmpty(waterResourceDto.getRealityImg()) ? null :
JSONArray.fromObject(waterResourceDto.getOrientationImg()));
// 查询属性信息 // 查询属性信息
String resourceType = waterResourceDto.getResourceType(); String resourceType = waterResourceDto.getResourceType();
if (!StringUtils.isEmpty(resourceType)) { if (!StringUtils.isEmpty(resourceType)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment