main
dongdingding 8 months ago
parent a2f377100c
commit 90a9f73c4c

@ -570,6 +570,8 @@ public class ASafeQyjcxx implements Serializable {
public ASafeQyjcxx() {
}
public ASafeQyjcxx(EnterpriseResponse res) {
this.jd = conversion(res.getLongitude());

@ -58,6 +58,11 @@ public class ACheckQuatzRequest {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finalDateTime;
/**
* qyjcxx xxbh
*/
private String xxbh;
/**
*
*/

@ -0,0 +1,21 @@
package com.mudu.entity.dto.response;
import lombok.Data;
/**
* @author dong
* @since 2024/8/27 20:04
*/
@Data
public class FxdwzResponse {
/**
*
*/
private String wzbh;
/**
*
*/
private String xxbh;
}

@ -2,6 +2,7 @@ package com.mudu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mudu.entity.ASafeQyjcxx;
import com.mudu.entity.dto.response.FxdwzResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -29,5 +30,15 @@ public interface ASafeQyjcxxMapper extends BaseMapper<ASafeQyjcxx> {
* @param list
*/
void updateByTyshxybm(List<String> list);
/**
* ida_safe_fxdwzwzbhxxbh
*
* @param enterPriseId id
* @return
*/
FxdwzResponse findByEnterPeriseId(@Param("enterPriseId") String enterPriseId);
}

@ -3,6 +3,7 @@ package com.mudu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mudu.entity.ASafeRwzq;
import com.mudu.entity.dto.response.RwzqUuidResponse;
import org.apache.ibatis.annotations.Param;
/**
* (ASafeRwzq)访
@ -26,5 +27,15 @@ public interface ASafeRwzqMapper extends BaseMapper<ASafeRwzq> {
* @return
*/
RwzqUuidResponse getZcUuid();
/**
* ids_safe_fxdfxdbh
*
* @param enterPriseId id
* @param fxdbh
* @return
*/
String findByEnIdFxd(@Param("enterPriseId") String enterPriseId, @Param("fxdbh") String fxdbh);
}

@ -6,50 +6,20 @@ import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.mudu.entity.ACheckQuatzEntity;
import com.mudu.entity.ACheckQuatzZichaEntity;
import com.mudu.entity.ASafeQyjcxx;
import com.mudu.entity.ASafeRwfj;
import com.mudu.entity.ASafeRwzq;
import com.mudu.entity.ASafeTfg;
import com.mudu.entity.ASafeTfgsh;
import com.mudu.entity.ASafeXcrw;
import com.mudu.entity.ASafeXcrwjcx;
import com.mudu.entity.ASafeXcrwjcxzgxx;
import com.mudu.entity.ASafeXcrwwz;
import com.mudu.entity.ASafeYhzgxx;
import com.mudu.entity.ASafeZcrw;
import com.mudu.entity.ASafeZcrwjl;
import com.mudu.entity.ASafeZcrwwz;
import com.mudu.entity.SzsASafeZcyhxx;
import com.mudu.entity.*;
import com.mudu.entity.dto.request.ACheckQuatzRequest;
import com.mudu.entity.dto.request.ACheckQuatzZichaRequest;
import com.mudu.entity.dto.response.ACheckXcTpResponse;
import com.mudu.entity.dto.response.FxdwzResponse;
import com.mudu.entity.dto.response.RwzqUuidResponse;
import com.mudu.service.ASafeQyjcxxService;
import com.mudu.service.ASafeRwfjService;
import com.mudu.service.ASafeRwzqService;
import com.mudu.service.ASafeTfgService;
import com.mudu.service.ASafeTfgshService;
import com.mudu.service.ASafeXcrwService;
import com.mudu.service.ASafeXcrwjcxService;
import com.mudu.service.ASafeXcrwjcxzgxxService;
import com.mudu.service.ASafeXcrwwzService;
import com.mudu.service.ASafeYhzgxxService;
import com.mudu.service.ASafeZcrwService;
import com.mudu.service.ASafeZcrwjlService;
import com.mudu.service.ASafeZcrwwzService;
import com.mudu.service.SzsASafeZcyhxxService;
import com.mudu.service.*;
import com.mudu.service.impl.LoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -188,35 +158,29 @@ public class AcheckTaskQuartz {
.header("Authorization", token)
// .timeout(60*1000*2)
.execute().body();
logger.info(responseList);
JSONObject jsonResponseList = JSON.parseObject(responseList);
logger.info(responseList);
String dataList = jsonResponseList.getString("data");
if (StrUtil.isEmpty(dataList)) {
logger.info("dataList没有数据");
return;
}
logger.info(dataList);
List<ACheckQuatzRequest> list = JSON.parseArray(dataList, ACheckQuatzRequest.class);
if (CollectionUtil.isEmpty(list)) {
logger.info("list没有数据");
logger.info(list.toString());
return;
}
for (ACheckQuatzRequest a : list) {
//获取企业编号
ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getEntCode());
String enterPriseId = "";
if (aSafeQyjcxx == null) {
if (a.getXxbh() == null) {
continue;
} else {
enterPriseId = aSafeQyjcxx.getXxbh();
enterPriseId = a.getXxbh();
}
// todo 来自新表查询 根据企业xxbh 以及周期编号
JSONObject xcjsonObject = new JSONObject();
xcjsonObject.put("qybh", aSafeQyjcxx.getXxbh());
xcjsonObject.put("qybh", a.getXxbh());
xcjsonObject.put("zqbh", rwzqUuid);
String xcresponse = HttpRequest.post(xczqUrl)
.contentType("application/x-www-form-urlencoded;charset=UTF-8")
@ -284,7 +248,8 @@ public class AcheckTaskQuartz {
String xcrwjcxzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
String xcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
String yhzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
//根据企业id查询a_safe_fxdwz的wzbh和xxbh
FxdwzResponse fxdwzResponse = aSafeQyjcxxService.findByEnterPeriseId(enterPriseId);
/**
* a_safe_xcrwwz
*/
@ -293,12 +258,14 @@ public class AcheckTaskQuartz {
/**
* a_safe_yhzgxx
*/
saveYhzgxx(list, a, b, yhzgxxUuid, xcrwuuid, enterPriseId, rwzqUuid, xcrwwzUuid);
saveYhzgxx(list, a, b, yhzgxxUuid, xcrwuuid, enterPriseId, rwzqUuid, xcrwwzUuid, fxdwzResponse);
/**
* a_safe_xcrwjcx
*/
saveXcrwJcx(b, xcrwjcxUuid, yhzgxxUuid, xcrwwzUuid, enterPriseId, xcrwuuid, rwzqUuid);
//根据企业id和s_safe_fxd的fxdbh查询风险点的信息编号
String fxdxxbh = aSafeRwzqService.findByEnIdFxd(enterPriseId, "03_20240621172152865517");
saveXcrwJcx(b, xcrwjcxUuid, yhzgxxUuid, xcrwwzUuid, enterPriseId, xcrwuuid, rwzqUuid, fxdxxbh, fxdwzResponse);
/**
* / a_safe_xcrwjcxzgxx
@ -319,24 +286,22 @@ public class AcheckTaskQuartz {
* @param rwzqUuid id
* @param xcrwwzUuid id
*/
private void saveYhzgxx(List<ACheckQuatzRequest> list, ACheckQuatzRequest a, ACheckQuatzEntity b, String yhzgxxUuid, String xcrwuuid, String enterPriseId, String rwzqUuid, String xcrwwzUuid) {
private void saveYhzgxx(List<ACheckQuatzRequest> list, ACheckQuatzRequest a, ACheckQuatzEntity b, String yhzgxxUuid, String xcrwuuid, String enterPriseId, String rwzqUuid, String xcrwwzUuid, FxdwzResponse fxdwzResponse) {
ASafeYhzgxx aSafeYhzgxx = new ASafeYhzgxx();
//信息编号
aSafeYhzgxx.setXxbh(yhzgxxUuid);
//任务编号
aSafeYhzgxx.setRwbh(xcrwuuid);
//位置编号
aSafeYhzgxx.setWzbh(b.getWzxxbh());
//todo 位置编号
if (fxdwzResponse != null) {
aSafeYhzgxx.setWzbh(fxdwzResponse.getWzbh());
}
//企业编号
aSafeYhzgxx.setQybh(enterPriseId);
//周期编号
aSafeYhzgxx.setZqbh(rwzqUuid);
//企业风险点编号 对应a_safe_fxd的信息编号
if (b.getFxdxxbh() == null) {
aSafeYhzgxx.setQyfxdbh("03_20240617093239130405");
} else {
aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh());
}
aSafeYhzgxx.setQyfxdbh("03_20240621172152865517");
//隐患来源
aSafeYhzgxx.setYhly("1");
//检查时间
@ -389,9 +354,9 @@ public class AcheckTaskQuartz {
//任务编号
aSafeXcrwwz.setRwbh(xcrwuuid);
//位置编号
aSafeXcrwwz.setWzbh(b.getWzxxbh());
aSafeXcrwwz.setWzbh(null);
//位置名称
aSafeXcrwwz.setWzmc(b.getWzmc());
aSafeXcrwwz.setWzmc(null);
//周期编号
aSafeXcrwwz.setZqbh(rwzqUuid);
//完成状态 todo 1
@ -453,7 +418,7 @@ public class AcheckTaskQuartz {
* @param xcrwuuid id
* @param rwzqUuid id
*/
private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String yhzgxxUuid, String xcrwwzUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) {
private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String yhzgxxUuid, String xcrwwzUuid, String enterPriseId, String xcrwuuid, String rwzqUuid, String fxdxxbh, FxdwzResponse fxdwzResponse) {
ASafeXcrwjcx aSafeXcrwjcx = new ASafeXcrwjcx();
//信息编号
aSafeXcrwjcx.setXxbh(xcrwjcxUuid);
@ -463,12 +428,7 @@ public class AcheckTaskQuartz {
aSafeXcrwjcx.setRwbh(xcrwuuid);
//企业风险点编号 对应a_safe_fxd的信息编号
//todo
if (b.getFxdxxbh() == null) {
aSafeXcrwjcx.setQyfxdbh("03_20240617093239130405");
} else {
aSafeXcrwjcx.setQyfxdbh(b.getFxdxxbh());
}
aSafeXcrwjcx.setQyfxdbh("03_20240621172152865517");
//周期编号
aSafeXcrwjcx.setZqbh(rwzqUuid);
//完成状态
@ -502,9 +462,9 @@ public class AcheckTaskQuartz {
//是否重点检查项
aSafeXcrwjcx.setSfzdjcx(1);
//检查要点 todo 检查要点要传中文描述内容
aSafeXcrwjcx.setJcyd(b.getJcyd());
aSafeXcrwjcx.setJcyd("请网格员认真核查企业基本信息、历史记录、委外作业、安全投入等内容,并反馈在此风险点上。");
// 检查要点编号
aSafeXcrwjcx.setJcydbh(b.getJcydId());
aSafeXcrwjcx.setJcydbh("9b46ab79101844f58843cbcc41156b67");
//是否展示
aSafeXcrwjcx.setSfzs(1);
//历史整改逾期
@ -513,12 +473,14 @@ public class AcheckTaskQuartz {
aSafeXcrwjcx.setFclsyq(0);
//复查信息
aSafeXcrwjcx.setFcxx(b.getReviewContent());
//位置编号 todo 企业风险点位置的位置编号即 企业风险位置的xxbh
aSafeXcrwjcx.setWzbh(b.getWzxxbh());
//位置编号 todo 位置编号
if (fxdwzResponse != null) {
aSafeXcrwjcx.setWzbh(fxdwzResponse.getWzbh());
}
//巡查位置编号
aSafeXcrwjcx.setXcwzbh(xcrwwzUuid);
//巡查风险点编号 todo默认木渎通用检查点,检查要点
aSafeXcrwjcx.setXcfxdbh(b.getFxdxxbh());
aSafeXcrwjcx.setXcfxdbh(fxdxxbh);
//任务类型
aSafeXcrwjcx.setRwlx(3);
//入库人员
@ -679,10 +641,10 @@ public class AcheckTaskQuartz {
}
@Scheduled(cron = "0 0 4 * * ? ")
// @Scheduled(cron = "0 0 4 * * ? ")
// @Scheduled(cron = "0 0/5 * * * ?")
// @PostMapping("/zicha")
// @ApiOperation(value = "自查")
@PostMapping("/zicha")
@ApiOperation(value = "自查")
public void zicha() throws ParseException {
// 获取token
getToken();
@ -697,7 +659,6 @@ public class AcheckTaskQuartz {
String dataList = jsonResponseList.getString("data");
logger.info(JSONUtil.toJsonStr(responseList));
if (StrUtil.isEmpty(dataList)) {
logger.info("dataList没有数据");
return;
}
List<ACheckQuatzZichaRequest> list = JSON.parseArray(dataList, ACheckQuatzZichaRequest.class);
@ -705,9 +666,7 @@ public class AcheckTaskQuartz {
return;
}
for (ACheckQuatzZichaRequest a : list) {
if (a.getEnterpriseID() == null) {
logger.info("getEnterpriseID为空");
continue;
}
JSONObject zcjsonObject = new JSONObject();
@ -769,14 +728,16 @@ public class AcheckTaskQuartz {
*/
saveZczgqTp(zc, zcrwUuid, xxsx);
}
//根据企业id查询a_safe_fxdwz的wzbh和xxbh
FxdwzResponse fxdwzResponse = aSafeQyjcxxService.findByEnterPeriseId(a.getEnterpriseID());
/**
*a_safe_zcrwwz
*/
saveZcRwwz(a, b, zcrwwzUuid, zcrwUuid, rwzqUuid);
saveZcRwwz(a, b, zcrwwzUuid, zcrwUuid, rwzqUuid, fxdwzResponse);
/**
* a_safe_zcrwjl
*/
saveZcrwjl(b, zcrwjlUuid, zcrwUuid, rwzqUuid, zcrwwzUuid);
saveZcrwjl(b, zcrwjlUuid, zcrwUuid, rwzqUuid, zcrwwzUuid, fxdwzResponse);
/**
* / szs_a_safe_zcyhxx
*/
@ -836,7 +797,7 @@ public class AcheckTaskQuartz {
* @param rwzqUuid id
* @param zcrwwzUuid id
*/
private void saveZcrwjl(ACheckQuatzZichaEntity b, String zcrwjlUuid, String zcrwUuid, String rwzqUuid, String zcrwwzUuid) {
private void saveZcrwjl(ACheckQuatzZichaEntity b, String zcrwjlUuid, String zcrwUuid, String rwzqUuid, String zcrwwzUuid, FxdwzResponse fxdwzResponse) {
ASafeZcrwjl aSafeZcrwjl = new ASafeZcrwjl();
//信息编号
aSafeZcrwjl.setXxbh(zcrwjlUuid);
@ -845,13 +806,12 @@ public class AcheckTaskQuartz {
//任务编号
aSafeZcrwjl.setRwbh(zcrwUuid);
//企业风险点编号
if (b.getFxdxxbh() == null) {
aSafeZcrwjl.setQyfxdbh("03_20240617093239130405");
} else {
aSafeZcrwjl.setQyfxdbh(b.getFxdxxbh());
}
aSafeZcrwjl.setQyfxdbh("03_20240621172152865517");
//企业风险点位置编号
aSafeZcrwjl.setQyfxdwzbh(b.getFxbh());
// TODO 企业风险点位置编号
if (fxdwzResponse != null) {
aSafeZcrwjl.setQyfxdwzbh(fxdwzResponse.getXxbh());
}
//是否发现隐患
aSafeZcrwjl.setSffxyh(0);
//完成状态
@ -861,7 +821,10 @@ public class AcheckTaskQuartz {
//周期编号
aSafeZcrwjl.setZqbh(rwzqUuid);
//位置编号
aSafeZcrwjl.setWzbh(b.getWzbh());
//todo 位置编号
if (fxdwzResponse != null) {
aSafeZcrwjl.setWzbh(fxdwzResponse.getWzbh());
}
//自查任务位置编号
aSafeZcrwjl.setZcrwwzbh(zcrwwzUuid);
//设备数量
@ -896,7 +859,7 @@ public class AcheckTaskQuartz {
* @param zcrwUuid id
* @param rwzqUuid id
*/
private void saveZcRwwz(ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String zcrwwzUuid, String zcrwUuid, String rwzqUuid) {
private void saveZcRwwz(ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String zcrwwzUuid, String zcrwUuid, String rwzqUuid, FxdwzResponse fxdwzResponse) {
ASafeZcrwwz aSafeZcrwwz = new ASafeZcrwwz();
//信息编号
aSafeZcrwwz.setXxbh(zcrwwzUuid);
@ -909,7 +872,10 @@ public class AcheckTaskQuartz {
//市风险点编号
aSafeZcrwwz.setSfxdbh(b.getSfxdbh());
//位置编号
aSafeZcrwwz.setWzbh(b.getWzbh());
//todo 位置编号
if (fxdwzResponse != null) {
aSafeZcrwwz.setWzbh(fxdwzResponse.getWzbh());
}
//入库人员
aSafeZcrwwz.setRkry(b.getAddUserID());
//入库时间
@ -1029,17 +995,15 @@ public class AcheckTaskQuartz {
//任务编号
aSafeYhzgxx.setRwbh(zcrwUuid);
//位置编号
aSafeYhzgxx.setWzbh(b.getWzbh());
if (b.getWzbh() != null) {
aSafeYhzgxx.setWzbh(b.getWzbh());
}
//企业编号
aSafeYhzgxx.setQybh(b.getEnterpriseID());
//周期编号
aSafeYhzgxx.setZqbh(rwzqUuid);
//企业风险点编号 对应a_safe_fxd的信息编号
if (b.getFxdxxbh() == null) {
aSafeYhzgxx.setQyfxdbh("03_20240617093239130405");
} else {
aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh());
}
aSafeYhzgxx.setQyfxdbh("03_20240621172152865517");
//隐患来源
aSafeYhzgxx.setYhly("2");
//检查时间

@ -2,6 +2,7 @@ package com.mudu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mudu.entity.ASafeQyjcxx;
import com.mudu.entity.dto.response.FxdwzResponse;
import java.util.List;
@ -33,5 +34,14 @@ public interface ASafeQyjcxxService extends IService<ASafeQyjcxx> {
* @param tyshxybmList
*/
void updateByTyshxybm(List<String> tyshxybmList);
/**
* ida_safe_fxdwzwzbhxxbh
*
* @param enterPriseId id
* @return
*/
FxdwzResponse findByEnterPeriseId(String enterPriseId);
}

@ -21,13 +21,21 @@ public interface ASafeRwzqService extends IService<ASafeRwzq> {
RwzqUuidResponse getXcUuid();
/**
* id
*
* @return
*/
RwzqUuidResponse getZcUuid();
/**
* ids_safe_fxdfxdbh
*
* @param enterPriseId id
* @param fxdbh
* @return
*/
String findByEnIdFxd(String enterPriseId, String fxdbh);
}

@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mudu.entity.ASafeQyjcxx;
import com.mudu.entity.dto.response.EnterpriseResponse;
import com.mudu.entity.dto.response.FxdwzResponse;
import com.mudu.entity.dto.response.GeneralResponse;
import com.mudu.mapper.ASafeQyjcxxMapper;
import com.mudu.service.ASafeQyjcxxService;
@ -95,5 +96,10 @@ public class ASafeQyjcxxServiceImpl extends ServiceImpl<ASafeQyjcxxMapper, ASafe
public void updateByTyshxybm(List<String> tyshxybmList) {
baseMapper.updateByTyshxybm(tyshxybmList);
}
@Override
public FxdwzResponse findByEnterPeriseId(String enterPriseId) {
return baseMapper.findByEnterPeriseId(enterPriseId);
}
}

@ -29,5 +29,10 @@ public class ASafeRwzqServiceImpl extends ServiceImpl<ASafeRwzqMapper, ASafeRwzq
public RwzqUuidResponse getZcUuid() {
return aSafeRwzqMapper.getZcUuid();
}
@Override
public String findByEnIdFxd(String enterPriseId, String fxdbh) {
return aSafeRwzqMapper.findByEnIdFxd(enterPriseId,fxdbh);
}
}

@ -63,10 +63,12 @@ url: http://localhost:9028
#工单url
improveUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/xctp
#improveUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/xctp
improveUrl: http://localhost:9028/mudu/quatz/xctp
#自查url
zcUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/zctp
#zcUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/zctp
zcUrl: http://localhost:9028/mudu/quatz/zctp
#图片路径
api: http://mdapi.junln.net/api/
@ -93,7 +95,9 @@ tfgUrl: http://localhost:9028/mudu/aSafeTfg
zczqUrl: http://localhost:9028/mudu/aSafeZcrwRead/getByxxbh
#巡查周期url
xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
#xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
xczqUrl: http://localhost:9028/mudu/aSafeXcrwRead/getByxxbh
# 获取新增企业信息
addEntUrl: https://www.jichuanglanhai.com:88/csapi/mudu/enterprise/findAddEnt

@ -2,7 +2,7 @@ server:
port: 9998
spring:
profiles:
active: dev
active: prod
#获取token
getToken: https://www.jichuanglanhai.com:88/loginnocaptcha

@ -38,4 +38,10 @@
GROUP BY asq.XXBH
limit 1
</select>
<select id="findByEnterPeriseId" resultType="com.mudu.entity.dto.response.FxdwzResponse"
parameterType="java.lang.String">
select wzbh, xxbh
from a_safe_fxdwz
where QYBH = #{enterPriseId} limit 1
</select>
</mapper>

@ -23,4 +23,9 @@
-- and ZQJSSJ = '2024-07-31 23:59:59'
</select>
<select id="findByEnIdFxd" resultType="java.lang.String">
select XXBH from a_safe_fxd
where FXDBH =#{fxdbh}
AND QYBH=#{enterPriseId} limit 1
</select>
</mapper>
Loading…
Cancel
Save