Explorar o código

增加日志记录设备处理的每条数据的采集时间

lixing %!s(int64=3) %!d(string=hai) anos
pai
achega
37c5a9a527

+ 1 - 1
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java

@@ -147,7 +147,7 @@ public class AlarmHandleServiceImpl {
                             String funcId = jsonObject.getString("funcId");
                             // 采集值
                             String value = jsonObject.getString("value");
-                            log.debug("设备id: {}, 报警类型: {}, 监测指标:{},采集值:{}", meterId, itemCode, funcId, value);
+                            log.debug("设备id: {}, 报警类型: {}, 监测指标:{},采集值:{}, 采集时间:{}", meterId, itemCode, funcId, value,dataTime);
                             // 处理iot数据
                             HashMap<String, Object> paramMap = new HashMap<>();
                             JSONArray funcIdArray = JSON.parseArray(funcId);

+ 55 - 0
src/main/java/com/persagy/test/TestController.java

@@ -0,0 +1,55 @@
+package com.persagy.test;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 报警记录控制层
+ *
+ * @author lixing
+ * @version V1.0 2021-09-08 22:30:38
+ */
+@RestController
+@RequestMapping("test")
+public class TestController {
+    @Resource(name = "alarmRedisTemplate")
+    private RedisTemplate<String, Object> alarmRedisTemplate;
+
+    @PostMapping("/redis")
+    public void testRedis() {
+//        Cursor<Map.Entry<Object, Object>> entryCursor = alarmRedisTemplate.opsForHash().scan("ALARM_CONDITION_STATE", ScanOptions.scanOptions()       //绑定模糊查询的hash的key
+//                .match("Eqdx*")                                 //模糊查询规则
+//                .count(10000).build());
+//
+//        List<String> keys = new ArrayList<>();
+//        while(entryCursor.hasNext()){
+//            Map.Entry next = entryCursor.next();
+//
+//            String key = next.getKey().toString();
+//
+//            // 将查询出的item放入list
+//
+//            keys.add(key);
+//
+//        }
+//
+//        Set<String> keys1 = alarmRedisTemplate.keys("ALL-PROJECT_ITEM_SEND_TIME*");
+//
+//        alarmRedisTemplate.delete(keys1);
+//        Iterator<String> iterator = keys.iterator();
+//        while (iterator.hasNext()) {
+//            alarmRedisTemplate.opsForHash().delete("ALARM_CONDITION_STATE", iterator.next());
+//        }
+        long time = 111L;
+        alarmRedisTemplate.opsForValue().set("test", time);
+    }
+}
+

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -47,7 +47,7 @@ configuration 子节点为 appender、logger、root       -->
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--查看   gunzip -c xx.log.gz | less-->
             <fileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log.%i.gz</fileNamePattern>
-            <maxHistory>1</maxHistory><!--保存最近30天的日志-->
+            <maxHistory>5</maxHistory><!--保存最近5天的日志-->
         </rollingPolicy>
         <encoder>
             <charset>UTF-8</charset>