Przeglądaj źródła

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/adm-middleware.git into develop

zhangqiankun 3 lat temu
rodzic
commit
5be38123be

+ 4 - 0
src/main/java/com/persagy/proxy/adm/service/IAdmShaftService.java

@@ -1,6 +1,9 @@
 package com.persagy.proxy.adm.service;
 
 import com.persagy.proxy.adm.model.AdmShaft;
+import com.persagy.proxy.common.entity.InstanceUrlParam;
+
+import java.util.List;
 
 /**
  * ADM 竖井接口
@@ -8,4 +11,5 @@ import com.persagy.proxy.adm.model.AdmShaft;
  * @date 2021/8/18
  */
 public interface IAdmShaftService extends IAdmBaseService<AdmShaft>{
+    void ensureSpecialValues(InstanceUrlParam context, List<AdmShaft> vos);
 }

+ 35 - 0
src/main/java/com/persagy/proxy/adm/service/impl/AdmShaftServiceImpl.java

@@ -1,9 +1,20 @@
 package com.persagy.proxy.adm.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.persagy.proxy.adm.model.AdmEquipment;
 import com.persagy.proxy.adm.model.AdmShaft;
+import com.persagy.proxy.adm.request.AdmQueryCriteria;
+import com.persagy.proxy.adm.request.AdmResponse;
+import com.persagy.proxy.adm.service.IAdmEquipmentService;
 import com.persagy.proxy.adm.service.IAdmShaftService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.common.entity.InstanceUrlParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * ADM 竖井 实现类
  * @author lvxy
@@ -11,4 +22,28 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AdmShaftServiceImpl extends AbstractAdmBaseServiceImpl<AdmShaft> implements IAdmShaftService {
+    @Autowired
+    private IAdmEquipmentService equipmentService;
+
+    @Override
+    public void ensureSpecialValues(InstanceUrlParam context, List<AdmShaft> vos) {
+        if(CollUtil.isEmpty(vos)) {
+            return;
+        }
+        //收集设备对象
+        List<AdmEquipment> equipmentList = new ArrayList<>();
+        vos.stream().forEach(admShaft -> {
+            if(CollUtil.isNotEmpty(admShaft.getEquipmentList())){
+                equipmentList.addAll(admShaft.getEquipmentList());
+            }
+        });
+        equipmentService.ensureSpecialValues(AdmContextUtil.toDmpContext(), equipmentList);
+    }
+    @Override
+    public AdmResponse doQuery(InstanceUrlParam context, AdmQueryCriteria request, Class<AdmShaft> clazz) {
+        AdmResponse response = super.doQuery(context, request, clazz);
+        // 系统需要补充分类名称属性
+        ensureSpecialValues(context, (List<AdmShaft>) response.getContent());
+        return response;
+    }
 }

+ 8 - 0
src/main/java/com/persagy/proxy/adm/service/impl/AdmSpaceServiceImpl.java

@@ -49,6 +49,14 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
     protected IAdmEquipmentService equipmentService;
 
     @Override
+    public AdmResponse doQuery(InstanceUrlParam context, AdmQueryCriteria request, Class<AdmSpace> clazz) {
+        AdmResponse response = super.doQuery(context, request, clazz);
+        // 系统需要补充分类名称属性
+        ensureSpecialValues(context, (List<AdmSpace>) response.getContent());
+        return response;
+    }
+
+    @Override
     public List<AdmSpace> doInsertExt(InstanceUrlParam context, Class<AdmSpace> clazz, List<AdmSpace> voList) {
         Map<String, AdmSpace> spaceMapByFlId = CollUtil.fieldValueMap(voList, "floorId");
         //查询空间中floorId 对应的floor