Browse Source

1.修复更新信息点报错的bug
2.日志增加动态控制日志级别功能

lijie 3 years ago
parent
commit
d07cdd101d

+ 12 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -140,6 +140,12 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
 
             //数据合并
             ObjectDigital newDbVO = dbVO;
+            // 合并通用信息点数据
+            if (!vo.getObjType().equals(vo.getClassCode())){
+                Map<String, ObjectInfoDefine> commonInfoMap = allInfoMap.getOrDefault(vo.getObjType(), new HashMap<>());
+                dataMerge(newDbVO,vo,commonInfoMap,fieldSet);
+            }
+            // 合并对象分类信息点数据
             Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.get(vo.getClassCode());
             dataMerge(newDbVO,vo,infoDefineMap,fieldSet);
 
@@ -595,9 +601,9 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
                     infoMap.putAll(infoDefineMap);
                 }
             }
-            String objType = objTypeMap.get(vo.getClassCode());
+            String objType = objTypeMap.getOrDefault(vo.getClassCode(),"");
             //设置通用信息点
-            if(!objType.equals(vo.getClassCode())){
+            if(!objType.equals(vo.getClassCode()) && MapUtil.isNotEmpty(allInfoMap)){
                 Map<String, ObjectInfoDefine> commonInfoDefineMap = allInfoMap.getOrDefault(objType,new HashMap<>());
                 if(null!=commonInfoDefineMap && commonInfoDefineMap.size()>0){
                     infoMap.putAll(commonInfoDefineMap);
@@ -760,9 +766,12 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
         }
         for (ObjectDigital digital : voList) {
             ObjectDigital dbDigital = dbMap.get(digital.getId());
-            if(dbDigital!=null){
+            if(dbDigital!=null && StrUtil.isBlank(digital.getClassCode())){
                 digital.setClassCode(dbDigital.getClassCode());
             }
+            if(dbDigital!=null && StrUtil.isBlank(digital.getObjType())){
+                digital.setObjType(dbDigital.getObjType());
+            }
         }
     }
 

+ 2 - 1
dmp-server/src/main/resources/logback-spring.xml

@@ -5,6 +5,7 @@
     <springProperty name="LOG_FILE" scope="context" source="logging.file" defaultValue="../logs/${APP_NAME}"/>
     <springProperty name="LOG_POINT_FILE" scope="context" source="logging.file" defaultValue="../logs/point"/>
     <springProperty name="LOG_AUDIT_FILE" scope="context" source="logging.file" defaultValue="../logs/audit"/>
+    <springProperty name="LOG_LEVEL" scope="context" source="persagy.bdtp.logging.level" defaultValue="INFO"/>
     <springProperty name="LOG_MAXFILESIZE" scope="context" source="logback.filesize" defaultValue="50MB"/>
     <springProperty name="LOG_TOTAL_SIZE_CAP" scope="context" source="logback.total.size.cap" defaultValue="2GB"/>
     <springProperty name="LOG_FILEMAXDAY" scope="context" source="logback.filemaxday" defaultValue="7"/>
@@ -104,7 +105,7 @@
         <appender-ref ref="audit_log_async" />
     </logger>
 
-    <root level="INFO">
+    <root level="${LOG_LEVEL}">
         <appender-ref ref="StdoutAppender"/>
         <appender-ref ref="file_async"/>
         <appender-ref ref="audit_log_async"/>