修改提交
This commit is contained in:
parent
0fa013a492
commit
74b54c7488
|
|
@ -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 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_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";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,6 @@ public class DataCenterService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private InterMapper mapper;
|
private InterMapper mapper;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据存储入库
|
* 数据存储入库
|
||||||
* @param list
|
* @param list
|
||||||
|
|
|
||||||
|
|
@ -341,8 +341,8 @@ public class InterService {
|
||||||
//当前页
|
//当前页
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "1");
|
obj.put("type", "9");
|
||||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL);
|
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_URL);
|
||||||
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -370,8 +370,8 @@ public class InterService {
|
||||||
//当前页
|
//当前页
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "2");
|
obj.put("type", "10");
|
||||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL);
|
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_PEO_URL);
|
||||||
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -379,7 +379,7 @@ public class InterService {
|
||||||
service.insertClassMeetingPeopleData(list);
|
service.insertClassMeetingPeopleData(list);
|
||||||
pageNum++;
|
pageNum++;
|
||||||
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||||
// getProInfo();
|
// getClassMeetingPeopleInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
@ -401,7 +401,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "3");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -431,7 +431,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "4");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -439,7 +439,7 @@ public class InterService {
|
||||||
service.insertOnDutyData(list);
|
service.insertOnDutyData(list);
|
||||||
pageNum++;
|
pageNum++;
|
||||||
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||||
// getProInfo();
|
// getOnDutyInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
@ -461,7 +461,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "5");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -491,7 +491,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "6");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -521,7 +521,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "7");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -551,7 +551,7 @@ public class InterService {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "8");
|
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<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
@ -578,8 +578,8 @@ public class InterService {
|
||||||
//当前页
|
//当前页
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("type", "9");
|
obj.put("type", "999");
|
||||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL);
|
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_XMB_URL);
|
||||||
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||||
JSONArray array = (JSONArray) map.get("array");
|
JSONArray array = (JSONArray) map.get("array");
|
||||||
if (array != null) {
|
if (array != null) {
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,6 @@ public class DataCenterXxlJob {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 站班会定时任务
|
* 站班会定时任务
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue