From 74b54c748826ec7dc00132fbce6c510634164619 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 8 May 2024 17:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/inter/config/GlobalConfig.java | 22 ++++++--------- .../inter/service/DataCenterService.java | 2 -- .../executor/inter/service/InterService.java | 28 +++++++++---------- .../service/jobhandler/DataCenterXxlJob.java | 1 - 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/config/GlobalConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/config/GlobalConfig.java index c3ed236..12943a1 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/config/GlobalConfig.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/config/GlobalConfig.java @@ -28,7 +28,7 @@ public class GlobalConfig { /** * 单项工程 */ - public final static String DX_PRO_URL=IP_URL+"/test/getPrjDwSingleProject"; + public final static String DX_PRO_URL=IP_URL+"/biz-api/ifsct/up/sel/getPrjDwSingleProject"; /** * 标段-工程 */ @@ -37,19 +37,12 @@ public class GlobalConfig { * 站班会信息 */ public final static String ZBH_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwToolBoxTalk"; - /** - * 施工作业任务-日 - */ - public final static String RJH_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwConstructionTaskDesDaily"; - /** - * 安监人员 - */ - public final static String AJ_RY_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmSafetyPersonnel"; + /** * 站班会人员 */ - public final static String ZBH_PEO_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmSafetyPersonnel"; + public final static String ZBH_PEO_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmToolBoxTalkDesMember"; /** * 到岗到位人员 @@ -90,7 +83,7 @@ public class GlobalConfig { * 班组 * */ - public final static String WORK_TEAM_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwRiskPrecaution"; + public final static String WORK_TEAM_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwWorkingTeam"; /** * 安全-班组成员信息 * @@ -109,7 +102,7 @@ public class GlobalConfig { /** * 安全人员信息 */ - public final static String AQ_ZR_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/smSafetyPersonnel"; + public final static String AQ_ZR_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmSafetyPersonnel"; /** * 基建布控球 @@ -125,5 +118,8 @@ public class GlobalConfig { */ public static final String JJ_GC_LL_URL = IP_URL+"/biz-api/ifsct/up/sel/getPrjEnginneringExperience"; - + /** + * 工程履历 + */ + public static final String JJ_XMB_URL = IP_URL+"/biz-api/ifsct/up/sel/getPrjDwDeptGcprojectRela"; } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java index 5d53e98..58f9b67 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java @@ -19,8 +19,6 @@ public class DataCenterService { @Autowired private InterMapper mapper; - - /** * 数据存储入库 * @param list diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java index 85bfba1..65eddb0 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java @@ -341,8 +341,8 @@ public class InterService { //当前页 int pageNum = 1; JSONObject obj = new JSONObject(); - obj.put("type", "1"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + obj.put("type", "9"); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -370,8 +370,8 @@ public class InterService { //当前页 int pageNum = 1; JSONObject obj = new JSONObject(); - obj.put("type", "2"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + obj.put("type", "10"); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_PEO_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -379,7 +379,7 @@ public class InterService { service.insertClassMeetingPeopleData(list); pageNum++; if (pageNum <= (Integer) map.get("TOTAL_PAGE")) { - // getProInfo(); + // getClassMeetingPeopleInfo(); } } } catch (Exception e) { @@ -401,7 +401,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "3"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DX_PRO_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -431,7 +431,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "4"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DGDW_USER_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -439,7 +439,7 @@ public class InterService { service.insertOnDutyData(list); pageNum++; if (pageNum <= (Integer) map.get("TOTAL_PAGE")) { - // getProInfo(); + // getOnDutyInfo(); } } } catch (Exception e) { @@ -461,7 +461,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "5"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.RISK_DS_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -491,7 +491,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "6"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_DW_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -521,7 +521,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "7"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DETAILS_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -551,7 +551,7 @@ public class InterService { int pageNum = 1; JSONObject obj = new JSONObject(); obj.put("type", "8"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.SG_GT_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { @@ -578,8 +578,8 @@ public class InterService { //当前页 int pageNum = 1; JSONObject obj = new JSONObject(); - obj.put("type", "9"); - HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL); + obj.put("type", "999"); + HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_XMB_URL); Map map = DataUtils.getArray(httpResponse); JSONArray array = (JSONArray) map.get("array"); if (array != null) { diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java index 258db82..fecfb14 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java @@ -110,7 +110,6 @@ public class DataCenterXxlJob { } - /** * 站班会定时任务 */