cuikaidong
2025-08-29 3b20c91323abd42512a45a8796871a81454f53b8
设备单表设备编号处理
已修改2个文件
19 ■■■■ 文件已修改
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
@@ -91,7 +91,6 @@
                        // 获取当前时间
                        LocalDateTime now = LocalDateTime.now();
                        // 减去一分钟
//                        LocalDateTime oneMinuteAgo = now.minusMinutes(1);
                        LocalDateTime oneMinuteAgo = now.minusSeconds(2);
                        // 格式化为字符串(可选)
                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -109,22 +108,9 @@
                LocalDateTime endTime = LocalDateTime.parse(end.get(), inputFormatter);
                // 定义日期时间格式器(ISO_LOCAL_DATE_TIME 对应 "yyyy-MM-ddTHH:mm:ss")
                DateTimeFormatter formatter1 = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
                // 解析字符串为 LocalDateTime 对象
                LocalDateTime startDateTime = LocalDateTime.parse(startTime.toString(), formatter1);// 解析字符串为 LocalDateTime 对象
                LocalDateTime endDateTime = LocalDateTime.parse(endTime.toString(), formatter1);
                // 加上 8 小时
                LocalDateTime startNewDateTime = startDateTime.minusHours(8);
                LocalDateTime endNewDateTime = endDateTime.minusHours(8);
//                String query = "from(bucket: \"IOT\") \n" +
//                        "|> range(start: "+startNewDateTime+"Z, stop: "+endNewDateTime+"Z) \n" +
//                        "|> fill(usePrevious: true) \n" +
//                        "|> filter(fn: (r) => r[\"_field\"] == \"TimeStamp\" or r[\"_field\"] == \"Value\")";
                String query = "from(bucket: \"" + influxBucket + "\") " +
                        "|> range(start: -5s) " +
                        "|> filter(fn: (r) => r[\"_field\"] == \"TimeStamp\" or r[\"_field\"] == \"Value\")";
                // 执行查询
                try {
                    List<FluxTable> tables = queryApi.query(query, influxOrg);
@@ -158,7 +144,6 @@
                                        )),
                                        Collectors.toList()
                                ));
                        // 处理设备状态
                        int lastIndex = table.lastIndexOf('.');
                        String code = table.substring(lastIndex + 1);
@@ -212,7 +197,7 @@
                                values[influxdbList.size() + 1] = dateTime;
                                int index = tableName.indexOf("_");
                                if (index != -1) {
                                    values[influxdbList.size()] = tableName.substring(0, index);
                                    values[influxdbList.size()] = tableName.substring(index + 1);
                                }
                                if (databaseType.equals("SqlServer")) {
                                    equipmentService.insertSqlServerData(tableName, columns, values);
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
@@ -315,7 +315,7 @@
ftp:
  LOCAL_CHARSET: GBK
  SERVER_CHARSET: ISO-8859-1
  ftpHost: 10.0.221.200
  ftpHost: 10.0.214.201
  ftpPort: 21
  ftpUserName: admin
  ftpPassword: lx@2024