liwenxuan 4 months ago
parent
commit
5eee7bc733
  1. 11
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
  2. 8
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
  3. 4
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
  4. 10
      src/main/resources/mapper/FxfxdxMapper.xml

11
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java

@ -61,9 +61,14 @@ public class FxgkcsJobHandler {
if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//成功 //成功
System.out.println("成功"+(i+1)+","); System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject); /*System.out.println(jsonObject);
//System.out.println("post:" + post.toString()); System.out.println("post:" + post.toString());*/
//XxlJobHelper.log("执行日志:" + company + post.toString()); XxlJobHelper.log("执行日志:" + company + post.toString());
/*log.info("成功"+(i+1)+",");
log.info(""+jsonObject);
log.info("post:" + post.toString());*/
success++; success++;
}else{ }else{

8
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java

@ -205,10 +205,10 @@ public class YhpcjhJobHandler {
if(postJsonObj.get("msg")!=null && postJsonObj.get("code")!=null && postJsonObj.get("status")!=null && !StringUtils.isBlank(postJsonObj.get("msg").toString())&&!StringUtils.isBlank(postJsonObj.get("code").toString())&&!StringUtils.isBlank(postJsonObj.get("status").toString())){ if(postJsonObj.get("msg")!=null && postJsonObj.get("code")!=null && postJsonObj.get("status")!=null && !StringUtils.isBlank(postJsonObj.get("msg").toString())&&!StringUtils.isBlank(postJsonObj.get("code").toString())&&!StringUtils.isBlank(postJsonObj.get("status").toString())){
if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//成功 //成功
/*System.out.println("成功"+(i+1)+","); System.out.println("成功"+(i+1)+",");
System.out.println(jsonObject); /*System.out.println(jsonObject);
System.out.println("post:" + post.toString()); System.out.println("post:" + post.toString());*/
XxlJobHelper.log("执行日志:" + company + post.toString());*/ XxlJobHelper.log("执行日志:" + company + post.toString());
success++; success++;
}else{ }else{

4
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java

@ -212,8 +212,8 @@ public class YhpcrwJobHandler {
/*System.out.println(" 当前时间: " + formattedDate); /*System.out.println(" 当前时间: " + formattedDate);
System.out.println("成功"+(x+1)+","); System.out.println("成功"+(x+1)+",");
System.out.println("请求体:"+jsonObject); System.out.println("请求体:"+jsonObject);
System.out.println("post:" + post.toString()); System.out.println("post:" + post.toString());*/
XxlJobHelper.log("执行日志:" + company + post.toString());*/ XxlJobHelper.log("执行日志:" + company + post.toString());
success++; success++;
}else{ }else{

10
src/main/resources/mapper/FxfxdxMapper.xml

@ -164,8 +164,6 @@
</select> </select>
<select id="getFxgkcss" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs"> <select id="getFxgkcss" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs">
-- 隐患排查与风险管控信息查询
-- 此查询旨在从多个相关表中获取恒信中碳氢能源科技(山东)有限公司的隐患排查与风险管控相关信息
SELECT SELECT
(case (case
when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司' when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
@ -206,19 +204,12 @@
FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS jilushijian FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS jilushijian
FROM FROM
ISM_RISKMEASURE a ISM_RISKMEASURE a
-- 左连接风险信息表
LEFT JOIN ISM_HAZARD b ON a.FHAZARDID = b.ID LEFT JOIN ISM_HAZARD b ON a.FHAZARDID = b.ID
-- 左连接风险单元表
LEFT JOIN ISM_HAZARDUNIT c ON a.FRISKUNITID = c.ID LEFT JOIN ISM_HAZARDUNIT c ON a.FRISKUNITID = c.ID
-- 左连接风险事件表
LEFT JOIN ISM_RISKEVENT d ON a.FRISKEVENTID = d.ID LEFT JOIN ISM_RISKEVENT d ON a.FRISKEVENTID = d.ID
-- 左连接风险分类表1
LEFT JOIN ISM_CONMEATYPE e ON a.FCLASSIFY1 = e.ID LEFT JOIN ISM_CONMEATYPE e ON a.FCLASSIFY1 = e.ID
-- 左连接风险分类表2
LEFT JOIN ISM_CONMEATYPE f ON a.FCLASSIFY2 = f.ID LEFT JOIN ISM_CONMEATYPE f ON a.FCLASSIFY2 = f.ID
-- 左连接故障排除表
LEFT JOIN ISM_TROUBLESHOOT g ON a.ID = g.FRISKMEASUREID LEFT JOIN ISM_TROUBLESHOOT g ON a.ID = g.FRISKMEASUREID
-- 左连接账户表
LEFT JOIN PF_ACCOUNT h ON a.CREATOR = h.id LEFT JOIN PF_ACCOUNT h ON a.CREATOR = h.id
WHERE WHERE
a.ISDELETE = 'N' a.ISDELETE = 'N'
@ -232,7 +223,6 @@
</select> </select>
<select id="getYhpcjhs" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh"> <select id="getYhpcjhs" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh">
SELECT SELECT
(case (case
when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司' when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'

Loading…
Cancel
Save