Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

config-server/src/main/resources/application.yml

@@ -57,8 +57,8 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  security:
-    enabled: false
+#  security:
+#    enabled: false
 
 myuri: localhost
 

config-server/src/main/resources/shared/monitor-service-dev.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-local.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-pro.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-test.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

icssman-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java

@@ -113,15 +113,12 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
 		for (EvaluationModuleVO dataNew : data) {
 			EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-			evaMou.setDiseaseId(dataNew.getDiseaseId());
-			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+			BeanUtil.copyProperties(dataNew,evaMou);
 			evaMou.setGmtCreate(DateUtil.now());
 			evaMou.setGmtModified(DateUtil.now());
-			evaMou.setRegionName(dataNew.getRegionName());
-			evaMou.setRegionType(dataNew.getRegionType());
+			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
 			evaMou.setModifier(UserUtils.getCurrentPrincipleID());
 			evaMou.setOrderNo(dataNew.getOrderNo());
-			evaMou.setRemark(dataNew.getRemark());
 			evaluationModuleLsit.add(evaMou);
 		}
 
@@ -156,15 +153,11 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 			List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
 			for (EvaluationModuleVO dataNew : data) {
 				EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-				evaMou.setDiseaseId(dataNew.getDiseaseId());
-				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,evaMou);
 				evaMou.setGmtCreate(DateUtil.now());
 				evaMou.setGmtModified(DateUtil.now());
-				evaMou.setRegionName(dataNew.getRegionName());
-				evaMou.setRegionType(dataNew.getRegionType());
+				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
 				evaMou.setModifier(UserUtils.getCurrentPrincipleID());
-				evaMou.setOrderNo(dataNew.getOrderNo());
-				evaMou.setRemark(dataNew.getRemark());
 				evaluationModuleLsit.add(evaMou);
 			}
 			res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
@@ -185,8 +178,13 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		return update(new EvaluationModuleMapping(), evaluaNew);
 	}
 
+	/**
+	 * 
+	 * @param diseaseNameVO
+	 * @return
+	 */
 	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
+
 		return evaluationModuleMappingService.queryEvaluationDiseaseName(diseaseNameVO);
 	}
 

icssman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -99,15 +99,11 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
 			for (IndexConfigVO dataNew : data) {
 				IndexConfig IndexConfig = new IndexConfig();
-				IndexConfig.setDiseaseId(dataNew.getDiseaseId());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,IndexConfig);
 				IndexConfig.setGmtCreate(DateUtil.now());
 				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setIndexDesc(dataNew.getIndexDesc());
-				IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
 				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setOrderNo(dataNew.getOrderNo());
-				IndexConfig.setRemark(dataNew.getRemark());
 				IndexConfigLsit.add(IndexConfig);
 			}
 
@@ -148,15 +144,11 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
 			for (IndexConfigVO dataNew : data) {
 				IndexConfig IndexConfig = new IndexConfig();
-				IndexConfig.setDiseaseId(dataNew.getDiseaseId());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				BeanUtil.copyProperties(dataNew,IndexConfig);
 				IndexConfig.setGmtCreate(DateUtil.now());
 				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setIndexDesc(dataNew.getIndexDesc());
-				IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
 				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setOrderNo(dataNew.getOrderNo());
-				IndexConfig.setRemark(dataNew.getRemark());
 				IndexConfigLsit.add(IndexConfig);
 			}
 			res = indexConfigService.saveBatch(IndexConfigLsit);
@@ -184,7 +176,6 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	 * @return
 	 */
 	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
 		return indexConfigService.queryIndexConfigDiseaseName(diseaseNameVO);
 	}
 }

pom.xml

@@ -65,6 +65,12 @@
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-core</artifactId>
         </dependency>
+        <!-- 自动提示配置问题 -->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-properties-migrator</artifactId>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
     </dependencies>
 
     <dependencyManagement>

uaa-service/src/main/resources/bootstrap.yml

@@ -20,6 +20,6 @@ eureka:
 
 myuri: localhost
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false