Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/CheckReport.java

+package com.yeejoin.amos.boot.module.tdc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author DELL
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tdc_report")
+@ApiModel(value="CheckReport对象", description="校验报告表")
+public class CheckReport {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "报告名称")
+    private String name;
+
+    @ApiModelProperty(value = "机构code")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构名称")
+    private String amosOrgName;
+
+    @ApiModelProperty(value = "报告地址")
+    private String reportUrl;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "校验人名称")
+    private String checkPeopleName;
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckReportMapper.java

+package com.yeejoin.amos.boot.module.tdc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
+import org.mapstruct.Mapper;
+
+/**
+ * @author DELL
+ */
+@Mapper
+public interface CheckReportMapper extends BaseMapper<CheckReport> {
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckReportService.java

+package com.yeejoin.amos.boot.module.tdc.api.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DELL
+ */
+@Service
+public interface CheckReportService  extends IService<CheckReport> {
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckReportMapper.xml

+<?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.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper">
+
+</mapper>

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckReportController.java

+package com.yeejoin.amos.boot.module.tdc.biz.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 校验报告
+ * @author DELL
+ */
+@RestController
+@Api(tags = "校验报告api")
+@RequestMapping(value = "/report")
+public class CheckReportController {
+
+}

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckReportImpl.java

+package com.yeejoin.amos.boot.module.tdc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
+import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
+import com.yeejoin.amos.boot.module.tdc.api.service.CheckModelService;
+import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DELL
+ */
+@Service
+public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport> implements CheckReportService {
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java

@@ -2,6 +2,10 @@ package com.yeejoin.amos.boot.module.tzs.biz.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.injector.methods.Update;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
@@ -9,6 +13,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoSer
 import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
@@ -24,6 +29,7 @@ import org.typroject.tyboot.component.emq.EmqxListener;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,6 +52,9 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
         System.out.println(message);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
         JSONObject object = null;
         try {
             object = JSONObject.parseObject(message.toString());
@@ -62,14 +71,18 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         getCompanyInfoMap(companyModels,companyMap);
 
         //判断库中company是否重复
-        CompanyModel companyPrivilegeModel = Privilege.companyClient.seleteOne(Long.valueOf(object.getString("sequence_nbr"))).getResult();
-
+        CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyName(object.getString("unit_name")).getResult();
 
-        TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getById(object.getLong("sequence_nbr"));
+        QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
+        queryWrapper.eq("use_unit",object.getString("unit_name"));
+        TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
 
         CompanyModel companyModel = new CompanyModel();
         TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
 
+        Date syncDate = sdf.parse(object.getString("sync_date"));
+        Date recDate = sdf.parse(object.getString("issue_date"));
+
         tzBaseEnterpriseInfo.setSequenceNbr(object.getLong("sequence_nbr"));
         tzBaseEnterpriseInfo.setAddress(object.getString("reg_address"));
         tzBaseEnterpriseInfo.setUnitType(object.getString("cert_type"));
@@ -78,8 +91,21 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         tzBaseEnterpriseInfo.setProvince(object.getString("province"));
         tzBaseEnterpriseInfo.setCity(object.getString("city"));
         tzBaseEnterpriseInfo.setDistrict(object.getString("district"));
-        tzBaseEnterpriseInfo.setSyncDate(object.getDate("sync_date"));
+        tzBaseEnterpriseInfo.setSyncDate(syncDate);
         tzBaseEnterpriseInfo.setSyncState(object.getInteger("sync_state"));
+        tzBaseEnterpriseInfo.setRecDate(recDate);
+
+        companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+        companyModel.setCompanyName(object.getString("unit_name"));
+        companyModel.setCompanyCode(object.getString("unit_code"));
+        companyModel.setLevel("company");
+        companyModel.setAgencyCode("tzs");
+        companyModel.setCompanyType(object.getString("cert_type"));
+        companyModel.setAddress(object.getString("reg_address"));
+
+        //业务表更新条件构造器
+        UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("Use_unit",object.getString("unit_name"));
 
         try {
             if(ValidationUtil.isEmpty(object.getString("reg_code")) || ValidationUtil.isEmpty(companyMap.get(object.getString("reg_code")))){
@@ -94,36 +120,32 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             System.out.println("名称为"+object.getString("unit_name")+"的许可企业同步企业信息时出错："+e.getMessage());
         }
-        
-        if(tzBaseEnterprisePrivilegeInfo == null){
-            //当企业表中没有时
-            tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
-        }else{
-            //当企业表中有时
-            tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
-        }
 
-
-        companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
-        companyModel.setCompanyName(object.getString("unit_name"));
-        companyModel.setCompanyCode(object.getString("unit_code"));
-        companyModel.setLevel("company");
-        companyModel.setAgencyCode("tzs");
-        companyModel.setCompanyType(object.getString("cert_type"));
-        companyModel.setAddress(object.getString("reg_address"));
-
-
-
-        if (companyPrivilegeModel == null ) {
-            try {
-                //平台表新增
+        try {
+            if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
+                //当企业表、平台表 中没有时
+                tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
+                Privilege.companyClient.create(companyModel);
+            } else if(tzBaseEnterprisePrivilegeInfo == null){
+                //企业表没有，平台表有
+                tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
+                Privilege.companyClient.update(companyModel, tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
+            } else if(companyPrivilegeModel == null){
+                //平台表没有，企业表有
                 Privilege.companyClient.create(companyModel);
-            }catch (Exception e) {
-                System.out.println("名称为"+object.getString("unit_name")+"的公司已存在！"+e.getMessage());
+                tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
+            }
+            else {
+                //当企业表、平台表 中有时
+                if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
+                    tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
+                    Privilege.companyClient.update(companyModel, tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
+                } else {
+                    System.out.println("该数据不是最新的数据 不用更新");
+                }
             }
-        }else{
-            //更新
-            Privilege.companyClient.update(companyModel,object.getLong("sequence_nbr"));
+        } catch(Exception e) {
+            System.out.println("名称为"+object.getString("unit_name")+"的公司:"+e.getMessage());
         }
     }
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

@@ -43,8 +43,8 @@ spring.redis.expire.time=300
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.90:1883
-emqx.user-name=super
-emqx.password=123456
+emqx.user-name=admin
+emqx.password=public
 
 tzs.cti.url=http://172.16.10.90:8000