diff --git a/src/main/java/com/hxjt/dataupload/controller/UploadController.java b/src/main/java/com/hxjt/dataupload/controller/UploadController.java index 2fe1027..636a72d 100644 --- a/src/main/java/com/hxjt/dataupload/controller/UploadController.java +++ b/src/main/java/com/hxjt/dataupload/controller/UploadController.java @@ -277,8 +277,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/donghuozuoyebaobei/v1/donghuozuoyebaobei"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -349,11 +349,11 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } @@ -430,8 +430,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/shouxiankongjiananqu/v1/shouxiankongjiananqu"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -503,11 +503,11 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } @@ -586,8 +586,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/mangbanchouduanquanz/v1/mangbanchouduanquanz"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()); @@ -659,11 +659,11 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } @@ -746,8 +746,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/gaochuanquanzuoyebao/v1/gaochuanquanzuoyebao"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -819,11 +819,11 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } @@ -903,8 +903,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/diaozhuanganquanzuoy/v1/diaozhuanganquanzuoy"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -976,11 +976,11 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } @@ -1057,7 +1057,7 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/linshiyongdiananquan/v1/linshiyongdiananquan"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -1129,10 +1129,10 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } @@ -1210,7 +1210,7 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/dongtuanquanzuoyebao/v1/dongtuanquanzuoyebao"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -1282,10 +1282,10 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } @@ -1305,7 +1305,9 @@ private ZypSingleQueryMapper zypSingleQueryMapper; //XxlJobHelper.log("执行日志:本次无新数据需上传"); } - + /* + + * */ } public boolean dlzy(String id,File file) { @@ -1331,6 +1333,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; long total = 0; + + int pageNum = 1; do { List onePage = new ArrayList<>(); @@ -1362,7 +1366,7 @@ private ZypSingleQueryMapper zypSingleQueryMapper; String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/duanluanquanzuoyebao/v1/duanluanquanzuoyebao"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -1434,10 +1438,10 @@ private ZypSingleQueryMapper zypSingleQueryMapper; } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } 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 84447db..25ca73f 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java @@ -72,8 +72,8 @@ public class DhzyJobHandler { String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/donghuozuoyebaobei/v1/donghuozuoyebaobei"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -125,7 +125,7 @@ public class DhzyJobHandler { System.out.println("失败"+(x+1)+",动火作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(qiyebianma+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -144,11 +144,11 @@ public class DhzyJobHandler { } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } 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 2b8ff54..96d4812 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DlzyJobHandler.java @@ -73,7 +73,7 @@ public class DlzyJobHandler { String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/duanluanquanzuoyebao/v1/duanluanquanzuoyebao"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -101,11 +101,11 @@ public class DlzyJobHandler { System.out.println("成功"+(x+1)+","); - /*DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); String formattedDate = LocalDateTime.now().format(formatter); System.out.println(" 当前时间: " + formattedDate); // 示例输出：2025-03-12 08:29:25 System.out.println(jsonObject); - System.out.println("post:" + post.toString());*/ + System.out.println("post:" + post.toString()); success++; }else{ @@ -126,7 +126,7 @@ public class DlzyJobHandler { System.out.println("失败"+(x+1)+",断路作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(shenqingdanwei+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -145,10 +145,10 @@ public class DlzyJobHandler { } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } 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 668a0de..d40e559 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DtzyJobHandler.java @@ -73,7 +73,7 @@ public class DtzyJobHandler { String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/dongtuanquanzuoyebao/v1/dongtuanquanzuoyebao"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -126,7 +126,7 @@ public class DtzyJobHandler { System.out.println("失败"+(x+1)+",动土作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(shenqingdanwei+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -145,10 +145,10 @@ public class DtzyJobHandler { } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } 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 bce97aa..0806872 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DzaqzyJobHandler.java @@ -76,8 +76,8 @@ public class DzaqzyJobHandler { String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/diaozhuanganquanzuoy/v1/diaozhuanganquanzuoy"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -130,7 +130,7 @@ public class DzaqzyJobHandler { System.out.println("失败"+(x+1)+",吊装安全作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(qiyebianma+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -149,11 +149,11 @@ public class DzaqzyJobHandler { } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } 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 e96b1a0..7c55f9e 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/GczyJobHandler.java @@ -80,8 +80,8 @@ public class GczyJobHandler { String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/gaochuanquanzuoyebao/v1/gaochuanquanzuoyebao"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -134,7 +134,7 @@ public class GczyJobHandler { System.out.println("失败"+(x+1)+",高处作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(qiyebianma+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -153,11 +153,11 @@ public class GczyJobHandler { } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } 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 3fc7bf5..f06c907 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/LsydzyJobHandler.java @@ -73,7 +73,7 @@ public class LsydzyJobHandler { String shenqingdanwei = pageInfo.getList().get(x).getShenqingdanwei(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/linshiyongdiananquan/v1/linshiyongdiananquan"; - if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ + //if(shenqingdanwei.equals("山东恒信高科能源有限公司")){ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -126,7 +126,7 @@ public class LsydzyJobHandler { System.out.println("失败"+(x+1)+",临时用电作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(shenqingdanwei+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -145,10 +145,10 @@ public class LsydzyJobHandler { } } - }else{ + /*}else{ //中碳氢能源 System.out.println(1); - } + }*/ } 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 5f6ef25..1eec54e 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/MbcdzyJobHandler.java @@ -74,8 +74,8 @@ public class MbcdzyJobHandler { String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/mangbanchouduanquanz/v1/mangbanchouduanquanz"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getZuoyepiaobianhao()); @@ -128,7 +128,7 @@ public class MbcdzyJobHandler { System.out.println("失败"+(x+1)+",盲板抽堵作业"); if(!postIsNull){ System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + XxlJobHelper.log(qiyebianma+"执行日志:" + post.toString()); } System.out.println(jsonObject); @@ -147,11 +147,11 @@ public class MbcdzyJobHandler { } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } 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 39f9faa..2f89054 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java @@ -72,8 +72,8 @@ public class SxkjzyJobHandler { String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); String url = "https://ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/shouxiankongjiananqu/v1/shouxiankongjiananqu"; - switch (qiyebianma) { - case "370910170": + /*switch (qiyebianma) { + case "370910170":*/ //恒信高科 //查询安全措施 ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); @@ -145,11 +145,11 @@ public class SxkjzyJobHandler { } } - break; + /*break; case "370980326": //中碳氢能源 System.out.println(1); - } + }*/ } diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 9e09e08..8599555 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -707,7 +707,7 @@ a.isdelete = 'N' and d.showflag = '1' and c.id in('e3dbc4258dae4f21961dbb0e83701929','626e96e90760406a98c20f2f1f9d014f') - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -807,7 +807,7 @@ --and a.APPLYTIME >= '2025-01-01 00:00:00.000' and c.id in('4babbbd0f1714289bd0b70222998834c', 'c72815d306314dca864414c7ea4a80c7') --AND OTBILLID='DH20250213197' - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -934,7 +934,7 @@ --and a.APPLYTIME >= '2024-01-01 00:00:00.000' and c.id in('457abb402d9b42ad8b8fd601d24fcece', '7314a6809e66452e9e5e51dfab9a2b3d') --AND OTBILLID='DH20250213197' - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -1038,7 +1038,7 @@ and d.showflag = '1' --and a.APPLYTIME >= '2025-01-01 00:00:00.000' and c.id in('0dc5370dda5248e69db924de402b6639', 'e05c6ca6921f4900af3d6d85cdd9337c') - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -1150,7 +1150,7 @@ and d.showflag = '1' --and a.APPLYTIME >= '2024-01-01 00:00:00.000' and c.id in('e7671c99bca845e49aad9baab1084331', '2ce56e004e114f5a9c4b010392780abe') - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -1254,7 +1254,7 @@ where a.isdelete = 'N' and d.showflag = '1' - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -1348,7 +1348,7 @@ where a.isdelete = 'N' and d.showflag = '1' - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End' @@ -1444,7 +1444,7 @@ where a.isdelete = 'N' and d.showflag = '1' - and OTM_OPERATICK.FSTATECODE='End' + and a.FSTATECODE='End'