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 5dcd5b6..ef00608 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/DhzyJobHandler.java @@ -3,12 +3,10 @@ package com.hxjt.dataupload.jobhandler.specialassignments; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; -import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcrw; -import com.hxjt.dataupload.model.entity.tszy.aqcs.DhAqcs; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy; import com.hxjt.dataupload.service.FxfxdxService; -import com.hxjt.dataupload.utils.DhAqcsUtil; +import com.hxjt.dataupload.utils.tszy.DhAqcsUtil; import com.hxjt.dataupload.utils.HttpUtils; import com.hxjt.dataupload.utils.JingWeiDuConverter; import com.xxl.job.core.context.XxlJobHelper; @@ -77,9 +75,9 @@ public class DhzyJobHandler { case "370910170": //恒信高科 //查询安全措施 - ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + ArrayList dhAqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); //根据安全措施列表便利处理给当前上传对象赋值相关字段 - for (DhAqcs dhAqcs: dhAqcsList) { + for (Aqcs dhAqcs: dhAqcsList) { DhAqcsUtil.handle(pageInfo.getList().get(x),dhAqcs); } JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x)); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java new file mode 100644 index 0000000..9a2ade0 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/jobhandler/specialassignments/SxkjzyJobHandler.java @@ -0,0 +1,176 @@ +package com.hxjt.dataupload.jobhandler.specialassignments; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; +import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy; +import com.hxjt.dataupload.service.FxfxdxService; +import com.hxjt.dataupload.utils.HttpUtils; +import com.hxjt.dataupload.utils.JingWeiDuConverter; +import com.hxjt.dataupload.utils.tszy.SxkjzyUtil; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.protocol.HTTP; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + + +@Component +public class SxkjzyJobHandler { + + + private Logger log = LoggerFactory.getLogger(SxkjzyJobHandler.class); + + @Autowired + FxfxdxService fxfxdxService; + + @XxlJob(value = "SxkjzyJobHandler", init = "init", destroy = "destroy") + public void execute(String param) { + String jobParam = XxlJobHelper.getJobParam(); + + int pageSize = 1000; + int success = 0; + int fail = 0; + long total = 0; + + + int pageNum = 1; + do { + List onePage = new ArrayList<>(); + // 1. 启动分页（必须紧邻查询语句） + PageHelper.startPage(pageNum, pageSize); + // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑） + if (jobParam.equals("全量")) { + onePage = fxfxdxService.getOneSxkjzysPage("N"); + } else { + onePage = fxfxdxService.getOneSxkjzysPage("Y"); + } + + // 3. 封装分页结果 + PageInfo pageInfo = new PageInfo<>(onePage); + //设置总数 + total = pageInfo.getTotal(); + System.out.println("总条数:" + total); + System.out.println("第" + pageNum + "页"); + System.out.println("本页条数:" + pageInfo.getList().size()); + //处理经纬度 + for (int x = 0; x < pageInfo.getList().size(); x++) { + pageInfo.getList().get(x).setJingweidu(JingWeiDuConverter.createGeoPoint(pageInfo.getList().get(x).getJingweidu())); + } + //对本页数据进行上传 + for (int x = 0; x < pageInfo.getList().size(); x++) { + + String qiyebianma = pageInfo.getList().get(x).getQiyebianma(); + String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/shouxiankongjiananqu/v1/shouxiankongjiananqu"; + switch (qiyebianma) { + case "370910170": + //恒信高科 + //查询安全措施 + ArrayList aqcsList = fxfxdxService.queryDhAqcsByBianhao(pageInfo.getList().get(x).getBianhao()); + //根据安全措施列表便利处理给当前上传对象赋值相关字段 + for (Aqcs aqcs: aqcsList) { + SxkjzyUtil.handle(pageInfo.getList().get(x),aqcs); + //System.out.println(aqcs); + } + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x)); + String post = null; + + System.out.println(jsonObject); + + + try { + post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "UgedXJ6rjuZ0iPihxQRN1A312DA6ACE3B28F"); + boolean thisFailFlag = false; + boolean postIsNull = false; + boolean postNoMsgs = false; + if(!StringUtils.isBlank(post)){ + JSONObject postJsonObj = JSONObject.parseObject(post); + 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 + //成功 + System.out.println("成功"+(x+1)+","); + + + 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()); + + success++; + }else{ + thisFailFlag = true; + } + }else{ + thisFailFlag = true; + postNoMsgs = true; + } + }else{ + postIsNull = true; + thisFailFlag = true; + } + if(thisFailFlag){//异常情况 + 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("失败"+(x+1)+",受限空间作业"); + if(!postIsNull){ + System.out.println("post:" + post.toString()); + XxlJobHelper.log("执行日志:(恒信高科)" + post.toString()); + } + + System.out.println(jsonObject); + + fail++; + Thread.sleep(120000); + } + } catch (Exception e) { + e.printStackTrace(); + XxlJobHelper.log("错误信息:" + e); + XxlJobHelper.log("请求体:" + jsonObject); + + + } + break; + case "370980326": + //中碳氢能源 + System.out.println(1); + } + + + } + pageNum++; + + } while (total > (pageNum - 1) * pageSize); + + + + + if (total > 0) { + XxlJobHelper.log("执行日志:本次有" + total + "条需要上传,成功上传" + success + "条,失败" + fail + "条"); + } else { + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } + + + } + + + private void init() { + log.info("init 方法调用成功"); + } + + private void destroy() { + log.info("destroy 方法调用成功"); + } + +} diff --git a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java index 8b90916..b1b6c1c 100644 --- a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java +++ b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java @@ -1,9 +1,9 @@ package com.hxjt.dataupload.mapper; import com.hxjt.dataupload.model.entity.doubleprevent.*; -import com.hxjt.dataupload.model.entity.tszy.aqcs.DhAqcs; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy; -import org.apache.ibatis.annotations.CacheNamespace; +import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,5 +32,7 @@ public interface FxfxdxMapper { List getOneDhzysPage(@Param("isSingleDay")String isSingleDay); - ArrayList queryDhAqcsByBianhao(@Param("bianhao")String bianhao); + ArrayList queryDhAqcsByBianhao(@Param("bianhao")String isSingleDay); + + List getOneSxkjzysPage(@Param("isSingleDay")String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/DhAqcs.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/Aqcs.java similarity index 71% rename from src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/DhAqcs.java rename to src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/Aqcs.java index d4a7fb9..aac2294 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/DhAqcs.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/aqcs/Aqcs.java @@ -3,7 +3,7 @@ package com.hxjt.dataupload.model.entity.tszy.aqcs; import org.springframework.stereotype.Repository; @Repository -public class DhAqcs { +public class Aqcs { private String querenren; private String ancuoneirong; private String shifousheji; @@ -32,4 +32,13 @@ public class DhAqcs { public void setShifousheji(String shifousheji) { this.shifousheji = shifousheji; } + + @Override + public String toString() { + return "DhAqcs{" + + "querenren='" + querenren + '\'' + + ", ancuoneirong='" + ancuoneirong + '\'' + + ", shifousheji='" + shifousheji + '\'' + + '}'; + } } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java new file mode 100644 index 0000000..0fac7e9 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java @@ -0,0 +1,560 @@ +package com.hxjt.dataupload.model.entity.tszy.upload; + +import org.springframework.stereotype.Repository; + +@Repository +public class Sxkjzy { + private String bianhao; + private String zuoyeshenqingdanwei; + private String qiyebianma; + private String shishikaishishijian; + private String shishijieshushijian; + private String donghuodidianjidongh; + private String zuoyeneirong; + private String jingweidu; + private String zuoyezhuangtai; + private String jianhuren; + private String zuoyeren; + private String zuoyedanwei; + private String shifouchengbaoshangz; + private String zuoyefuzeren; + private String fuzerenlianxifangshi; + private String zuoyeshifoubiangengg; + private String zuoyebiangengyuanyin; + private String zuoyeshifouquxiao; + private String zuoyezuofeiyuanyin; + private String zuoyepiao; + private String fengxianbianshijiegu; + private String shifousheji; + + private String shifousheji1; + private String querenren1; + + private String shifousheji2; + private String querenren2; + private String shifousheji3; + private String querenren3; + private String shifousheji4; + private String querenren4; + private String shifousheji5; + private String querenren5; + private String shifousheji6; + private String querenren6; + private String shifousheji7; + private String querenren7; + + private String shifousheji8; + private String querenren8; + private String shifousheji9; + private String querenren9; + private String shifousheji10; + private String querenren10; + private String qifangzhuangbei; + private String jiushengsheng; + private String xiaofangqicai; + private String shifousheji11; + private String querenren11; + private String shifousheji12; + private String querenren12; + private String shifousheji13; + private String querenren13; + private String shifousheji14; + private String querenren14; + private String jieshoujiaodiren; + private String anquanjiaodiren; + private String bianzhiren; + private String querenren15; + private String qitaanquancuoshi; + private String shouxiankongjianneiy; + private String guanliandeqitateshuz; + private String shifouweiqiyetuisong; + + + public String getBianhao() { + return bianhao; + } + + public void setBianhao(String bianhao) { + this.bianhao = bianhao; + } + + public String getZuoyeshenqingdanwei() { + return zuoyeshenqingdanwei; + } + + public void setZuoyeshenqingdanwei(String zuoyeshenqingdanwei) { + this.zuoyeshenqingdanwei = zuoyeshenqingdanwei; + } + + public String getQiyebianma() { + return qiyebianma; + } + + public void setQiyebianma(String qiyebianma) { + this.qiyebianma = qiyebianma; + } + + public String getShishikaishishijian() { + return shishikaishishijian; + } + + public void setShishikaishishijian(String shishikaishishijian) { + this.shishikaishishijian = shishikaishishijian; + } + + public String getShishijieshushijian() { + return shishijieshushijian; + } + + public void setShishijieshushijian(String shishijieshushijian) { + this.shishijieshushijian = shishijieshushijian; + } + + public String getDonghuodidianjidongh() { + return donghuodidianjidongh; + } + + public void setDonghuodidianjidongh(String donghuodidianjidongh) { + this.donghuodidianjidongh = donghuodidianjidongh; + } + + public String getZuoyeneirong() { + return zuoyeneirong; + } + + public void setZuoyeneirong(String zuoyeneirong) { + this.zuoyeneirong = zuoyeneirong; + } + + public String getJingweidu() { + return jingweidu; + } + + public void setJingweidu(String jingweidu) { + this.jingweidu = jingweidu; + } + + public String getZuoyezhuangtai() { + return zuoyezhuangtai; + } + + public void setZuoyezhuangtai(String zuoyezhuangtai) { + this.zuoyezhuangtai = zuoyezhuangtai; + } + + public String getJianhuren() { + return jianhuren; + } + + public void setJianhuren(String jianhuren) { + this.jianhuren = jianhuren; + } + + public String getZuoyeren() { + return zuoyeren; + } + + public void setZuoyeren(String zuoyeren) { + this.zuoyeren = zuoyeren; + } + + public String getZuoyedanwei() { + return zuoyedanwei; + } + + public void setZuoyedanwei(String zuoyedanwei) { + this.zuoyedanwei = zuoyedanwei; + } + + public String getShifouchengbaoshangz() { + return shifouchengbaoshangz; + } + + public void setShifouchengbaoshangz(String shifouchengbaoshangz) { + this.shifouchengbaoshangz = shifouchengbaoshangz; + } + + public String getZuoyefuzeren() { + return zuoyefuzeren; + } + + public void setZuoyefuzeren(String zuoyefuzeren) { + this.zuoyefuzeren = zuoyefuzeren; + } + + public String getFuzerenlianxifangshi() { + return fuzerenlianxifangshi; + } + + public void setFuzerenlianxifangshi(String fuzerenlianxifangshi) { + this.fuzerenlianxifangshi = fuzerenlianxifangshi; + } + + public String getZuoyeshifoubiangengg() { + return zuoyeshifoubiangengg; + } + + public void setZuoyeshifoubiangengg(String zuoyeshifoubiangengg) { + this.zuoyeshifoubiangengg = zuoyeshifoubiangengg; + } + + public String getZuoyebiangengyuanyin() { + return zuoyebiangengyuanyin; + } + + public void setZuoyebiangengyuanyin(String zuoyebiangengyuanyin) { + this.zuoyebiangengyuanyin = zuoyebiangengyuanyin; + } + + public String getZuoyeshifouquxiao() { + return zuoyeshifouquxiao; + } + + public void setZuoyeshifouquxiao(String zuoyeshifouquxiao) { + this.zuoyeshifouquxiao = zuoyeshifouquxiao; + } + + public String getZuoyezuofeiyuanyin() { + return zuoyezuofeiyuanyin; + } + + public void setZuoyezuofeiyuanyin(String zuoyezuofeiyuanyin) { + this.zuoyezuofeiyuanyin = zuoyezuofeiyuanyin; + } + + public String getZuoyepiao() { + return zuoyepiao; + } + + public void setZuoyepiao(String zuoyepiao) { + this.zuoyepiao = zuoyepiao; + } + + public String getFengxianbianshijiegu() { + return fengxianbianshijiegu; + } + + public void setFengxianbianshijiegu(String fengxianbianshijiegu) { + this.fengxianbianshijiegu = fengxianbianshijiegu; + } + + public String getShifousheji() { + return shifousheji; + } + + public void setShifousheji(String shifousheji) { + this.shifousheji = shifousheji; + } + + public String getShifousheji1() { + return shifousheji1; + } + + public void setShifousheji1(String shifousheji1) { + this.shifousheji1 = shifousheji1; + } + + public String getQuerenren1() { + return querenren1; + } + + public void setQuerenren1(String querenren1) { + this.querenren1 = querenren1; + } + + public String getShifousheji2() { + return shifousheji2; + } + + public void setShifousheji2(String shifousheji2) { + this.shifousheji2 = shifousheji2; + } + + public String getQuerenren2() { + return querenren2; + } + + public void setQuerenren2(String querenren2) { + this.querenren2 = querenren2; + } + + public String getShifousheji3() { + return shifousheji3; + } + + public void setShifousheji3(String shifousheji3) { + this.shifousheji3 = shifousheji3; + } + + public String getQuerenren3() { + return querenren3; + } + + public void setQuerenren3(String querenren3) { + this.querenren3 = querenren3; + } + + public String getShifousheji4() { + return shifousheji4; + } + + public void setShifousheji4(String shifousheji4) { + this.shifousheji4 = shifousheji4; + } + + public String getQuerenren4() { + return querenren4; + } + + public void setQuerenren4(String querenren4) { + this.querenren4 = querenren4; + } + + public String getShifousheji5() { + return shifousheji5; + } + + public void setShifousheji5(String shifousheji5) { + this.shifousheji5 = shifousheji5; + } + + public String getQuerenren5() { + return querenren5; + } + + public void setQuerenren5(String querenren5) { + this.querenren5 = querenren5; + } + + public String getShifousheji6() { + return shifousheji6; + } + + public void setShifousheji6(String shifousheji6) { + this.shifousheji6 = shifousheji6; + } + + public String getQuerenren6() { + return querenren6; + } + + public void setQuerenren6(String querenren6) { + this.querenren6 = querenren6; + } + + public String getShifousheji7() { + return shifousheji7; + } + + public void setShifousheji7(String shifousheji7) { + this.shifousheji7 = shifousheji7; + } + + public String getQuerenren7() { + return querenren7; + } + + public void setQuerenren7(String querenren7) { + this.querenren7 = querenren7; + } + + public String getShifousheji8() { + return shifousheji8; + } + + public void setShifousheji8(String shifousheji8) { + this.shifousheji8 = shifousheji8; + } + + public String getQuerenren8() { + return querenren8; + } + + public void setQuerenren8(String querenren8) { + this.querenren8 = querenren8; + } + + public String getShifousheji9() { + return shifousheji9; + } + + public void setShifousheji9(String shifousheji9) { + this.shifousheji9 = shifousheji9; + } + + public String getQuerenren9() { + return querenren9; + } + + public void setQuerenren9(String querenren9) { + this.querenren9 = querenren9; + } + + public String getShifousheji10() { + return shifousheji10; + } + + public void setShifousheji10(String shifousheji10) { + this.shifousheji10 = shifousheji10; + } + + public String getQuerenren10() { + return querenren10; + } + + public void setQuerenren10(String querenren10) { + this.querenren10 = querenren10; + } + + public String getQifangzhuangbei() { + return qifangzhuangbei; + } + + public void setQifangzhuangbei(String qifangzhuangbei) { + this.qifangzhuangbei = qifangzhuangbei; + } + + public String getJiushengsheng() { + return jiushengsheng; + } + + public void setJiushengsheng(String jiushengsheng) { + this.jiushengsheng = jiushengsheng; + } + + public String getXiaofangqicai() { + return xiaofangqicai; + } + + public void setXiaofangqicai(String xiaofangqicai) { + this.xiaofangqicai = xiaofangqicai; + } + + public String getShifousheji11() { + return shifousheji11; + } + + public void setShifousheji11(String shifousheji11) { + this.shifousheji11 = shifousheji11; + } + + public String getQuerenren11() { + return querenren11; + } + + public void setQuerenren11(String querenren11) { + this.querenren11 = querenren11; + } + + public String getShifousheji12() { + return shifousheji12; + } + + public void setShifousheji12(String shifousheji12) { + this.shifousheji12 = shifousheji12; + } + + public String getQuerenren12() { + return querenren12; + } + + public void setQuerenren12(String querenren12) { + this.querenren12 = querenren12; + } + + public String getShifousheji13() { + return shifousheji13; + } + + public void setShifousheji13(String shifousheji13) { + this.shifousheji13 = shifousheji13; + } + + public String getQuerenren13() { + return querenren13; + } + + public void setQuerenren13(String querenren13) { + this.querenren13 = querenren13; + } + + public String getShifousheji14() { + return shifousheji14; + } + + public void setShifousheji14(String shifousheji14) { + this.shifousheji14 = shifousheji14; + } + + public String getQuerenren14() { + return querenren14; + } + + public void setQuerenren14(String querenren14) { + this.querenren14 = querenren14; + } + + public String getJieshoujiaodiren() { + return jieshoujiaodiren; + } + + public void setJieshoujiaodiren(String jieshoujiaodiren) { + this.jieshoujiaodiren = jieshoujiaodiren; + } + + public String getAnquanjiaodiren() { + return anquanjiaodiren; + } + + public void setAnquanjiaodiren(String anquanjiaodiren) { + this.anquanjiaodiren = anquanjiaodiren; + } + + public String getBianzhiren() { + return bianzhiren; + } + + public void setBianzhiren(String bianzhiren) { + this.bianzhiren = bianzhiren; + } + + public String getQuerenren15() { + return querenren15; + } + + public void setQuerenren15(String querenren15) { + this.querenren15 = querenren15; + } + + public String getQitaanquancuoshi() { + return qitaanquancuoshi; + } + + public void setQitaanquancuoshi(String qitaanquancuoshi) { + this.qitaanquancuoshi = qitaanquancuoshi; + } + + public String getShouxiankongjianneiy() { + return shouxiankongjianneiy; + } + + public void setShouxiankongjianneiy(String shouxiankongjianneiy) { + this.shouxiankongjianneiy = shouxiankongjianneiy; + } + + public String getGuanliandeqitateshuz() { + return guanliandeqitateshuz; + } + + public void setGuanliandeqitateshuz(String guanliandeqitateshuz) { + this.guanliandeqitateshuz = guanliandeqitateshuz; + } + + public String getShifouweiqiyetuisong() { + return shifouweiqiyetuisong; + } + + public void setShifouweiqiyetuisong(String shifouweiqiyetuisong) { + this.shifouweiqiyetuisong = shifouweiqiyetuisong; + } +} diff --git a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java index 5be23a8..afedcfc 100644 --- a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java +++ b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java @@ -1,8 +1,9 @@ package com.hxjt.dataupload.service; import com.hxjt.dataupload.model.entity.doubleprevent.*; -import com.hxjt.dataupload.model.entity.tszy.aqcs.DhAqcs; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy; +import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy; import java.util.ArrayList; @@ -33,5 +34,7 @@ public interface FxfxdxService { //动火作业 List getOneDhzysPage(String isSingleDay); //动火安全措施 - ArrayList queryDhAqcsByBianhao(String bianhao); + ArrayList queryDhAqcsByBianhao(String bianhao); + + List getOneSxkjzysPage(String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java index ca8f431..4e33676 100644 --- a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java +++ b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java @@ -2,12 +2,12 @@ package com.hxjt.dataupload.service.impl; import com.hxjt.dataupload.mapper.FxfxdxMapper; import com.hxjt.dataupload.model.entity.doubleprevent.*; -import com.hxjt.dataupload.model.entity.tszy.aqcs.DhAqcs; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy; +import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy; import com.hxjt.dataupload.service.FxfxdxService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -67,7 +67,12 @@ public class FxfxdxServiceImpl implements FxfxdxService { } @Override - public ArrayList queryDhAqcsByBianhao(String bianhao) { - return fxfxdxMapper.queryDhAqcsByBianhao(bianhao); + public ArrayList queryDhAqcsByBianhao(String isSingleDay) { + return fxfxdxMapper.queryDhAqcsByBianhao(isSingleDay); + } + + @Override + public List getOneSxkjzysPage(String isSingleDay) { + return fxfxdxMapper.getOneSxkjzysPage(isSingleDay); } } diff --git a/src/main/java/com/hxjt/dataupload/utils/DhAqcsUtil.java b/src/main/java/com/hxjt/dataupload/utils/tszy/DhAqcsUtil.java similarity index 97% rename from src/main/java/com/hxjt/dataupload/utils/DhAqcsUtil.java rename to src/main/java/com/hxjt/dataupload/utils/tszy/DhAqcsUtil.java index d912f81..6f6de2e 100644 --- a/src/main/java/com/hxjt/dataupload/utils/DhAqcsUtil.java +++ b/src/main/java/com/hxjt/dataupload/utils/tszy/DhAqcsUtil.java @@ -1,6 +1,6 @@ -package com.hxjt.dataupload.utils; +package com.hxjt.dataupload.utils.tszy; -import com.hxjt.dataupload.model.entity.tszy.aqcs.DhAqcs; +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; import com.hxjt.dataupload.model.entity.tszy.upload.Dhzy; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class DhAqcsUtil { - public static void handle(Dhzy dhzy, DhAqcs dhAqcs) { + public static void handle(Dhzy dhzy, Aqcs dhAqcs) { if(dhAqcs.getAncuoneirong().startsWith("动火设备内部构件清理干净")){ dhzy.setShifousheji1(dhAqcs.getShifousheji().equals("Y")?"是":"否"); dhzy.setQuerenren1(dhAqcs.getQuerenren()); @@ -138,7 +138,7 @@ public class DhAqcsUtil { public static String processSecurityMeasures(String input) { // 定位关键词位置 - int index = input.indexOf(" 其他安全措施"); + int index = input.indexOf("其他安全措施"); if (index == -1) return "无"; // 截取关键词后的内容并去除两端空格 diff --git a/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java b/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java new file mode 100644 index 0000000..0ab2de5 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java @@ -0,0 +1,62 @@ +package com.hxjt.dataupload.utils.tszy; + +import com.hxjt.dataupload.model.entity.tszy.aqcs.Aqcs; +import com.hxjt.dataupload.model.entity.tszy.upload.Sxkjzy; + +public class SxkjzyUtil { + + + public static void handle(Sxkjzy sxkjzy, Aqcs aqcs) { + if(aqcs.getAncuoneirong().startsWith("盛装过有毒、可燃物料的受限空间，所有与受限空间有联系的阀")){ + sxkjzy.setShifousheji1(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren1(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("盛装过有毒、可燃物料及其他物料的受限空间，设备已经过置")){ + sxkjzy.setShifousheji2(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren2(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("设备打开通风孔进行自然通风，温度适宜人员作业；必要时采用")){ + sxkjzy.setShifousheji3(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren3(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("带搅拌机的设备、转动设备已切断电源，电源开关处")){ + sxkjzy.setShifousheji4(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren4(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("受限空间内部已具备进人作业条件，易燃易爆物料容器内")){ + sxkjzy.setShifousheji5(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren5(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("受限空间进出口通道畅通，无阻碍人")){ + sxkjzy.setShifousheji6(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren6(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("盛装过可燃有毒液体、气体的受限空间，已分析其中的可燃")){ + sxkjzy.setShifousheji7(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren7(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("存在大量扬尘的设备")){ + sxkjzy.setShifousheji8(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren8(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("用于连续检测的移动式可燃")){ + sxkjzy.setShifousheji9(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren9(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("作业人员已佩戴必要的个体防护装备")){ + sxkjzy.setShifousheji10(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren10(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("已配备作业应急设施消防器材")){ + String[] arr = DhAqcsUtil.extractBracketContents(aqcs.getAncuoneirong()); + sxkjzy.setQifangzhuangbei(arr[2]); + sxkjzy.setJiushengsheng(arr[1]); + sxkjzy.setXiaofangqicai(arr[0]); + sxkjzy.setShifousheji11(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren11(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("受限空间内作业已配备通信设")){ + sxkjzy.setShifousheji12(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren12(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("受限空间出入口四周已设立警")){ + sxkjzy.setShifousheji13(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren13(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("其他相关特殊作业已办理相应安全作")){ + sxkjzy.setShifousheji14(aqcs.getShifousheji().equals("Y")?"是":"否"); + sxkjzy.setQuerenren14(aqcs.getQuerenren()); + }else if(aqcs.getAncuoneirong().startsWith("其他安全措施")){ + sxkjzy.setQitaanquancuoshi(DhAqcsUtil.processSecurityMeasures(aqcs.getAncuoneirong())); + sxkjzy.setBianzhiren(aqcs.getQuerenren()); + sxkjzy.setQuerenren15(aqcs.getQuerenren()); + } + }// +} diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 62d961e..b0e929b 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -664,7 +664,8 @@ --a.othercontent AS guanliandeqitateshuz, A.NAME08 AS guanliandeqitateshuz, d.personname9 AS jieshoujiaodiren, - d.firepersonname2 AS anquanjiaodiren + d.firepersonname2 AS anquanjiaodiren, + '是' as shifouweiqiyetuisong FROM OTM_OPERATICK A LEFT JOIN ISM_AREA B ON @@ -696,13 +697,101 @@ zuoyeshenqingshijian desc - SELECT MEAIMP as querenren,SAFCONTENT as ancuoneirong,SAFMEASIMPLE as shifousheji from OTM_OTSAFMEAS WHERE - FOTID = 'a5d0e6e4e5a14768b02b111da3eaf072' + FOTID = #{bianhao} order by SAFCONTENT + + \ No newline at end of file