提交

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentTransferAddParm.java

@@ -3,6 +3,8 @@ package com.njcn.csdevice.pojo.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 
  * Description:
@@ -25,16 +27,19 @@ public class CsEquipmentTransferAddParm  {
     private String equipmentIds;
 
     @ApiModelProperty(value = "发起人")
+    @NotBlank(message="发起人不能为空！")
     private String promoter;
 
 
     @ApiModelProperty(value = "移交人")
+    @NotBlank(message="移交人为空！")
     private String transferor;
 
     /**
      * 事件类型（权限转移，数据恢复）
      */
     @ApiModelProperty(value = "事件类型")
+    @NotBlank(message="事件类型不能为空！")
     private String eventType;
 
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java

@@ -25,7 +25,7 @@ public class AppLineTopologyDiagramPO  extends BaseEntity {
     /**
      * 拓扑图Id
      */
-    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    @TableField(value = "id")
     private String id;
 
     /**

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -38,8 +38,8 @@ public class CslineController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryLineById")
-    @ApiOperation("项目查询通过id获取")
-    @ApiImplicitParam(name = "ids", value = "项目id集合", required = true)
+    @ApiOperation("监测点查询通过设备id获取")
+    @ApiImplicitParam(name = "ids", value = "设备id获集合", required = true)
     public HttpResult<List<CsLinePO>> queryLineById(@RequestParam List<String> ids){
         String methodDescribe = getMethodDescribe("queryLineById");
         List<CsLinePO> csLinePOS = csLinePOService.listByIds(ids);
@@ -48,7 +48,7 @@ public class CslineController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryLineByDevId")
-    @ApiOperation("项目查询通过设备id获取")
+    @ApiOperation("监测点查询通过设备id获取")
     @ApiImplicitParam(name = "id", value = "设备id集合", required = true)
     public HttpResult<List<CsLinePO>> queryLineByDevId(@RequestParam String id){
         String methodDescribe = getMethodDescribe("queryLineByDevId");

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java

@@ -3,6 +3,7 @@ package com.njcn.csdevice.controller.project;
 import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAddParm;
 import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAuditParm;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
 import com.njcn.csdevice.service.AppLineTopologyDiagramService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -17,10 +18,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Description:
@@ -64,4 +62,13 @@ public class LineTopologyDiagramController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryTopologyDiagram")
+    @ApiOperation("查询装置拓扑图")
+    public HttpResult<AppTopologyDiagramVO> queryTopologyDiagram(@RequestParam(value="devId") String devId){
+        String methodDescribe = getMethodDescribe("queryTopologyDiagram");
+        AppTopologyDiagramVO appTopologyDiagramVO = appLineTopologyDiagramService.query(devId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVO, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppLineTopologyDiagramService.java

@@ -2,7 +2,9 @@ package com.njcn.csdevice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
-    /**
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
+
+/**
  * 
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -14,4 +16,5 @@ import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
 public interface AppLineTopologyDiagramService extends IService<AppLineTopologyDiagramPO> {
 
 
-}
+    AppTopologyDiagramVO query(String devId);
+    }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java

@@ -1,11 +1,23 @@
 package com.njcn.csdevice.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
 import com.njcn.csdevice.service.AppLineTopologyDiagramService;
+import com.njcn.csdevice.service.AppTopologyDiagramService;
+import com.njcn.csdevice.service.CsLinePOService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 
  * Description:
@@ -16,6 +28,24 @@ import org.springframework.stereotype.Service;
  * @version V1.0.0
  */
 @Service
+@RequiredArgsConstructor
 public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopologyDiagramMapper, AppLineTopologyDiagramPO> implements AppLineTopologyDiagramService {
-
+    private final CsLinePOService csLinePOService;
+    private final AppTopologyDiagramService appTopologyDiagramService;
+    @Override
+    public AppTopologyDiagramVO query(String devId) {
+        List<CsLinePO> csLinePOList = csLinePOService.queryByDevId(devId);
+        List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        if(CollectionUtil.isEmpty(collect)){
+            throw new BusinessException("设备下暂未绑定监测点，未找到拓扑图信息");
+        }
+        QueryWrapper<AppLineTopologyDiagramPO> queryWrap = new QueryWrapper<>();
+        queryWrap.select("distinct (id)").in("line_id",collect);
+        AppLineTopologyDiagramPO appLineTopologyDiagramPO = this.getBaseMapper().selectOne(queryWrap);
+        AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
+        appTopologyDiagramQueryParm.setId(appLineTopologyDiagramPO.getId());
+        List<AppTopologyDiagramVO> appTopologyDiagramVOS = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramQueryParm);
+        AppTopologyDiagramVO appTopologyDiagramVO = appTopologyDiagramVOS.get(0);
+        return appTopologyDiagramVO;
+    }
 }