Browse Source

实现接口queryEquipListBySystemId

lijie 3 years ago
parent
commit
fbd8c96120

+ 7 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/dto/RequestData.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.persagy.dmp.rwd.basic.validations.QueryClassCodeVadition;
 import com.persagy.dmp.rwd.basic.validations.QueryFloorIdVadition;
 import com.persagy.dmp.rwd.basic.validations.QuerySpaceIdVadition;
+import com.persagy.dmp.rwd.basic.validations.QuerySystemIdVadition;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -93,6 +94,12 @@ public class RequestData {
     @JSONField(name = "spaceId",alternateNames = {"space_id","spaceId"})
     @NotBlank(message = "缺少必填项:空间id", groups = {QuerySpaceIdVadition.class})
     private String spaceId;
+    /** 系统id */
+    @JsonAlias({"system_id","systemId"})
+    @JsonProperty("systemId")
+    @JSONField(name = "systemId",alternateNames = {"system_id","systemId"})
+    @NotBlank(message = "缺少必填项:空间id", groups = {QuerySystemIdVadition.class})
+    private String systemId;
     /** 空间功能类型 */
     @JsonAlias({"room_func_type","roomFuncType"})
     @JsonProperty("roomFuncType")

+ 6 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/validations/QuerySystemIdVadition.java

@@ -0,0 +1,6 @@
+package com.persagy.dmp.rwd.basic.validations;
+
+import javax.validation.groups.Default;
+
+public interface QuerySystemIdVadition extends Default {
+}

+ 17 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -22,6 +22,7 @@ import com.persagy.dmp.rwd.basic.dto.RequestData;
 import com.persagy.dmp.rwd.basic.validations.QueryClassCodeVadition;
 import com.persagy.dmp.rwd.basic.validations.QueryFloorIdVadition;
 import com.persagy.dmp.rwd.basic.validations.QuerySpaceIdVadition;
+import com.persagy.dmp.rwd.basic.validations.QuerySystemIdVadition;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
 import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
@@ -248,6 +249,22 @@ public class ObjectDigitalController{
         requestData.setProjectId(AppContext.getContext().getProjectId());
         return service.queryEquipListByClassCode(requestData);
     }
+    /***
+     * Description: 按系统查询系统下所有设备
+     * @param requestData : 请求参数
+     * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
+     * @author : lijie
+     * @date :2021/8/30 9:41
+     * Update By lijie 2021/8/30 9:41
+     */
+    @PostMapping("/queryEquipListBySystemId")
+    public CommonResult<List<ObjectDigital>> queryEquipListBySystemId(@Validated({QuerySystemIdVadition.class})
+                                                                                    @RequestBody RequestData requestData) {
+        //基础参数校验
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
+        requestData.setProjectId(AppContext.getContext().getProjectId());
+        return service.queryEquipListBySystemId(requestData);
+    }
 
 
 

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/dao/ObjectDigitalMapper.java

@@ -50,7 +50,7 @@ public interface ObjectDigitalMapper extends BaseMapper<ObjectDigital> {
      * @date :2021/8/30 17:03
      * Update By lijie 2021/8/30 17:03
      */
-    List<List<ObjectDigital>> queryObjectListBySpaceIdAndClassCode(@Param("param") RequestData requestData);
+    List<List<ObjectDigital>> queryObjectListByRelIdAndClassCode(@Param("param") RequestData requestData);
     /***
      * Description: 按类型编码查询所有设备
      * @param requestData : 请求参数

+ 9 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectDigitalService.java

@@ -109,4 +109,13 @@ public interface IObjectDigitalService {
      * Update By lijie 2021/8/30 9:41
      */
     CommonResult<List<ObjectDigital>> queryEquipListByClassCode(RequestData requestData);
+    /***
+     * Description: 按系统查询系统下所有设备
+     * @param requestData : 请求参数
+     * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
+     * @author : lijie
+     * @date :2021/8/30 9:41
+     * Update By lijie 2021/8/30 9:41
+     */
+    CommonResult<List<ObjectDigital>> queryEquipListBySystemId(RequestData requestData);
 }

+ 20 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ValidEnum;
-import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.model.response.CommonResult;
@@ -244,7 +243,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         requestData.setRelCode(DigitalRelCode.EQ_2_SP.getIndex());
         requestData.setObjType(DigitalObjectType.EQUIPMENT.getIndex());
         requestData.setRelId(requestData.getSpaceId());
-        List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListBySpaceIdAndClassCode(requestData);
+        List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByRelIdAndClassCode(requestData);
         return commonAnalysisPageResult(dataResult);
     }
     /***
@@ -264,6 +263,25 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryEquipListByClassCode(requestData);
         return commonAnalysisPageResult(dataResult);
     }
+    /***
+     * Description: 按系统查询系统下所有设备
+     * @param requestData : 请求参数
+     * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
+     * @author : lijie
+     * @date :2021/8/30 9:41
+     * Update By lijie 2021/8/30 9:41
+     */
+    @Override
+    public CommonResult<List<ObjectDigital>> queryEquipListBySystemId(RequestData requestData) {
+        // 1.计算分页参数
+        computePageParam(requestData);
+        // 2.使用Sy2Eq关系查询系统下的设备
+        requestData.setRelId(requestData.getSystemId());
+        requestData.setObjType(DigitalObjectType.EQUIPMENT.getIndex());
+        requestData.setRelCode(DigitalRelCode.SY_2_EQ.getIndex());
+        List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByRelIdAndClassCode(requestData);
+        return commonAnalysisPageResult(dataResult);
+    }
 
     /***
      * Description: 通用处理分页数据方法

+ 1 - 1
dmp-business/dmp-rwd/src/main/resources/mapper/ObjectDigitalMapper.xml

@@ -255,7 +255,7 @@
             <property name="param" value="#{param}"/>
         </include>
     </select>
-    <select id="queryObjectListBySpaceIdAndClassCode" resultMap="BaseResultMap,count">
+    <select id="queryObjectListByRelIdAndClassCode" resultMap="BaseResultMap,count">
         <include refid="commonQueryObjectListByParam">
             <property name="param" value="#{param}"/>
         </include>