From 9decbff7677665bdae03b817dbf22e62f727c03a Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Thu, 10 Jul 2025 14:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UploadController.java | 89 +++++++++++++++++-- .../specialassignments/DhzyJobHandler.java | 13 ++- .../specialassignments/DlzyJobHandler.java | 13 ++- .../specialassignments/DtzyJobHandler.java | 13 ++- .../specialassignments/DzaqzyJobHandler.java | 13 ++- .../specialassignments/GczyJobHandler.java | 14 ++- .../specialassignments/LsydzyJobHandler.java | 13 ++- .../specialassignments/MbcdzyJobHandler.java | 13 ++- .../specialassignments/SxkjzyJobHandler.java | 13 ++- src/main/resources/application-dev.yml | 2 +- 10 files changed, 179 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/hxjt/dataupload/controller/UploadController.java b/src/main/java/com/hxjt/dataupload/controller/UploadController.java index 636a72d..0dbd704 100644 --- a/src/main/java/com/hxjt/dataupload/controller/UploadController.java +++ b/src/main/java/com/hxjt/dataupload/controller/UploadController.java @@ -38,6 +38,7 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * liwenxuan @@ -281,7 +282,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs dhAqcs: dhAqcsList) { DhAqcsUtil.handle(pageInfo.getList().get(x),dhAqcs); @@ -434,7 +444,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { SxkjzyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -590,7 +609,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { MbcdzyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -750,7 +778,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { GczyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -907,7 +944,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DzaqzyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -1060,7 +1106,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { LsydzyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -1213,7 +1268,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DtzyUtil.handle(pageInfo.getList().get(x),aqcs); @@ -1369,7 +1433,16 @@ private ZypSingleQueryMapper zypSingleQueryMapper; //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DlzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java index 25ca73f..dfa2cd1 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java @@ -22,7 +22,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component @@ -76,7 +78,16 @@ public class DhzyJobHandler { case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs dhAqcs: dhAqcsList) { DhAqcsUtil.handle(pageInfo.getList().get(x),dhAqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java index 96d4812..adaff2f 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java @@ -23,7 +23,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component public class DlzyJobHandler { @@ -76,7 +78,16 @@ public class DlzyJobHandler { //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DlzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java index d40e559..026385f 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java @@ -23,7 +23,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component public class DtzyJobHandler { @@ -76,7 +78,16 @@ public class DtzyJobHandler { //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DtzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java index 0806872..f9b1ffe 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java @@ -23,7 +23,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component public class DzaqzyJobHandler { @@ -80,7 +82,16 @@ public class DzaqzyJobHandler { case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { DzaqzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java index 7c55f9e..b08552b 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java @@ -25,7 +25,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import org.springframework.stereotype.Component; @@ -84,7 +86,17 @@ public class GczyJobHandler { case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); + //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { GczyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java index f06c907..2457628 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java @@ -23,7 +23,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component public class LsydzyJobHandler { @@ -76,7 +78,16 @@ public class LsydzyJobHandler { //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { LsydzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java index 1eec54e..9287285 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java @@ -24,7 +24,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component @@ -78,7 +80,16 @@ public class MbcdzyJobHandler { case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { MbcdzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java index 2f89054..f0c2342 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java @@ -22,7 +22,9 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Component @@ -76,7 +78,16 @@ public class SxkjzyJobHandler { case "370910170":*/ //恒信高科 //查询安全措施 - ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + List aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()).stream().filter(Objects::nonNull) + .map(aqcs -> { + if (null == aqcs.getShifousheji()) { + aqcs.setShifousheji("N"); + return aqcs; + } else { + return aqcs; + } + }) + .collect(Collectors.toList()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 for (Aqcs aqcs: aqcsList) { SxkjzyUtil.handle(pageInfo.getList().get(x),aqcs); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b68371b..b880547 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -97,7 +97,7 @@ xxl: #[选填]执行器IP ：默认为空表示自动获取IP（即springboot容器的ip和端口，可以自动获取，也可以指定），多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"， ip: # [选填]执行器端口号：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； - port: 9998 + port: 10003 #执行器日志文件存储路径，需要对该路径拥有读写权限；为空则使用默认路径 logpath: ./data/logs/xxl-job/executor #执行器日志保存天数