bug fix

src/main/java/com/mudu/entity/Enterprise.java

@@ -0,0 +1,355 @@
+package com.mudu.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+
+/**
+ * 企业基本信息表(Enterprise)表实体类
+ *
+ * @author wu
+ * @since 2024-02-22 16:14:24
+ */
+@Data
+@ApiModel("企业基本信息表实体类")
+@TableName(value = "enterprise")
+public class Enterprise implements Serializable {
+
+    private static final long serialVersionUID = 801806350790350898L;
+    @TableField(value = "ID")
+    private String id;
+
+    /**
+     * 所属园区ID
+     */
+    @ApiModelProperty(value = "所属园区ID")
+    private String parkid;
+
+    /**
+     * 所属园区
+     */
+    @ApiModelProperty(value = "所属园区")
+    private String parkname;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    private String name;
+
+    /**
+     * 企业类型ID
+     */
+    @ApiModelProperty(value = "企业类型ID")
+    private String typeid;
+
+    /**
+     * 企业类型
+     */
+    @ApiModelProperty(value = "企业类型")
+    private String typename;
+
+    /**
+     * 机构代码证
+     */
+    @ApiModelProperty(value = "机构代码证")
+    private String certificatecode;
+
+    /**
+     * 所属行业ID
+     */
+    @ApiModelProperty(value = "所属行业ID")
+    private String industryid;
+
+    /**
+     * 所属行业
+     */
+    @ApiModelProperty(value = "所属行业")
+    private String industryname;
+
+    /**
+     * 归宿地ID
+     */
+    @ApiModelProperty(value = "归宿地ID")
+    private String locationid;
+
+    /**
+     * 归属地
+     */
+    @ApiModelProperty(value = "归属地")
+    private String locationname;
+
+    /**
+     * 法人
+     */
+    @ApiModelProperty(value = "法人")
+    private String legalperson;
+
+    /**
+     * 法人电话
+     */
+    @ApiModelProperty(value = "法人电话")
+    private String legalpersonphone;
+
+    /**
+     * 注册地
+     */
+    @ApiModelProperty(value = "注册地")
+    private String registeraddress;
+
+    /**
+     * 经营地
+     */
+    @ApiModelProperty(value = "经营地")
+    private String businessaddress;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    /**
+     * 租用面积
+     */
+    @ApiModelProperty(value = "租用面积")
+    private Double rentspace;
+
+    /**
+     * 具体楼层位置
+     */
+    @ApiModelProperty(value = "具体楼层位置")
+    private String floor;
+
+    /**
+     * 人数
+     */
+    @ApiModelProperty(value = "人数")
+    private Integer person;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 企业图片关联ID
+     */
+    @ApiModelProperty(value = "企业图片关联ID")
+    private String imagerelationid;
+
+    /**
+     * 企业产证关联ID
+     */
+    @ApiModelProperty(value = "企业产证关联ID")
+    private String imagecertificateid;
+
+    /**
+     * 环评文件照片关联ID
+     */
+    @ApiModelProperty(value = "环评文件照片关联ID")
+    private String imageenvironmentalprotectionid;
+
+    /**
+     * 营业执照关联ID
+     */
+    @ApiModelProperty(value = "营业执照关联ID")
+    private String imagebusinesslicenseid;
+
+    /**
+     * 土地证关联ID
+     */
+    @ApiModelProperty(value = "土地证关联ID")
+    private String imagelandcertificateid;
+
+    /**
+     * 消防验收证明关联ID
+     */
+    @ApiModelProperty(value = "消防验收证明关联ID")
+    private String imagefiresafetyid;
+
+    /**
+     * 安全证书关联ID
+     */
+    @ApiModelProperty(value = "安全证书关联ID")
+    private String imagesafetyid;
+
+    /**
+     * 经营产品ID
+     */
+    @ApiModelProperty(value = "经营产品ID")
+    private String businessscopeid;
+
+    /**
+     * 经营产品
+     */
+    @ApiModelProperty(value = "经营产品")
+    private String businessscope;
+
+    /**
+     * 风险等级ID
+     */
+    @ApiModelProperty(value = "风险等级ID")
+    private String risklevelid;
+
+    /**
+     * 风险等级
+     */
+    @ApiModelProperty(value = "风险等级")
+    private String risklevel;
+
+    /**
+     * 风险源等级ID
+     */
+    @ApiModelProperty(value = "风险源等级ID")
+    private String risksourcelevelid;
+
+    /**
+     * 风险源等级
+     */
+    @ApiModelProperty(value = "风险源等级")
+    private String risksourcelevel;
+
+    /**
+     * 风险源类型ID
+     */
+    @ApiModelProperty(value = "风险源类型ID")
+    private String risksourcetypeid;
+
+    /**
+     * 风险源类型
+     */
+    @ApiModelProperty(value = "风险源类型")
+    private String risksourcetype;
+
+    /**
+     * 入驻日期
+     */
+    @ApiModelProperty(value = "入驻日期")
+    private Date indatetime;
+
+    /**
+     * 合同结束日期
+     */
+    @ApiModelProperty(value = "合同结束日期")
+    private Date enddatetime;
+
+    /**
+     * 搬离日期
+     */
+    @ApiModelProperty(value = "搬离日期")
+    private Date leavedatetime;
+
+    /**
+     * 是否重点监管
+     */
+    @ApiModelProperty(value = "是否重点监管")
+    private Integer iskeysupervision;
+
+    /**
+     * 安全等级管理ID
+     */
+    @ApiModelProperty(value = "安全等级管理ID")
+    private String safelevelid;
+
+    /**
+     * 安全登记管理
+     */
+    @ApiModelProperty(value = "安全登记管理")
+    private String safelevelname;
+
+    /**
+     * 标准化等级ID
+     */
+    @ApiModelProperty(value = "标准化等级ID")
+    private String standardlevelid;
+
+    /**
+     * 标准化等级
+     */
+    @ApiModelProperty(value = "标准化等级")
+    private String standardlevel;
+
+    /**
+     * 网格员ID
+     */
+    @ApiModelProperty(value = "网格员ID")
+    private String networkuserid;
+
+    /**
+     * 网格员名称
+     */
+    @ApiModelProperty(value = "网格员名称")
+    private String networkusername;
+
+    /**
+     * 分管领导ID
+     */
+    @ApiModelProperty(value = "分管领导ID")
+    private String masteruserid;
+
+    /**
+     * 分管领导
+     */
+    @ApiModelProperty(value = "分管领导")
+    private String masterusername;
+
+    /**
+     * 空间数据
+     */
+    @ApiModelProperty(value = "空间数据")
+    private String mapshape;
+
+    private String adduserid;
+
+    private String addusername;
+
+    private Date adddatetime;
+
+    private String edituserid;
+
+    private String editusername;
+
+    private Date editdatetime;
+
+    private Integer isdel;
+
+    /**
+     * 是否规上企业(0/1)
+     */
+    @ApiModelProperty(value = "是否规上企业(0/1)")
+    private Integer standardsized;
+
+    /**
+     * 是否上亿企业(0/1)
+     */
+    @ApiModelProperty(value = "是否上亿企业(0/1)")
+    private Integer onehundredmillion;
+
+    /**
+     * 标记(默认0未标记,1已标记)
+     */
+    @ApiModelProperty(value = "标记(默认0未标记,1已标记)")
+    private Integer lab;
+
+}
+

src/main/java/com/mudu/entity/dto/request/ASafeBqbhpxRequest.java

@@ -113,6 +113,10 @@ public class ASafeBqbhpxRequest implements Serializable {
      */
     @ApiModelProperty(value = "企业信息编号")
     private String qyxxbh;
-
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String entCode;
 }
 

src/main/java/com/mudu/entity/dto/request/ASafeQyzypglRequest.java

@@ -139,5 +139,13 @@ public class ASafeQyzypglRequest implements Serializable {
      */
     @ApiModelProperty(value = "企业信息编号")
     private String qyxxbh;
+
+
+
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String entCode;
 }
 

src/main/java/com/mudu/mapper/EnterpriseMapper.java

@@ -0,0 +1,24 @@
+package com.mudu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.mudu.entity.Enterprise;
+import com.mudu.entity.dto.response.EnterpriseResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 企业基本信息表(Enterprise)表数据库访问层
+ *
+ * @author wu
+ * @since 2024-02-22 16:14:23
+ */
+public interface EnterpriseMapper extends BaseMapper<Enterprise> {
+
+
+    EnterpriseResponse findByQybh(@Param("qybh") String qybh);
+
+
+}
+

src/main/java/com/mudu/quartz/AcheckTaskQuartz.java

@@ -40,11 +40,16 @@ import com.mudu.service.ASafeZcrwjlService;
 import com.mudu.service.ASafeZcrwwzService;
 import com.mudu.service.SzsASafeZcyhxxService;
 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
@@ -57,12 +62,12 @@ import java.util.UUID;
  * @author dong
  * @since 2024/3/12 16:37
  */
-//@RestController
+@RestController
-//@RequestMapping("pharmaceuticals/aCheck")
+@RequestMapping("pharmaceuticals/aCheck")
-//@Api(tags = "新增")
+@Api(tags = "新增")
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
-@Configuration
+//@Configuration
-@EnableScheduling
+//@EnableScheduling
 public class AcheckTaskQuartz {
 
     /**
@@ -163,10 +168,10 @@ public class AcheckTaskQuartz {
      *
      * @Param qymc 企业名称
      */
-    @Scheduled(cron = "0 0 4 * * ? ")
+//    @Scheduled(cron = "0 0 4 * * ? ")
 //    @Scheduled(cron = "0 0/5 * * * ?")
-//    @PostMapping("/insert")
+    @PostMapping("/insert")
-//    @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据")
+    @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据")
     public void selectAll() throws ParseException {
 
         // 获取token
@@ -661,11 +666,11 @@ 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")
+    @PostMapping("/zicha")
-//    @ApiOperation(value = "自查")
+    @ApiOperation(value = "自查")
     public void zicha() throws ParseException {
 
         //自己查任务周期id
@@ -1059,10 +1064,10 @@ public class AcheckTaskQuartz {
     /**
      * 停复工表
      */
-    @Scheduled(cron = "0 0 4 * * ? ")
+//    @Scheduled(cron = "0 0 4 * * ? ")
 //    @Scheduled(cron = "0 0/5 * * * ?")
-//    @PostMapping("/tfg")
+    @PostMapping("/tfg")
-//    @ApiOperation(value = "停复工表")
+    @ApiOperation(value = "停复工表")
     public void tfg() {
         //当前时间
         Date currentDate = new Date();

src/main/java/com/mudu/quartz/BqbhTszyQuartz.java

@@ -12,16 +12,23 @@ 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;
@@ -50,6 +57,8 @@ public class BqbhTszyQuartz {
     @Resource
     private ASafeQyjcxxService aSafeQyjcxxService;
 
+    @Resource
+    private EnterpriseService enterpriseService;
 
     @Value("${bqbhUrl}")
     private String bqbhUrl;
@@ -87,10 +96,6 @@ public class BqbhTszyQuartz {
         for (ASafeBqbhpxRequest x : list) {
             ASafeBqbhpx aSafeBqbhpx = BeanUtil.copyProperties(x, ASafeBqbhpx.class);
             XcTpResponse xcTpResponse = new XcTpResponse();
-            ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(null, x.getQyxxbh());
-            if (aSafeQyjcxx==null){
-                continue;
-            }
             if (StrUtil.isNotEmpty(aSafeBqbhpx.getPxxctp())) {
                 xcTpResponse.setFJDZ(api + aSafeBqbhpx.getPxxctp());
                 xcTpResponse.setFJHZ(aSafeBqbhpx.getPxxctp().substring(aSafeBqbhpx.getPxxctp().lastIndexOf(".") + 1));
@@ -100,6 +105,17 @@ public class BqbhTszyQuartz {
                 JSONArray jsonArray = new JSONArray(xcTpResponse);
                 aSafeBqbhpx.setPxxctp(String.valueOf(jsonArray));
             }
+//            EnterpriseResponse a = enterpriseService.findByQybh(aSafeBqbhpx.getQybh());
+//            if (a!=null){
+//                ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getCertificateCode());
+//                if (aSafeQyjcxx==null){
+//                    continue;
+//                }
+//                aSafeBqbhpx.setQybh(aSafeQyjcxx.getXxbh());
+//                aSafeBqbhpxes.add(aSafeBqbhpx);
+//            }
+
+            ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(null, x.getEntCode());
             aSafeBqbhpx.setQybh(aSafeQyjcxx.getXxbh());
             aSafeBqbhpxes.add(aSafeBqbhpx);
         }
@@ -128,14 +144,18 @@ public class BqbhTszyQuartz {
         List<ASafeQyzypgl> aSafeQyzypgls = new ArrayList<>();
         List<ASafeQyzypglRequest> list = JSON.parseArray(dataList, ASafeQyzypglRequest.class);
         for (ASafeQyzypglRequest x : list) {
-
+          //  EnterpriseResponse a = enterpriseService.findByQybh(x.getQybh());
-            ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(null, x.getQyxxbh());
+//            if (a!=null){
-            if (aSafeQyjcxx==null){
+//                ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getCertificateCode());
-                continue;
+//                if (aSafeQyjcxx==null){
-            }
+//                    continue;
+//                }
+//
+//            }
+            ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(x.getQymc(), x.getEntCode());
             ASafeQyzypgl aSafeQyzypgl = BeanUtil.copyProperties(x, ASafeQyzypgl.class);
-            aSafeQyzypgl.setQybh(aSafeQyjcxx.getXxbh());
+                aSafeQyzypgl.setQybh(aSafeQyjcxx.getXxbh());
-            aSafeQyzypgls.add(aSafeQyzypgl);
+                aSafeQyzypgls.add(aSafeQyzypgl);
         }
         if (CollectionUtil.isNotEmpty(aSafeQyzypgls)) {
             safeQyzypglService.saveBatch(aSafeQyzypgls);

src/main/java/com/mudu/service/EnterpriseService.java

@@ -0,0 +1,33 @@
+package com.mudu.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mudu.entity.Enterprise;
+import com.mudu.entity.dto.response.EnterpriseResponse;
+
+import java.util.List;
+
+/**
+ * 企业基本信息表(Enterprise)表服务接口
+ *
+ * @author wu
+ * @since 2024-02-22 16:14:24
+ */
+public interface EnterpriseService extends IService<Enterprise> {
+
+
+
+
+
+    /**
+     * 根据企业编号查询企业信息编号
+     *
+     * @return 企业信息
+     */
+    EnterpriseResponse findByQybh(String qybh);
+
+
+
+}
+

src/main/java/com/mudu/service/impl/EnterpriseServiceImpl.java

@@ -0,0 +1,32 @@
+package com.mudu.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.mudu.entity.Enterprise;
+import com.mudu.entity.dto.response.EnterpriseResponse;
+import com.mudu.mapper.EnterpriseMapper;
+import com.mudu.service.EnterpriseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 企业基本信息表(Enterprise)表服务实现类
+ *
+ * @author wu
+ * @since 2024-02-22 16:14:24
+ */
+@Service("enterpriseService")
+
+public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
+
+
+    @Override
+    public EnterpriseResponse findByQybh(String qybh) {
+        return baseMapper.findByQybh(qybh);
+    }
+
+
+}
+

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   profiles:
     active: prod
 #获取token
-getToken: http://221.229.220.83:9028/loginnocaptcha
+getToken: https://www.jichuanglanhai.com:88/loginnocaptcha
 
 
 # 日志配置

src/main/resources/mapper/mudu/EnterpriseMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mudu.mapper.EnterpriseMapper">
+
+
+    <select id="findByQybh" resultType="com.mudu.entity.dto.response.EnterpriseResponse"
+            parameterType="java.lang.String">
+        select * from enterprise
+        <where>
+            <if test="qybh !=null and qybh!=''">
+                id =#{qybh}
+            </if>
+        </where>
+    </select>
+</mapper>