修改提交
This commit is contained in:
parent
53d5976897
commit
0bac985cb0
|
|
@ -655,21 +655,27 @@ public class InterService {
|
|||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询扩展信息
|
||||
*/
|
||||
public void getInfo(int pageNum){
|
||||
public void getInfo(int pageNum,String extType){
|
||||
try {
|
||||
JSONObject obj= DataUtils.getTwoJsonObject(pageNum);
|
||||
JSONObject obj = new JSONObject();
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("EXT_TYPE",extType);
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("CREATE_TIME", DataUtils.getTimes2());
|
||||
XxlJobHelper.log("请求参数---->{}", obj.toString());
|
||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DETAILS_URL);
|
||||
Map<String, Object> map = DataUtils.getArrayLogs(httpResponse);
|
||||
|
|
@ -680,7 +686,41 @@ public class InterService {
|
|||
pageNum++;
|
||||
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
if (FY_BOOLEAN){
|
||||
getInfo(pageNum);
|
||||
getInfo(pageNum,extType);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
log.error(e.toString(), e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询扩展信息
|
||||
*/
|
||||
public void getInfo2(int pageNum,String refId,String extType){
|
||||
try {
|
||||
//当前页
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
//业务id
|
||||
obj.put("REF_ID1",refId);
|
||||
//业务类型
|
||||
obj.put("EXT_TYPE",extType);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
XxlJobHelper.log("请求参数---->{}", obj.toString());
|
||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DETAILS_URL);
|
||||
Map<String, Object> map = DataUtils.getArrayLogs(httpResponse);
|
||||
JSONArray array = (JSONArray) map.get("array");
|
||||
if (array != null ) {
|
||||
List<JjInfo> list = JSONArray.parseArray(array.toJSONString(), JjInfo.class);
|
||||
service.insertInfoData(list);
|
||||
pageNum++;
|
||||
if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
if (FY_BOOLEAN){
|
||||
getInfo2(pageNum,refId,extType);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -805,7 +845,7 @@ public class InterService {
|
|||
*/
|
||||
public void getSignInfoPro(int pageNum) {
|
||||
try {
|
||||
JSONObject obj= DataUtils.getJsonObject(pageNum);
|
||||
JSONObject obj= DataUtils.getJsonObjectByParo(pageNum);
|
||||
HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_SING_PRO_AQ);
|
||||
Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
Object objata=map.get("array");
|
||||
|
|
@ -960,25 +1000,141 @@ public class InterService {
|
|||
}
|
||||
}
|
||||
|
||||
public void getSmDwRiskPrecautionInfo(int i) {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 风险底数一本账
|
||||
* -分项预控措施一本账
|
||||
* 风险预控措施
|
||||
* 预控措施类型;包括:01-风险库;02-风险清册;03-风险底数一本账;04-一览表
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmDwRiskPrecautionInfo(int pageNum) {
|
||||
try {
|
||||
List<JjRiskPrecaution> list=service.getJjRiskPrecautionList(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
|
||||
for (JjRiskPrecaution vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"10");
|
||||
}
|
||||
|
||||
public void getSmConstructionWorkTicketInfo(int i) {
|
||||
}
|
||||
|
||||
public void getSmDwToolBoxTalkInfo(int i) {
|
||||
}
|
||||
|
||||
public void getSmConstructionWorkTicketInfo2(int i) {
|
||||
}
|
||||
|
||||
public void getSmDwRiskPrecautionInfo2(int i) {
|
||||
}
|
||||
|
||||
public void getSmDwToolBoxTalkInfo2(int i) {
|
||||
}
|
||||
|
||||
public void getSmDwDataStandardExtInfo(int i) {
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 扩展信息-施工作业票_预控措施
|
||||
* 施工作业票_预控措施
|
||||
* 预控措施
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmConstructionWorkTicketInfo(int pageNum) {
|
||||
try {
|
||||
List<JjTicket> list=service.getSmConstructionWorkTicketList(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
for (JjTicket vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"20");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 扩展信息-预控措施_站班会
|
||||
* 预控措施_站班会
|
||||
* 预控措施
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmDwToolBoxTalkInfo(int pageNum) {
|
||||
try {
|
||||
List<JjClassMeetting> list=service.getClassMettingIds(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
for (JjClassMeetting vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"30");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 扩展信息-施工作业票_扩展信息
|
||||
* 施工作业票_扩展信息
|
||||
* 内容类型;包括:01-变化情况;02-情况控制措施;03-主要风险
|
||||
* ->同 外键id同 20 -作业票
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmConstructionWorkTicketInfo2(int pageNum) {
|
||||
try {
|
||||
List<JjTicket> list=service.getSmConstructionWorkTicketList(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
for (JjTicket vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"40");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 风险底数一本账_扩展信息
|
||||
* 风险底数一本账_扩展信息
|
||||
* 内容类型;包括:01-备注;02-风险可能导致后果;03-风险控制关键因素;04-作业部位名称;05-一览表作业部位名称
|
||||
*
|
||||
* id 同 10 ->风险一本账id
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmDwRiskPrecautionInfo2(int pageNum) {
|
||||
try {
|
||||
List<JjRiskPrecaution> list=service.getJjRiskPrecautionList(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
for (JjRiskPrecaution vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"50");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 站班会_扩展信息
|
||||
* 当日控制措施
|
||||
* 站班会的当日控制措施
|
||||
* ->同作业票扩展信息
|
||||
* ->同 30
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmDwToolBoxTalkInfo2(int pageNum) {
|
||||
try {
|
||||
List<JjClassMeetting> list=service.getClassMettingIds(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
for (JjClassMeetting vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"60");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
log.error(e.toString(), e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 站班会_拆分扩展信息
|
||||
* 当日控制措施
|
||||
* 内容类型;包括:01-备注;02-现场风险复测变化情况及补充措施;03-风险异常原因;04-补充安全控制措施
|
||||
* @param pageNum
|
||||
*/
|
||||
public void getSmDwDataStandardExtInfo(int pageNum) {
|
||||
try {
|
||||
List<JjInfo> list=service.getJjinfoList(DataUtils.getStartTime2(),DataUtils.getEndTime());
|
||||
|
||||
for (JjInfo vo:list) {
|
||||
getInfo2(pageNum,vo.getId(),"70");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
log.error(e.toString(), e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -88,10 +88,34 @@ public class DataUtils {
|
|||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static JSONObject getJsonObjectByParo(int pageNum){
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("CREATE_TIME", DataUtils.getProTime());
|
||||
return obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* 昨日数据
|
||||
* @param pageNum
|
||||
|
|
@ -99,19 +123,34 @@ public class DataUtils {
|
|||
*/
|
||||
public static JSONObject getTwoJsonObject(int pageNum){
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("CREATE_TIME", DataUtils.getTimes2());
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.err.println(DataUtils.getTimes2());
|
||||
System.err.println(DataUtils.getProTime());
|
||||
}
|
||||
public static JSONObject getJsonObject2(int pageNum){
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("UPDATE_TIME", DataUtils.getTimes());
|
||||
return obj;
|
||||
}
|
||||
|
|
@ -120,9 +159,19 @@ public class DataUtils {
|
|||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
if(StringHelper.isNotEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>2){
|
||||
obj.put("PAGE_SIZE", times[2]);
|
||||
}
|
||||
}
|
||||
obj.put("UPDATE_TIME", DataUtils.getTimes2());
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 分页数据解析
|
||||
*
|
||||
|
|
@ -152,7 +201,26 @@ public class DataUtils {
|
|||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 开始时间-结束时间
|
||||
* @return
|
||||
*/
|
||||
public static String getProTime(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(StringUtil.isNullOrEmpty(param)){
|
||||
param="2020-01-01";
|
||||
String nowTime=DateUtil.getNowTime();
|
||||
return param+" 00:00:00,"+nowTime;
|
||||
}else {
|
||||
String[] times=param.split(",");
|
||||
if(times.length>1){
|
||||
return times[0]+" 00:00:00,"+times[1]+" 59:59:59";
|
||||
}else {
|
||||
String nowTime=DateUtil.getNowTime();
|
||||
return times[0]+" 00:00:00,"+nowTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 开始时间-结束时间
|
||||
* @return
|
||||
|
|
@ -195,6 +263,7 @@ public class DataUtils {
|
|||
}
|
||||
|
||||
|
||||
|
||||
public static String getStartTime(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(StringUtil.isNullOrEmpty(param)){
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmDwRiskPrecautionInfo")
|
||||
public void getSmDwRiskPrecautionInfo() {
|
||||
interService.getSmDwRiskPrecautionInfo(1);
|
||||
// interService.getSmDwRiskPrecautionInfo(1);
|
||||
}
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
|
|
@ -267,7 +267,12 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getInfo")
|
||||
public void getInfo() {
|
||||
interService.getInfo(1);
|
||||
interService.getInfo(1,"40");
|
||||
interService.getInfo(1,"10");
|
||||
interService.getInfo(1,"20");
|
||||
interService.getInfo(1,"30");
|
||||
interService.getInfo(1,"50");
|
||||
interService.getInfo(1,"60");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -281,7 +286,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmConstructionWorkTicketInfo")
|
||||
public void getSmConstructionWorkTicketInfo() {
|
||||
interService.getSmConstructionWorkTicketInfo(1);
|
||||
// interService.getSmConstructionWorkTicketInfo(1);
|
||||
}
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
|
|
@ -292,7 +297,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmDwToolBoxTalkInfo")
|
||||
public void getSmDwToolBoxTalkInfo() {
|
||||
interService.getSmDwToolBoxTalkInfo(1);
|
||||
// interService.getSmDwToolBoxTalkInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -300,7 +305,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmConstructionWorkTicketInfo2")
|
||||
public void getSmConstructionWorkTicketInfo2() {
|
||||
interService.getSmConstructionWorkTicketInfo2(1);
|
||||
// interService.getSmConstructionWorkTicketInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -308,7 +313,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmDwRiskPrecautionInfo2")
|
||||
public void getSmDwRiskPrecautionInfo2() {
|
||||
interService.getSmDwRiskPrecautionInfo2(1);
|
||||
// interService.getSmDwRiskPrecautionInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -316,7 +321,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmDwToolBoxTalkInfo2")
|
||||
public void getSmDwToolBoxTalkInfo2() {
|
||||
interService.getSmDwToolBoxTalkInfo2(1);
|
||||
// interService.getSmDwToolBoxTalkInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -324,7 +329,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSmDwDataStandardExtInfo")
|
||||
public void getSmDwDataStandardExtInfo() {
|
||||
interService.getSmDwDataStandardExtInfo(1);
|
||||
// interService.getSmDwDataStandardExtInfo(1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue