From 014ea0ba3b48ef9b6a47cf68daa4fd449066d78a Mon Sep 17 00:00:00 2001 From: wu Date: Sat, 24 Aug 2024 18:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mudu/entity/ASafeQyjcxx.java | 15 ++- src/main/java/com/mudu/entity/ASafeWgcy.java | 111 ++++++++++++++++++ .../com/mudu/mapper/ASafeQyjcxxMapper.java | 9 ++ .../java/com/mudu/mapper/ASafeWgcyMapper.java | 15 +++ .../java/com/mudu/quartz/BqbhTszyQuartz.java | 12 +- src/main/java/com/mudu/quartz/EntQuartz.java | 97 +++++++++++++++ .../com/mudu/service/ASafeQyjcxxService.java | 9 ++ .../com/mudu/service/ASafeWgcyService.java | 15 +++ .../service/impl/ASafeQyjcxxServiceImpl.java | 11 +- .../service/impl/ASafeWgcyServiceImpl.java | 19 +++ src/main/resources/application-prod.yml | 8 +- src/main/resources/application-test.yml | 6 + .../mapper/mudu/ASafeQyjcxxMapper.xml | 8 ++ 13 files changed, 318 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/mudu/entity/ASafeWgcy.java create mode 100644 src/main/java/com/mudu/mapper/ASafeWgcyMapper.java create mode 100644 src/main/java/com/mudu/quartz/EntQuartz.java create mode 100644 src/main/java/com/mudu/service/ASafeWgcyService.java create mode 100644 src/main/java/com/mudu/service/impl/ASafeWgcyServiceImpl.java diff --git a/src/main/java/com/mudu/entity/ASafeQyjcxx.java b/src/main/java/com/mudu/entity/ASafeQyjcxx.java index 442ca32..b0cef8f 100644 --- a/src/main/java/com/mudu/entity/ASafeQyjcxx.java +++ b/src/main/java/com/mudu/entity/ASafeQyjcxx.java @@ -1,11 +1,11 @@ package com.mudu.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.mudu.entity.dto.response.EnterpriseResponse; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; import java.io.Serializable; import java.text.NumberFormat; @@ -18,8 +18,7 @@ import java.util.Date; * @author wu * @since 2024-02-26 10:43:24 */ -@Getter -@Setter +@Data @ApiModel("实体类") @TableName(value = "a_safe_qyjcxx") public class ASafeQyjcxx implements Serializable { @@ -562,8 +561,12 @@ public class ASafeQyjcxx implements Serializable { @ApiModelProperty(value = "科达企业编号，用来对照") private String kdqybh; - public ASafeQyjcxx() { - } + /** + * 企业网格关联 + */ + @TableField(exist = false) + private ASafeWgcy aSafeWgcy; + public ASafeQyjcxx(EnterpriseResponse res) { diff --git a/src/main/java/com/mudu/entity/ASafeWgcy.java b/src/main/java/com/mudu/entity/ASafeWgcy.java new file mode 100644 index 0000000..0bfbd38 --- /dev/null +++ b/src/main/java/com/mudu/entity/ASafeWgcy.java @@ -0,0 +1,111 @@ +package com.mudu.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * (ASafeWgcy)表实体类 + * + * @author wu + * @since 2024-08-24 18:14:06 + */ +@Data +@ApiModel("实体类") +@TableName(value = "a_safe_wgcy") +public class ASafeWgcy implements Serializable { + + private static final long serialVersionUID = -54375539799721806L; + private String xxbh; + + /** + * 人员编号 + */ + @ApiModelProperty(value = "人员编号") + private String rybh; + + /** + * 人员姓名 + */ + @ApiModelProperty(value = "人员姓名") + private String ryxm; + + /** + * 固定电话 + */ + @ApiModelProperty(value = "固定电话") + private String gddh; + + /** + * 人员职务 + */ + @ApiModelProperty(value = "人员职务") + private String ryzw; + + /** + * 电子邮箱 + */ + @ApiModelProperty(value = "电子邮箱") + private String dzyx; + + /** + * 移动电话 + */ + @ApiModelProperty(value = "移动电话") + private String yddh; + + /** + * 父级编号 + */ + @ApiModelProperty(value = "父级编号") + private String pid; + + /** + * 1,网格成员，2企业专职安全员 + */ + @ApiModelProperty(value = "1,网格成员，2企业专职安全员") + private Integer rylx; + + /** + * 记录状态 + */ + @ApiModelProperty(value = "记录状态") + private Integer jlzt; + + /** + * 显示顺序 + */ + @ApiModelProperty(value = "显示顺序") + private Integer xssx; + + /** + * 入库人员 + */ + @ApiModelProperty(value = "入库人员") + private String rkry; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String gxry; + + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + private Date rksj; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Date gxsj; + +} + diff --git a/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java b/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java index 8ec5d04..46f9f7e 100644 --- a/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java +++ b/src/main/java/com/mudu/mapper/ASafeQyjcxxMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mudu.entity.ASafeQyjcxx; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * (ASafeQyjcxx)表数据库访问层 * @@ -20,5 +22,12 @@ public interface ASafeQyjcxxMapper extends BaseMapper { * @return 数据 */ ASafeQyjcxx findOneByqymcOrXybm(@Param("qymc") String qymc, @Param("xybm") String xybm); + + /** + * 根据企业信用代码删除企业 + * + * @param list 企业信用代码 + */ + void updateByTyshxybm(List list); } diff --git a/src/main/java/com/mudu/mapper/ASafeWgcyMapper.java b/src/main/java/com/mudu/mapper/ASafeWgcyMapper.java new file mode 100644 index 0000000..2d9dcb7 --- /dev/null +++ b/src/main/java/com/mudu/mapper/ASafeWgcyMapper.java @@ -0,0 +1,15 @@ +package com.mudu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mudu.entity.ASafeWgcy; + +/** + * (ASafeWgcy)表数据库访问层 + * + * @author wu + * @since 2024-08-24 18:14:06 + */ +public interface ASafeWgcyMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java b/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java index c50d8bd..3377e57 100644 --- a/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java +++ b/src/main/java/com/mudu/quartz/BqbhTszyQuartz.java @@ -12,23 +12,17 @@ import com.mudu.entity.ASafeQyjcxx; import com.mudu.entity.ASafeQyzypgl; import com.mudu.entity.dto.request.ASafeBqbhpxRequest; import com.mudu.entity.dto.request.ASafeQyzypglRequest; -import com.mudu.entity.dto.response.EnterpriseResponse; import com.mudu.entity.dto.response.XcTpResponse; import com.mudu.service.ASafeBqbhpxService; import com.mudu.service.ASafeQyjcxxService; import com.mudu.service.ASafeQyzypglService; import com.mudu.service.EnterpriseService; import com.mudu.service.impl.LoginService; -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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.ArrayList; @@ -151,7 +145,7 @@ public class BqbhTszyQuartz { List aSafeQyzypgls = new ArrayList<>(); List list = JSON.parseArray(dataList, ASafeQyzypglRequest.class); for (ASafeQyzypglRequest x : list) { - // EnterpriseResponse a = enterpriseService.findByQybh(x.getQybh()); + // EnterpriseResponse a = enterpriseService.findByQybh(x.getQybh()); // if (a!=null){ // ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getCertificateCode()); // if (aSafeQyjcxx==null){ @@ -161,8 +155,8 @@ public class BqbhTszyQuartz { // } ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(x.getQymc(), x.getEntCode()); ASafeQyzypgl aSafeQyzypgl = BeanUtil.copyProperties(x, ASafeQyzypgl.class); - aSafeQyzypgl.setQybh(aSafeQyjcxx.getXxbh()); - aSafeQyzypgls.add(aSafeQyzypgl); + aSafeQyzypgl.setQybh(aSafeQyjcxx.getXxbh()); + aSafeQyzypgls.add(aSafeQyzypgl); } if (CollectionUtil.isNotEmpty(aSafeQyzypgls)) { safeQyzypglService.saveBatch(aSafeQyzypgls); diff --git a/src/main/java/com/mudu/quartz/EntQuartz.java b/src/main/java/com/mudu/quartz/EntQuartz.java new file mode 100644 index 0000000..9967060 --- /dev/null +++ b/src/main/java/com/mudu/quartz/EntQuartz.java @@ -0,0 +1,97 @@ +package com.mudu.quartz; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.mudu.entity.ASafeQyjcxx; +import com.mudu.entity.ASafeWgcy; +import com.mudu.service.ASafeQyjcxxService; +import com.mudu.service.ASafeWgcyService; +import com.mudu.service.impl.LoginService; +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 javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 获取木渎新增企业定时任务 + * + * @author wu + * @since 2024/8/24 18:11 + */ +@Transactional(rollbackFor = Exception.class) +@Configuration +@EnableScheduling +public class EntQuartz { + + @Resource + private ASafeQyjcxxService qyjcxxService; + + @Resource + private ASafeWgcyService wgcyService; + + @Resource + private LoginService loginService; + + @Value("${addEntUrl}") + private String addEntUrl; + + @Value("${findEntDelUrl}") + private String findEntDelUrl; + + + private String getToken() { + return "Bearer " + loginService.getToken(); + } + + /** + * 新增昨天木渎新增的企业 + */ + @Scheduled(cron = "0 30 12 * * ? ") + public void addqyjcxxAndWgcy() { + // 获取token + String token = getToken(); + // 获取所有信息 + String res = HttpRequest.get(addEntUrl) + .contentType("application/x-www-form-urlencoded;charset=UTF-8") + .header("Authorization", token) + .execute().body(); + JSONObject resObj = JSON.parseObject(res); + String dataList = resObj.getString("data"); + if (StrUtil.isEmpty(dataList)) { + return; + } + List qyjcxxList = JSON.parseArray(dataList, ASafeQyjcxx.class); + qyjcxxService.saveBatch(qyjcxxList); + List wgcyList = qyjcxxList.stream().map(ASafeQyjcxx::getASafeWgcy).collect(Collectors.toList()); + wgcyService.saveBatch(wgcyList); + } + + + /** + * 删除昨天木渎删除的企业 + */ + @Scheduled(cron = "0 30 12 * * ? ") + public void findEntDel() { + // 获取token + String token = getToken(); + // 获取所有信息 + String res = HttpRequest.get(findEntDelUrl) + .contentType("application/x-www-form-urlencoded;charset=UTF-8") + .header("Authorization", token) + .execute().body(); + JSONObject resObj = JSON.parseObject(res); + String dataList = resObj.getString("data"); + if (StrUtil.isEmpty(dataList)) { + return; + } + List tyshxybmList = JSON.parseArray(dataList, String.class); + qyjcxxService.updateByTyshxybm(tyshxybmList); + } +} diff --git a/src/main/java/com/mudu/service/ASafeQyjcxxService.java b/src/main/java/com/mudu/service/ASafeQyjcxxService.java index 3480f86..0afedca 100644 --- a/src/main/java/com/mudu/service/ASafeQyjcxxService.java +++ b/src/main/java/com/mudu/service/ASafeQyjcxxService.java @@ -3,6 +3,8 @@ package com.mudu.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mudu.entity.ASafeQyjcxx; +import java.util.List; + /** * (ASafeQyjcxx)表服务接口 * @@ -24,5 +26,12 @@ public interface ASafeQyjcxxService extends IService { * @return 数据 */ ASafeQyjcxx findOneByqymcOrXybm(String qymc, String xybm); + + /** + * 根据企业信用代码删除企业 + * + * @param tyshxybmList 企业信用代码 + */ + void updateByTyshxybm(List tyshxybmList); } diff --git a/src/main/java/com/mudu/service/ASafeWgcyService.java b/src/main/java/com/mudu/service/ASafeWgcyService.java new file mode 100644 index 0000000..8ef7a86 --- /dev/null +++ b/src/main/java/com/mudu/service/ASafeWgcyService.java @@ -0,0 +1,15 @@ +package com.mudu.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mudu.entity.ASafeWgcy; + +/** + * (ASafeWgcy)表服务接口 + * + * @author wu + * @since 2024-08-24 18:14:06 + */ +public interface ASafeWgcyService extends IService { + +} + diff --git a/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java index aabe2f7..fc575cc 100644 --- a/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java +++ b/src/main/java/com/mudu/service/impl/ASafeQyjcxxServiceImpl.java @@ -15,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * (ASafeQyjcxx)表服务实现类 @@ -86,5 +85,15 @@ public class ASafeQyjcxxServiceImpl extends ServiceImpl tyshxybmList) { + baseMapper.updateByTyshxybm(tyshxybmList); + } } diff --git a/src/main/java/com/mudu/service/impl/ASafeWgcyServiceImpl.java b/src/main/java/com/mudu/service/impl/ASafeWgcyServiceImpl.java new file mode 100644 index 0000000..dc12cab --- /dev/null +++ b/src/main/java/com/mudu/service/impl/ASafeWgcyServiceImpl.java @@ -0,0 +1,19 @@ +package com.mudu.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mudu.entity.ASafeWgcy; +import com.mudu.mapper.ASafeWgcyMapper; +import com.mudu.service.ASafeWgcyService; +import org.springframework.stereotype.Service; + +/** + * (ASafeWgcy)表服务实现类 + * + * @author wu + * @since 2024-08-24 18:14:07 + */ +@Service("aSafeWgcyService") +public class ASafeWgcyServiceImpl extends ServiceImpl implements ASafeWgcyService { + +} + diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index a968185..707c8ff 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -58,4 +58,10 @@ zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh 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 +tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg + +# 获取新增企业信息 +addEntUrl: https://www.jichuanglanhai.com:88/csapi/mudu/enterprise/findAddEnt + +# 获取删除企业信息 +findEntDelUrl: https://www.jichuanglanhai.com:88/csapi/mudu/enterprise/findEntDel \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d895577..8ba4d3b 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -63,4 +63,10 @@ xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh #停复工url tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg +# 获取新增企业信息 +addEntUrl: https://www.jichuanglanhai.com:88/csapi/mudu/enterprise/findAddEnt + +# 获取删除企业信息 +findEntDelUrl: https://www.jichuanglanhai.com:88/csapi/mudu/enterprise/findEntDel + diff --git a/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml b/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml index 1837500..940f0fd 100644 --- a/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml +++ b/src/main/resources/mapper/mudu/ASafeQyjcxxMapper.xml @@ -3,6 +3,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update a_safe_qyjcxx set jlzt = 0 where + tyshxybm in + + #{item} + +