瀏覽代碼

土建装饰说明接口开发

linhuili 3 年之前
父節點
當前提交
54410a033a

+ 114 - 8
src/main/java/com/persagy/dmp/middleware/controller/EquipController.java

@@ -1,9 +1,14 @@
 package com.persagy.dmp.middleware.controller;
 
 
+import cn.hutool.core.collection.CollUtil;
+import com.persagy.dmp.common.constant.CommonConstant;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import com.persagy.dmp.middleware.service.IConstructDescriptionService;
 import com.persagy.dmp.middleware.service.IEquipService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.QueryParam;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @ClassName ObjectInstanceController
@@ -28,6 +35,9 @@ public class EquipController {
     @Autowired
     private IEquipService equipService;
 
+    @Autowired
+    private IConstructDescriptionService constructDescriptionService;
+
     /**
      * 查询/统计设备设施下的设备/阀门
      * @param projectId
@@ -50,7 +60,7 @@ public class EquipController {
     }
 
     /**
-     *  查询设备设施- 暖通系统-全局-3D原理图相关的设备/阀门
+     *  查询设备设施-暖通系统-全局-3D原理图相关的设备/阀门
      * @param projectId
      * @param request
      * @return
@@ -83,20 +93,116 @@ public class EquipController {
         return  response;
     }
 
+
     /**
-     * 防火分区数量统计
+     * 查询土建装饰说明
      * @param projectId
-     * @param request
+     * @param vo
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/construction/query")
+    public CommonResult queryConstructionDesc(@QueryParam("groupCode") String groupCode, @QueryParam("projectId") String projectId,
+                                          @RequestBody WdConstructDescription vo) throws Exception {
+        // 组装上下文条件
+        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, null);
+        if(StringUtils.isEmpty(vo.getFloorId())){
+            throw new Exception("楼层id不能为空");
+        }
+        //添加默认条件
+        List<WdConstructDescription> vos = new ArrayList<>();
+        vos.add(vo);
+        createDefaultValue(vos);
+        //查询土建装饰说明
+        CommonResult response = constructDescriptionService.query(context,vos.get(0));
+        return  response;
+    }
+
+
+    /**
+     * 添加土建装饰说明
+     * @param projectId
+     * @param vos
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/construction/insert")
+    public CommonResult insertConstructionDesc(@QueryParam("groupCode") String groupCode, @QueryParam("projectId") String projectId,
+                                              @RequestBody List<WdConstructDescription> vos) throws Exception {
+        // 组装上下文条件
+        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, null);
+        if(CollUtil.isEmpty(vos)){
+            throw new Exception("待添加数据不能为空");
+        }
+        //添加默认条件
+        createDefaultValue(vos);
+        //添加土建装饰说明
+        CommonResult response = constructDescriptionService.insert(context,vos);
+        return  response;
+    }
+
+    /**
+     * 修改土建装饰说明
+     * @param projectId
+     * @param vos
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/construction/update")
+    public CommonResult updateConstructionDesc(@QueryParam("groupCode") String groupCode, @QueryParam("projectId") String projectId,
+                                               @RequestBody List<WdConstructDescription> vos) throws Exception {
+        // 组装上下文条件
+        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, null);
+        if(CollUtil.isEmpty(vos)){
+            throw new Exception("待修改数据不能为空");
+        }
+        //添加默认条件
+        createDefaultValue(vos);
+        //删除土建装饰说明
+        CommonResult response = constructDescriptionService.update(context,vos);
+        return  response;
+    }
+
+    /**
+     * 删除土建装饰说明
+     * @param projectId
+     * @param vos
      * @return
      * @throws Exception
      */
-    @PostMapping("/fireZone/count")
-    public CommonResult countFireZone(@QueryParam("groupCode") String groupCode, @QueryParam("projectId") String projectId,
-                                          @RequestBody CommonRequestDTO request) throws Exception {
+    @PostMapping("/construction/update")
+    public CommonResult deleteConstructionDesc(@QueryParam("groupCode") String groupCode, @QueryParam("projectId") String projectId,
+                                               @RequestBody List<String> vos) throws Exception {
         // 组装上下文条件
         InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, null);
-        //防火分区数量统计
-        CommonResult response = equipService.countFireZone(context,request);
+        if(CollUtil.isEmpty(vos)){
+            throw new Exception("id不能为空");
+        }
+        //删除土建装饰说明
+        CommonResult response = constructDescriptionService.delete(context,vos);
         return  response;
     }
+
+    /**
+     * 创建默认条件
+     * @param voList
+     */
+    private void createDefaultValue(List<WdConstructDescription> voList){
+        String groupCode = AppContext.getContext().getGroupCode();
+        if(StringUtils.isEmpty(groupCode)){
+            //默认集团
+            groupCode = CommonConstant.DEFAULT_ID;
+        }
+        String projectId = AppContext.getContext().getProjectId();
+        if(StringUtils.isEmpty(projectId)){
+            //默认项目
+            projectId = CommonConstant.DEFAULT_ID;
+        }
+        for (WdConstructDescription vo : voList) {
+            vo.setGroupCode(groupCode);
+            vo.setProjectId(projectId);
+        }
+    }
+
+
 }

+ 15 - 0
src/main/java/com/persagy/dmp/middleware/dao/WdConstructDescriptionMapper.java

@@ -0,0 +1,15 @@
+package com.persagy.dmp.middleware.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+
+/**
+ * @ClassName DefineTypeRelMapper
+ * @Description: 土建装饰说明DAO
+ * @Author linhuili
+ * @Date 2021/9/9 10:24
+ * @Version V1.0
+ **/
+public interface WdConstructDescriptionMapper extends BaseMapper<WdConstructDescription> {
+
+}

+ 3 - 3
src/main/java/com/persagy/dmp/middleware/dao/DefineTypeRelMapper.java

@@ -1,14 +1,14 @@
 package com.persagy.dmp.middleware.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 
 /**
  * @ClassName DefineTypeRelMapper
- * @Description: 关系映射dao
+ * @Description: 广联达关系映射DAO
  * @Author linhuili
  * @Date 2021/9/9 10:24
  * @Version V1.0
  **/
-public interface DefineTypeRelMapper extends BaseMapper<DefineTypeRel> {
+public interface WdDefineTypeRelMapper extends BaseMapper<WdDefineTypeRel> {
 }

+ 41 - 0
src/main/java/com/persagy/dmp/middleware/entity/vo/WdConstructDescription.java

@@ -0,0 +1,41 @@
+package com.persagy.dmp.middleware.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.Data;
+import lombok.NonNull;
+
+import java.util.List;
+
+/**
+ * @ClassName DefineTypeRel
+ * @Description: 土建装饰说明
+ * @Author linhuili
+ * @Date 2021/9/14 15:01
+ * @Version V1.0
+ **/
+@Data
+@TableName(value = "wd_construct_description", autoResultMap = true)
+public class WdConstructDescription {
+
+    /** id */
+    private Integer id;
+
+    /** 集团编码 */
+    private String groupCode;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 万达系统编码 */
+    private String wdSystemCode;
+
+    /** 楼层id */
+    @NonNull
+    private String floorId;
+
+    /** 备注 */
+    @NonNull
+    private String remark;
+}

+ 1 - 1
src/main/java/com/persagy/dmp/middleware/entity/vo/DefineTypeRel.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @TableName(value = "wd_define_type_rel", autoResultMap = true)
 @EqualsAndHashCode()
-public class DefineTypeRel {
+public class WdDefineTypeRel {
 
     /** id */
     private Integer id;

+ 45 - 0
src/main/java/com/persagy/dmp/middleware/service/IConstructDescriptionService.java

@@ -0,0 +1,45 @@
+package com.persagy.dmp.middleware.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
+import com.persagy.dmp.middleware.entity.response.CommonResult;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+
+import java.util.List;
+
+public interface IConstructDescriptionService extends IService<WdConstructDescription> {
+
+    /**
+     * 查询土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    CommonResult query(InstanceUrlParam context, WdConstructDescription vos);
+
+    /**
+     * 新增土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    CommonResult insert(InstanceUrlParam context, List<WdConstructDescription> vos);
+
+
+    /**
+     * 修改土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    CommonResult update(InstanceUrlParam context, List<WdConstructDescription> vos);
+
+
+    /**
+     * 删除土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    CommonResult delete(InstanceUrlParam context, List<String> vos);
+}

+ 10 - 6
src/main/java/com/persagy/dmp/middleware/service/IEquipService.java

@@ -1,10 +1,14 @@
 package com.persagy.dmp.middleware.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.persagy.dmp.digital.entity.ObjectRelation;
+import com.persagy.dmp.middleware.dao.WdConstructDescriptionMapper;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 
 import java.util.List;
 
@@ -57,7 +61,7 @@ public interface IEquipService {
      * 查询广联达设备类型
      * @return
      */
-    List<DefineTypeRel> queryGldEquipTypeRel();
+    List<WdDefineTypeRel> queryGldEquipTypeRel();
 
 
     /**
@@ -67,14 +71,14 @@ public interface IEquipService {
      * @param request
      * @return
      */
-    List<JSONObject> queryEquipByGldTypeRel(InstanceUrlParam context, List<DefineTypeRel> defineTypeRels, CommonRequestDTO request);
+    List<JSONObject> queryEquipByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request);
 
 
     /**
      * 查询广联达阀门类型
      * @return
      */
-    List<DefineTypeRel> queryGldMateriaTypeRel();
+    List<WdDefineTypeRel> queryGldMateriaTypeRel();
 
 
     /**
@@ -84,7 +88,7 @@ public interface IEquipService {
      * @param request
      * @return
      */
-    List<JSONObject> queryMateriaByGldTypeRel(InstanceUrlParam context, List<DefineTypeRel> defineTypeRels, CommonRequestDTO request);
+    List<JSONObject> queryMateriaByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request);
 
 
     /**
@@ -95,6 +99,6 @@ public interface IEquipService {
      * @param infoCode
      * @return
      */
-    List<JSONObject> queryEquipObjectByInfoCode(InstanceUrlParam context,List<DefineTypeRel> defineTypeRels,CommonRequestDTO request,String infoCode);
+    List<JSONObject> queryEquipObjectByInfoCode(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request, String infoCode);
 
 }

+ 6 - 3
src/main/java/com/persagy/dmp/middleware/service/ISpaceService.java

@@ -1,10 +1,12 @@
 package com.persagy.dmp.middleware.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 
 import java.util.List;
 
@@ -29,7 +31,7 @@ public interface ISpaceService {
      * 查询广联达空间类型
      * @return
      */
-    List<DefineTypeRel> queryGldSpaceTypeRel();
+    List<WdDefineTypeRel> queryGldSpaceTypeRel();
 
 
     /**
@@ -39,7 +41,7 @@ public interface ISpaceService {
      * @param request
      * @return
      */
-    List<JSONObject> querySpaceByGldTypeRel(InstanceUrlParam context, List<DefineTypeRel> defineTypeRels, CommonRequestDTO request);
+    List<JSONObject> querySpaceByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request);
 
     /**
      * 查询空间内的设备/阀门
@@ -58,4 +60,5 @@ public interface ISpaceService {
      * @return
      */
     List<JSONObject> queryEquipInSpace(InstanceUrlParam context, CommonRequestDTO request,String bimTypeId) throws Exception;
+
 }

+ 90 - 0
src/main/java/com/persagy/dmp/middleware/service/impl/ConstructDescriptionServiceImpl.java

@@ -0,0 +1,90 @@
+package com.persagy.dmp.middleware.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.middleware.dao.WdConstructDescriptionMapper;
+import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
+import com.persagy.dmp.middleware.entity.response.CommonResult;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import com.persagy.dmp.middleware.service.IConstructDescriptionService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @ClassName ConstructDescriptionServiceImpl
+ * @Description: 土建装饰说明
+ * @Author linhuili
+ * @Date 2021/9/14 15:27
+ * @Version V1.0
+ **/
+@Service
+public class ConstructDescriptionServiceImpl extends ServiceImpl<WdConstructDescriptionMapper, WdConstructDescription>  implements IConstructDescriptionService {
+
+    @Autowired
+    private WdConstructDescriptionMapper constructDescriptionMapper;
+
+    /**
+     * 查询土建装饰说明
+     * @param context
+     * @param vo
+     * @return
+     */
+    @Override
+    public CommonResult query(InstanceUrlParam context, WdConstructDescription vo) {
+        QueryWrapper<WdConstructDescription> wrapper = new QueryWrapper<>();
+        if(vo.getId() != null){
+            wrapper.eq("id",vo.getId());
+        }
+        if(StringUtils.isNotEmpty(vo.getFloorId())){
+            wrapper.eq("floor_id",vo.getFloorId());
+        }
+        if(StringUtils.isNotEmpty(vo.getWdSystemCode())){
+            wrapper.eq("wd_system_code",vo.getWdSystemCode());
+        }
+        List<WdConstructDescription> wdConstructDescriptions = constructDescriptionMapper.selectList(wrapper);
+        CommonResult<List<WdConstructDescription>> response = CommonResult.success(wdConstructDescriptions);
+        Long total = response.getCount() == null ? null : response.getCount().longValue();
+        response.setCount(total);
+        return response;
+    }
+
+    /**
+     * 新增土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    @Override
+    public CommonResult insert(InstanceUrlParam context, List<WdConstructDescription> vos) {
+        saveOrUpdateBatch(vos);
+        return CommonResult.success(vos);
+    }
+
+    /**
+     * 修改土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    @Override
+    public CommonResult update(InstanceUrlParam context, List<WdConstructDescription> vos) {
+        saveOrUpdateBatch(vos);
+        return CommonResult.success(vos);
+    }
+
+    /**
+     * 删除土建装饰说明
+     * @param context
+     * @param vos
+     * @return
+     */
+    @Override
+    public CommonResult delete(InstanceUrlParam context, List<String> vos) {
+        constructDescriptionMapper.deleteBatchIds(vos);
+        return CommonResult.success(vos);
+    }
+
+}

+ 29 - 22
src/main/java/com/persagy/dmp/middleware/service/impl/EquipServiceImpl.java

@@ -3,18 +3,22 @@ package com.persagy.dmp.middleware.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.RelationTypeEnum;
-import com.persagy.dmp.middleware.dao.DefineTypeRelMapper;
+import com.persagy.dmp.middleware.dao.WdConstructDescriptionMapper;
+import com.persagy.dmp.middleware.dao.WdDefineTypeRelMapper;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdConstructDescription;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 import com.persagy.dmp.middleware.service.IBaseService;
 import com.persagy.dmp.middleware.service.IEquipService;
 import com.persagy.dmp.middleware.service.ISpaceService;
@@ -37,7 +41,7 @@ import java.util.stream.Collectors;
 public class EquipServiceImpl implements IEquipService {
 
     @Autowired
-    private DefineTypeRelMapper defineTypeRelMapper;
+    private WdDefineTypeRelMapper defineTypeRelMapper;
 
     @Autowired
     private IBaseService baseService;
@@ -45,6 +49,9 @@ public class EquipServiceImpl implements IEquipService {
     @Autowired
     private ISpaceService spaceService;
 
+    @Autowired
+    private WdConstructDescriptionMapper constructDescriptionMapper;
+
     /**
      * 查询设备设施模块下的设备/阀门
      * @param context
@@ -84,7 +91,7 @@ public class EquipServiceImpl implements IEquipService {
         List<JSONObject> result = new ArrayList<>();
 
         //1.查询冷却塔设备类下的设备/阀门
-        List<DefineTypeRel> coolTowerDefineTypeRels = queryGldHavcTypeRel(CommonConsant.ACCCOT_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
+        List<WdDefineTypeRel> coolTowerDefineTypeRels = queryGldHavcTypeRel(CommonConsant.ACCCOT_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
         List<JSONObject> coolTowerObjects = queryEquipObjectByInfoCode(context, coolTowerDefineTypeRels, request, CommonConsant.BIM_TYPE_ID);
         if(CollUtil.isNotEmpty(coolTowerObjects)){
             result.addAll(coolTowerObjects);
@@ -126,13 +133,13 @@ public class EquipServiceImpl implements IEquipService {
         List<JSONObject> result = new ArrayList<>();
 
         //1.查询分水器
-        List<DefineTypeRel> divideDefineTypeRels = queryGldHavcTypeRel(CommonConsant.DIVIDE_BREECH_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
+        List<WdDefineTypeRel> divideDefineTypeRels = queryGldHavcTypeRel(CommonConsant.DIVIDE_BREECH_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
         List<JSONObject> divideBreechObjects = queryEquipObjectByInfoCode(context, divideDefineTypeRels, request, CommonConsant.BIM_TYPE_ID);
         if(CollUtil.isNotEmpty(divideBreechObjects)){
             result.addAll(divideBreechObjects);
         }
         //2. 查询集水器
-        List<DefineTypeRel> collectDefineTypeRels = queryGldHavcTypeRel(CommonConsant.COLLECT_BREECH_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
+        List<WdDefineTypeRel> collectDefineTypeRels = queryGldHavcTypeRel(CommonConsant.COLLECT_BREECH_BIMTYPEID,CommonConsant.WD_HAVC_SYSTEM_CODE);
         List<JSONObject> collectBreechObjects = queryEquipObjectByInfoCode(context, collectDefineTypeRels, request, CommonConsant.BIM_TYPE_ID);
         if(CollUtil.isNotEmpty(collectBreechObjects)){
             result.addAll(collectBreechObjects);
@@ -160,7 +167,7 @@ public class EquipServiceImpl implements IEquipService {
      */
     private List<JSONObject>  querySystemEquipList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达设备类型
-        List<DefineTypeRel> defineTypeRels = queryGldEquipTypeRel();
+        List<WdDefineTypeRel> defineTypeRels = queryGldEquipTypeRel();
         //根据系统过滤
         if(StringUtils.isNotEmpty(request.getSystemCode())){
             String systemCode = request.getSystemCode();
@@ -179,7 +186,7 @@ public class EquipServiceImpl implements IEquipService {
      */
     private List<JSONObject>  querySystemMateriaList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达设备类型
-        List<DefineTypeRel> defineTypeRels = queryGldMateriaTypeRel();
+        List<WdDefineTypeRel> defineTypeRels = queryGldMateriaTypeRel();
         //根据系统过滤
         if(StringUtils.isNotEmpty(request.getSystemCode())){
             String systemCode = request.getSystemCode();
@@ -195,10 +202,10 @@ public class EquipServiceImpl implements IEquipService {
      * 查询万达映射表中的设备类型
      */
     @Override
-    public List<DefineTypeRel> queryGldEquipTypeRel(){
-        QueryWrapper<DefineTypeRel> wrapper = new QueryWrapper<>();
+    public List<WdDefineTypeRel> queryGldEquipTypeRel(){
+        QueryWrapper<WdDefineTypeRel> wrapper = new QueryWrapper<>();
         wrapper.eq("obj_type","equipment");
-        List<DefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
+        List<WdDefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
         return defineTypeRels;
     }
 
@@ -210,7 +217,7 @@ public class EquipServiceImpl implements IEquipService {
      * @param request
      */
     @Override
-    public List<JSONObject> queryEquipByGldTypeRel(InstanceUrlParam context, List<DefineTypeRel> defineTypeRels, CommonRequestDTO request){
+    public List<JSONObject> queryEquipByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request){
         // 根据bimTypeId查询楼层下的设备
         List<JSONObject> bimTypeSpace = queryEquipObjectByInfoCode(context, defineTypeRels, request, "bimTypeId");
         // 数据组装:根据bimTypeId查询楼层下的设备结果
@@ -227,7 +234,7 @@ public class EquipServiceImpl implements IEquipService {
      * @return
      */
     @Override
-    public List<JSONObject> queryEquipObjectByInfoCode(InstanceUrlParam context,List<DefineTypeRel> defineTypeRels,CommonRequestDTO request,String infoCode){
+    public List<JSONObject> queryEquipObjectByInfoCode(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request, String infoCode){
         //1. 根据bimTypeId查询楼层下的设备
         Set<String> bimTypeIdSets = defineTypeRels.stream().filter(k-> StringUtils.isNotEmpty(k.getBimTypeId())).map(k->k.getBimTypeId()).collect(Collectors.toSet());
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
@@ -253,10 +260,10 @@ public class EquipServiceImpl implements IEquipService {
      * 查询万达映射表中的阀门类型
      */
     @Override
-    public List<DefineTypeRel> queryGldMateriaTypeRel(){
-        QueryWrapper<DefineTypeRel> wrapper = new QueryWrapper<>();
+    public List<WdDefineTypeRel> queryGldMateriaTypeRel(){
+        QueryWrapper<WdDefineTypeRel> wrapper = new QueryWrapper<>();
         wrapper.eq("obj_type","material");
-        List<DefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
+        List<WdDefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
         return defineTypeRels;
     }
 
@@ -268,7 +275,7 @@ public class EquipServiceImpl implements IEquipService {
      * @param request
      */
     @Override
-    public List<JSONObject> queryMateriaByGldTypeRel(InstanceUrlParam context, List<DefineTypeRel> defineTypeRels, CommonRequestDTO request){
+    public List<JSONObject> queryMateriaByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request){
         // 根据bimTypeId查询楼层下的设备
         List<JSONObject> bimTypeSpace = queryEquipObjectByInfoCode(context, defineTypeRels, request,"bimTypeId");
         // 数据组装:根据bimTypeId查询楼层下的设备结果
@@ -284,7 +291,7 @@ public class EquipServiceImpl implements IEquipService {
      * @param infoCode
      * @return
      */
-    private List<JSONObject>  combineQueryEquipResultData(List<DefineTypeRel> defineTypeRels,List<JSONObject> spaceList,String infoCode){
+    private List<JSONObject>  combineQueryEquipResultData(List<WdDefineTypeRel> defineTypeRels, List<JSONObject> spaceList, String infoCode){
         if(CollUtil.isEmpty(defineTypeRels)){
             return new ArrayList<>();
         }
@@ -292,7 +299,7 @@ public class EquipServiceImpl implements IEquipService {
 
         //数据组装
         List<JSONObject> result = new ArrayList<>();
-        for (DefineTypeRel defineTypeRel : defineTypeRels) {
+        for (WdDefineTypeRel defineTypeRel : defineTypeRels) {
             JSONObject data = new JSONObject();
             data.put("bimTypeId",defineTypeRel.getBimTypeId());
             data.put("className",defineTypeRel.getWdClassName());
@@ -316,12 +323,12 @@ public class EquipServiceImpl implements IEquipService {
      * @param systemCode
      * @return
      */
-    public List<DefineTypeRel> queryGldHavcTypeRel(String bimTypeId,String systemCode){
-        QueryWrapper<DefineTypeRel> wrapper = new QueryWrapper<>();
+    public List<WdDefineTypeRel> queryGldHavcTypeRel(String bimTypeId, String systemCode){
+        QueryWrapper<WdDefineTypeRel> wrapper = new QueryWrapper<>();
 
         wrapper.eq("bim_type_id",bimTypeId);
         wrapper.eq("wd_system_code",systemCode);
-        List<DefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
+        List<WdDefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
         return defineTypeRels;
     }
 

+ 7 - 7
src/main/java/com/persagy/dmp/middleware/service/impl/FloorServiceImpl.java

@@ -9,11 +9,11 @@ import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.ClassCodeEnum;
 import com.persagy.dmp.middleware.constant.enums.RelationTypeEnum;
-import com.persagy.dmp.middleware.dao.DefineTypeRelMapper;
+import com.persagy.dmp.middleware.dao.WdDefineTypeRelMapper;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 import com.persagy.dmp.middleware.service.IBaseService;
 import com.persagy.dmp.middleware.service.IEquipService;
 import com.persagy.dmp.middleware.service.IFloorService;
@@ -39,7 +39,7 @@ public class FloorServiceImpl implements IFloorService {
     private IBaseService baseService;
 
     @Autowired
-    private DefineTypeRelMapper defineTypeRelMapper;
+    private WdDefineTypeRelMapper defineTypeRelMapper;
     
     @Autowired
     private ISpaceService spaceService;
@@ -117,9 +117,9 @@ public class FloorServiceImpl implements IFloorService {
      */
     private List<JSONObject>  queryFloorSpaceList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达空间类型
-        List<DefineTypeRel> defineTypeRels = spaceService.queryGldSpaceTypeRel();
+        List<WdDefineTypeRel> defineTypeRels = spaceService.queryGldSpaceTypeRel();
         //过滤不需要的类型,只需要楼层功能相关的空间
-        List<DefineTypeRel> floorDefineTypeRels = defineTypeRels.stream().filter(k->!"LC".equals(k.getWdModelCode())).collect(Collectors.toList());
+        List<WdDefineTypeRel> floorDefineTypeRels = defineTypeRels.stream().filter(k->!"LC".equals(k.getWdModelCode())).collect(Collectors.toList());
 
         //根据广联达空间类型查询空间信息
         List<JSONObject> spaceList = spaceService.querySpaceByGldTypeRel(context, floorDefineTypeRels, request);
@@ -134,7 +134,7 @@ public class FloorServiceImpl implements IFloorService {
      */
     private List<JSONObject>  queryFloorEquipList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达设备类型
-        List<DefineTypeRel> defineTypeRels = equipService.queryGldEquipTypeRel();
+        List<WdDefineTypeRel> defineTypeRels = equipService.queryGldEquipTypeRel();
         //根据广联达设备类型查询设备信息
         List<JSONObject> equipList = equipService.queryEquipByGldTypeRel(context, defineTypeRels, request);
         return equipList;
@@ -147,7 +147,7 @@ public class FloorServiceImpl implements IFloorService {
      */
     public List<JSONObject>  queryFloorMateriaList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达设备类型
-        List<DefineTypeRel> defineTypeRels = equipService.queryGldMateriaTypeRel();
+        List<WdDefineTypeRel> defineTypeRels = equipService.queryGldMateriaTypeRel();
         //根据广联达设备类型查询阀门信息
         List<JSONObject> materiaList = equipService.queryMateriaByGldTypeRel(context, defineTypeRels, request);
         return materiaList;

+ 21 - 22
src/main/java/com/persagy/dmp/middleware/service/impl/SpaceServiceImpl.java

@@ -3,7 +3,6 @@ package com.persagy.dmp.middleware.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -14,12 +13,12 @@ import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.dmp.middleware.client.DmpRwdClient;
 import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.RelationTypeEnum;
-import com.persagy.dmp.middleware.dao.DefineTypeRelMapper;
+import com.persagy.dmp.middleware.dao.WdDefineTypeRelMapper;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
 import com.persagy.dmp.middleware.entity.response.DmpResult;
-import com.persagy.dmp.middleware.entity.vo.DefineTypeRel;
+import com.persagy.dmp.middleware.entity.vo.WdDefineTypeRel;
 import com.persagy.dmp.middleware.service.IBaseService;
 import com.persagy.dmp.middleware.service.ISpaceService;
 import com.persagy.dmp.middleware.utils.EntityTransferUtil;
@@ -42,7 +41,7 @@ import java.util.stream.Collectors;
 public class SpaceServiceImpl implements ISpaceService {
 
     @Autowired
-    private DefineTypeRelMapper defineTypeRelMapper;
+    private WdDefineTypeRelMapper defineTypeRelMapper;
 
     @Autowired
     private DmpRwdClient dmpRwdClient;
@@ -66,10 +65,10 @@ public class SpaceServiceImpl implements ISpaceService {
      * 查询万达映射表中的空间类型
      */
     @Override
-    public List<DefineTypeRel> queryGldSpaceTypeRel(){
-        QueryWrapper<DefineTypeRel> wrapper = new QueryWrapper<>();
+    public List<WdDefineTypeRel> queryGldSpaceTypeRel(){
+        QueryWrapper<WdDefineTypeRel> wrapper = new QueryWrapper<>();
         wrapper.eq("obj_type","space");
-        List<DefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
+        List<WdDefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
         return defineTypeRels;
     }
 
@@ -80,9 +79,9 @@ public class SpaceServiceImpl implements ISpaceService {
      * @param request
      */
     @Override
-    public List<JSONObject> querySpaceByGldTypeRel(InstanceUrlParam context,List<DefineTypeRel> defineTypeRels,CommonRequestDTO request){
+    public List<JSONObject> querySpaceByGldTypeRel(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request){
         //1. 筛选出bimTypeId为空间类型的数据:bimTypeId:FireZone
-        List<DefineTypeRel> spaceTypeRels = filterSpaceType(context, defineTypeRels);
+        List<WdDefineTypeRel> spaceTypeRels = filterSpaceType(context, defineTypeRels);
 
         //2. 根据bimTypeId查询楼层下的空间
         List<JSONObject> bimTypeSpace = querySpaceObjectByInfoCode(context, defineTypeRels, request, "bimTypeId");
@@ -145,16 +144,16 @@ public class SpaceServiceImpl implements ISpaceService {
     public List<JSONObject> queryEquipInSpace(InstanceUrlParam context, CommonRequestDTO request,String bimTypeId) throws Exception{
 
         //根据空间的BimTypeId构建编码获取所在系统
-        List<DefineTypeRel> spaceTypeRelList = queryGldSpaceTypeRel();
-        Map<String, List<DefineTypeRel>> spaceTypeRelMap = spaceTypeRelList.stream().collect(Collectors.groupingBy(DefineTypeRel::getBimTypeId));
-        List<DefineTypeRel> defineTypeRels = spaceTypeRelMap.get(bimTypeId);
+        List<WdDefineTypeRel> spaceTypeRelList = queryGldSpaceTypeRel();
+        Map<String, List<WdDefineTypeRel>> spaceTypeRelMap = spaceTypeRelList.stream().collect(Collectors.groupingBy(WdDefineTypeRel::getBimTypeId));
+        List<WdDefineTypeRel> defineTypeRels = spaceTypeRelMap.get(bimTypeId);
         if(CollUtil.isEmpty(defineTypeRels)){
             throw new Exception("空间所属系统不存在");
         }
         Set<String> wdSystemCodes = defineTypeRels.stream().filter(k-> StringUtils.isNotEmpty(k.getWdSystemCode())).map(k->k.getWdSystemCode()).collect(Collectors.toSet());
 
         //获取万达系统类下的设备类/阀门
-        List<DefineTypeRel> equipByWdObjectType = getEquipByWdObjectType(wdSystemCodes);
+        List<WdDefineTypeRel> equipByWdObjectType = getEquipByWdObjectType(wdSystemCodes);
         List<JSONObject> objects = new ArrayList<>();
         Set<String> bimTypeIds = new HashSet<>();
         if(CollUtil.isNotEmpty(equipByWdObjectType)){
@@ -209,10 +208,10 @@ public class SpaceServiceImpl implements ISpaceService {
      * @param wdSystemCodes
      * @return
      */
-    private List<DefineTypeRel> getEquipByWdObjectType(Set<String> wdSystemCodes){
+    private List<WdDefineTypeRel> getEquipByWdObjectType(Set<String> wdSystemCodes){
         List<JSONObject> result = new ArrayList<>();
 
-        QueryWrapper<DefineTypeRel> wrapper = new QueryWrapper<>();
+        QueryWrapper<WdDefineTypeRel> wrapper = new QueryWrapper<>();
 
         Set<String> objTypes = new HashSet<>();
         objTypes.add("equipment");
@@ -220,7 +219,7 @@ public class SpaceServiceImpl implements ISpaceService {
 
         wrapper.in("obj_type",objTypes);
         wrapper.in("wd_system_code",wdSystemCodes);
-        List<DefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
+        List<WdDefineTypeRel> defineTypeRels = defineTypeRelMapper.selectList(wrapper);
         return defineTypeRels;
     }
 
@@ -232,7 +231,7 @@ public class SpaceServiceImpl implements ISpaceService {
      * @param infoCode
      * @return
      */
-    private List<JSONObject>  combineQuerySpaceResultData(List<DefineTypeRel> defineTypeRels,List<JSONObject> spaceList,String infoCode){
+    private List<JSONObject>  combineQuerySpaceResultData(List<WdDefineTypeRel> defineTypeRels, List<JSONObject> spaceList, String infoCode){
         if(CollUtil.isEmpty(defineTypeRels)){
             return new ArrayList<>();
         }
@@ -241,7 +240,7 @@ public class SpaceServiceImpl implements ISpaceService {
 
         //数据组装
         List<JSONObject> result = new ArrayList<>();
-        for (DefineTypeRel defineTypeRel : defineTypeRels) {
+        for (WdDefineTypeRel defineTypeRel : defineTypeRels) {
             JSONObject data = new JSONObject();
             data.put("bimTypeId",defineTypeRel.getBimTypeId());
             data.put("className",defineTypeRel.getWdClassName());
@@ -266,7 +265,7 @@ public class SpaceServiceImpl implements ISpaceService {
      * @param request
      * @return
      */
-    private List<JSONObject> querySpaceObjectByInfoCode(InstanceUrlParam context,List<DefineTypeRel> defineTypeRels,CommonRequestDTO request,String infoCode){
+    private List<JSONObject> querySpaceObjectByInfoCode(InstanceUrlParam context, List<WdDefineTypeRel> defineTypeRels, CommonRequestDTO request, String infoCode){
         //1. 根据bimTypeId查询楼层下的空间
         Set<String> bimTypeIdSets = defineTypeRels.stream().filter(k-> StringUtils.isNotEmpty(k.getBimTypeId())).map(k->k.getBimTypeId()).collect(Collectors.toSet());
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
@@ -311,14 +310,14 @@ public class SpaceServiceImpl implements ISpaceService {
      * @param defineTypeRels
      * @return
      */
-    private List<DefineTypeRel> filterSpaceType(InstanceUrlParam instanceUrlParam,List<DefineTypeRel> defineTypeRels){
+    private List<WdDefineTypeRel> filterSpaceType(InstanceUrlParam instanceUrlParam, List<WdDefineTypeRel> defineTypeRels){
         if(CollUtil.isEmpty(defineTypeRels)){
             return new ArrayList<>();
         }
-        List<DefineTypeRel> spaceTypeRels = new ArrayList<>();
+        List<WdDefineTypeRel> spaceTypeRels = new ArrayList<>();
         //获取中台基础空间类型
         JSONArray dmpSpaceType = getDmpBaseSpaceType(instanceUrlParam);
-        for (DefineTypeRel defineTypeRel : defineTypeRels) {
+        for (WdDefineTypeRel defineTypeRel : defineTypeRels) {
             if(dmpSpaceType.contains(defineTypeRel.getBimTypeId())){
                 defineTypeRels.remove(defineTypeRel);
                 spaceTypeRels.add(defineTypeRel);