Merge pull request 'master' (#23) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/23

application/src/main/resources/logback.xml

@@ -84,7 +84,7 @@
                 <maxFileSize>2048MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>90</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录info级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -107,10 +107,10 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/warn/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>1024MB</maxFileSize>
+                <maxFileSize>24MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>365</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录warn级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -134,10 +134,10 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/error/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>1024MB</maxFileSize>
+                <maxFileSize>24MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>365</maxHistory>
+            <maxHistory>30</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录ERROR级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">

modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionResultServiceImpl.java

@@ -5,6 +5,7 @@ import static com.thing.carbon.pub.entity.table.CarbonPubProductionResultEntityT
 import static com.thing.common.core.enumeration.CarbonLifecycleEnum.*;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryColumn;
@@ -269,14 +270,19 @@ public class CarbonPubProductionResultServiceImpl extends BaseServiceImpl<Carbon
                         QueryWrapper.create()
                                 .in(CarbonPubProductionModelEntity::getProductId, productIds)
                                 .eq(CarbonPubProductionModelEntity::getTenantCode, tenantCode));
-        List<CarbonPubLibRecordBaseInfoOnYear> res =
-                productions.stream()
-                        .map(
-                                p ->
-                                        CarbonPubLibRecordBaseInfoOnYear.init(
-                                                JSONObject.parseObject(p.getProductJson(), ProductJsonBean.class),
-                                                p.getProductId()))
-                        .toList();
+
+        List<CarbonPubLibRecordBaseInfoOnYear> res = productions.stream()
+                .map(production -> {
+                    try {
+                        ProductJsonBean productJsonBean = JSONObject.parseObject(production.getProductJson(), ProductJsonBean.class);
+                        return CarbonPubLibRecordBaseInfoOnYear.init(productJsonBean, production.getProductId());
+                    } catch (Exception e) {
+                        // 处理 JSON 解析异常，例如记录日志或返回一个默认值
+                        return null; // 或者返回一个默认的 CarbonPubLibRecordBaseInfoOnYear 对象
+                    }
+                })
+                .filter(Objects::nonNull) // 过滤掉 null 值
+                .toList();
 
         Date start = new Date(DateTimeUtils.yearStartTs());
         Date end = new Date(DateTimeUtils.yearEndTs());

modules/thing/src/main/java/com/thing/listener/QueueDeviceEventListener.java

@@ -87,7 +87,13 @@ public class QueueDeviceEventListener {
                 //更新物模板缓存
                 List<IotThingModelDTO> iotThingModelDTOS = ConvertUtils.sourceToTarget(insertModelList, IotThingModelDTO.class);
                 List<ObjectNode> modelList = JsonConverter.convertToJsonObjectListObjectNode(iotThingModelDTOS);
-                CacheInit.modelMap(modelList,thingCache);
+
+                for (ObjectNode item : modelList) {
+                    //更新物模型
+                    thingCache.updateKeyMap(CacheNameEnum.THING_MODEL
+                            , item.get(CacheNameEnum.ModelField.THING_MODEL_CODE.getField()).asText()
+                                    + ":" + item.get(CacheNameEnum.ModelField.THING_MODEL_ID.getField()).asText(),item);
+                }
 
                 if(CollectionUtils.isNotEmpty(insertEntityList)){
                     List<IotThingEntity> distinctStudentFile = insertEntityList.stream()
@@ -122,7 +128,12 @@ public class QueueDeviceEventListener {
                                 .setCreateDate(e.getCreateDate());
                     }).toList();
                     List<ObjectNode> entityJsonList = JsonConverter.convertToJsonObjectListObjectNode(entityList);
-                    CacheInit.entityMap(entityJsonList,thingCache);
+                    for (ObjectNode entityNode : entityJsonList) {
+                        thingCache.updateKeyMap(CacheNameEnum.THING_ENTITY
+                                ,entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_TENANT_CODE.getField()).asText()
+                                        + ":" + entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_CODE.getField()).asText()
+                                        + ":" + entityNode.get(CacheNameEnum.EntityField.THING_ENTITY_ID.getField()).asText(),entityNode);
+                    }
                 }
             }
         } catch (Exception e) {

modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

@@ -137,6 +137,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
                                      Long startTime,
                                      Long endTime) {
         List<ObjectNode> modelList = cache.getTopicMap(CacheNameEnum.THING_MODEL);
+        log.info("modelList缓存数据个数:{},modelList缓存数据:{}", modelList.size(),modelList.toString());
         if (CollectionUtils.isEmpty(modelList)) {
             List<IotThingModelDTO> list = mapper.selectListByQueryAs(getWrapper(orderField, order, null, null, null,
                     null, null,null,null, null), IotThingModelDTO.class);