Kaynağa Gözat

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-delivery

 Conflicts:
	adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/TemplateController.java
zhaoyk 3 yıl önce
ebeveyn
işleme
e6d7637113
15 değiştirilmiş dosya ile 210 ekleme ve 153 silme
  1. 38 39
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/CommonController.java
  2. 80 70
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DemoDiagramController.java
  3. 0 2
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DiagramController.java
  4. 0 2
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/IconController.java
  5. 26 22
      adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/LegendController.java
  6. 21 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/SpaceTypeEnum.java
  7. 1 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/common/service/impl/EmsAuthServiceImpl.java
  8. 9 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java
  9. 5 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java
  10. 0 1
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectDigitalMigration.java
  11. 20 5
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java
  12. 7 2
      adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java
  13. 1 0
      adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelBackServiceImpl.java
  14. 1 2
      docker/dockerfiles/adm-middleware/Dockerfile
  15. 1 2
      docker/dockerfiles/adm-server/Dockerfile

+ 38 - 39
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/CommonController.java

@@ -11,7 +11,6 @@ import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,55 +20,55 @@ import java.util.Map;
 
 /**
  * 公共接口
+ *
  * @author zhaoyk
  * @date 2021-12-27
  */
 @RestController
-@CrossOrigin
 public class CommonController {
 
-	@Autowired
-	private BdtpDataService bdtpDataService;
+    @Autowired
+    private BdtpDataService bdtpDataService;
 
-	@Autowired
-	@Qualifier(DataStrategy.IMPL_QUALIFIER)
-	private DataStrategy dataStrategy;
+    @Autowired
+    @Qualifier(DataStrategy.IMPL_QUALIFIER)
+    private DataStrategy dataStrategy;
 
-	@GetMapping("equipTypes")
-	public CommonResult<List<ObjectNode>> equipTypes(){
-		return ResultHelper.single(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
-	}
+    @GetMapping("equipTypes")
+    public CommonResult<List<ObjectNode>> equipTypes() {
+        return ResultHelper.single(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
+    }
 
-	@GetMapping("relTypes")
-	public CommonResult<List<Map<String, Object>>> relTypes(){
-		return ResultHelper.single(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
-	}
+    @GetMapping("relTypes")
+    public CommonResult<List<Map<String, Object>>> relTypes() {
+        return ResultHelper.single(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
+    }
 
-	@GetMapping("majSys")
-	public CommonResult<List<ObjectNode>> majSys(){
-		BdtpRequest req = BdtpRequest.getCurrent();
-		List<ObjectNode> majList = bdtpDataService.getMajorList(req);
-		List<ObjectNode> sysList = bdtpDataService.getSystemList(req);
+    @GetMapping("majSys")
+    public CommonResult<List<ObjectNode>> majSys() {
+        BdtpRequest req = BdtpRequest.getCurrent();
+        List<ObjectNode> majList = bdtpDataService.getMajorList(req);
+        List<ObjectNode> sysList = bdtpDataService.getSystemList(req);
 
-		for(ObjectNode maj : majList){
-			ArrayNode childrenSys = maj.putArray("children");
-			String majorCode = maj.get("code").asText();
-			maj.put("name", maj.get("label").asText());
-			for(Iterator<ObjectNode> sysIter = sysList.iterator(); sysIter.hasNext();){
-				ObjectNode sys = sysIter.next();
-				if(sys.get("majorCode") != null && sys.get("majorCode").asText().equals(majorCode)){
-					childrenSys.add(sys);
-					sysIter.remove();
-				}
-			}
-		}
-		return ResultHelper.single(majList);
-	}
+        for (ObjectNode maj : majList) {
+            ArrayNode childrenSys = maj.putArray("children");
+            String majorCode = maj.get("code").asText();
+            maj.put("name", maj.get("label").asText());
+            for (Iterator<ObjectNode> sysIter = sysList.iterator(); sysIter.hasNext(); ) {
+                ObjectNode sys = sysIter.next();
+                if (sys.get("majorCode") != null && sys.get("majorCode").asText().equals(majorCode)) {
+                    childrenSys.add(sys);
+                    sysIter.remove();
+                }
+            }
+        }
+        return ResultHelper.single(majList);
+    }
 
-	@ApiOperation("查询系统图类型列表")
-	@GetMapping("diagramTypes")
-	public CommonResult<List<DiagramType>> diagramTypes(){
-		return ResultHelper.single(dataStrategy.getDiagramTypes());
-	}
+    @ApiOperation("查询系统图类型列表")
+    @GetMapping("diagramTypes")
+    public CommonResult<List<DiagramType>> diagramTypes() {
+        return ResultHelper.single(dataStrategy.getDiagramTypes());
+    }
 
 }

+ 80 - 70
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DemoDiagramController.java

@@ -1,95 +1,105 @@
 package com.persagy.adm.diagram.controller;
 
+import com.persagy.adm.diagram.core.model.Diagram;
 import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.manage.DemoDiagramManager;
 import com.persagy.adm.diagram.manage.Folder;
-import com.persagy.adm.diagram.core.model.Diagram;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
 
 @RestController
-@CrossOrigin
 @RequestMapping("diagram0")
 public class DemoDiagramController {
 
-	@Autowired
-	private DemoDiagramManager diagramManager;
+    @Autowired
+    private DemoDiagramManager diagramManager;
 
-	/**
-	 * 查询系统图
-	 * @param projectId 项目id
-	 * @param systemId 系统实例id
-	 * @param groupCode 集团编码
-	 * @return 树形结构数据(专业-系统-类型-图)
-	 */
-	@ApiOperation("查询系统图,返回树形结构")
-	@GetMapping("getDiagrams")
-	public CommonResult<List<Folder>> getDiagrams(@RequestParam String projectId,
-												  @RequestParam(required = false) String systemId,
-												  @RequestParam(required = false) String groupCode){
-		return ResultHelper.single(diagramManager.getDiagrams(projectId, systemId, groupCode));
-	}
+    /**
+     * 查询系统图
+     *
+     * @param projectId 项目id
+     * @param systemId  系统实例id
+     * @param groupCode 集团编码
+     * @return 树形结构数据(专业 - 系统 - 类型 - 图)
+     */
+    @ApiOperation("查询系统图,返回树形结构")
+    @GetMapping("getDiagrams")
+    public CommonResult<List<Folder>> getDiagrams(@RequestParam String projectId,
+                                                  @RequestParam(required = false) String systemId,
+                                                  @RequestParam(required = false) String groupCode) {
+        return ResultHelper.single(diagramManager.getDiagrams(projectId, systemId, groupCode));
+    }
 
-	/**
-	 * 新建系统图
-	 * @param params 新建参数,对象类型,包含字段 name:名称, type:系统图类型编码
-	 * @param projectId 项目id
-	 * @param systemId 系统实例id
-	 * @param groupCode 集团编码
-	 * @return 新建的系统图对象
-	 */
-	@PostMapping("newDiagram")
-	public CommonResult<Diagram> newDiagram(@RequestBody Map<String, String> params,
-											@RequestParam String projectId,
-											@RequestParam(required = false) String systemId,
-											@RequestParam(required = false) String groupCode){
-		return ResultHelper.single(diagramManager.createDiagram(params.get("name"), params.get("type"), projectId, systemId, groupCode));
-	}
+    /**
+     * 新建系统图
+     *
+     * @param params    新建参数,对象类型,包含字段 name:名称, type:系统图类型编码
+     * @param projectId 项目id
+     * @param systemId  系统实例id
+     * @param groupCode 集团编码
+     * @return 新建的系统图对象
+     */
+    @PostMapping("newDiagram")
+    public CommonResult<Diagram> newDiagram(@RequestBody Map<String, String> params,
+                                            @RequestParam String projectId,
+                                            @RequestParam(required = false) String systemId,
+                                            @RequestParam(required = false) String groupCode) {
+        return ResultHelper.single(diagramManager.createDiagram(params.get("name"), params.get("type"), projectId, systemId, groupCode));
+    }
 
-	/**
-	 * 删除系统图
-	 * @param params 删除参数,对象类型,包含字段 id:系统图id
-	 * @return
-	 */
-	@PostMapping("delDiagram")
-	public CommonResult<Boolean> delDiagram(@RequestBody Map<String, String> params){
-		return ResultHelper.single(diagramManager.deleteDiagram(params.get("id")));
-	}
+    /**
+     * 删除系统图
+     *
+     * @param params 删除参数,对象类型,包含字段 id:系统图id
+     * @return
+     */
+    @PostMapping("delDiagram")
+    public CommonResult<Boolean> delDiagram(@RequestBody Map<String, String> params) {
+        return ResultHelper.single(diagramManager.deleteDiagram(params.get("id")));
+    }
 
-	/**
-	 * 设置(修改)系统图使用的模板
-	 * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id, templateId:使用的模板id
-	 * @return 系统图对象
-	 */
-	@PostMapping("setTemplate")
-	public CommonResult<Diagram> setTemplate(@RequestBody EditRequest req){
-		return ResultHelper.single(diagramManager.setTemplate(req.getDiagramId(), req.getTemplateId()));
-	}
+    /**
+     * 设置(修改)系统图使用的模板
+     *
+     * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id, templateId:使用的模板id
+     * @return 系统图对象
+     */
+    @PostMapping("setTemplate")
+    public CommonResult<Diagram> setTemplate(@RequestBody EditRequest req) {
+        return ResultHelper.single(diagramManager.setTemplate(req.getDiagramId(), req.getTemplateId()));
+    }
 
-	/**
-	 * 自动加载数据
-	 * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id
-	 * @return 系统图对象
-	 */
-	@PostMapping("loadData")
-	public CommonResult<Diagram> loadData(@RequestBody EditRequest req) {
-		return ResultHelper.single(diagramManager.loadData(req.getDiagramId(), true));
-	}
+    /**
+     * 自动加载数据
+     *
+     * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id
+     * @return 系统图对象
+     */
+    @PostMapping("loadData")
+    public CommonResult<Diagram> loadData(@RequestBody EditRequest req) {
+        return ResultHelper.single(diagramManager.loadData(req.getDiagramId(), true));
+    }
 
-	/**
-	 * 保存系统图
-	 * @param req 编辑参数,对象类型,包含字段 diagram:系统图对象
-	 * @return 保存后的系统图对象
-	 */
-	@PostMapping("saveDiagram")
-	public CommonResult<Diagram> saveDiagram(@RequestBody EditRequest req) {
-		return ResultHelper.single(diagramManager.saveDiagram(req.getDiagram()));
-	}
+    /**
+     * 保存系统图
+     *
+     * @param req 编辑参数,对象类型,包含字段 diagram:系统图对象
+     * @return 保存后的系统图对象
+     */
+    @PostMapping("saveDiagram")
+    public CommonResult<Diagram> saveDiagram(@RequestBody EditRequest req) {
+        return ResultHelper.single(diagramManager.saveDiagram(req.getDiagram()));
+    }
 
 }

+ 0 - 2
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DiagramController.java

@@ -21,7 +21,6 @@ import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +41,6 @@ import java.util.Optional;
  * @date 2022-01-04
  */
 @RestController
-@CrossOrigin
 @RequestMapping("/diagram")
 public class DiagramController {
 

+ 0 - 2
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/IconController.java

@@ -14,7 +14,6 @@ import com.persagy.dmp.file.model.FileInfoCreator;
 import com.persagy.dmp.file.utils.FileStorageHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,7 +36,6 @@ import java.util.Optional;
  * @date 2022-01-06
  */
 @RestController
-@CrossOrigin
 @RequestMapping("/icon")
 public class IconController {
 

+ 26 - 22
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/LegendController.java

@@ -1,48 +1,52 @@
 package com.persagy.adm.diagram.controller;
 
-import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.core.model.legend.Legend;
+import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.manage.LegendManager;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
-@CrossOrigin
 @RequestMapping("legend")
 public class LegendController {
 
-	@Autowired
-	private LegendManager legendManager;
+    @Autowired
+    private LegendManager legendManager;
 
-	@ApiOperation("按照系统代码,查询图例列表")
-	@GetMapping("getLegends")
-	public CommonResult<List<Legend>> getLegends(@RequestParam String sys){
-		return ResultHelper.single(legendManager.getLegends(sys));
-	}
+    @ApiOperation("按照系统代码,查询图例列表")
+    @GetMapping("getLegends")
+    public CommonResult<List<Legend>> getLegends(@RequestParam String sys) {
+        return ResultHelper.single(legendManager.getLegends(sys));
+    }
 
-	@PostMapping("saveLegend")
-	public CommonResult<Legend> saveLegend(@RequestBody EditRequest req){
-		return ResultHelper.single(legendManager.saveLegend(req.getLegend(), req.getSys()));
-	}
+    @PostMapping("saveLegend")
+    public CommonResult<Legend> saveLegend(@RequestBody EditRequest req) {
+        return ResultHelper.single(legendManager.saveLegend(req.getLegend(), req.getSys()));
+    }
 
-	@PostMapping("delLegend")
-	public CommonResult<Boolean> delLegend(@RequestBody EditRequest req){
-		return ResultHelper.single(legendManager.deleteLegend(req.getCurrentCompId(), req.getSys()));
-	}
+    @PostMapping("delLegend")
+    public CommonResult<Boolean> delLegend(@RequestBody EditRequest req) {
+        return ResultHelper.single(legendManager.deleteLegend(req.getCurrentCompId(), req.getSys()));
+    }
 
 //	@RequestMapping("fixRel")
 //	public CommonResult<Boolean> fixRel(){
 //		return ResultHelper.single(legendManager.fixRel());
 //	}
 
-	@RequestMapping("fixDiagramType")
-	public CommonResult<Boolean> fixDiagramType(){
-		return ResultHelper.single(legendManager.fixDiagramType());
-	}
+    @RequestMapping("fixDiagramType")
+    public CommonResult<Boolean> fixDiagramType() {
+        return ResultHelper.single(legendManager.fixDiagramType());
+    }
 
 }

+ 21 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/constant/SpaceTypeEnum.java

@@ -12,25 +12,44 @@ import lombok.Getter;
  */
 @Getter
 public enum SpaceTypeEnum {
-
+	/**物业分区*/
 	GeneralZone("GeneralZone", "物业分区"),
+	/**供电分区*/
 	PowerSupplyZone("PowerSupplyZone", "供电分区"),
+	/**照明分区*/
 	LightingZone("LightingZone", "照明分区"),
+	/**网络分区*/
 	NetworkZone("NetworkZone", "网络分区"),
+	/**空调分区*/
 	AirConditioningZone("AirConditioningZone", "空调分区"),
+	/**采暖分区*/
 	HeatingZone("HeatingZone", "采暖分区"),
+	/**洁净分区*/
 	CleanZone("CleanZone", "洁净分区"),
+	/**生活给水分区*/
 	DomesticWaterSupplyZone("DomesticWaterSupplyZone", "生活给水分区"),
+	/**防火分区*/
 	FireZone("FireZone", "防火分区"),
+	/**安防分区*/
 	SecurityZone("SecurityZone", "安防分区"),
+	/**租户分区*/
 	TenantZone("TenantZone", "租户分区"),
+	/**功能分区*/
 	FunctionZone("FunctionZone", "功能分区"),
+	/**客流分区*/
 	PassengerFlowZone("PassengerFlowZone", "客流分区"),
+	/**疏散分区*/
 	EvacuateZone("EvacuateZone", "疏散分区"),
+	/**环境分区*/
 	EnvironmentZone("EnvironmentZone", "环境分区"),
+	/**其他分区*/
 	OtherZone("OtherZone", "其他分区"),
+	/**主要功能区*/
 	MajorOperationZone("MajorOperationZone", "主要功能区"),
-	ParkingZone("ParkingZone", "停车分区");
+	/**停车分区*/
+	ParkingZone("ParkingZone", "停车分区"),
+	/**主要功能区*/
+	partition("partition", "主要功能区");
 
 	private String code;
     private String desc;

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/common/service/impl/EmsAuthServiceImpl.java

@@ -65,7 +65,7 @@ public class EmsAuthServiceImpl extends AbstractAuthServiceImpl {
                 continue;
             }
             for (Project project : entry.getValue()) {
-                if (AppContext.getContext().getProjectId().equals(project.getProjectId())){
+                if (project.getProjectId().equals(AppContext.getContext().getProjectId())){
                     AppContext.getContext().setGroupCode(entry.getKey());
                     break flag;
                 }

+ 9 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 import com.persagy.dmp.delivery.entity.ObjectTypeCollect;
+import com.persagy.dmp.common.model.entity.AuditableEntity;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
@@ -57,6 +58,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         if(AdmDictCategoryEnum.MAJOR.getValue().equals(type)){
             //查询专业分类
             node.put("type",AdmDictCategoryEnum.MAJOR.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             admResponse = doQueryDictData(context, criteria, clazz);
         }
@@ -65,6 +67,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         if(baseCategory.contains(type)){
             //查询设备类型:equipment,部件类型:component,输入系统类型:system,输入专业类型:major,业务空间类型 space ,资产 property
             node.put("objType",type);
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             admResponse = doQueryObjectType(context, criteria, clazz);
         }
@@ -74,6 +77,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             ArrayNode arrayNode = node.putObject("objType").putArray("$in");
             arrayNode.add(AdmDictCategoryEnum.COMPONENT.getValue());
             arrayNode.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
+            node.put(AuditableEntity.PROP_VALID,1);
             criteria.setCriteria(node);
             admResponse = doQueryObjectType(context, criteria, clazz);
         }
@@ -106,9 +110,12 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
     private AdmResponse queryDictObjectTypeTree(InstanceUrlParam context ,String type, Class<T> clazz){
         //查询所有的专业
         List<AdmObjectType> allMajor = getAllMajor(context, clazz);
-
+        QueryCriteria criteria = new QueryCriteria();
+        ObjectNode node = JsonNodeFactory.instance.objectNode();
+        node.put(AuditableEntity.PROP_VALID,1);
+        criteria.setCriteria(node);
         //查询所有的类型
-        AdmResponse admResponse = doQueryObjectType(context, new QueryCriteria(), clazz);
+        AdmResponse admResponse = doQueryObjectType(context, criteria, clazz);
         List<AdmObjectType> objectTypes = (List<AdmObjectType>) admResponse.getContent();
         Map<String, List<AdmObjectType>> objectTypeMap = objectTypes.stream().filter(k-> StringUtils.isNotEmpty(k.getObjType()))
                 .collect(Collectors.groupingBy(AdmObjectType::getObjType));

+ 5 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java

@@ -464,7 +464,11 @@ public class MigrationAbstractServiceImpl<T> implements IMigrationAbstractServic
             return  null;
         }
         Map<String, Object> targetsMap = new HashMap<>(sets.size());
-        sets.forEach(key -> targetsMap.put(key, map.get(key)));
+        for(String key : sets){
+            if(map.containsKey(key)){
+                targetsMap.put(key, map.get(key));
+            }
+        }
         return targetsMap;
     }
 }

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectDigitalMigration.java

@@ -202,7 +202,6 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
             log.error(" ######################### dt_object adm已交付:"+ ResponseCode.C0320.getDesc() +" 同步结束 #########################");
         }
 
-        //因获取的数据均有主键 使用更新
         String insertUrl = requestUrl(context, migrationInfo, MigrationType.CREATE.getCode());
         if(CollUtil.isEmpty(projObjectNodeList)){
             //调用中台验证待新增的数据

+ 20 - 5
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -60,6 +60,7 @@ import java.awt.Color;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.*;
@@ -492,7 +493,7 @@ public class AdmEquipmentController {
 						equipment.put(define.getCode(), tempCell.getStringCellValue().trim());
 					} else if ("INTEGER".equalsIgnoreCase(define.getDataType())) {
 						try {
-							if (!CellType.NUMERIC.equals(tempCell.getCellTypeEnum())
+							if (!CellType.NUMERIC.equals(tempCell.getCellType())
 									|| StrUtil.isBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
 								failurNum++;
 								this.setColor(workbook, 155, 227, 255, tempCell);
@@ -500,7 +501,7 @@ public class AdmEquipmentController {
 								continue;
 							}
 							tempCell.setCellType(CellType.STRING);
-							equipment.put(define.getCode(), tempCell.getStringCellValue().trim());
+							equipment.putPOJO(define.getCode(), CellUtil.getCellValue(tempCell,CellType.STRING,true));
 						} catch (Exception e) {
 							failurNum++;
 							this.setColor(workbook, 155, 227, 255, tempCell);
@@ -508,11 +509,11 @@ public class AdmEquipmentController {
 							continue;
 						}
 					} else if ("ENUM".equalsIgnoreCase(define.getDataType())) {
-						if (CellType.NUMERIC.equals(tempCell.getCellTypeEnum())
+						if (CellType.NUMERIC.equals(tempCell.getCellType())
 								&& StrUtil.isNotBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
 							tempCell.setCellType(CellType.STRING);
-							equipment.put(define.getCode(), tempCell.getStringCellValue().trim());
-						} else if (CellType.STRING.equals(tempCell.getCellTypeEnum())
+							equipment.putPOJO(define.getCode(), CellUtil.getCellValue(tempCell,CellType.STRING,true));
+						} else if (CellType.STRING.equals(tempCell.getCellType())
 								&& StrUtil.isNotBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
 							equipment.put(define.getCode(), tempCell.getStringCellValue().trim());
 						} else {
@@ -521,6 +522,20 @@ public class AdmEquipmentController {
 							changeFlag=false;
 							continue;
 						}
+					} else if ("MENUM".equalsIgnoreCase(define.getDataType())) {
+						if (CellType.NUMERIC.equals(tempCell.getCellType())
+								&& StrUtil.isNotBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
+							tempCell.setCellType(CellType.STRING);
+							equipment.putPOJO(define.getCode(), CollUtil.newArrayList(CellUtil.getCellValue(tempCell,CellType.STRING,true)));
+						} else if (CellType.STRING.equals(tempCell.getCellType())
+								&& StrUtil.isNotBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
+							equipment.putPOJO(define.getCode(), CollUtil.newArrayList(CellUtil.getCellValue(tempCell,CellType.STRING,true)));
+						} else {
+							failurNum++;
+							this.setColor(workbook, 155, 227, 255, tempCell);
+							changeFlag=false;
+							continue;
+						}
 					} else if ("DATETIME".equalsIgnoreCase(define.getDataType())) {
 						try {
 							tempCell.setCellType(CellType.STRING);

+ 7 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java

@@ -4,11 +4,15 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
+import com.persagy.proxy.adm.constant.GraphCodeEnum;
+import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
@@ -102,7 +106,7 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
 
     @Override
     public void processDmpCriteria(QueryCriteria dmpRequest) {
-        /*ObjectNode criteria = dmpRequest.getCriteria();
+        ObjectNode criteria = dmpRequest.getCriteria();
         if (null==criteria){
             return;
         }
@@ -134,13 +138,14 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
             }
             criteria.set("relationFrom",relationFrom);
             criteria.remove("buildingId");
-        }*/
+        }
     }
 
     @Override
     public AdmResponse queryNewInternal(String buildingId, String floorId, AdmQueryCriteria request) {
         constructQueryNewParam(buildingId,floorId,request);
         QueryCriteria rwdQueryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
+        processDmpCriteria(rwdQueryCriteria);
         if(JSONUtil.isNull(rwdQueryCriteria.getCriteria())){
             return AdmResponse.failure("请求参数错误");
         }

+ 1 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelBackServiceImpl.java

@@ -69,6 +69,7 @@ public class AdmModelBackServiceImpl implements AdmModelBackService {
 
 
 
+
         }
 
     }

+ 1 - 2
docker/dockerfiles/adm-middleware/Dockerfile

@@ -1,5 +1,5 @@
 #构建此镜像的基础镜像
-FROM java:8-jre
+FROM registry.persagy.com/base/centos:v-jdk1.8
 #指定作者名称
 MAINTAINER lijie<lijie@persagy.com>
 
@@ -16,7 +16,6 @@ ENV TZ Asia/Shanghai
 ARG WORKER_HOME
 
 #执行的命令
-RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
 
 RUN mkdir -p $WORKER_HOME/config

+ 1 - 2
docker/dockerfiles/adm-server/Dockerfile

@@ -1,5 +1,5 @@
 #构建此镜像的基础镜像
-FROM java:8-jre
+FROM registry.persagy.com/base/centos:v-jdk1.8
 #指定作者名称
 MAINTAINER lijie<lijie@persagy.com>
 
@@ -16,7 +16,6 @@ ENV TZ Asia/Shanghai
 ARG WORKER_HOME
 
 #执行的命令
-RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
 
 RUN mkdir -p $WORKER_HOME/config