瀏覽代碼

2021-1119
打包部署
正向交付设备配置

zhaoyk 3 年之前
父節點
當前提交
47a006ae44

+ 2 - 2
pom.xml

@@ -56,10 +56,10 @@
 
     <dependencies>
         <!-- 配置中心(包含注册中心) -->
-        <!--<dependency>
+        <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>

+ 33 - 4
src/main/java/com/persagy/bdtp/adm/controller/ToolController.java

@@ -2,6 +2,7 @@ package com.persagy.bdtp.adm.controller;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -9,10 +10,7 @@ import com.persagy.bdtp.adm.client.RwdClient;
 import com.persagy.bdtp.adm.common.AdmConst;
 import com.persagy.bdtp.adm.common.AdmRequest;
 import com.persagy.bdtp.adm.common.AdmResult;
-import com.persagy.bdtp.adm.dao.AdmContainerConfigMapper;
-import com.persagy.bdtp.adm.dao.AdmInfosConfigMapper;
-import com.persagy.bdtp.adm.dao.AdmPipeConfigMapper;
-import com.persagy.bdtp.adm.dao.AdmRelsConfigMapper;
+import com.persagy.bdtp.adm.dao.*;
 import com.persagy.bdtp.adm.entity.*;
 import com.persagy.bdtp.adm.entity.db.*;
 import com.persagy.bdtp.adm.service.IConfigService;
@@ -48,6 +46,9 @@ public class ToolController {
 	@Autowired
 	private IConfigService configService;
 
+	@Autowired
+	private AdmM2dEquipMapper m2dEquipMapper;
+
 	@GetMapping("/hello")
 	public AdmResult<Integer> hello(){
 		return AdmResult.success(configService.queryCommonConfig(null).size());
@@ -67,6 +68,15 @@ public class ToolController {
 		clearTime(sysList);
 		clearTime(equipList);
 
+		//设置正向交付类型
+		List<AdmM2dEquip> m2dList = configService.queryM2dEquip(req.getProjectId());
+		HashSet<String> m2dSet = new HashSet<>();
+		m2dList.forEach(item -> m2dSet.add(item.getClassCode()));
+		for(TypeDef eqType : equipList) {
+			if(m2dSet.contains(eqType.getCode()))
+				eqType.setM2d(true);
+		}
+
 		//组织专业-系统树形结构
 		for(Map<String, Object> major : majorList){
 			ArrayList<TypeDef> childrenSys = new ArrayList<>();
@@ -289,4 +299,23 @@ public class ToolController {
 		return AdmResult.success(newId);
 	}
 
+	@PostMapping("/updateM2d")
+	public AdmResult<Object> updateM2d(@RequestBody Map<String, Object> cfg){
+		String code = (String) cfg.get("code");
+		boolean m2d = (Boolean)cfg.get("m2d");
+		AdmM2dEquip item = m2dEquipMapper.selectOne(new QueryWrapper<AdmM2dEquip>().eq("class_code", code));
+		if(m2d){
+			if(item == null){
+				item = new AdmM2dEquip();
+				item.setId(IdUtil.simpleUUID());
+				item.setClassCode(code);
+				m2dEquipMapper.insert(item);
+			}
+		} else {
+			if(item != null)
+				m2dEquipMapper.deleteById(item.getId());
+		}
+		return AdmResult.success(null);
+	}
+
 }

+ 5 - 0
src/main/java/com/persagy/bdtp/adm/entity/TypeDef.java

@@ -1,6 +1,7 @@
 package com.persagy.bdtp.adm.entity;
 
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
+import lombok.Data;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -8,8 +9,12 @@ import java.util.List;
 /**
  * 类型定义,封装children操作,支持树形结构
  */
+@Data
 public class TypeDef extends ObjectTypeDefine {
 
+	/** 正向交付设备类标注 */
+	private boolean m2d;
+
 	private List<TypeDef> children;
 
 	public void addChild(TypeDef child){

+ 13 - 13
src/main/resources/application-test.yml

@@ -9,12 +9,12 @@ spring:
           username: root
           password: Bdtp@1qaz@WSX
           url: jdbc:mysql://10.0.0.5:3306/adm-poc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT
-  rabbitmq:
-    host: 82.156.204.212
-    port: 9936
-    username: admin
-    password: bdtp123456
-    virtualHost: /test
+#  rabbitmq:
+#    host: 82.156.204.212
+#    port: 9936
+#    username: admin
+#    password: bdtp123456
+#    virtualHost: /test
 persagy:
   common:
 #    file:
@@ -26,12 +26,12 @@ persagy:
       enabled: false
   adm:
     oldPlatformUrl: http://39.102.40.239
-  bdtp:
-    rwd:
-      service: http://82.157.151.123/dmp-rwd
-    file:
-      service: http://82.157.151.123/dmp-file
-    dic:
-      service: http://82.157.151.123/dmp-dic
+#  bdtp:
+#    rwd:
+#      service: http://82.157.151.123/dmp-rwd
+#    file:
+#      service: http://82.157.151.123/dmp-file
+#    dic:
+#      service: http://82.157.151.123/dmp-dic
 mybatis-plus:
   type-handlers-package: com.persagy.**.typehandler