diff --git a/src/main/java/com/mudu/entity/ASafeTfg.java b/src/main/java/com/mudu/entity/ASafeTfg.java new file mode 100644 index 0000000..8f56819 --- /dev/null +++ b/src/main/java/com/mudu/entity/ASafeTfg.java @@ -0,0 +1,99 @@ +package com.mudu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 停复工表(ASafeTfg)表实体类 + * + * @author wu + * @since 2024-06-07 17:07:15 + */ +@Data +@ApiModel("停复工表实体类") +public class ASafeTfg implements Serializable { + + private static final long serialVersionUID = 140502563309362949L; + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private String xxbh; + /** + * 企业名称 + */ + @ApiModelProperty(value = "企业名称") + private String qymc; + /** + * 对应企业基础信息表中的主键ID + */ + @ApiModelProperty(value = "对应企业基础信息表中的主键ID") + private String qybh; + /** + * 统一社会信用代码 + */ + @ApiModelProperty(value = "统一社会信用代码") + private String tyshxydm; + /** + * 格式： yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "格式： yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date tgkssj; + /** + * 格式： yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "格式： yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date tgjssj; + /** + * 停工原因 + */ + @ApiModelProperty(value = "停工原因") + private String tgyy; + /** + * 停工附件信息 + */ + @ApiModelProperty(value = "停工附件信息") + private String fjxx; + /** + * 入库人员 + */ + @ApiModelProperty(value = "入库人员") + private String rkry; + /** + * 格式： yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "格式： yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date rksj; + /** + * 更新人员 + */ + @ApiModelProperty(value = "更新人员") + private String gxry; + /** + * 格式： yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "格式： yyyy-MM-dd HH:mm:ss") + private Date gxsj; + /** + * 0：逻辑删除 + * 1：正常 + */ + @ApiModelProperty(value = "0：逻辑删除 1：正常") + private Integer jlzt; + /** + * 审核状态 0待审核 1已通过 2已驳回 + */ + @ApiModelProperty(value = "审核状态 0待审核 1已通过 2已驳回") + private String shzt; +} + diff --git a/src/main/java/com/mudu/entity/ASafeTfgsh.java b/src/main/java/com/mudu/entity/ASafeTfgsh.java new file mode 100644 index 0000000..40ca9c9 --- /dev/null +++ b/src/main/java/com/mudu/entity/ASafeTfgsh.java @@ -0,0 +1,78 @@ +package com.mudu.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 停复工审核信息表(ASafeTfgsh)表实体类 + * + * @author wu + * @since 2024-06-07 17:07:16 + */ +@Data +@ApiModel("停复工审核信息表实体类") +@TableName(value = "a_safe_tfgsh") +public class ASafeTfgsh implements Serializable { + + private static final long serialVersionUID = -60575438286733802L; + + @TableId + private String xxbh; + /** + * 停复工编号 + */ + @ApiModelProperty(value = "停复工编号") + private String tfgbh; + /** + * 审核时间 + */ + @ApiModelProperty(value = "审核时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String shsj; + /** + * 审核结果 1审核通过 2审核驳回 + */ + @ApiModelProperty(value = "审核结果 1审核通过 2审核驳回") + private String shjg; + /** + * 原因 + */ + @ApiModelProperty(value = "原因") + private String yy; + /** + * 记录状态 0逻辑删除 1正常 + */ + @ApiModelProperty(value = "记录状态 0逻辑删除 1正常") + private Integer jlzt; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date gxsj; + /** + * 更新人员 + */ + @ApiModelProperty(value = "更新人员") + private String gxry; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date rksj; + /** + * 入库人员 + */ + @ApiModelProperty(value = "入库人员") + private String rkry; +} + diff --git a/src/main/java/com/mudu/entity/dto/request/ASafeBqbhpxRequest.java b/src/main/java/com/mudu/entity/dto/request/ASafeBqbhpxRequest.java new file mode 100644 index 0000000..08c58f6 --- /dev/null +++ b/src/main/java/com/mudu/entity/dto/request/ASafeBqbhpxRequest.java @@ -0,0 +1,118 @@ +package com.mudu.entity.dto.request; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + +/** + * 班前班后表(ASafeBqbhpx)表实体类 + * + * @author wu + * @since 2024-03-27 09:54:37 + */ +@Data +@ApiModel("班前班后表实体类") +public class ASafeBqbhpxRequest implements Serializable { + + private static final long serialVersionUID = -70204298929184134L; + /** + * 信息编号 + */ + @TableId(type = IdType.ASSIGN_UUID) + @ApiModelProperty(value = "信息编号") + private String xxbh; + /** + * 企业编号 + */ + @ApiModelProperty(value = "企业编号") + private String qybh; + /** + * 班组名称 + */ + @ApiModelProperty(value = "班组名称") + private String bzmc; + /** + * 班组长姓名 + */ + @ApiModelProperty(value = "班组长姓名") + private String bzzxm; + /** + * 参培人数 + */ + @ApiModelProperty(value = "参培人数") + private Integer cprs; + + /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date pxkssj; + + /** + * 宣传内容简述 + */ + @ApiModelProperty(value = "宣传内容简述") + private String xcnrjs; + /** + * 行政区划 + */ + @ApiModelProperty(value = "行政区划") + private String xzqh; + /** + * 行政区划名称 + */ + @ApiModelProperty(value = "行政区划名称") + private String xzqhmc; + /** + * 培训现场照片 + */ + @ApiModelProperty(value = "培训现场照片") + private String pxxctp; + /** + * 入库人员 + */ + @ApiModelProperty(value = "入库人员") + private String rkry; + + /** + * 更新人员 + */ + @ApiModelProperty(value = "更新人员") + private String gxry; + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime rksj; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime gxsj; + /** + * 记录状态 + */ + @ApiModelProperty(value = "记录状态") + private Integer jlzt; + + /** + * 企业信息编号 + */ + @ApiModelProperty(value = "企业信息编号") + private String qyxxbh; + +} + diff --git a/src/main/java/com/mudu/entity/dto/request/ASafeQyzypglRequest.java b/src/main/java/com/mudu/entity/dto/request/ASafeQyzypglRequest.java new file mode 100644 index 0000000..d76241a --- /dev/null +++ b/src/main/java/com/mudu/entity/dto/request/ASafeQyzypglRequest.java @@ -0,0 +1,143 @@ +package com.mudu.entity.dto.request; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + +/** + * (ASafeQyzypgl)表实体类 + * + * @author wu + * @since 2024-03-27 09:55:35 + */ +@Data +@ApiModel("实体类") +public class ASafeQyzypglRequest implements Serializable { + + private static final long serialVersionUID = 496384598819764323L; + /** + * 信息编号 + */ + @TableId(type = IdType.ASSIGN_UUID) + @ApiModelProperty(value = "信息编号") + private String xxbh; + /** + * 作业类型id + */ + @ApiModelProperty(value = "作业类型id") + private String zylxid; + /** + * 作业类型value + */ + @ApiModelProperty(value = "作业类型value") + private String zylxvalue; + + /** + * 作业时间 + */ + @ApiModelProperty(value = "作业时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date zysj; + + + /** + * 作业人员 + */ + @ApiModelProperty(value = "作业人员") + private String zyry; + /** + * 作业地点 + */ + @ApiModelProperty(value = "作业地点") + private String zydd; + /** + * 作业方式 + */ + @ApiModelProperty(value = "作业方式") + private String zyfs; + /** + * 作业原因 + */ + @ApiModelProperty(value = "作业原因") + private String zyyy; + /** + * 风险描述 + */ + @ApiModelProperty(value = "风险描述") + private String fxms; + /** + * 防范措施 + */ + @ApiModelProperty(value = "防范措施") + private String ffcs; + /** + * 作业状态 0-待签名 1-待作业 2-已作业 + */ + @ApiModelProperty(value = "作业状态 0-待签名 1-待作业 2-已作业") + private String zyzt; + /** + * 企业编号 + */ + @ApiModelProperty(value = "企业编号") + private String qybh; + /** + * 企业名称 + */ + @ApiModelProperty(value = "企业名称") + private String qymc; + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String ssbm; + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime rksj; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime gxsj; + /** + * 入库人员 + */ + @ApiModelProperty(value = "入库人员") + private String rkry; + /** + * 更新人员 + */ + @ApiModelProperty(value = "更新人员") + private String gxry; + /** + * 记录状态 + */ + @ApiModelProperty(value = "记录状态") + private Integer jlzt; + /** + * 监护人员 + */ + @ApiModelProperty(value = "监护人员") + private String jhry; + + + /** + * 企业信息编号 + */ + @ApiModelProperty(value = "企业信息编号") + private String qyxxbh; +} + diff --git a/src/main/java/com/mudu/mapper/ASafeTfgMapper.java b/src/main/java/com/mudu/mapper/ASafeTfgMapper.java new file mode 100644 index 0000000..dc37c5a --- /dev/null +++ b/src/main/java/com/mudu/mapper/ASafeTfgMapper.java @@ -0,0 +1,18 @@ +package com.mudu.mapper; + + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mudu.entity.ASafeTfg; + + +/** + * 停复工表(ASafeTfg)表数据库访问层 + * + * @author wu + * @since 2024-06-07 17:07:15 + */ +public interface ASafeTfgMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/mudu/mapper/ASafeTfgshMapper.java b/src/main/java/com/mudu/mapper/ASafeTfgshMapper.java new file mode 100644 index 0000000..a54db89 --- /dev/null +++ b/src/main/java/com/mudu/mapper/ASafeTfgshMapper.java @@ -0,0 +1,15 @@ +package com.mudu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mudu.entity.ASafeTfgsh; + +/** + * 停复工审核信息表(ASafeTfgsh)表数据库访问层 + * + * @author wu + * @since 2024-06-07 17:07:16 + */ +public interface ASafeTfgshMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index ae9b1de..7cec138 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -11,16 +11,11 @@ import com.mudu.entity.dto.request.ACheckQuatzZichaRequest; import com.mudu.entity.dto.response.ACheckXcTpResponse; import com.mudu.entity.dto.response.RwzqUuidResponse; import com.mudu.service.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; 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; import javax.annotation.Resource; import java.text.ParseException; @@ -87,7 +82,12 @@ public class AcheckTaskQuartz { @Resource private ASafeQyjcxxService aSafeQyjcxxService; + @Resource + private ASafeTfgService aSafeTfgService; + + @Resource + private ASafeTfgshService aSafeTfgshService; @Resource private ASafeRwzqService aSafeRwzqService; @@ -112,6 +112,10 @@ public class AcheckTaskQuartz { @Value("${xczqUrl}") private String xczqUrl; + @Value("${tfgUrl}") + private String tfgUrl; + + /** * 新增创建时间为昨天且处于审批通过的工单数据 * @@ -585,7 +589,7 @@ public class AcheckTaskQuartz { } - @Scheduled(cron = "0 0 4 * * ? ") + @Scheduled(cron = "0 0 4 * * ? ") // @Scheduled(cron = "0 0/5 * * * ?") //@Scheduled(cron = "0 58 18 * * ?") // @PostMapping("/zicha") @@ -870,6 +874,8 @@ public class AcheckTaskQuartz { aSafeZcrw.setGxsj(new Date()); //更新人员 aSafeZcrw.setGxry(a.getAddUserID()); + aSafeZcrw.setJlzt(1); + aSafeZcrwService.save(aSafeZcrw); } @@ -954,4 +960,58 @@ public class AcheckTaskQuartz { aSafeYhzgxxService.save(aSafeYhzgxx); } + + /** + * 停复工表 + */ + @Scheduled(cron = "0 0 4 * * ? ") +// @Scheduled(cron = "0 0/5 * * * ?") +// @PostMapping("/tfg") +// @ApiOperation(value = "停复工表") + public void tfg() { + //当前时间 + Date currentDate = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String currentTimeString = dateFormat.format(currentDate); + //停复工表推送 + String responseList = HttpRequest.get(tfgUrl).header("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8").execute().body(); + JSONObject jsonResponseList = JSON.parseObject(responseList); + String dataList = jsonResponseList.getString("rows"); + if (StrUtil.isEmpty(dataList)) { + return; + } + //获取企业编号 + List tfgList = JSON.parseArray(dataList, ASafeTfg.class); + for (ASafeTfg a : tfgList) { + ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getQymc(), a.getTyshxydm()); + String enterPriseId = aSafeQyjcxx.getXxbh(); + String tyshxydm = aSafeQyjcxx.getTyshxybm(); + a.setQybh(enterPriseId); + a.setTyshxydm(tyshxydm); + aSafeTfgService.save(a); + //停复工审核表推送 + saveAsafeTfg(a, currentTimeString); + } + + + } + + /** + * 停复工审核表推送 + * + * @param a 停工推送信息 + * @param currentTimeString 当前时间 + */ + private void saveAsafeTfg(ASafeTfg a, String currentTimeString) { + ASafeTfgsh aSafeTfgsh = new ASafeTfgsh(); + aSafeTfgsh.setTfgbh(a.getXxbh()); + aSafeTfgsh.setShsj(currentTimeString); + aSafeTfgsh.setShjg(String.valueOf(1)); + aSafeTfgsh.setJlzt(1); + aSafeTfgsh.setGxsj(new Date()); + aSafeTfgsh.setGxry(a.getGxry()); + aSafeTfgsh.setRksj(new Date()); + aSafeTfgsh.setRkry(a.getRkry()); + aSafeTfgshService.save(aSafeTfgsh); + } } diff --git a/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java b/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java index b77393d..1b170aa 100644 --- a/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java +++ b/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java @@ -1,5 +1,6 @@ package com.mudu.quartz; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; @@ -7,6 +8,8 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.mudu.entity.ASafeBqbhpx; import com.mudu.entity.ASafeQyzypgl; +import com.mudu.entity.dto.request.ASafeBqbhpxRequest; +import com.mudu.entity.dto.request.ASafeQyzypglRequest; import com.mudu.service.ASafeBqbhpxService; import com.mudu.service.ASafeQyzypglService; import org.springframework.beans.factory.annotation.Value; @@ -16,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -54,6 +58,7 @@ public class BqbhTszyQuartz { // @GetMapping("/bqbh") // @ApiOperation(value = "保存班前班后数据") @Scheduled(cron = "0 0 1 * * ? ") +// @Scheduled(cron = "0 0/5 * * * ?") public void saveBqbh() { String res = HttpRequest.get(bqbhUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body(); JSONObject resObj = JSON.parseObject(res); @@ -61,14 +66,18 @@ public class BqbhTszyQuartz { if (StrUtil.isEmpty(dataList)) { return; } - List list = JSON.parseArray(dataList, ASafeBqbhpx.class); + List aSafeBqbhpxes = new ArrayList<>(); + List list = JSON.parseArray(dataList, ASafeBqbhpxRequest.class); list.forEach(x -> { - if (StrUtil.isNotEmpty(x.getPxxctp())) { - x.setPxxctp(api + x.getPxxctp()); + ASafeBqbhpx aSafeBqbhpx = BeanUtil.copyProperties(x, ASafeBqbhpx.class); + if (StrUtil.isNotEmpty(aSafeBqbhpx.getPxxctp())) { + aSafeBqbhpx.setPxxctp(api + aSafeBqbhpx.getPxxctp()); } + aSafeBqbhpx.setQybh(x.getQyxxbh()); + aSafeBqbhpxes.add(aSafeBqbhpx); }); - if (CollectionUtil.isNotEmpty(list)) { - safeBqbhpxService.saveBatch(list); + if (CollectionUtil.isNotEmpty(aSafeBqbhpxes)) { + safeBqbhpxService.saveBatch(aSafeBqbhpxes); } } @@ -78,6 +87,7 @@ public class BqbhTszyQuartz { // @GetMapping("/tszy") // @ApiOperation(value = "保存特殊作业数据") @Scheduled(cron = "0 0 1 * * ? ") +// @Scheduled(cron = "0 0/5 * * * ?") public void saveTszy() { String res = HttpRequest.get(tszyUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body(); JSONObject resObj = JSON.parseObject(res); @@ -85,9 +95,15 @@ public class BqbhTszyQuartz { if (StrUtil.isEmpty(dataList)) { return; } - List list = JSON.parseArray(dataList, ASafeQyzypgl.class); - if (CollectionUtil.isNotEmpty(list)) { - safeQyzypglService.saveBatch(list); + List aSafeQyzypgls = new ArrayList<>(); + List list = JSON.parseArray(dataList, ASafeQyzypglRequest.class); + list.forEach(x -> { + ASafeQyzypgl aSafeQyzypgl = BeanUtil.copyProperties(x, ASafeQyzypgl.class); + aSafeQyzypgl.setQybh(x.getQyxxbh()); + aSafeQyzypgls.add(aSafeQyzypgl); + }); + if (CollectionUtil.isNotEmpty(aSafeQyzypgls)) { + safeQyzypglService.saveBatch(aSafeQyzypgls); } } } diff --git a/src/main/java/com/mudu/service/ASafeTfgService.java b/src/main/java/com/mudu/service/ASafeTfgService.java new file mode 100644 index 0000000..f01b64d --- /dev/null +++ b/src/main/java/com/mudu/service/ASafeTfgService.java @@ -0,0 +1,16 @@ +package com.mudu.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mudu.entity.ASafeTfg; + + +/** + * 停复工表(ASafeTfg)表服务接口 + * + * @author wu + * @since 2024-06-07 17:07:15 + */ +public interface ASafeTfgService extends IService { + +} + diff --git a/src/main/java/com/mudu/service/ASafeTfgshService.java b/src/main/java/com/mudu/service/ASafeTfgshService.java new file mode 100644 index 0000000..428c091 --- /dev/null +++ b/src/main/java/com/mudu/service/ASafeTfgshService.java @@ -0,0 +1,16 @@ +package com.mudu.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mudu.entity.ASafeTfgsh; + + +/** + * 停复工审核信息表(ASafeTfgsh)表服务接口 + * + * @author wu + * @since 2024-06-07 17:07:16 + */ +public interface ASafeTfgshService extends IService { + +} + diff --git a/src/main/java/com/mudu/service/impl/ASafeTfgServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeTfgServiceImpl.java new file mode 100644 index 0000000..a04bb20 --- /dev/null +++ b/src/main/java/com/mudu/service/impl/ASafeTfgServiceImpl.java @@ -0,0 +1,17 @@ +package com.mudu.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mudu.entity.ASafeTfg; +import com.mudu.mapper.ASafeTfgMapper; +import com.mudu.service.ASafeTfgService; +import org.springframework.stereotype.Service; + + +/** + * @author dong + * @since 2024/6/11 10:43 + */ +@Service("aSafeTfgService") +public class ASafeTfgServiceImpl extends ServiceImpl implements ASafeTfgService { + +} diff --git a/src/main/java/com/mudu/service/impl/ASafeTfgshServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeTfgshServiceImpl.java new file mode 100644 index 0000000..5fa708a --- /dev/null +++ b/src/main/java/com/mudu/service/impl/ASafeTfgshServiceImpl.java @@ -0,0 +1,20 @@ +package com.mudu.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.mudu.entity.ASafeTfgsh; +import com.mudu.mapper.ASafeTfgshMapper; +import com.mudu.service.ASafeTfgshService; +import org.springframework.stereotype.Service; + +/** + * 停复工审核信息表(ASafeTfgsh)表服务实现类 + * + * @author wu + * @since 2024-06-07 17:07:16 + */ +@Service("aSafeTfgshService") +public class ASafeTfgshServiceImpl extends ServiceImpl implements ASafeTfgshService { + +} + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f7fa14b..ff753e2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -78,11 +78,15 @@ imUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/get zcXxUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/zicha # 班前班后 -bqbhUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeBqbhpx/findAll - +#bqbhUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeBqbhpx/findAll +bqbhUrl: http://localhost:9028/mudu/aSafeBqbhpx/findAll # 特殊作业 -tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll +#tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll +tszyUrl: http://localhost:9028/mudu/aSafeQyzypgl/findAll +#停复工url +#tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg +tfgUrl: http://localhost:9028/mudu/aSafeTfg #自查周期url zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 021b9ce..23f9f06 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -55,4 +55,7 @@ tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh #巡查周期url -xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh \ No newline at end of file +xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh + +#停复工url +tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 19dc6c7..d895577 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -57,4 +57,10 @@ zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh #巡查周期url -xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh \ No newline at end of file +xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh + + +#停复工url +tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg + + diff --git a/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml b/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml index fdf98dd..1837500 100644 --- a/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml +++ b/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml @@ -10,7 +10,7 @@ FROM a_safe_qyjcxx asq - + and (REPLACE ( REPLACE ( asq.qymc, '（', '(' ), '）', ')' ) like concat('%',REPLACE ( REPLACE ( #{qymc}, '（', '(' ), '）', ')' ),'%'))