市认证同步代码修改

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java

@@ -12,8 +12,10 @@ import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.DictDataApi;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.code.domain.EnterpriseComplaint;
+import com.zdxt.code.domain.EnterpriseInformation;
 import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.LinkageDict;
+import com.zdxt.code.mapper.EnterpriseInformationMapper;
 import com.zdxt.code.service.IEnterpriseComplaintService;
 import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 import com.zdxt.code.service.ILinkageDictService;
@@ -48,6 +50,8 @@ public class AppEnterpriseLawEnforcementController extends BaseController
 
     @Autowired
     private IEnterpriseLawEnforcementService enterpriseLawEnforcementService;
+    @Autowired
+    EnterpriseInformationMapper enterpriseInformationMapper;
     @Autowired private ILinkageDictService iLinkageDictService;
     @Autowired private IEnterpriseComplaintService enterpriseComplaintService;
     @Autowired private UserApi userApi;
@@ -236,6 +240,14 @@ public class AppEnterpriseLawEnforcementController extends BaseController
             this.sendSms(enterpriseLawEnforcement);
         }
 
+        if (resNum > 0) {
+            // 更新企业的手机号码
+            EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
+            enterpriseInformation.setEnterpriseNumber(enterpriseLawEnforcement.getEnterpriseNumber());
+            enterpriseInformation.setEnterpriseTel(enterpriseLawEnforcement.getLinkTel());
+            enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation);
+        }
+
 
         // 处理 联合执法 关联部门的json, 用于前端页面不同的展示效果
         UserBean ub = new UserBean();

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java

@@ -67,6 +67,7 @@ public class SynUserInfoTask {
 
     /** 同步用户数据 */
     public void userInfo(){
+        log.info("====================> 市认证原始表 -> 业务表 同步开始");
         int insertNum = 0;
         int updateNum = 0;
         int rowNom_srz = 0;
@@ -79,6 +80,7 @@ public class SynUserInfoTask {
 
                 // 开始同步更新数据到用户表
                 for(SrzUser srzUser : srzUserList){
+                    log.info("====> 获取数据: {}", srzUser.getUsername());
                     User user = new User();
                     BeanUtils.copyProperties(srzUser,user);
                     user.setSex(srzUser.getGenderCode());
@@ -147,10 +149,12 @@ public class SynUserInfoTask {
                                 user.setLawCertificateNum(uniqueUser.getLawCertificateNum());
                             }
 
+                            log.info("====> 更新数据: {}", srzUser.getUsername());
                             int rowNum = userService.updateUser(user);
                             updateNum += rowNum;
                         } else {
                             // 插入数据库
+                            log.info("====> 新增数据: {}", srzUser.getUsername());
                             int rowNum = userService.insertUser(user);
                             insertNum += rowNum;
                         }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -373,7 +373,7 @@
     <select id="selectUserByLoginName" parameterType="String" resultMap="UserResult">
         <include refid="selectUserVo"/>
         where u.login_name = #{userName}
-        and u.del_flag = 0
+        and u.del_flag = 0 order by create_time desc limit 1
     </select>
 
     <select id="selectUserByLoginNameD" parameterType="String" resultMap="UserResult">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -11,9 +11,8 @@ import cn.hutool.core.util.StrUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
-import com.zdxt.code.domain.EnforcementRegistration;
+import com.zdxt.code.domain.*;
-import com.zdxt.code.domain.EnterpriseMerchantAuthorization;
+import com.zdxt.code.mapper.EnterpriseInformationMapper;
-import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService;
 import com.zdxt.code.service.ILinkageDictService;
 import com.zdxt.code.utils.ZwSmsClient;
@@ -24,7 +23,6 @@ import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnterpriseLawEnforcementMapper;
-import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 
 /**
@@ -39,6 +37,9 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     @Autowired
     private EnterpriseLawEnforcementMapper enterpriseLawEnforcementMapper;
 
+    @Autowired
+    EnterpriseInformationMapper enterpriseInformationMapper;
+
     @Autowired
     private ZdxtFileCommonApi zdxtFileCommonApi;
 
@@ -225,6 +226,13 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
             }
             resNum = enterpriseLawEnforcementMapper.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
         }
+        if (resNum > 0) {
+            // 更新企业的手机号码
+            EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
+            enterpriseInformation.setEnterpriseNumber(enterpriseLawEnforcement.getEnterpriseNumber());
+            enterpriseInformation.setEnterpriseTel(enterpriseLawEnforcement.getLinkTel());
+            enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation);
+        }
         return resNum;
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzDeptOriginalDataTask.java

@@ -95,9 +95,9 @@ public class SrzDeptOriginalDataTask {
                 if (null == dataArr || dataArr.size()==0) { break; }
                 // 插入更新数据库
                 log.error("-------------------> 原始组织json: {}", dataArr);
-                Map<String, Integer> resMap = srzDeptService.saveSrzDept(dataArr,"");
+                Map<String, Integer> resMap = srzDeptService.saveSrzDept(dataArr,token);
                 sumMap.add(resMap);
-                page++;
+//                page++;
             }
 
             insertNum = 0;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java

@@ -94,7 +94,7 @@ public class SrzUserOriginalDataTask {
                 if (null == dataArr || dataArr.size()==0) { break; }
                 Map<String, Integer> resMap = srzUserService.saveSrzUser(dataArr, token);
                 sumMap.add(resMap);
-                page++;
+//                page++;
             }
 
             insertNum = 0;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -119,11 +119,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasAuto != null"> and has_auto = #{hasAuto}</if>
 
             <if test="searchValue != null and searchValue != ''">
-                and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')
+                and (law_enforcement_item_text  like concat('%',#{searchValue},'%')
-                or law_enforcement like concat(concat('%',#{searchValue}),'%')
+                or law_enforcement like concat('%',#{searchValue},'%')
-                or law_enforcer like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer like concat('%',#{searchValue},'%')
-                or law_enforcer_two like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer_two like concat('%',#{searchValue},'%')
-                or enterprise_name like concat(concat('%',#{searchValue}),'%')
+                or enterprise_name like concat('%',#{searchValue},'%')
+                or bureau_dept_name like concat('%',#{searchValue},'%')
                 )
             </if>
             <if test="dateType != null and dateType == 1">
@@ -218,11 +219,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasAuto != null"> and has_auto = #{hasAuto}</if>
 
             <if test="searchValue != null and searchValue != ''">
-                and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')
+                and (law_enforcement_item_text  like concat('%',#{searchValue},'%')
-                or law_enforcement like concat(concat('%',#{searchValue}),'%')
+                or law_enforcement like concat('%',#{searchValue},'%')
-                or law_enforcer like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer like concat('%',#{searchValue},'%')
-                or law_enforcer_two like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer_two like concat('%',#{searchValue},'%')
-                or enterprise_name like concat(concat('%',#{searchValue}),'%')
+                or enterprise_name like concat('%',#{searchValue},'%')
+                or bureau_dept_name like concat('%',#{searchValue},'%')
                 )
             </if>
             <if test="dateType != null and dateType == 1">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml

@@ -257,6 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isUnsubscribe != null">is_unsubscribe = #{isUnsubscribe},</if>
             <if test="salt != null and salt != ''">salt = #{salt} ,</if>
             <if test="industry != null and industry != ''">industry = #{industry} ,</if>
+            <if test="enterpriseTel != null and enterpriseTel != ''">enterprise_tel = #{enterpriseTel}</if>
         </trim>
         where enterprise_number = #{enterpriseNumber}
     </update>