sx_yjb
/
sx_yjb_scheduled
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(scheduled):修正设备ID过滤逻辑错误 

- 交换了1#和2#精炼炉的设备ID过滤条件
-重新排列了1#至4#高炉的设备ID匹配顺序
- 确保每个设备的数据流正确对应其目标列表
dev
wangyan 2025-10-14 11:48:03 +08:00
parent a3bdecbc9e
commit 9ac702069b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -484,7 +484,15 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build> </build>
</project> </project>

12
src/main/java/com/zcloud/scheduled/dataDocking/MesDataScheduled.java
View File

@ -143,11 +143,11 @@ public class MesDataScheduled extends IJobHandler {
// 1#精炼炉 // 1#精炼炉
List<PageData> jll1TargetList = targetAllList.stream() List<PageData> jll1TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("ee8263519520e35fd18168a531f0837a")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("ede5a2e669ea08b3d7dbb22dce05c583"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 2#精炼炉 // 2#精炼炉
List<PageData> jll2TargetList = targetAllList.stream() List<PageData> jll2TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("ede5a2e669ea08b3d7dbb22dce05c583")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("ee8263519520e35fd18168a531f0837a"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 1#转炉 // 1#转炉
List<PageData> zl1TargetList = targetAllList.stream() List<PageData> zl1TargetList = targetAllList.stream()
@ -160,19 +160,19 @@ public class MesDataScheduled extends IJobHandler {
// 1#高炉 // 1#高炉
List<PageData> gl1TargetList = targetAllList.stream() List<PageData> gl1TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("67c2e8315ca57d68201762e4ce9db351")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("c6825a6e1c959c3e5c800433516b2e8d"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 2#高炉 // 2#高炉
List<PageData> gl2TargetList = targetAllList.stream() List<PageData> gl2TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("2cb052450581597064b510118c076e2a")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("7face71b8cb7b47872cbe94f9b16831d"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 3#高炉 // 3#高炉
List<PageData> gl3TargetList = targetAllList.stream() List<PageData> gl3TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("7face71b8cb7b47872cbe94f9b16831d")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("2cb052450581597064b510118c076e2a"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 4#高炉 // 4#高炉
List<PageData> gl4TargetList = targetAllList.stream() List<PageData> gl4TargetList = targetAllList.stream()
.filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("c6825a6e1c959c3e5c800433516b2e8d")) .filter(item -> item.get("EQUIPMENT_ID") != null && item.get("EQUIPMENT_ID").equals("67c2e8315ca57d68201762e4ce9db351"))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 保存数据到数据库 // 保存数据到数据库