1.机器人

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/listener/BaseEnterpriseMqTtlListener.java

 package com.yeejoin.amos.boot.module.elevator.biz.listener;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.elevator.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -30,8 +13,15 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: mqtt监听服务
@@ -41,127 +31,123 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @Slf4j
 public class BaseEnterpriseMqTtlListener extends EmqxListener {
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Value("${amos.secret.key}")
+    String secretKey;
 
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
-	@Autowired
-	RedisUtil redisUtil;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
 
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
+    @Value("${org.filter.group.seq}")
+    private Long groupSeq;
 
-	@Value("${org.filter.group.seq}")
-	private Long groupSeq;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
-	@Override
-	public void processMessage(String topic, MqttMessage message) throws Exception {
-		System.out.println(message);
-		JSONObject object = null;
-		try {
-			object = JSONObject.parseObject(message.toString());
-		} catch (Exception e) {
-			throw new Exception("公司同步消息解析失败");
-		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
-		List<ApplicationModel> aList = aResult.getResult();
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+        JSONObject object = null;
+        try {
+            object = JSONObject.parseObject(message.toString());
+        } catch (Exception e) {
+            throw new Exception("公司同步消息解析失败");
+        }
+        platformTokenService.getToken();
+        FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+        List<ApplicationModel> aList = aResult.getResult();
 //		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
 //				.map(i -> i.getAppCode()).collect(Collectors.toList());
-		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
-		// FeignClientResult<Collection<CompanyModel>> cResult =
-		// Privilege.companyClient.queryAgencyTree(null);
-		String useCode = object.getString("use_code");
-		// if (useCode == null || !isUse(useCode, cResult.getResult())) {
-		if (cResult.getResult() == null) {
-			CompanyModel companyModel = new CompanyModel();
-			companyModel.setCompanyName(object.getString("use_unit"));
-			companyModel.setParentId(0L);
-			companyModel.setLevel("company");
-			String unitTypes = object.getString("unit_type");
-			companyModel.setCompanyType(unitTypes);
-			// companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
-			companyModel.setCompanyCode(useCode);
-			if (object.getString("supervise_org_code") != null) {
-				FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
-						.queryByOrgcode(object.getString("supervise_org_code"));
-				// JSONObject parent =
-				// JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
-				if (result.getResult().get("sequenceNbr") != null) {
-					companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
-				}
-			}
-			FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
-			Long companySqr = createResult.getResult().getSequenceNbr();
-			String unitCode = object.getString("use_code");
-			if (unitCode == null || unitCode.length() < 6) {
-				log.error("公司统一信用代码长度不够6位");
-				throw new Exception("公司统一信用代码长度不够6位");
-			}
-			String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
-			FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
-			if (uResult.getResult() == null) {
-				FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-				List<RoleModel> allRoleList = roleListResult.getResult();
-				AgencyUserModel userModel = new AgencyUserModel();
-				userModel.setUserName(userName);
-				userModel.setRealName(userName);
-				userModel.setPassword(DesUtil.encode(userName, secretKey));
-				userModel.setRePassword(DesUtil.encode(userName, secretKey));
-				// userModel.setMobile(vo.getPhoneNo());
-				userModel.setLockStatus("UNLOCK");
-				// FeignClientResult<List<RoleModel>> list =
-				// Privilege.roleClient.queryRoleList("使用单位", "admin");
-				String[] unitTypeArray = unitTypes.split(",");
-				List<String> unitTypeList = Arrays.asList(unitTypeArray);
-				Set<String> roleNameSet = new HashSet<>();
-				Set<String> appCodesSet = new HashSet<>();
-				List<RoleModel> userRoleList = new ArrayList<>();
-				List<Long> roleIds = new ArrayList<>();
-				Map<Long, List<Long>> roleSeqMap = new HashMap<>();
-				for (String unitTypeStr : unitTypeList) {
-					DataDictionary unitType = iDataDictionaryService
-							.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, unitTypeStr));
-					String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
-					String[] appCodes = appCode.split(",");
-					Collections.addAll(appCodesSet, appCodes);
-					roleNameSet.add(unitType.getName());
-					userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
-							.collect(Collectors.toList());
-					for (RoleModel r : userRoleList) {
-						if (!roleIds.contains(r.getSequenceNbr())) {
-							roleIds.add(r.getSequenceNbr());
-						}
-					}
-					roleSeqMap.put(companySqr, roleIds);
-				}
-				userModel.setAppCodes(new ArrayList<>(appCodesSet));
-				userModel.setOrgRoleSeqs(roleSeqMap);
-				FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
-				String[] userIds = { userResult.getResult().getUserId() };
+        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
+        // FeignClientResult<Collection<CompanyModel>> cResult =
+        // Privilege.companyClient.queryAgencyTree(null);
+        String useCode = object.getString("use_code");
+        // if (useCode == null || !isUse(useCode, cResult.getResult())) {
+        if (cResult.getResult() == null) {
+            CompanyModel companyModel = new CompanyModel();
+            companyModel.setCompanyName(object.getString("use_unit"));
+            companyModel.setParentId(0L);
+            companyModel.setLevel("company");
+            String unitTypes = object.getString("unit_type");
+            companyModel.setCompanyType(unitTypes);
+            // companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+            companyModel.setCompanyCode(useCode);
+            if (object.getString("supervise_org_code") != null) {
+                FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
+                        .queryByOrgcode(object.getString("supervise_org_code"));
+                // JSONObject parent =
+                // JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
+                if (result.getResult().get("sequenceNbr") != null) {
+                    companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
+                }
+            }
+            FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
+            Long companySqr = createResult.getResult().getSequenceNbr();
+            String unitCode = object.getString("use_code");
+            if (unitCode == null || unitCode.length() < 6) {
+                log.error("公司统一信用代码长度不够6位");
+                throw new Exception("公司统一信用代码长度不够6位");
+            }
+            String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+            FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+            if (uResult.getResult() == null) {
+                FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+                List<RoleModel> allRoleList = roleListResult.getResult();
+                AgencyUserModel userModel = new AgencyUserModel();
+                userModel.setUserName(userName);
+                userModel.setRealName(userName);
+                userModel.setPassword(DesUtil.encode(userName, secretKey));
+                userModel.setRePassword(DesUtil.encode(userName, secretKey));
+                // userModel.setMobile(vo.getPhoneNo());
+                userModel.setLockStatus("UNLOCK");
+                // FeignClientResult<List<RoleModel>> list =
+                // Privilege.roleClient.queryRoleList("使用单位", "admin");
+                String[] unitTypeArray = unitTypes.split(",");
+                List<String> unitTypeList = Arrays.asList(unitTypeArray);
+                Set<String> roleNameSet = new HashSet<>();
+                Set<String> appCodesSet = new HashSet<>();
+                List<RoleModel> userRoleList = new ArrayList<>();
+                List<Long> roleIds = new ArrayList<>();
+                Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+                for (String unitTypeStr : unitTypeList) {
+                    DataDictionary unitType = iDataDictionaryService
+                            .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, unitTypeStr));
+                    String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
+                    String[] appCodes = appCode.split(",");
+                    Collections.addAll(appCodesSet, appCodes);
+                    roleNameSet.add(unitType.getName());
+                    userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
+                            .collect(Collectors.toList());
+                    for (RoleModel r : userRoleList) {
+                        if (!roleIds.contains(r.getSequenceNbr())) {
+                            roleIds.add(r.getSequenceNbr());
+                        }
+                    }
+                    roleSeqMap.put(companySqr, roleIds);
+                }
+                userModel.setAppCodes(new ArrayList<>(appCodesSet));
+                userModel.setOrgRoleSeqs(roleSeqMap);
+                FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
+                String[] userIds = {userResult.getResult().getUserId()};
 //				if (groupSeq != null) {
 //					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
 //				}
-			}
-		}
-	}
+            }
+        }
+    }
 
-	private boolean isUse(String useCode, Collection<CompanyModel> companys) {
-		for (Object obj : companys) {
-			String json = JSONObject.toJSONString(obj);
-			CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
-			if (useCode.equals(companyMode.getCompanyCode())) {
-				return true;
-			} else if (companyMode.getChildren() != null) {
-				return isUse(useCode, companyMode.getChildren());
-			}
-		}
-		return false;
-	}
+    private boolean isUse(String useCode, Collection<CompanyModel> companys) {
+        for (Object obj : companys) {
+            String json = JSONObject.toJSONString(obj);
+            CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
+            if (useCode.equals(companyMode.getCompanyCode())) {
+                return true;
+            } else if (companyMode.getChildren() != null) {
+                return isUse(useCode, companyMode.getChildren());
+            }
+        }
+        return false;
+    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/listener/CarcylUnitInspectMqTtlListener.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.elevator.biz.service.impl.StartPlatformTokenService;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,16 +37,14 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 	@Value("${amos.secret.key}")
 	String secretKey;
 
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
-
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
 	@Autowired
 	RedisUtil redisUtil;
 
 	@Value("${org.filter.group.seq}")
 	private Long groupSeq;
+
+	@Autowired
+	StartPlatformTokenService platformTokenService;
 	
 	@Override 
 	public void processMessage(String topic, MqttMessage message) throws Exception {
@@ -56,9 +55,7 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 		} catch (Exception e) {
 			throw new Exception("公司同步消息解析失败");
 		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		platformTokenService.getToken();
 		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
 		List<ApplicationModel> aList = aResult.getResult();
 		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/listener/PlatformUserTopicMessage.java

@@ -5,18 +5,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.elevator.api.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.elevator.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.elevator.flc.api.service.IRegUnitInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 @Component
@@ -40,11 +38,6 @@ public class PlatformUserTopicMessage extends EmqxListener {
     @Autowired
     RedisUtils redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
 
     @Autowired
     IEquipmentCategoryService equipmentCategoryService;
@@ -52,11 +45,12 @@ public class PlatformUserTopicMessage extends EmqxListener {
     @Autowired
     IRegUnitInfoService regUnitInfoService;
 
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
     @Override
     public void processMessage(String topic, MqttMessage message) {
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.getToken();
         JSONObject jsonObject = JSON.parseObject(message.toString());
         JSONObject result = jsonObject.getJSONObject("result");
         JSONObject dataResult = result.getJSONObject("result");

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

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.elevator.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.elevator.flc.api.feign.AccessFeignService;
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
@@ -16,14 +16,15 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 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.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
 
 @Component
 @Slf4j
@@ -40,11 +41,8 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
@@ -58,15 +56,13 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             throw new Exception("公司同步消息解析失败");
         }
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.getToken();
 
         //判断库中业务tz_base_enterprise_info是否存在
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-        queryWrapper.eq("use_code",object.getString("unit_code"));
+        queryWrapper.eq("use_code", object.getString("unit_code"));
         TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
-        if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)){
+        if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
             accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             return;
         }
@@ -95,14 +91,14 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("use_code",object.getString("unit_code"));
+        updateWrapper.eq("use_code", object.getString("unit_code"));
 
         String regCode = object.getString("reg_code");
         CompanyModel supervisePrivilegeCompanyModel;
         if (!ValidationUtil.isEmpty(regCode)) {
             supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
-            if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
                 supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
 
                 if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
@@ -120,37 +116,37 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
         tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
 
-        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
+        if (ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())) {
             tzBaseEnterpriseInfo.setUnitType("");
         }
 
 
         try {
-            if (tzBaseEnterprisePrivilegeInfo == null ) {
+            if (tzBaseEnterprisePrivilegeInfo == null) {
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 return;
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
         }
     }
 
-    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-        if(companyModels == null){
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
             return map;
         }
         Iterator iter = companyModels.iterator();
-        while(iter.hasNext()){
+        while (iter.hasNext()) {
             String json = JSON.toJSONString(iter.next());
-            CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
 
             String code = companyModel.getCompanyCode();
-            if(code.length() >=6){
+            if (code.length() >= 6) {
                 code = code.substring(0, 6);
             }
-            map.put(code,companyModel);
-            getCompanyInfoMap(companyModel.getChildren(),map);
+            map.put(code, companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
         }
         return map;
     }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/StartPlatformTokenService.java

 package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
-import com.yeejoin.amos.component.robot.AmosRequestContext;
-
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Value("${admin.user}")
-	String user;
-
-	@Value("${admin.password}")
-	String password;
 
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Autowired
-	RedisUtil redisUtil;
-	
-	@Autowired
-	AmosRequestContext amosRequestContext;
-	
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
-	public void getToken() {
-		RequestContext.setProduct(product);
-		RequestContext.setAppKey(appkey);
-		String token = amosRequestContext.getToken();
-		System.out.println("token:" + token);
-		RequestContext.setToken(token);
-		redisUtil.set("platform_token", token);
-	}
+    public void getToken() {
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.RegUnitIcServiceImpl;
-import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.TzBaseEnterpriseInfoDto;
@@ -21,7 +19,6 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.elevator.api.entity.SpeUseUnit;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.elevator.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.elevator.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.RegUnitIcDto;
@@ -30,19 +27,18 @@ import com.yeejoin.amos.boot.module.elevator.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.elevator.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.elevator.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.elevator.flc.api.mapper.RegUnitInfoMapper;
+import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.RegUnitInfoServiceImpl;
 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.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -58,445 +54,425 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TzBaseEnterpriseInfoServiceImpl
-		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
-		implements ITzBaseEnterpriseInfoService {
-
-	@Autowired
-	RedisUtil redisUtil;
-
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.product.web}")
-	String webProduct;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Autowired
-	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
-
-	@Autowired
-	BaseUnitLicenceServiceImpl baseUnitLicenceService;
-
-	@Autowired
-	RegUnitIcServiceImpl regUnitIcService;
-
-	@Autowired
-	@Lazy
-	RegUnitInfoServiceImpl regUnitInfoService;
-
-	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
-
-	@Autowired
-	private SpeUseUnitServiceImpl speUseUnitService;
-
-	@Autowired
-	private AccessFeignService accessFeignService;
-
-	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
-
-	@Autowired
-	RegUnitInfoMapper regUnitInfoMapper;
-
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
-
-	@Value("${redis.cache.failure.time}")
-	private Long redisRegionTimeSecond;
-
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
-
-	/**
-	 * 企业管理员变更缓存key前缀
-	 */
-	private final  String adminChange = "ADMIN_CHANGE_";
-	@Autowired
-	private EquipmentCategoryServiceImpl equipmentCategoryService;
-
-	@Override
-	public List<EquEnterDto> getInfo(String sequenceNbr) {
-		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
-		List<String> orgCodeList = new ArrayList<>();
-		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
-			FeignClientResult<CompanyModel> result = Privilege.companyClient
-					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
-			if (result.getResult() != null) {
-				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
-			}
-		}
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
-		if (!ValidationUtil.isEmpty(companyType1)) {
-			for (JSONObject jsonObject : companyType1) {
-				String orgCode = jsonObject.getString("orgCode");
-				if (!ValidationUtil.isEmpty(orgCode)) {
-					orgCodeList.add(orgCode);
-				}
-			}
-		}
-
-		return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto,orgCodeList);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto detail(Long id) {
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-			tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
-			tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
-			tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
-			tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
-			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 管理员信息
-		RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
-				new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
-		if (regUnitInfo != null) {
-			BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
-		}
-		regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo)||ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
-		tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
-
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
-		return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
-	}
-
-	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
-		if (!ValidationUtil.isEmpty(resultMap)) {
-			String area = String.valueOf(resultMap.get("area"));
-			String city = area.substring(0, area.indexOf("市") + 1);
-			String district = area.substring(city.length());
-			if (district.equals("高新区")) {
-				district = "雁塔区";
-			}
-			String industryName = "";
-			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
-			if (!ValidationUtil.isEmpty(dataDictionary)) {
-				industryName = dataDictionary.getName();
-			}
-			String approveDate = String.valueOf(resultMap.get("approval_time"));
-			approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
-			approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
-			approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
-			regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
-			String approve = approveDate.substring(0, 10) + "核准";
-			tzBaseEnterpriseInfoDto.setApproval(approve);
-			try {
-				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
-			regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
-			for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
-				if(djjg.getName().equals(resultMap.get("registration_authority"))){
-					regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
-				}
-			}
-			regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
-			regUnitIcDto.setProvince("陕西省");
-			regUnitIcDto.setCity(city);
-			regUnitIcDto.setDistrict(district);
-			regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
-			regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
-			regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
-			regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-			regUnitIcDto.setIndustryName(industryName);
-			regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
-			ArrayList<Object> objects = new ArrayList<>();
-			objects.add("陕西省");
-			objects.add(city);
-			objects.add(district);
-			regUnitIcDto.setRegisterAddressList(objects);
-			regUnitIcDto.setIsNotAccess("1");
-		} else {
-			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
-			regUnitIcDto.setIsNotAccess("0");
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
-		return tzBaseEnterpriseInfoDto;
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
-		ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
-		result.add(tzBaseEnterpriseInfoDto);
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		return page.setRecords(result);
-	}
-
-	@Override
-	public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
-		return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
-		if(ValidationUtil.isEmpty(useUnit)){
-			return new TzBaseEnterpriseInfoDto();
-		}
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-
-		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
-
-		//获取平台企业表企业名称及sequence_code，并装入map中
-		Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
-		Map<String,CompanyModel> companyMap = new HashMap<>();
-
-		getCompanyInfoMap(companyModels,companyMap);
-
-		int size = 500;
-		int total = speUseUnitService.count();
-		int current = total/size;
-		current = current + 1;
-		for(int i = 1; i<=current; i++){
-
-
-			IPage<SpeUseUnit> page = new Page<>();
-			page.setCurrent(i);
-			page.setSize(size);
-			List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
-			for (SpeUseUnit speUseUnit : speUseUnitList) {
-
-				if(speUseUnit.getSyncState() != 3){
-					CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
-					QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-					queryWrapper.eq("use_code",speUseUnit.getCerCode());
-					TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
-
-					Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
-
-					if (ValidationUtil.isEmpty(resultMap)){
-						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){
-							List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(),null,null,null).getResult();
-							if(ValidationUtil.isEmpty(agencyUserModelList)){
-								//spe表中的数据在工商查不到，且平台无用户，将删除企业数据
-								Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
-								if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
-									this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
-								}
-							}
-						}
-						//spe表中的数据在工商查不到,设置spe表状态为1
-						speUseUnit.setSyncState(1);
-						speUseUnitService.updateById(speUseUnit);
-					}else {
-						CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
-						CompanyModel companyModel = new CompanyModel();
-						companyModel.setCompanyName(speUseUnit.getName());
-						companyModel.setCompanyCode(speUseUnit.getCerCode());
-						companyModel.setLevel("company");
-						companyModel.setAgencyCode("tzs");
-						companyModel.setCompanyType("使用单位");
-						companyModel.setAddress(String.valueOf(resultMap.get("address")));
-						companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
-
-
-						String area = String.valueOf(resultMap.get("area"));
-						String province = "";
-						if (area.contains("省")) {
-							province = area.substring(0, area.indexOf("省") + 1);
-						}
-						String city = "";
-						if (area.contains("市")) {
-							city = area.substring(province.length(), area.indexOf("市") + 1);
-						}
-						String district = area.substring(city.length() + province.length());
-						TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
-						baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
-						baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setProvince(province);
-						baseEnterpriseInfo.setCity(city);
-						baseEnterpriseInfo.setDistrict(district);
-						baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
-						baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
-						baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
-						baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-						baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
-						baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
-						baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfoList.add(baseEnterpriseInfo);
-
-
-						//保存平台和业务的企业信息
-						try {
-							if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
-								//当企业表、平台表 中没有时
-								this.save(baseEnterpriseInfo);
-								Privilege.companyClient.create(companyModel);
-							} else if (tzBaseEnterprisePrivilegeInfo == null) {
-								//企业表没有，平台表有
-								this.save(baseEnterpriseInfo);
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-							} else if (companyPrivilegeModel == null) {
-								//平台表没有，企业表有
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-								Privilege.companyClient.create(companyModel);
-							} else {
-								//企业表有 平台表有
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-							}
-							setSpeUseUnitState(3,speUseUnit);
-						} catch (Exception e) {
-							System.out.println(e.getMessage());
-							//当报错时 设置状态为 2
-							speUseUnit.setSyncState(2);
-							speUseUnitService.updateById(speUseUnit);
-						}
-					}
-				}
-			}
-		}
-		return "ok";
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
-		tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
-
-		tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
-		Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
-		tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
-		tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
-		tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
-		tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
-		tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
-		tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
-		tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
-		tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
-		tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
-
-		//修改工商信息
-		RegUnitIc regUnitIc = new RegUnitIc();
-		List<String> addressList = (List<String>) map.get("registerAddressList");
-		tzBaseEnterpriseInfo.setProvince(addressList.get(0));
-		tzBaseEnterpriseInfo.setCity(addressList.get(1));
-		tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
-		tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
-		tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
-		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
-		regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
-		regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
-		Date approvedDate = new Date();
-		try {
-			approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
-		regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
-		regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
-		RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
-		});
+        extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
+        implements ITzBaseEnterpriseInfoService {
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceService;
+
+    @Autowired
+    RegUnitIcServiceImpl regUnitIcService;
+
+    @Autowired
+    @Lazy
+    RegUnitInfoServiceImpl regUnitInfoService;
+
+    @Autowired
+    private SpeUseUnitServiceImpl speUseUnitService;
+
+    @Autowired
+    private AccessFeignService accessFeignService;
+
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Autowired
+    RegUnitInfoMapper regUnitInfoMapper;
+
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
+
+    /**
+     * 企业管理员变更缓存key前缀
+     */
+    private final String adminChange = "ADMIN_CHANGE_";
+    @Autowired
+    private EquipmentCategoryServiceImpl equipmentCategoryService;
+
+
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
+    @Override
+    public List<EquEnterDto> getInfo(String sequenceNbr) {
+        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+    }
+
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+        List<String> orgCodeList = new ArrayList<>();
+        if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+            FeignClientResult<CompanyModel> result = Privilege.companyClient
+                    .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+            if (result.getResult() != null) {
+                tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+            }
+        }
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
+        if (!ValidationUtil.isEmpty(companyType1)) {
+            for (JSONObject jsonObject : companyType1) {
+                String orgCode = jsonObject.getString("orgCode");
+                if (!ValidationUtil.isEmpty(orgCode)) {
+                    orgCodeList.add(orgCode);
+                }
+            }
+        }
+
+        return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto detail(Long id) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+            tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
+            tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
+            tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
+            tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
+            tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 管理员信息
+        RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
+                new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
+        if (regUnitInfo != null) {
+            BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
+        }
+        regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo) || ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
+        tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
+
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
+        return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
+    }
+
+    private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
+        if (!ValidationUtil.isEmpty(resultMap)) {
+            String area = String.valueOf(resultMap.get("area"));
+            String city = area.substring(0, area.indexOf("市") + 1);
+            String district = area.substring(city.length());
+            if (district.equals("高新区")) {
+                district = "雁塔区";
+            }
+            String industryName = "";
+            DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
+            if (!ValidationUtil.isEmpty(dataDictionary)) {
+                industryName = dataDictionary.getName();
+            }
+            String approveDate = String.valueOf(resultMap.get("approval_time"));
+            approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
+            approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
+            approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
+            regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
+            String approve = approveDate.substring(0, 10) + "核准";
+            tzBaseEnterpriseInfoDto.setApproval(approve);
+            try {
+                regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
+            regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
+            for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
+                if (djjg.getName().equals(resultMap.get("registration_authority"))) {
+                    regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
+                }
+            }
+            regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
+            regUnitIcDto.setProvince("陕西省");
+            regUnitIcDto.setCity(city);
+            regUnitIcDto.setDistrict(district);
+            regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
+            regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
+            regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
+            regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+            regUnitIcDto.setIndustryName(industryName);
+            regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
+            ArrayList<Object> objects = new ArrayList<>();
+            objects.add("陕西省");
+            objects.add(city);
+            objects.add(district);
+            regUnitIcDto.setRegisterAddressList(objects);
+            regUnitIcDto.setIsNotAccess("1");
+        } else {
+            regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
+            regUnitIcDto.setIsNotAccess("0");
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
+        return tzBaseEnterpriseInfoDto;
+    }
+
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
+        ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
+        result.add(tzBaseEnterpriseInfoDto);
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        return page.setRecords(result);
+    }
+
+    @Override
+    public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
+        return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
+        if (ValidationUtil.isEmpty(useUnit)) {
+            return new TzBaseEnterpriseInfoDto();
+        }
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public String syncEnterpriseInfo() {
+        platformTokenService.getToken();
+
+        List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
+
+        //获取平台企业表企业名称及sequence_code，并装入map中
+        Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
+        Map<String, CompanyModel> companyMap = new HashMap<>();
+
+        getCompanyInfoMap(companyModels, companyMap);
+
+        int size = 500;
+        int total = speUseUnitService.count();
+        int current = total / size;
+        current = current + 1;
+        for (int i = 1; i <= current; i++) {
+
+
+            IPage<SpeUseUnit> page = new Page<>();
+            page.setCurrent(i);
+            page.setSize(size);
+            List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
+            for (SpeUseUnit speUseUnit : speUseUnitList) {
+
+                if (speUseUnit.getSyncState() != 3) {
+                    CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
+                    QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
+                    queryWrapper.eq("use_code", speUseUnit.getCerCode());
+                    TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
+
+                    Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
+
+                    if (ValidationUtil.isEmpty(resultMap)) {
+                        if (!ValidationUtil.isEmpty(companyPrivilegeModel)) {
+                            List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(), null, null, null).getResult();
+                            if (ValidationUtil.isEmpty(agencyUserModelList)) {
+                                //spe表中的数据在工商查不到，且平台无用户，将删除企业数据
+                                Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
+                                if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
+                                    this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
+                                }
+                            }
+                        }
+                        //spe表中的数据在工商查不到,设置spe表状态为1
+                        speUseUnit.setSyncState(1);
+                        speUseUnitService.updateById(speUseUnit);
+                    } else {
+                        CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
+                        CompanyModel companyModel = new CompanyModel();
+                        companyModel.setCompanyName(speUseUnit.getName());
+                        companyModel.setCompanyCode(speUseUnit.getCerCode());
+                        companyModel.setLevel("company");
+                        companyModel.setAgencyCode("tzs");
+                        companyModel.setCompanyType("使用单位");
+                        companyModel.setAddress(String.valueOf(resultMap.get("address")));
+                        companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
+
+
+                        String area = String.valueOf(resultMap.get("area"));
+                        String province = "";
+                        if (area.contains("省")) {
+                            province = area.substring(0, area.indexOf("省") + 1);
+                        }
+                        String city = "";
+                        if (area.contains("市")) {
+                            city = area.substring(province.length(), area.indexOf("市") + 1);
+                        }
+                        String district = area.substring(city.length() + province.length());
+                        TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
+                        baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
+                        baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setProvince(province);
+                        baseEnterpriseInfo.setCity(city);
+                        baseEnterpriseInfo.setDistrict(district);
+                        baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
+                        baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
+                        baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
+                        baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+                        baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
+                        baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
+                        baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfoList.add(baseEnterpriseInfo);
+
+
+                        //保存平台和业务的企业信息
+                        try {
+                            if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
+                                //当企业表、平台表 中没有时
+                                this.save(baseEnterpriseInfo);
+                                Privilege.companyClient.create(companyModel);
+                            } else if (tzBaseEnterprisePrivilegeInfo == null) {
+                                //企业表没有，平台表有
+                                this.save(baseEnterpriseInfo);
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                            } else if (companyPrivilegeModel == null) {
+                                //平台表没有，企业表有
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                                Privilege.companyClient.create(companyModel);
+                            } else {
+                                //企业表有 平台表有
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                            }
+                            setSpeUseUnitState(3, speUseUnit);
+                        } catch (Exception e) {
+                            System.out.println(e.getMessage());
+                            //当报错时 设置状态为 2
+                            speUseUnit.setSyncState(2);
+                            speUseUnitService.updateById(speUseUnit);
+                        }
+                    }
+                }
+            }
+        }
+        return "ok";
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
+        tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
+
+        tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
+        Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
+        tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
+        tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
+        tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
+        tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
+        tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
+        tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
+        tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
+        tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
+        tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
+
+        //修改工商信息
+        RegUnitIc regUnitIc = new RegUnitIc();
+        List<String> addressList = (List<String>) map.get("registerAddressList");
+        tzBaseEnterpriseInfo.setProvince(addressList.get(0));
+        tzBaseEnterpriseInfo.setCity(addressList.get(1));
+        tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
+        tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
+        tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
+        tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
+        regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
+        regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
+        Date approvedDate = new Date();
+        try {
+            approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
+        regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
+        RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
+        });
 //		regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
 
 
-		//修改许可信息
-		List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
+        //修改许可信息
+        List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
 //		baseUnitLicenceService.saveOrUpdateBatch(licences);
 
 
 //        boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
-		boolean b = true;
+        boolean b = true;
         if (b) {
             TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
             BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
@@ -507,12 +483,12 @@ public class TzBaseEnterpriseInfoServiceImpl
 
     }
 
-	@Override
-	public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
-		List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
-		if (!ObjectUtils.isEmpty(enterpriseLabels)) {
-			for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
-				// 标签递增逻辑
+    @Override
+    public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
+        List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
+        if (!ObjectUtils.isEmpty(enterpriseLabels)) {
+            for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
+                // 标签递增逻辑
 //			if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getRegulatoryLabels())) {
 //				String result = checkLabel(enterpriseLabels, tzBaseEnterpriseInfo.getRegulatoryLabels());
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(result);
@@ -520,91 +496,73 @@ public class TzBaseEnterpriseInfoServiceImpl
 //				String labels = String.join(",", enterpriseLabels);
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
 //			}
-				String labels = String.join(",", enterpriseLabels);
-				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
-			}
-		} else {
-			tzBaseEnterpriseInfos.forEach(item -> {
-				item.setRegulatoryLabels(null);
-			});
-		}
-		this.updateBatchById(tzBaseEnterpriseInfos);
-		return "success";
-	}
-
-	private String checkLabel(List<String> enterpriseLabels, String result) {
-		List<String> strings = Arrays.asList(result.split(","));
-		ArrayList<String> res = new ArrayList<>(strings);
-		List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
-		res.addAll(collect);
-		return String.join(",", res);
-	}
-
-	public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
-		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
-		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(webProduct);
-		//获取机器人的token，获取不到则去登录
-		if (ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))) {
-			loginCtiUser();
-		}
-		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
-		Map<String, Object> resultMap = new HashMap<>();
-		if (!ObjectUtils.isEmpty(me)) {
-			RegUnitInfo regUnitInfo = new RegUnitInfo();
-			String unitCode = String.valueOf(map.get("unitCode"));
-			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
-			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
-			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
-			regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
-			me.setMobile(String.valueOf(map.get("adminTel")));
-			me.setRealName(String.valueOf(map.get("adminName")));
-			FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
-			if (200 == updateResult.getStatus()) {
-				regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
-				resultMap.put("success", regUnitInfo);
-				redisUtil.del(adminChange + map.get("adminTel"));
-			} else {
-				resultMap.put("fail", "平台用户修改失败，请联系管理员");
-			}
-		} else {
-			resultMap.put("fail", "平台用户不存在");
-		}
-		return resultMap;
-	}
-
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		loninData.setPassword(passwd);
-		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-		if(loginResult.getStatus() == 200) {
-			HashMap resultMap = (HashMap) loginResult.getResult();
-			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
-		}
-	}
-
-
-	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
-		speUseUnit.setSyncState(state);
-		speUseUnitService.updateById(speUseUnit);
-	}
-
-	public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-		if(companyModels == null){
-			return map;
-		}
-		Iterator iter = companyModels.iterator();
-		while(iter.hasNext()){
-			String json = JSON.toJSONString(iter.next());
-			CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
-			map.put(companyModel.getCompanyName(),companyModel);
-			getCompanyInfoMap(companyModel.getChildren(),map);
-		}
-		return map;
-	}
+                String labels = String.join(",", enterpriseLabels);
+                tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
+            }
+        } else {
+            tzBaseEnterpriseInfos.forEach(item -> {
+                item.setRegulatoryLabels(null);
+            });
+        }
+        this.updateBatchById(tzBaseEnterpriseInfos);
+        return "success";
+    }
+
+    private String checkLabel(List<String> enterpriseLabels, String result) {
+        List<String> strings = Arrays.asList(result.split(","));
+        ArrayList<String> res = new ArrayList<>(strings);
+        List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
+        res.addAll(collect);
+        return String.join(",", res);
+    }
+
+    @Override
+    public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
+        //每一个企业只有一个管理员，所以当前登录用户即管理员用户
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        platformTokenService.getToken();
+        Map<String, Object> resultMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(me)) {
+            RegUnitInfo regUnitInfo = new RegUnitInfo();
+            String unitCode = String.valueOf(map.get("unitCode"));
+            regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+            regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+            regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+            regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
+            me.setMobile(String.valueOf(map.get("adminTel")));
+            me.setRealName(String.valueOf(map.get("adminName")));
+            FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
+            if (200 == updateResult.getStatus()) {
+                regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
+                resultMap.put("success", regUnitInfo);
+                redisUtil.del(adminChange + map.get("adminTel"));
+            } else {
+                resultMap.put("fail", "平台用户修改失败，请联系管理员");
+            }
+        } else {
+            resultMap.put("fail", "平台用户不存在");
+        }
+        return resultMap;
+    }
+
+
+    public void setSpeUseUnitState(int state, SpeUseUnit speUseUnit) {
+        speUseUnit.setSyncState(state);
+        speUseUnitService.updateById(speUseUnit);
+    }
+
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
+            return map;
+        }
+        Iterator iter = companyModels.iterator();
+        while (iter.hasNext()) {
+            String json = JSON.toJSONString(iter.next());
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
+            map.put(companyModel.getCompanyName(), companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
+        }
+        return map;
+    }
 
 }

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

@@ -124,11 +124,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/StartPlatformTokenService.java

 package com.yeejoin.amos.boot.module.app.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
-import com.yeejoin.amos.component.robot.AmosRequestContext;
-
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${amos.system.user.product}")
-	String product;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${amos.system.user.app-key}")
-	String appkey;
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
-	@Autowired
-	RedisUtil redisUtil;
-	
-	@Autowired
-	AmosRequestContext amosRequestContext;
-	
-	public void getToken() {
-		RequestContext.setProduct(product);
-		RequestContext.setAppKey(appkey);
-		String token = amosRequestContext.getToken();
-		System.out.println("token:" + token);
-		RequestContext.setToken(token);
-		redisUtil.set("platform_token", token);
-	}
+    public void getToken() {
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+    }
 }

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -64,15 +64,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
 	RedisUtil redisUtil;
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.product.web}")
-	String webProduct;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
 	@Autowired
 	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
@@ -87,34 +78,20 @@ public class TzBaseEnterpriseInfoServiceImpl
 	RegUnitInfoServiceImpl regUnitInfoService;
 
 	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
-
-	@Autowired
 	private SpeUseUnitServiceImpl speUseUnitService;
 
 	@Autowired
 	private AccessFeignService accessFeignService;
 
 	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 
 	@Autowired
 	RegUnitInfoMapper regUnitInfoMapper;
 
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
-
 	@Value("${redis.cache.failure.time}")
 	private Long redisRegionTimeSecond;
 
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
-
 	/**
 	 * 企业管理员变更缓存key前缀
 	 */
@@ -122,6 +99,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
 	private EquipmentCategoryServiceImpl equipmentCategoryService;
 
+	@Autowired
+	StartPlatformTokenService platformTokenService;
+
 	@Override
 	public List<EquEnterDto> getInfo(String sequenceNbr) {
 		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
@@ -315,9 +295,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		platformTokenService.getToken();
 
 		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
 
@@ -540,16 +518,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return String.join(",", res);
 	}
 
+	@Override
 	public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
 		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
 		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(webProduct);
-		//获取机器人的token，获取不到则去登录
-		if (ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))) {
-			loginCtiUser();
-		}
-		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
+		platformTokenService.getToken();
 		Map<String, Object> resultMap = new HashMap<>();
 		if (!ObjectUtils.isEmpty(me)) {
 			RegUnitInfo regUnitInfo = new RegUnitInfo();
@@ -574,18 +547,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return resultMap;
 	}
 
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		loninData.setPassword(passwd);
-		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-		if(loginResult.getStatus() == 200) {
-			HashMap resultMap = (HashMap) loginResult.getResult();
-			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
-		}
-	}
 
 
 	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){

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

@@ -124,11 +124,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/StartPlatformTokenService.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.cylinder.biz.service.impl;
 import com.yeejoin.amos.boot.module.cylinder.biz.utils.RedisUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
@@ -11,34 +10,16 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Value("${admin.user}")
-	String user;
-
-	@Value("${admin.password}")
-	String password;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
-	@Autowired
-    RedisUtil redisUtil;
-	
-	@Autowired
-	AmosRequestContext amosRequestContext;
-	
 
-	public void getToken() {
-		RequestContext.setProduct(product);
-		RequestContext.setAppKey(appkey);
-		String token = amosRequestContext.getToken();
-		System.out.println("token:" + token);
-		RequestContext.setToken(token);
-		redisUtil.set("platform_token", token);
-	}
+    public void getToken() {
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+    }
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -11,9 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.cylinder.biz.utils.RedisUtil;
-import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.RegUnitIcServiceImpl;
-import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
@@ -22,26 +19,25 @@ import com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.SpeUseUnit;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.cylinder.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.cylinder.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.cylinder.api.service.ITzBaseEnterpriseInfoService;
+import com.yeejoin.amos.boot.module.cylinder.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.RegUnitInfoMapper;
+import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.RegUnitInfoServiceImpl;
 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.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -57,444 +53,425 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TzBaseEnterpriseInfoServiceImpl
-		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
-		implements ITzBaseEnterpriseInfoService {
-
-	@Autowired
-	RedisUtil redisUtil;
-
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.product.web}")
-	String webProduct;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Autowired
-	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
-
-	@Autowired
-	BaseUnitLicenceServiceImpl baseUnitLicenceService;
-
-	@Autowired
-	RegUnitIcServiceImpl regUnitIcService;
-
-	@Autowired
-	RegUnitInfoServiceImpl regUnitInfoService;
-
-	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
-
-	@Autowired
-	private SpeUseUnitServiceImpl speUseUnitService;
-
-	@Autowired
-	private AccessFeignService accessFeignService;
-
-	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
-
-	@Autowired
-	RegUnitInfoMapper regUnitInfoMapper;
-
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
-
-	@Value("${redis.cache.failure.time}")
-	private Long redisRegionTimeSecond;
-
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
-
-	/**
-	 * 企业管理员变更缓存key前缀
-	 */
-	private final  String adminChange = "ADMIN_CHANGE_";
-	@Autowired
-	private EquipmentCategoryServiceImpl equipmentCategoryService;
-
-	@Override
-	public List<EquEnterDto> getInfo(String sequenceNbr) {
-		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
-		List<String> orgCodeList = new ArrayList<>();
-		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
-			FeignClientResult<CompanyModel> result = Privilege.companyClient
-					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
-			if (result.getResult() != null) {
-				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
-			}
-		}
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
-		if (!ValidationUtil.isEmpty(companyType1)) {
-			for (JSONObject jsonObject : companyType1) {
-				String orgCode = jsonObject.getString("orgCode");
-				if (!ValidationUtil.isEmpty(orgCode)) {
-					orgCodeList.add(orgCode);
-				}
-			}
-		}
-
-		return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto,orgCodeList);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto detail(Long id) {
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-			tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
-			tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
-			tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
-			tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
-			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 管理员信息
-		RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
-				new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
-		if (regUnitInfo != null) {
-			BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
-		}
-		regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo)||ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
-		tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
-
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
-		return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
-	}
-
-	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
-		if (!ValidationUtil.isEmpty(resultMap)) {
-			String area = String.valueOf(resultMap.get("area"));
-			String city = area.substring(0, area.indexOf("市") + 1);
-			String district = area.substring(city.length());
-			if (district.equals("高新区")) {
-				district = "雁塔区";
-			}
-			String industryName = "";
-			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
-			if (!ValidationUtil.isEmpty(dataDictionary)) {
-				industryName = dataDictionary.getName();
-			}
-			String approveDate = String.valueOf(resultMap.get("approval_time"));
-			approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
-			approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
-			approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
-			regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
-			String approve = approveDate.substring(0, 10) + "核准";
-			tzBaseEnterpriseInfoDto.setApproval(approve);
-			try {
-				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
-			regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
-			for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
-				if(djjg.getName().equals(resultMap.get("registration_authority"))){
-					regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
-				}
-			}
-			regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
-			regUnitIcDto.setProvince("陕西省");
-			regUnitIcDto.setCity(city);
-			regUnitIcDto.setDistrict(district);
-			regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
-			regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
-			regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
-			regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-			regUnitIcDto.setIndustryName(industryName);
-			regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
-			ArrayList<Object> objects = new ArrayList<>();
-			objects.add("陕西省");
-			objects.add(city);
-			objects.add(district);
-			regUnitIcDto.setRegisterAddressList(objects);
-			regUnitIcDto.setIsNotAccess("1");
-		} else {
-			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
-			regUnitIcDto.setIsNotAccess("0");
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
-		return tzBaseEnterpriseInfoDto;
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
-		ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
-		result.add(tzBaseEnterpriseInfoDto);
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		return page.setRecords(result);
-	}
-
-	@Override
-	public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
-		return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
-		if(ValidationUtil.isEmpty(useUnit)){
-			return new TzBaseEnterpriseInfoDto();
-		}
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-
-		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
-
-		//获取平台企业表企业名称及sequence_code，并装入map中
-		Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
-		Map<String,CompanyModel> companyMap = new HashMap<>();
-
-		getCompanyInfoMap(companyModels,companyMap);
-
-		int size = 500;
-		int total = speUseUnitService.count();
-		int current = total/size;
-		current = current + 1;
-		for(int i = 1; i<=current; i++){
-
-
-			IPage<SpeUseUnit> page = new Page<>();
-			page.setCurrent(i);
-			page.setSize(size);
-			List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
-			for (SpeUseUnit speUseUnit : speUseUnitList) {
-
-				if(speUseUnit.getSyncState() != 3){
-					CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
-					QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-					queryWrapper.eq("use_code",speUseUnit.getCerCode());
-					TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
-
-					Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
-
-					if (ValidationUtil.isEmpty(resultMap)){
-						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){
-							List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(),null,null,null).getResult();
-							if(ValidationUtil.isEmpty(agencyUserModelList)){
-								//spe表中的数据在工商查不到，且平台无用户，将删除企业数据
-								Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
-								if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
-									this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
-								}
-							}
-						}
-						//spe表中的数据在工商查不到,设置spe表状态为1
-						speUseUnit.setSyncState(1);
-						speUseUnitService.updateById(speUseUnit);
-					}else {
-						CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
-						CompanyModel companyModel = new CompanyModel();
-						companyModel.setCompanyName(speUseUnit.getName());
-						companyModel.setCompanyCode(speUseUnit.getCerCode());
-						companyModel.setLevel("company");
-						companyModel.setAgencyCode("tzs");
-						companyModel.setCompanyType("使用单位");
-						companyModel.setAddress(String.valueOf(resultMap.get("address")));
-						companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
-
-
-						String area = String.valueOf(resultMap.get("area"));
-						String province = "";
-						if (area.contains("省")) {
-							province = area.substring(0, area.indexOf("省") + 1);
-						}
-						String city = "";
-						if (area.contains("市")) {
-							city = area.substring(province.length(), area.indexOf("市") + 1);
-						}
-						String district = area.substring(city.length() + province.length());
-						TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
-						baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
-						baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setProvince(province);
-						baseEnterpriseInfo.setCity(city);
-						baseEnterpriseInfo.setDistrict(district);
-						baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
-						baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
-						baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
-						baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-						baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
-						baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
-						baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfoList.add(baseEnterpriseInfo);
-
-
-						//保存平台和业务的企业信息
-						try {
-							if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
-								//当企业表、平台表 中没有时
-								this.save(baseEnterpriseInfo);
-								Privilege.companyClient.create(companyModel);
-							} else if (tzBaseEnterprisePrivilegeInfo == null) {
-								//企业表没有，平台表有
-								this.save(baseEnterpriseInfo);
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-							} else if (companyPrivilegeModel == null) {
-								//平台表没有，企业表有
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-								Privilege.companyClient.create(companyModel);
-							} else {
-								//企业表有 平台表有
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-							}
-							setSpeUseUnitState(3,speUseUnit);
-						} catch (Exception e) {
-							System.out.println(e.getMessage());
-							//当报错时 设置状态为 2
-							speUseUnit.setSyncState(2);
-							speUseUnitService.updateById(speUseUnit);
-						}
-					}
-				}
-			}
-		}
-		return "ok";
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
-		tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
-
-		tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
-		Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
-		tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
-		tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
-		tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
-		tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
-		tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
-		tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
-		tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
-		tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
-		tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
-
-		//修改工商信息
-		RegUnitIc regUnitIc = new RegUnitIc();
-		List<String> addressList = (List<String>) map.get("registerAddressList");
-		tzBaseEnterpriseInfo.setProvince(addressList.get(0));
-		tzBaseEnterpriseInfo.setCity(addressList.get(1));
-		tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
-		tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
-		tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
-		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
-		regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
-		regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
-		Date approvedDate = new Date();
-		try {
-			approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
-		regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
-		regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
-		RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
-		});
+        extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
+        implements ITzBaseEnterpriseInfoService {
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceService;
+
+    @Autowired
+    RegUnitIcServiceImpl regUnitIcService;
+
+    @Autowired
+    RegUnitInfoServiceImpl regUnitInfoService;
+
+
+    @Autowired
+    private SpeUseUnitServiceImpl speUseUnitService;
+
+    @Autowired
+    private AccessFeignService accessFeignService;
+
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Autowired
+    RegUnitInfoMapper regUnitInfoMapper;
+
+
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
+    /**
+     * 企业管理员变更缓存key前缀
+     */
+    private final String adminChange = "ADMIN_CHANGE_";
+
+    @Autowired
+    private EquipmentCategoryServiceImpl equipmentCategoryService;
+
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
+    @Override
+    public List<EquEnterDto> getInfo(String sequenceNbr) {
+        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+    }
+
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+        List<String> orgCodeList = new ArrayList<>();
+        if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+            FeignClientResult<CompanyModel> result = Privilege.companyClient
+                    .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+            if (result.getResult() != null) {
+                tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+            }
+        }
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
+        if (!ValidationUtil.isEmpty(companyType1)) {
+            for (JSONObject jsonObject : companyType1) {
+                String orgCode = jsonObject.getString("orgCode");
+                if (!ValidationUtil.isEmpty(orgCode)) {
+                    orgCodeList.add(orgCode);
+                }
+            }
+        }
+
+        return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto detail(Long id) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+            tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
+            tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
+            tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
+            tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
+            tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 管理员信息
+        RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
+                new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
+        if (regUnitInfo != null) {
+            BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
+        }
+        regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo) || ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
+        tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
+
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
+        return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
+    }
+
+    private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
+        if (!ValidationUtil.isEmpty(resultMap)) {
+            String area = String.valueOf(resultMap.get("area"));
+            String city = area.substring(0, area.indexOf("市") + 1);
+            String district = area.substring(city.length());
+            if (district.equals("高新区")) {
+                district = "雁塔区";
+            }
+            String industryName = "";
+            DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
+            if (!ValidationUtil.isEmpty(dataDictionary)) {
+                industryName = dataDictionary.getName();
+            }
+            String approveDate = String.valueOf(resultMap.get("approval_time"));
+            approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
+            approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
+            approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
+            regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
+            String approve = approveDate.substring(0, 10) + "核准";
+            tzBaseEnterpriseInfoDto.setApproval(approve);
+            try {
+                regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
+            regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
+            for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
+                if (djjg.getName().equals(resultMap.get("registration_authority"))) {
+                    regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
+                }
+            }
+            regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
+            regUnitIcDto.setProvince("陕西省");
+            regUnitIcDto.setCity(city);
+            regUnitIcDto.setDistrict(district);
+            regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
+            regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
+            regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
+            regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+            regUnitIcDto.setIndustryName(industryName);
+            regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
+            ArrayList<Object> objects = new ArrayList<>();
+            objects.add("陕西省");
+            objects.add(city);
+            objects.add(district);
+            regUnitIcDto.setRegisterAddressList(objects);
+            regUnitIcDto.setIsNotAccess("1");
+        } else {
+            regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
+            regUnitIcDto.setIsNotAccess("0");
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
+        return tzBaseEnterpriseInfoDto;
+    }
+
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
+        ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
+        result.add(tzBaseEnterpriseInfoDto);
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        return page.setRecords(result);
+    }
+
+    @Override
+    public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
+        return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
+        if (ValidationUtil.isEmpty(useUnit)) {
+            return new TzBaseEnterpriseInfoDto();
+        }
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public String syncEnterpriseInfo() {
+        platformTokenService.getToken();
+
+        List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
+
+        //获取平台企业表企业名称及sequence_code，并装入map中
+        Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
+        Map<String, CompanyModel> companyMap = new HashMap<>();
+
+        getCompanyInfoMap(companyModels, companyMap);
+
+        int size = 500;
+        int total = speUseUnitService.count();
+        int current = total / size;
+        current = current + 1;
+        for (int i = 1; i <= current; i++) {
+
+
+            IPage<SpeUseUnit> page = new Page<>();
+            page.setCurrent(i);
+            page.setSize(size);
+            List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
+            for (SpeUseUnit speUseUnit : speUseUnitList) {
+
+                if (speUseUnit.getSyncState() != 3) {
+                    CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
+                    QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
+                    queryWrapper.eq("use_code", speUseUnit.getCerCode());
+                    TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
+
+                    Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
+
+                    if (ValidationUtil.isEmpty(resultMap)) {
+                        if (!ValidationUtil.isEmpty(companyPrivilegeModel)) {
+                            List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(), null, null, null).getResult();
+                            if (ValidationUtil.isEmpty(agencyUserModelList)) {
+                                //spe表中的数据在工商查不到，且平台无用户，将删除企业数据
+                                Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
+                                if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
+                                    this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
+                                }
+                            }
+                        }
+                        //spe表中的数据在工商查不到,设置spe表状态为1
+                        speUseUnit.setSyncState(1);
+                        speUseUnitService.updateById(speUseUnit);
+                    } else {
+                        CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
+                        CompanyModel companyModel = new CompanyModel();
+                        companyModel.setCompanyName(speUseUnit.getName());
+                        companyModel.setCompanyCode(speUseUnit.getCerCode());
+                        companyModel.setLevel("company");
+                        companyModel.setAgencyCode("tzs");
+                        companyModel.setCompanyType("使用单位");
+                        companyModel.setAddress(String.valueOf(resultMap.get("address")));
+                        companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
+
+
+                        String area = String.valueOf(resultMap.get("area"));
+                        String province = "";
+                        if (area.contains("省")) {
+                            province = area.substring(0, area.indexOf("省") + 1);
+                        }
+                        String city = "";
+                        if (area.contains("市")) {
+                            city = area.substring(province.length(), area.indexOf("市") + 1);
+                        }
+                        String district = area.substring(city.length() + province.length());
+                        TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
+                        baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
+                        baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setProvince(province);
+                        baseEnterpriseInfo.setCity(city);
+                        baseEnterpriseInfo.setDistrict(district);
+                        baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
+                        baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
+                        baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
+                        baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+                        baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
+                        baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
+                        baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfoList.add(baseEnterpriseInfo);
+
+
+                        //保存平台和业务的企业信息
+                        try {
+                            if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
+                                //当企业表、平台表 中没有时
+                                this.save(baseEnterpriseInfo);
+                                Privilege.companyClient.create(companyModel);
+                            } else if (tzBaseEnterprisePrivilegeInfo == null) {
+                                //企业表没有，平台表有
+                                this.save(baseEnterpriseInfo);
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                            } else if (companyPrivilegeModel == null) {
+                                //平台表没有，企业表有
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                                Privilege.companyClient.create(companyModel);
+                            } else {
+                                //企业表有 平台表有
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                            }
+                            setSpeUseUnitState(3, speUseUnit);
+                        } catch (Exception e) {
+                            System.out.println(e.getMessage());
+                            //当报错时 设置状态为 2
+                            speUseUnit.setSyncState(2);
+                            speUseUnitService.updateById(speUseUnit);
+                        }
+                    }
+                }
+            }
+        }
+        return "ok";
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
+        tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
+
+        tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
+        Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
+        tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
+        tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
+        tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
+        tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
+        tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
+        tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
+        tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
+        tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
+        tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
+
+        //修改工商信息
+        RegUnitIc regUnitIc = new RegUnitIc();
+        List<String> addressList = (List<String>) map.get("registerAddressList");
+        tzBaseEnterpriseInfo.setProvince(addressList.get(0));
+        tzBaseEnterpriseInfo.setCity(addressList.get(1));
+        tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
+        tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
+        tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
+        tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
+        regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
+        regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
+        Date approvedDate = new Date();
+        try {
+            approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
+        regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
+        RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
+        });
 //		regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
 
 
-		//修改许可信息
-		List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
+        //修改许可信息
+        List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
 //		baseUnitLicenceService.saveOrUpdateBatch(licences);
 
 
 //        boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
-		boolean b = true;
+        boolean b = true;
         if (b) {
             TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
             BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
@@ -505,12 +482,12 @@ public class TzBaseEnterpriseInfoServiceImpl
 
     }
 
-	@Override
-	public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
-		List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
-		if (!ObjectUtils.isEmpty(enterpriseLabels)) {
-			for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
-				// 标签递增逻辑
+    @Override
+    public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
+        List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
+        if (!ObjectUtils.isEmpty(enterpriseLabels)) {
+            for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
+                // 标签递增逻辑
 //			if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getRegulatoryLabels())) {
 //				String result = checkLabel(enterpriseLabels, tzBaseEnterpriseInfo.getRegulatoryLabels());
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(result);
@@ -518,91 +495,72 @@ public class TzBaseEnterpriseInfoServiceImpl
 //				String labels = String.join(",", enterpriseLabels);
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
 //			}
-				String labels = String.join(",", enterpriseLabels);
-				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
-			}
-		} else {
-			tzBaseEnterpriseInfos.forEach(item -> {
-				item.setRegulatoryLabels(null);
-			});
-		}
-		this.updateBatchById(tzBaseEnterpriseInfos);
-		return "success";
-	}
-
-	private String checkLabel(List<String> enterpriseLabels, String result) {
-		List<String> strings = Arrays.asList(result.split(","));
-		ArrayList<String> res = new ArrayList<>(strings);
-		List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
-		res.addAll(collect);
-		return String.join(",", res);
-	}
-
-	public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
-		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
-		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(webProduct);
-		//获取机器人的token，获取不到则去登录
-		if (ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))) {
-			loginCtiUser();
-		}
-		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
-		Map<String, Object> resultMap = new HashMap<>();
-		if (!ObjectUtils.isEmpty(me)) {
-			RegUnitInfo regUnitInfo = new RegUnitInfo();
-			String unitCode = String.valueOf(map.get("unitCode"));
-			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
-			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
-			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
-			regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
-			me.setMobile(String.valueOf(map.get("adminTel")));
-			me.setRealName(String.valueOf(map.get("adminName")));
-			FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
-			if (200 == updateResult.getStatus()) {
-				regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
-				resultMap.put("success", regUnitInfo);
-				redisUtil.del(adminChange + map.get("adminTel"));
-			} else {
-				resultMap.put("fail", "平台用户修改失败，请联系管理员");
-			}
-		} else {
-			resultMap.put("fail", "平台用户不存在");
-		}
-		return resultMap;
-	}
-
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		loninData.setPassword(passwd);
-		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-		if(loginResult.getStatus() == 200) {
-			HashMap resultMap = (HashMap) loginResult.getResult();
-			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
-		}
-	}
-
-
-	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
-		speUseUnit.setSyncState(state);
-		speUseUnitService.updateById(speUseUnit);
-	}
-
-	public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-		if(companyModels == null){
-			return map;
-		}
-		Iterator iter = companyModels.iterator();
-		while(iter.hasNext()){
-			String json = JSON.toJSONString(iter.next());
-			CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
-			map.put(companyModel.getCompanyName(),companyModel);
-			getCompanyInfoMap(companyModel.getChildren(),map);
-		}
-		return map;
-	}
+                String labels = String.join(",", enterpriseLabels);
+                tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
+            }
+        } else {
+            tzBaseEnterpriseInfos.forEach(item -> {
+                item.setRegulatoryLabels(null);
+            });
+        }
+        this.updateBatchById(tzBaseEnterpriseInfos);
+        return "success";
+    }
+
+    private String checkLabel(List<String> enterpriseLabels, String result) {
+        List<String> strings = Arrays.asList(result.split(","));
+        ArrayList<String> res = new ArrayList<>(strings);
+        List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
+        res.addAll(collect);
+        return String.join(",", res);
+    }
+
+    @Override
+    public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
+        //每一个企业只有一个管理员，所以当前登录用户即管理员用户
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        platformTokenService.getToken();
+        Map<String, Object> resultMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(me)) {
+            RegUnitInfo regUnitInfo = new RegUnitInfo();
+            String unitCode = String.valueOf(map.get("unitCode"));
+            regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+            regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+            regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+            regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
+            me.setMobile(String.valueOf(map.get("adminTel")));
+            me.setRealName(String.valueOf(map.get("adminName")));
+            FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
+            if (200 == updateResult.getStatus()) {
+                regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
+                resultMap.put("success", regUnitInfo);
+                redisUtil.del(adminChange + map.get("adminTel"));
+            } else {
+                resultMap.put("fail", "平台用户修改失败，请联系管理员");
+            }
+        } else {
+            resultMap.put("fail", "平台用户不存在");
+        }
+        return resultMap;
+    }
+
+    public void setSpeUseUnitState(int state, SpeUseUnit speUseUnit) {
+        speUseUnit.setSyncState(state);
+        speUseUnitService.updateById(speUseUnit);
+    }
+
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
+            return map;
+        }
+        Iterator iter = companyModels.iterator();
+        while (iter.hasNext()) {
+            String json = JSON.toJSONString(iter.next());
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
+            map.put(companyModel.getCompanyName(), companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
+        }
+        return map;
+    }
 
 }

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

@@ -124,11 +124,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yeejoin.amos.boot.module.jczs.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.jczs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
 import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.jczs.biz.utils.RedisUtil;
@@ -40,11 +41,9 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
 
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
@@ -58,9 +57,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             throw new Exception("公司同步消息解析失败");
         }
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.getToken();
 
         //判断库中业务tz_base_enterprise_info是否存在
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/StartPlatformTokenService.java

 package com.yeejoin.amos.boot.module.jczs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.jczs.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.yeejoin.amos.boot.module.jczs.biz.utils.RedisUtil;
-import com.yeejoin.amos.component.robot.AmosRequestContext;
-
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Value("${admin.user}")
-	String user;
-
-	@Value("${admin.password}")
-	String password;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
-	@Autowired
-	RedisUtil redisUtil;
-	
-	@Autowired
-	AmosRequestContext amosRequestContext;
-	
 
-	public void getToken() {
-		RequestContext.setProduct(product);
-		RequestContext.setAppKey(appkey);
-		String token = amosRequestContext.getToken();
-		System.out.println("token:" + token);
-		RequestContext.setToken(token);
-		redisUtil.set("platform_token", token);
-	}
+    public void getToken() {
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+    }
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.jczs.flc.biz.service.impl.RegUnitIcServiceImpl;
-import com.yeejoin.amos.boot.module.jczs.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.boot.module.jczs.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.jczs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.jczs.api.dto.TzBaseEnterpriseInfoDto;
@@ -21,7 +19,6 @@ import com.yeejoin.amos.boot.module.jczs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.jczs.api.entity.SpeUseUnit;
 import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.jczs.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.jczs.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.jczs.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.jczs.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.jczs.flc.api.dto.RegUnitIcDto;
@@ -30,12 +27,12 @@ import com.yeejoin.amos.boot.module.jczs.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.jczs.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.jczs.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.jczs.flc.api.mapper.RegUnitInfoMapper;
+import com.yeejoin.amos.boot.module.jczs.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.boot.module.jczs.flc.biz.service.impl.RegUnitInfoServiceImpl;
 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.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,444 +54,421 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TzBaseEnterpriseInfoServiceImpl
-		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
-		implements ITzBaseEnterpriseInfoService {
+        extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
+        implements ITzBaseEnterpriseInfoService {
 
-	@Autowired
-	RedisUtil redisUtil;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${admin.product}")
-	String product;
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
-	@Value("${admin.product.web}")
-	String webProduct;
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceService;
 
-	@Value("${admin.appkey}")
-	String appkey;
+    @Autowired
+    RegUnitIcServiceImpl regUnitIcService;
 
-	@Autowired
-	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+    @Autowired
+    RegUnitInfoServiceImpl regUnitInfoService;
 
-	@Autowired
-	BaseUnitLicenceServiceImpl baseUnitLicenceService;
+    @Autowired
+    private SpeUseUnitServiceImpl speUseUnitService;
 
-	@Autowired
-    RegUnitIcServiceImpl regUnitIcService;
+    @Autowired
+    private AccessFeignService accessFeignService;
 
-	@Autowired
-    RegUnitInfoServiceImpl regUnitInfoService;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Autowired
+    RegUnitInfoMapper regUnitInfoMapper;
+
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
+    /**
+     * 企业管理员变更缓存key前缀
+     */
+    private final String adminChange = "ADMIN_CHANGE_";
+    @Autowired
+    private EquipmentCategoryServiceImpl equipmentCategoryService;
+
+    @Override
+    public List<EquEnterDto> getInfo(String sequenceNbr) {
+        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+    }
+
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+        List<String> orgCodeList = new ArrayList<>();
+        if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+            FeignClientResult<CompanyModel> result = Privilege.companyClient
+                    .seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+            if (result.getResult() != null) {
+                tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+            }
+        }
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
+        if (!ValidationUtil.isEmpty(companyType1)) {
+            for (JSONObject jsonObject : companyType1) {
+                String orgCode = jsonObject.getString("orgCode");
+                if (!ValidationUtil.isEmpty(orgCode)) {
+                    orgCodeList.add(orgCode);
+                }
+            }
+        }
+
+        return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto detail(Long id) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+            tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
+            tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
+            tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
+            tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
+            tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 管理员信息
+        RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
+                new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
+        if (regUnitInfo != null) {
+            BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
+        }
+        regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo) || ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
+        tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
+
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
+        return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
+    }
+
+    private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
+        if (!ValidationUtil.isEmpty(resultMap)) {
+            String area = String.valueOf(resultMap.get("area"));
+            String city = area.substring(0, area.indexOf("市") + 1);
+            String district = area.substring(city.length());
+            if (district.equals("高新区")) {
+                district = "雁塔区";
+            }
+            String industryName = "";
+            DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
+            if (!ValidationUtil.isEmpty(dataDictionary)) {
+                industryName = dataDictionary.getName();
+            }
+            String approveDate = String.valueOf(resultMap.get("approval_time"));
+            approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
+            approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
+            approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
+            regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
+            String approve = approveDate.substring(0, 10) + "核准";
+            tzBaseEnterpriseInfoDto.setApproval(approve);
+            try {
+                regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
+            regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
+            for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
+                if (djjg.getName().equals(resultMap.get("registration_authority"))) {
+                    regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
+                }
+            }
+            regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
+            regUnitIcDto.setProvince("陕西省");
+            regUnitIcDto.setCity(city);
+            regUnitIcDto.setDistrict(district);
+            regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
+            regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
+            regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
+            regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+            regUnitIcDto.setIndustryName(industryName);
+            regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
+            ArrayList<Object> objects = new ArrayList<>();
+            objects.add("陕西省");
+            objects.add(city);
+            objects.add(district);
+            regUnitIcDto.setRegisterAddressList(objects);
+            regUnitIcDto.setIsNotAccess("1");
+        } else {
+            regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
+            regUnitIcDto.setIsNotAccess("0");
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
+        return tzBaseEnterpriseInfoDto;
+    }
 
-	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
-
-	@Autowired
-	private SpeUseUnitServiceImpl speUseUnitService;
-
-	@Autowired
-	private AccessFeignService accessFeignService;
-
-	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
-
-	@Autowired
-	RegUnitInfoMapper regUnitInfoMapper;
-
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
-
-	@Value("${redis.cache.failure.time}")
-	private Long redisRegionTimeSecond;
-
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
-
-	/**
-	 * 企业管理员变更缓存key前缀
-	 */
-	private final  String adminChange = "ADMIN_CHANGE_";
-	@Autowired
-	private EquipmentCategoryServiceImpl equipmentCategoryService;
-
-	@Override
-	public List<EquEnterDto> getInfo(String sequenceNbr) {
-		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
-		List<String> orgCodeList = new ArrayList<>();
-		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
-			FeignClientResult<CompanyModel> result = Privilege.companyClient
-					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
-			if (result.getResult() != null) {
-				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
-			}
-		}
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
-		if (!ValidationUtil.isEmpty(companyType1)) {
-			for (JSONObject jsonObject : companyType1) {
-				String orgCode = jsonObject.getString("orgCode");
-				if (!ValidationUtil.isEmpty(orgCode)) {
-					orgCodeList.add(orgCode);
-				}
-			}
-		}
-
-		return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto,orgCodeList);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto detail(Long id) {
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-			tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
-			tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
-			tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
-			tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
-			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 管理员信息
-		RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
-				new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
-		if (regUnitInfo != null) {
-			BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
-		}
-		regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo)||ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
-		tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
-
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
-		return ObjectUtils.isEmpty(tzBaseEnterpriseInfo) ? null : getDetail(tzBaseEnterpriseInfo);
-	}
-
-	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
-		if (!ValidationUtil.isEmpty(resultMap)) {
-			String area = String.valueOf(resultMap.get("area"));
-			String city = area.substring(0, area.indexOf("市") + 1);
-			String district = area.substring(city.length());
-			if (district.equals("高新区")) {
-				district = "雁塔区";
-			}
-			String industryName = "";
-			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
-			if (!ValidationUtil.isEmpty(dataDictionary)) {
-				industryName = dataDictionary.getName();
-			}
-			String approveDate = String.valueOf(resultMap.get("approval_time"));
-			approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
-			approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
-			approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
-			regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
-			String approve = approveDate.substring(0, 10) + "核准";
-			tzBaseEnterpriseInfoDto.setApproval(approve);
-			try {
-				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
-			regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
-			for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
-				if(djjg.getName().equals(resultMap.get("registration_authority"))){
-					regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
-				}
-			}
-			regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
-			regUnitIcDto.setProvince("陕西省");
-			regUnitIcDto.setCity(city);
-			regUnitIcDto.setDistrict(district);
-			regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
-			regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
-			regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
-			regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-			regUnitIcDto.setIndustryName(industryName);
-			regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
-			ArrayList<Object> objects = new ArrayList<>();
-			objects.add("陕西省");
-			objects.add(city);
-			objects.add(district);
-			regUnitIcDto.setRegisterAddressList(objects);
-			regUnitIcDto.setIsNotAccess("1");
-		} else {
-			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
-			regUnitIcDto.setIsNotAccess("0");
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
-		return tzBaseEnterpriseInfoDto;
-	}
-
-	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
-		ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
-		result.add(tzBaseEnterpriseInfoDto);
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		return page.setRecords(result);
-	}
-
-	@Override
-	public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
-		return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
-		if(ValidationUtil.isEmpty(useUnit)){
-			return new TzBaseEnterpriseInfoDto();
-		}
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
-		if (tzBaseEnterpriseInfo != null) {
-			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
-		}
-		// 许可信息
-		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
-		if (!ValidationUtil.isEmpty(unitLicences)) {
-			for (BaseUnitLicence baseUnitLicence : unitLicences) {
-				BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
-				BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
-				unitLicenceDtos.add(baseUnitLicenceDto);
-			}
-		}
-
-		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
-		// 工商信息
-		RegUnitIc regUnitIc = regUnitIcService.getOne(
-				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		if (regUnitIc != null) {
-			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
-		}
-		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
-		return tzBaseEnterpriseInfoDto;
-
-	}
-
-	@Override
-	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-
-		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
-
-		//获取平台企业表企业名称及sequence_code，并装入map中
-		Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
-		Map<String,CompanyModel> companyMap = new HashMap<>();
-
-		getCompanyInfoMap(companyModels,companyMap);
-
-		int size = 500;
-		int total = speUseUnitService.count();
-		int current = total/size;
-		current = current + 1;
-		for(int i = 1; i<=current; i++){
-
-
-			IPage<SpeUseUnit> page = new Page<>();
-			page.setCurrent(i);
-			page.setSize(size);
-			List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
-			for (SpeUseUnit speUseUnit : speUseUnitList) {
-
-				if(speUseUnit.getSyncState() != 3){
-					CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
-					QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-					queryWrapper.eq("use_code",speUseUnit.getCerCode());
-					TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
-
-					Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
-
-					if (ValidationUtil.isEmpty(resultMap)){
-						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){
-							List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(),null,null,null).getResult();
-							if(ValidationUtil.isEmpty(agencyUserModelList)){
-								//spe表中的数据在工商查不到，且平台无用户，将删除企业数据
-								Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
-								if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
-									this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
-								}
-							}
-						}
-						//spe表中的数据在工商查不到,设置spe表状态为1
-						speUseUnit.setSyncState(1);
-						speUseUnitService.updateById(speUseUnit);
-					}else {
-						CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
-						CompanyModel companyModel = new CompanyModel();
-						companyModel.setCompanyName(speUseUnit.getName());
-						companyModel.setCompanyCode(speUseUnit.getCerCode());
-						companyModel.setLevel("company");
-						companyModel.setAgencyCode("tzs");
-						companyModel.setCompanyType("使用单位");
-						companyModel.setAddress(String.valueOf(resultMap.get("address")));
-						companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
-
-
-						String area = String.valueOf(resultMap.get("area"));
-						String province = "";
-						if (area.contains("省")) {
-							province = area.substring(0, area.indexOf("省") + 1);
-						}
-						String city = "";
-						if (area.contains("市")) {
-							city = area.substring(province.length(), area.indexOf("市") + 1);
-						}
-						String district = area.substring(city.length() + province.length());
-						TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
-						baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
-						baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setProvince(province);
-						baseEnterpriseInfo.setCity(city);
-						baseEnterpriseInfo.setDistrict(district);
-						baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
-						baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
-						baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
-						baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-						baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
-						baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
-						baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
-						baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
-						baseEnterpriseInfo.setUnitType("使用单位");
-						baseEnterpriseInfoList.add(baseEnterpriseInfo);
-
-
-						//保存平台和业务的企业信息
-						try {
-							if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
-								//当企业表、平台表 中没有时
-								this.save(baseEnterpriseInfo);
-								Privilege.companyClient.create(companyModel);
-							} else if (tzBaseEnterprisePrivilegeInfo == null) {
-								//企业表没有，平台表有
-								this.save(baseEnterpriseInfo);
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-							} else if (companyPrivilegeModel == null) {
-								//平台表没有，企业表有
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-								Privilege.companyClient.create(companyModel);
-							} else {
-								//企业表有 平台表有
-								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
-									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
-								}
-								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
-									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
-								}
-							}
-							setSpeUseUnitState(3,speUseUnit);
-						} catch (Exception e) {
-							System.out.println(e.getMessage());
-							//当报错时 设置状态为 2
-							speUseUnit.setSyncState(2);
-							speUseUnitService.updateById(speUseUnit);
-						}
-					}
-				}
-			}
-		}
-		return "ok";
-	}
-
-	@Override
-	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
-		tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
-
-		tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
-		Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
-		tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
-		tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
-		tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
-		tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
-		tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
-		tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
-		tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
-		tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
-		tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
-
-		//修改工商信息
-		RegUnitIc regUnitIc = new RegUnitIc();
-		List<String> addressList = (List<String>) map.get("registerAddressList");
-		tzBaseEnterpriseInfo.setProvince(addressList.get(0));
-		tzBaseEnterpriseInfo.setCity(addressList.get(1));
-		tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
-		tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
-		tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
-		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
-		regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
-		regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
-		Date approvedDate = new Date();
-		try {
-			approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
-		regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
-		regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
-		RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
-		});
+    @Override
+    public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
+        ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
+        result.add(tzBaseEnterpriseInfoDto);
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        return page.setRecords(result);
+    }
+
+    @Override
+    public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
+        return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
+        if (ValidationUtil.isEmpty(useUnit)) {
+            return new TzBaseEnterpriseInfoDto();
+        }
+        TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
+        if (tzBaseEnterpriseInfo != null) {
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+        }
+        // 许可信息
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+        if (!ValidationUtil.isEmpty(unitLicences)) {
+            for (BaseUnitLicence baseUnitLicence : unitLicences) {
+                BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+                BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+                unitLicenceDtos.add(baseUnitLicenceDto);
+            }
+        }
+
+        tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+        // 工商信息
+        RegUnitIc regUnitIc = regUnitIcService.getOne(
+                new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+        RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+        if (regUnitIc != null) {
+            BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+        }
+        tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+        return tzBaseEnterpriseInfoDto;
+
+    }
+
+    @Override
+    public String syncEnterpriseInfo() {
+		platformTokenService.getToken();
+        List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
+
+        //获取平台企业表企业名称及sequence_code，并装入map中
+        Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
+        Map<String, CompanyModel> companyMap = new HashMap<>();
+
+        getCompanyInfoMap(companyModels, companyMap);
+
+        int size = 500;
+        int total = speUseUnitService.count();
+        int current = total / size;
+        current = current + 1;
+        for (int i = 1; i <= current; i++) {
+
+
+            IPage<SpeUseUnit> page = new Page<>();
+            page.setCurrent(i);
+            page.setSize(size);
+            List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
+            for (SpeUseUnit speUseUnit : speUseUnitList) {
+
+                if (speUseUnit.getSyncState() != 3) {
+                    CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
+                    QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
+                    queryWrapper.eq("use_code", speUseUnit.getCerCode());
+                    TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
+
+                    Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
+
+                    if (ValidationUtil.isEmpty(resultMap)) {
+                        if (!ValidationUtil.isEmpty(companyPrivilegeModel)) {
+                            List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(), null, null, null).getResult();
+                            if (ValidationUtil.isEmpty(agencyUserModelList)) {
+                                //spe表中的数据在工商查不到，且平台无用户，将删除企业数据
+                                Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
+                                if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
+                                    this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
+                                }
+                            }
+                        }
+                        //spe表中的数据在工商查不到,设置spe表状态为1
+                        speUseUnit.setSyncState(1);
+                        speUseUnitService.updateById(speUseUnit);
+                    } else {
+                        CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
+                        CompanyModel companyModel = new CompanyModel();
+                        companyModel.setCompanyName(speUseUnit.getName());
+                        companyModel.setCompanyCode(speUseUnit.getCerCode());
+                        companyModel.setLevel("company");
+                        companyModel.setAgencyCode("tzs");
+                        companyModel.setCompanyType("使用单位");
+                        companyModel.setAddress(String.valueOf(resultMap.get("address")));
+                        companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
+
+
+                        String area = String.valueOf(resultMap.get("area"));
+                        String province = "";
+                        if (area.contains("省")) {
+                            province = area.substring(0, area.indexOf("省") + 1);
+                        }
+                        String city = "";
+                        if (area.contains("市")) {
+                            city = area.substring(province.length(), area.indexOf("市") + 1);
+                        }
+                        String district = area.substring(city.length() + province.length());
+                        TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
+                        baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
+                        baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfo.setRegistrationAuthority(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setProvince(province);
+                        baseEnterpriseInfo.setCity(city);
+                        baseEnterpriseInfo.setDistrict(district);
+                        baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
+                        baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
+                        baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
+                        baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
+                        baseEnterpriseInfo.setIndustry(String.valueOf(resultMap.get("industry")));
+                        baseEnterpriseInfo.setSuperviseOrgName(String.valueOf(resultMap.get("registration_authority")));
+                        baseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
+                        baseEnterpriseInfo.setOperatingStatus(String.valueOf(resultMap.get("operating_status")));
+                        baseEnterpriseInfo.setUnitType("使用单位");
+                        baseEnterpriseInfoList.add(baseEnterpriseInfo);
+
+
+                        //保存平台和业务的企业信息
+                        try {
+                            if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
+                                //当企业表、平台表 中没有时
+                                this.save(baseEnterpriseInfo);
+                                Privilege.companyClient.create(companyModel);
+                            } else if (tzBaseEnterprisePrivilegeInfo == null) {
+                                //企业表没有，平台表有
+                                this.save(baseEnterpriseInfo);
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                            } else if (companyPrivilegeModel == null) {
+                                //平台表没有，企业表有
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                                Privilege.companyClient.create(companyModel);
+                            } else {
+                                //企业表有 平台表有
+                                if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+                                    companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+                                    Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+                                }
+                                if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+                                    tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+                                    this.updateById(tzBaseEnterprisePrivilegeInfo);
+                                }
+                            }
+                            setSpeUseUnitState(3, speUseUnit);
+                        } catch (Exception e) {
+                            System.out.println(e.getMessage());
+                            //当报错时 设置状态为 2
+                            speUseUnit.setSyncState(2);
+                            speUseUnitService.updateById(speUseUnit);
+                        }
+                    }
+                }
+            }
+        }
+        return "ok";
+    }
+
+    @Override
+    public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
+        tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
+
+        tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
+        Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
+        tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
+        tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
+        tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
+        tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
+        tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
+        tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
+        tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
+        tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
+        tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
+
+        //修改工商信息
+        RegUnitIc regUnitIc = new RegUnitIc();
+        List<String> addressList = (List<String>) map.get("registerAddressList");
+        tzBaseEnterpriseInfo.setProvince(addressList.get(0));
+        tzBaseEnterpriseInfo.setCity(addressList.get(1));
+        tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
+        tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
+        tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
+        tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
+        regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
+        regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
+        Date approvedDate = new Date();
+        try {
+            approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
+        regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
+        RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
+        });
 //		regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
 
 
-		//修改许可信息
-		List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
+        //修改许可信息
+        List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
 //		baseUnitLicenceService.saveOrUpdateBatch(licences);
 
 
 //        boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
-		boolean b = true;
+        boolean b = true;
         if (b) {
             TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
             BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
@@ -505,12 +479,12 @@ public class TzBaseEnterpriseInfoServiceImpl
 
     }
 
-	@Override
-	public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
-		List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
-		if (!ObjectUtils.isEmpty(enterpriseLabels)) {
-			for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
-				// 标签递增逻辑
+    @Override
+    public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
+        List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
+        if (!ObjectUtils.isEmpty(enterpriseLabels)) {
+            for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
+                // 标签递增逻辑
 //			if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getRegulatoryLabels())) {
 //				String result = checkLabel(enterpriseLabels, tzBaseEnterpriseInfo.getRegulatoryLabels());
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(result);
@@ -518,91 +492,73 @@ public class TzBaseEnterpriseInfoServiceImpl
 //				String labels = String.join(",", enterpriseLabels);
 //				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
 //			}
-				String labels = String.join(",", enterpriseLabels);
-				tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
-			}
-		} else {
-			tzBaseEnterpriseInfos.forEach(item -> {
-				item.setRegulatoryLabels(null);
-			});
-		}
-		this.updateBatchById(tzBaseEnterpriseInfos);
-		return "success";
-	}
-
-	private String checkLabel(List<String> enterpriseLabels, String result) {
-		List<String> strings = Arrays.asList(result.split(","));
-		ArrayList<String> res = new ArrayList<>(strings);
-		List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
-		res.addAll(collect);
-		return String.join(",", res);
-	}
-
-	public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
-		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
-		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(webProduct);
-		//获取机器人的token，获取不到则去登录
-		if (ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))) {
-			loginCtiUser();
-		}
-		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
-		Map<String, Object> resultMap = new HashMap<>();
-		if (!ObjectUtils.isEmpty(me)) {
-			RegUnitInfo regUnitInfo = new RegUnitInfo();
-			String unitCode = String.valueOf(map.get("unitCode"));
-			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
-			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
-			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
-			regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
-			me.setMobile(String.valueOf(map.get("adminTel")));
-			me.setRealName(String.valueOf(map.get("adminName")));
-			FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
-			if (200 == updateResult.getStatus()) {
-				regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
-				resultMap.put("success", regUnitInfo);
-				redisUtil.del(adminChange + map.get("adminTel"));
-			} else {
-				resultMap.put("fail", "平台用户修改失败，请联系管理员");
-			}
-		} else {
-			resultMap.put("fail", "平台用户不存在");
-		}
-		return resultMap;
-	}
-
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		loninData.setPassword(passwd);
-		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-		if(loginResult.getStatus() == 200) {
-			HashMap resultMap = (HashMap) loginResult.getResult();
-			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
-		}
-	}
-
-
-	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
-		speUseUnit.setSyncState(state);
-		speUseUnitService.updateById(speUseUnit);
-	}
-
-	public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-		if(companyModels == null){
-			return map;
-		}
-		Iterator iter = companyModels.iterator();
-		while(iter.hasNext()){
-			String json = JSON.toJSONString(iter.next());
-			CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
-			map.put(companyModel.getCompanyName(),companyModel);
-			getCompanyInfoMap(companyModel.getChildren(),map);
-		}
-		return map;
-	}
+                String labels = String.join(",", enterpriseLabels);
+                tzBaseEnterpriseInfo.setRegulatoryLabels(labels);
+            }
+        } else {
+            tzBaseEnterpriseInfos.forEach(item -> {
+                item.setRegulatoryLabels(null);
+            });
+        }
+        this.updateBatchById(tzBaseEnterpriseInfos);
+        return "success";
+    }
+
+    private String checkLabel(List<String> enterpriseLabels, String result) {
+        List<String> strings = Arrays.asList(result.split(","));
+        ArrayList<String> res = new ArrayList<>(strings);
+        List<String> collect = enterpriseLabels.stream().filter(item -> !strings.contains(item)).collect(Collectors.toList());
+        res.addAll(collect);
+        return String.join(",", res);
+    }
+
+    @Override
+    public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
+        //每一个企业只有一个管理员，所以当前登录用户即管理员用户
+        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+        platformTokenService.getToken();
+        Map<String, Object> resultMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(me)) {
+            RegUnitInfo regUnitInfo = new RegUnitInfo();
+            String unitCode = String.valueOf(map.get("unitCode"));
+            regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+            regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+            regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+            regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
+            me.setMobile(String.valueOf(map.get("adminTel")));
+            me.setRealName(String.valueOf(map.get("adminName")));
+            FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
+            if (200 == updateResult.getStatus()) {
+                regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
+                resultMap.put("success", regUnitInfo);
+                redisUtil.del(adminChange + map.get("adminTel"));
+            } else {
+                resultMap.put("fail", "平台用户修改失败，请联系管理员");
+            }
+        } else {
+            resultMap.put("fail", "平台用户不存在");
+        }
+        return resultMap;
+    }
+
+
+    public void setSpeUseUnitState(int state, SpeUseUnit speUseUnit) {
+        speUseUnit.setSyncState(state);
+        speUseUnitService.updateById(speUseUnit);
+    }
+
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
+            return map;
+        }
+        Iterator iter = companyModels.iterator();
+        while (iter.hasNext()) {
+            String json = JSON.toJSONString(iter.next());
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
+            map.put(companyModel.getCompanyName(), companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
+        }
+        return map;
+    }
 
 }

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

@@ -122,11 +122,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false

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

 package com.yeejoin.amos.boot.module.tcm.biz.listener;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.boot.module.tcm.biz.utils.DesUtil;
-import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
+import com.yeejoin.amos.boot.module.tcm.biz.utils.DesUtil;
+import com.yeejoin.amos.boot.module.tcm.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;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: mqtt监听服务
@@ -41,127 +31,123 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @Slf4j
 public class BaseEnterpriseMqTtlListener extends EmqxListener {
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Value("${amos.secret.key}")
+    String secretKey;
 
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
-
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
-	@Autowired
+    @Autowired
     RedisUtil redisUtil;
 
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Value("${org.filter.group.seq}")
+    private Long groupSeq;
 
-	@Value("${org.filter.group.seq}")
-	private Long groupSeq;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
-	@Override
-	public void processMessage(String topic, MqttMessage message) throws Exception {
-		System.out.println(message);
-		JSONObject object = null;
-		try {
-			object = JSONObject.parseObject(message.toString());
-		} catch (Exception e) {
-			throw new Exception("公司同步消息解析失败");
-		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
-		List<ApplicationModel> aList = aResult.getResult();
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+        JSONObject object = null;
+        try {
+            object = JSONObject.parseObject(message.toString());
+        } catch (Exception e) {
+            throw new Exception("公司同步消息解析失败");
+        }
+        platformTokenService.setRequestContext();
+        FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+        List<ApplicationModel> aList = aResult.getResult();
 //		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
 //				.map(i -> i.getAppCode()).collect(Collectors.toList());
-		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
-		// FeignClientResult<Collection<CompanyModel>> cResult =
-		// Privilege.companyClient.queryAgencyTree(null);
-		String useCode = object.getString("use_code");
-		// if (useCode == null || !isUse(useCode, cResult.getResult())) {
-		if (cResult.getResult() == null) {
-			CompanyModel companyModel = new CompanyModel();
-			companyModel.setCompanyName(object.getString("use_unit"));
-			companyModel.setParentId(0L);
-			companyModel.setLevel("company");
-			String unitTypes = object.getString("unit_type");
-			companyModel.setCompanyType(unitTypes);
-			// companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
-			companyModel.setCompanyCode(useCode);
-			if (object.getString("supervise_org_code") != null) {
-				FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
-						.queryByOrgcode(object.getString("supervise_org_code"));
-				// JSONObject parent =
-				// JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
-				if (result.getResult().get("sequenceNbr") != null) {
-					companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
-				}
-			}
-			FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
-			Long companySqr = createResult.getResult().getSequenceNbr();
-			String unitCode = object.getString("use_code");
-			if (unitCode == null || unitCode.length() < 6) {
-				log.error("公司统一信用代码长度不够6位");
-				throw new Exception("公司统一信用代码长度不够6位");
-			}
-			String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
-			FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
-			if (uResult.getResult() == null) {
-				FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-				List<RoleModel> allRoleList = roleListResult.getResult();
-				AgencyUserModel userModel = new AgencyUserModel();
-				userModel.setUserName(userName);
-				userModel.setRealName(userName);
-				userModel.setPassword(DesUtil.encode(userName, secretKey));
-				userModel.setRePassword(DesUtil.encode(userName, secretKey));
-				// userModel.setMobile(vo.getPhoneNo());
-				userModel.setLockStatus("UNLOCK");
-				// FeignClientResult<List<RoleModel>> list =
-				// Privilege.roleClient.queryRoleList("使用单位", "admin");
-				String[] unitTypeArray = unitTypes.split(",");
-				List<String> unitTypeList = Arrays.asList(unitTypeArray);
-				Set<String> roleNameSet = new HashSet<>();
-				Set<String> appCodesSet = new HashSet<>();
-				List<RoleModel> userRoleList = new ArrayList<>();
-				List<Long> roleIds = new ArrayList<>();
-				Map<Long, List<Long>> roleSeqMap = new HashMap<>();
-				for (String unitTypeStr : unitTypeList) {
-					DataDictionary unitType = iDataDictionaryService
-							.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, unitTypeStr));
-					String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
-					String[] appCodes = appCode.split(",");
-					Collections.addAll(appCodesSet, appCodes);
-					roleNameSet.add(unitType.getName());
-					userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
-							.collect(Collectors.toList());
-					for (RoleModel r : userRoleList) {
-						if (!roleIds.contains(r.getSequenceNbr())) {
-							roleIds.add(r.getSequenceNbr());
-						}
-					}
-					roleSeqMap.put(companySqr, roleIds);
-				}
-				userModel.setAppCodes(new ArrayList<>(appCodesSet));
-				userModel.setOrgRoleSeqs(roleSeqMap);
-				FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
-				String[] userIds = { userResult.getResult().getUserId() };
+        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
+        // FeignClientResult<Collection<CompanyModel>> cResult =
+        // Privilege.companyClient.queryAgencyTree(null);
+        String useCode = object.getString("use_code");
+        // if (useCode == null || !isUse(useCode, cResult.getResult())) {
+        if (cResult.getResult() == null) {
+            CompanyModel companyModel = new CompanyModel();
+            companyModel.setCompanyName(object.getString("use_unit"));
+            companyModel.setParentId(0L);
+            companyModel.setLevel("company");
+            String unitTypes = object.getString("unit_type");
+            companyModel.setCompanyType(unitTypes);
+            // companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+            companyModel.setCompanyCode(useCode);
+            if (object.getString("supervise_org_code") != null) {
+                FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
+                        .queryByOrgcode(object.getString("supervise_org_code"));
+                // JSONObject parent =
+                // JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
+                if (result.getResult().get("sequenceNbr") != null) {
+                    companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
+                }
+            }
+            FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
+            Long companySqr = createResult.getResult().getSequenceNbr();
+            String unitCode = object.getString("use_code");
+            if (unitCode == null || unitCode.length() < 6) {
+                log.error("公司统一信用代码长度不够6位");
+                throw new Exception("公司统一信用代码长度不够6位");
+            }
+            String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+            FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+            if (uResult.getResult() == null) {
+                FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+                List<RoleModel> allRoleList = roleListResult.getResult();
+                AgencyUserModel userModel = new AgencyUserModel();
+                userModel.setUserName(userName);
+                userModel.setRealName(userName);
+                userModel.setPassword(DesUtil.encode(userName, secretKey));
+                userModel.setRePassword(DesUtil.encode(userName, secretKey));
+                // userModel.setMobile(vo.getPhoneNo());
+                userModel.setLockStatus("UNLOCK");
+                // FeignClientResult<List<RoleModel>> list =
+                // Privilege.roleClient.queryRoleList("使用单位", "admin");
+                String[] unitTypeArray = unitTypes.split(",");
+                List<String> unitTypeList = Arrays.asList(unitTypeArray);
+                Set<String> roleNameSet = new HashSet<>();
+                Set<String> appCodesSet = new HashSet<>();
+                List<RoleModel> userRoleList = new ArrayList<>();
+                List<Long> roleIds = new ArrayList<>();
+                Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+                for (String unitTypeStr : unitTypeList) {
+                    DataDictionary unitType = iDataDictionaryService
+                            .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, unitTypeStr));
+                    String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
+                    String[] appCodes = appCode.split(",");
+                    Collections.addAll(appCodesSet, appCodes);
+                    roleNameSet.add(unitType.getName());
+                    userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
+                            .collect(Collectors.toList());
+                    for (RoleModel r : userRoleList) {
+                        if (!roleIds.contains(r.getSequenceNbr())) {
+                            roleIds.add(r.getSequenceNbr());
+                        }
+                    }
+                    roleSeqMap.put(companySqr, roleIds);
+                }
+                userModel.setAppCodes(new ArrayList<>(appCodesSet));
+                userModel.setOrgRoleSeqs(roleSeqMap);
+                FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
+                String[] userIds = {userResult.getResult().getUserId()};
 //				if (groupSeq != null) {
 //					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
 //				}
-			}
-		}
-	}
+            }
+        }
+    }
 
-	private boolean isUse(String useCode, Collection<CompanyModel> companys) {
-		for (Object obj : companys) {
-			String json = JSONObject.toJSONString(obj);
-			CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
-			if (useCode.equals(companyMode.getCompanyCode())) {
-				return true;
-			} else if (companyMode.getChildren() != null) {
-				return isUse(useCode, companyMode.getChildren());
-			}
-		}
-		return false;
-	}
+    private boolean isUse(String useCode, Collection<CompanyModel> companys) {
+        for (Object obj : companys) {
+            String json = JSONObject.toJSONString(obj);
+            CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
+            if (useCode.equals(companyMode.getCompanyCode())) {
+                return true;
+            } else if (companyMode.getChildren() != null) {
+                return isUse(useCode, companyMode.getChildren());
+            }
+        }
+        return false;
+    }
 }

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

 package com.yeejoin.amos.boot.module.tcm.biz.listener;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
-import com.alibaba.fastjson.JSONObject;
 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;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: mqtt监听服务
@@ -33,78 +31,74 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @Slf4j
 public class CarcylUnitInspectMqTtlListener extends EmqxListener {
-	@Value("${amos.secret.key}")
-	String secretKey;
-
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
+    @Value("${amos.secret.key}")
+    String secretKey;
 
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
-	@Autowired
+    @Autowired
     RedisUtil redisUtil;
 
-	@Value("${org.filter.group.seq}")
-	private Long groupSeq;
-	
-	@Override 
-	public void processMessage(String topic, MqttMessage message) throws Exception {
-		System.out.println(message);
-		JSONObject object = null;
-		try {
-			object = JSONObject.parseObject(message.toString());
-		} catch (Exception e) {
-			throw new Exception("公司同步消息解析失败");
-		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
-		List<ApplicationModel> aList = aResult.getResult();
-		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
-				.map(i -> i.getAppCode()).collect(Collectors.toList());
+    @Value("${org.filter.group.seq}")
+    private Long groupSeq;
+
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+        JSONObject object = null;
+        try {
+            object = JSONObject.parseObject(message.toString());
+        } catch (Exception e) {
+            throw new Exception("公司同步消息解析失败");
+        }
+        platformTokenService.setRequestContext();
+        FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+        List<ApplicationModel> aList = aResult.getResult();
+        List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
+                .map(i -> i.getAppCode()).collect(Collectors.toList());
         String uuid = object.getString("id");
-        Long id = Long.valueOf(uuid.replaceAll("-","").hashCode());
-        
-		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(id);
-		if (cResult.getResult() == null) {
-			CompanyModel companyModel = new CompanyModel();
-			companyModel.setCompanyName(object.getString("inspect_unit_name"));
-			companyModel.setParentId(0L);
-			companyModel.setLevel("company");
-			companyModel.setSequenceNbr(id);
-			companyModel.setCompanyCode(object.getString("org_unit_name"));
-			companyModel.setCompanyType("检验单位");
-			Privilege.companyClient.create(companyModel);
-		}
+        Long id = Long.valueOf(uuid.replaceAll("-", "").hashCode());
+
+        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(id);
+        if (cResult.getResult() == null) {
+            CompanyModel companyModel = new CompanyModel();
+            companyModel.setCompanyName(object.getString("inspect_unit_name"));
+            companyModel.setParentId(0L);
+            companyModel.setLevel("company");
+            companyModel.setSequenceNbr(id);
+            companyModel.setCompanyCode(object.getString("org_unit_name"));
+            companyModel.setCompanyType("检验单位");
+            Privilege.companyClient.create(companyModel);
+        }
 
-		String unitCode = object.getString("org_unit_name");
-		if (unitCode == null || unitCode.length() < 6) {
-			log.error("公司统一信用代码长度不够6位");
-			throw new Exception("公司统一信用代码长度不够6位");
-		}
-		String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
-		FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
-		if (uResult.getResult() == null) {
-			AgencyUserModel userModel = new AgencyUserModel();
-			userModel.setUserName(userName);
-			userModel.setRealName(userName);
-			userModel.setPassword(DesUtil.encode(userName, secretKey));
-			userModel.setRePassword(DesUtil.encode(userName, secretKey));
-			// userModel.setMobile(vo.getPhoneNo());
-			userModel.setLockStatus("UNLOCK");
-			FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("检验单位", "admin");
-			Map<Long, List<Long>> orgRoles = new HashMap<>();
-			List<Long> roleIds = new ArrayList<>();
-			roleIds.add(list.getResult().get(0).getSequenceNbr());
-			orgRoles.put(id, roleIds);
-			userModel.setAppCodes(appCodes);
-			userModel.setOrgRoleSeqs(orgRoles);
-			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
-			String[] userIds = {userResult.getResult().getUserId()};
+        String unitCode = object.getString("org_unit_name");
+        if (unitCode == null || unitCode.length() < 6) {
+            log.error("公司统一信用代码长度不够6位");
+            throw new Exception("公司统一信用代码长度不够6位");
+        }
+        String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+        FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+        if (uResult.getResult() == null) {
+            AgencyUserModel userModel = new AgencyUserModel();
+            userModel.setUserName(userName);
+            userModel.setRealName(userName);
+            userModel.setPassword(DesUtil.encode(userName, secretKey));
+            userModel.setRePassword(DesUtil.encode(userName, secretKey));
+            // userModel.setMobile(vo.getPhoneNo());
+            userModel.setLockStatus("UNLOCK");
+            FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("检验单位", "admin");
+            Map<Long, List<Long>> orgRoles = new HashMap<>();
+            List<Long> roleIds = new ArrayList<>();
+            roleIds.add(list.getResult().get(0).getSequenceNbr());
+            orgRoles.put(id, roleIds);
+            userModel.setAppCodes(appCodes);
+            userModel.setOrgRoleSeqs(orgRoles);
+            FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
+            String[] userIds = {userResult.getResult().getUserId()};
 //			if (groupSeq != null) {
 //				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
 //			}
-		}
-	}
+        }
+    }
 }

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

@@ -5,16 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.service.IRegUnitInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -39,23 +38,18 @@ public class PlatformUserTopicMessage extends EmqxListener {
     @Autowired
     RedisUtils redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
-
     @Autowired
     IEquipmentCategoryService equipmentCategoryService;
 
     @Autowired
     IRegUnitInfoService regUnitInfoService;
 
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
     @Override
     public void processMessage(String topic, MqttMessage message) {
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.setRequestContext();
         JSONObject jsonObject = JSON.parseObject(message.toString());
         JSONObject result = jsonObject.getJSONObject("result");
         JSONObject dataResult = result.getJSONObject("result");

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

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.AccessFeignService;
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
@@ -16,14 +16,16 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 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.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
 
 @Component
 @Slf4j
@@ -40,11 +42,8 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
@@ -58,15 +57,13 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             throw new Exception("公司同步消息解析失败");
         }
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.setRequestContext();
 
         //判断库中业务tz_base_enterprise_info是否存在
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-        queryWrapper.eq("use_code",object.getString("unit_code"));
+        queryWrapper.eq("use_code", object.getString("unit_code"));
         TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
-        if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)){
+        if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
             accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             return;
         }
@@ -95,14 +92,14 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("use_code",object.getString("unit_code"));
+        updateWrapper.eq("use_code", object.getString("unit_code"));
 
         String regCode = object.getString("reg_code");
         CompanyModel supervisePrivilegeCompanyModel;
         if (!ValidationUtil.isEmpty(regCode)) {
             supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
-            if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
                 supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
 
                 if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
@@ -120,37 +117,37 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
         tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
 
-        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
+        if (ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())) {
             tzBaseEnterpriseInfo.setUnitType("");
         }
 
 
         try {
-            if (tzBaseEnterprisePrivilegeInfo == null ) {
+            if (tzBaseEnterprisePrivilegeInfo == null) {
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 return;
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
         }
     }
 
-    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-        if(companyModels == null){
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
             return map;
         }
         Iterator iter = companyModels.iterator();
-        while(iter.hasNext()){
+        while (iter.hasNext()) {
             String json = JSON.toJSONString(iter.next());
-            CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
 
             String code = companyModel.getCompanyCode();
-            if(code.length() >=6){
+            if (code.length() >= 6) {
                 code = code.substring(0, 6);
             }
-            map.put(code,companyModel);
-            getCompanyInfoMap(companyModel.getChildren(),map);
+            map.put(code, companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
         }
         return map;
     }

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

@@ -132,11 +132,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false

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

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -44,11 +45,6 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 	@Value("${amos.secret.key}")
 	String secretKey;
 
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
-
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
 	@Autowired
     RedisUtil redisUtil;
 
@@ -58,6 +54,9 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 	@Value("${org.filter.group.seq}")
 	private Long groupSeq;
 
+	@Autowired
+	StartPlatformTokenService platformTokenService;
+
 	@Override
 	public void processMessage(String topic, MqttMessage message) throws Exception {
 		System.out.println(message);
@@ -67,9 +66,7 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 		} catch (Exception e) {
 			throw new Exception("公司同步消息解析失败");
 		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		platformTokenService.getToken();
 		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
 		List<ApplicationModel> aList = aResult.getResult();
 //		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)

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

 package com.yeejoin.amos.boot.module.ymt.biz.listener;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.DesUtil;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
-import com.alibaba.fastjson.JSONObject;
 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;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: mqtt监听服务
@@ -33,78 +31,74 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @Slf4j
 public class CarcylUnitInspectMqTtlListener extends EmqxListener {
-	@Value("${amos.secret.key}")
-	String secretKey;
-
-	@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-	String product;
+    @Value("${amos.secret.key}")
+    String secretKey;
 
-	@Value("${amos.system.user.app-key:AMOS_STUDIO}")
-	String appkey;
-	@Autowired
+    @Autowired
     RedisUtil redisUtil;
 
-	@Value("${org.filter.group.seq}")
-	private Long groupSeq;
-	
-	@Override 
-	public void processMessage(String topic, MqttMessage message) throws Exception {
-		System.out.println(message);
-		JSONObject object = null;
-		try {
-			object = JSONObject.parseObject(message.toString());
-		} catch (Exception e) {
-			throw new Exception("公司同步消息解析失败");
-		}
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-		FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
-		List<ApplicationModel> aList = aResult.getResult();
-		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
-				.map(i -> i.getAppCode()).collect(Collectors.toList());
+    @Value("${org.filter.group.seq}")
+    private Long groupSeq;
+
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+        System.out.println(message);
+        JSONObject object = null;
+        try {
+            object = JSONObject.parseObject(message.toString());
+        } catch (Exception e) {
+            throw new Exception("公司同步消息解析失败");
+        }
+        platformTokenService.getToken();
+        FeignClientResult<List<ApplicationModel>> aResult = Privilege.applicationClient.queryAgencyApplications();
+        List<ApplicationModel> aList = aResult.getResult();
+        List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
+                .map(i -> i.getAppCode()).collect(Collectors.toList());
         String uuid = object.getString("id");
-        Long id = Long.valueOf(uuid.replaceAll("-","").hashCode());
-        
-		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(id);
-		if (cResult.getResult() == null) {
-			CompanyModel companyModel = new CompanyModel();
-			companyModel.setCompanyName(object.getString("inspect_unit_name"));
-			companyModel.setParentId(0L);
-			companyModel.setLevel("company");
-			companyModel.setSequenceNbr(id);
-			companyModel.setCompanyCode(object.getString("org_unit_name"));
-			companyModel.setCompanyType("检验单位");
-			Privilege.companyClient.create(companyModel);
-		}
+        Long id = Long.valueOf(uuid.replaceAll("-", "").hashCode());
+
+        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(id);
+        if (cResult.getResult() == null) {
+            CompanyModel companyModel = new CompanyModel();
+            companyModel.setCompanyName(object.getString("inspect_unit_name"));
+            companyModel.setParentId(0L);
+            companyModel.setLevel("company");
+            companyModel.setSequenceNbr(id);
+            companyModel.setCompanyCode(object.getString("org_unit_name"));
+            companyModel.setCompanyType("检验单位");
+            Privilege.companyClient.create(companyModel);
+        }
 
-		String unitCode = object.getString("org_unit_name");
-		if (unitCode == null || unitCode.length() < 6) {
-			log.error("公司统一信用代码长度不够6位");
-			throw new Exception("公司统一信用代码长度不够6位");
-		}
-		String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
-		FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
-		if (uResult.getResult() == null) {
-			AgencyUserModel userModel = new AgencyUserModel();
-			userModel.setUserName(userName);
-			userModel.setRealName(userName);
-			userModel.setPassword(DesUtil.encode(userName, secretKey));
-			userModel.setRePassword(DesUtil.encode(userName, secretKey));
-			// userModel.setMobile(vo.getPhoneNo());
-			userModel.setLockStatus("UNLOCK");
-			FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("检验单位", "admin");
-			Map<Long, List<Long>> orgRoles = new HashMap<>();
-			List<Long> roleIds = new ArrayList<>();
-			roleIds.add(list.getResult().get(0).getSequenceNbr());
-			orgRoles.put(id, roleIds);
-			userModel.setAppCodes(appCodes);
-			userModel.setOrgRoleSeqs(orgRoles);
-			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
-			String[] userIds = {userResult.getResult().getUserId()};
+        String unitCode = object.getString("org_unit_name");
+        if (unitCode == null || unitCode.length() < 6) {
+            log.error("公司统一信用代码长度不够6位");
+            throw new Exception("公司统一信用代码长度不够6位");
+        }
+        String userName = unitCode.substring(unitCode.length() - 6, unitCode.length());
+        FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
+        if (uResult.getResult() == null) {
+            AgencyUserModel userModel = new AgencyUserModel();
+            userModel.setUserName(userName);
+            userModel.setRealName(userName);
+            userModel.setPassword(DesUtil.encode(userName, secretKey));
+            userModel.setRePassword(DesUtil.encode(userName, secretKey));
+            // userModel.setMobile(vo.getPhoneNo());
+            userModel.setLockStatus("UNLOCK");
+            FeignClientResult<List<RoleModel>> list = Privilege.roleClient.queryRoleList("检验单位", "admin");
+            Map<Long, List<Long>> orgRoles = new HashMap<>();
+            List<Long> roleIds = new ArrayList<>();
+            roleIds.add(list.getResult().get(0).getSequenceNbr());
+            orgRoles.put(id, roleIds);
+            userModel.setAppCodes(appCodes);
+            userModel.setOrgRoleSeqs(orgRoles);
+            FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
+            String[] userIds = {userResult.getResult().getUserId()};
 //			if (groupSeq != null) {
 //				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
 //			}
-		}
-	}
+        }
+    }
 }

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

@@ -5,16 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.service.IRegUnitInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -39,23 +38,18 @@ public class PlatformUserTopicMessage extends EmqxListener {
     @Autowired
     RedisUtils redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
-
     @Autowired
     IEquipmentCategoryService equipmentCategoryService;
 
     @Autowired
     IRegUnitInfoService regUnitInfoService;
 
+    @Autowired
+    StartPlatformTokenService platformTokenService;
+
     @Override
     public void processMessage(String topic, MqttMessage message) {
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.getToken();
         JSONObject jsonObject = JSON.parseObject(message.toString());
         JSONObject result = jsonObject.getJSONObject("result");
         JSONObject dataResult = result.getJSONObject("result");

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

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.ymt.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.AccessFeignService;
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
@@ -16,14 +16,15 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 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.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
 
 @Component
 @Slf4j
@@ -40,11 +41,8 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
     @Autowired
     RedisUtil redisUtil;
 
-    @Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
-    String product;
-
-    @Value("${amos.system.user.app-key:AMOS_STUDIO}")
-    String appKey;
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
     @Override
     public void processMessage(String s, MqttMessage message) throws Exception {
@@ -58,15 +56,13 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         } catch (Exception e) {
             throw new Exception("公司同步消息解析失败");
         }
-        RequestContext.setAppKey(appKey);
-        RequestContext.setProduct(product);
-        RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+        platformTokenService.getToken();
 
         //判断库中业务tz_base_enterprise_info是否存在
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-        queryWrapper.eq("use_code",object.getString("unit_code"));
+        queryWrapper.eq("use_code", object.getString("unit_code"));
         TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
-        if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)){
+        if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
             accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             return;
         }
@@ -95,14 +91,14 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("use_code",object.getString("unit_code"));
+        updateWrapper.eq("use_code", object.getString("unit_code"));
 
         String regCode = object.getString("reg_code");
         CompanyModel supervisePrivilegeCompanyModel;
         if (!ValidationUtil.isEmpty(regCode)) {
             supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
-            if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
                 supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
 
                 if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
@@ -120,37 +116,37 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
         tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
 
-        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
+        if (ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())) {
             tzBaseEnterpriseInfo.setUnitType("");
         }
 
 
         try {
-            if (tzBaseEnterprisePrivilegeInfo == null ) {
+            if (tzBaseEnterprisePrivilegeInfo == null) {
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 return;
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
         }
     }
 
-    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
-        if(companyModels == null){
+    public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels, Map<String, CompanyModel> map) {
+        if (companyModels == null) {
             return map;
         }
         Iterator iter = companyModels.iterator();
-        while(iter.hasNext()){
+        while (iter.hasNext()) {
             String json = JSON.toJSONString(iter.next());
-            CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
+            CompanyModel companyModel = JSON.parseObject(json, CompanyModel.class);
 
             String code = companyModel.getCompanyCode();
-            if(code.length() >=6){
+            if (code.length() >= 6) {
                 code = code.substring(0, 6);
             }
-            map.put(code,companyModel);
-            getCompanyInfoMap(companyModel.getChildren(),map);
+            map.put(code, companyModel);
+            getCompanyInfoMap(companyModel.getChildren(), map);
         }
         return map;
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/StartPlatformTokenService.java

 package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.yeejoin.amos.component.robot.AmosRequestContext;
-
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
-	@Value("${admin.user}")
-	String user;
-
-	@Value("${admin.password}")
-	String password;
+    @Autowired
+    RedisUtil redisUtil;
 
-	@Value("${amos.secret.key}")
-	String secretKey;
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
-	@Autowired
-    RedisUtil redisUtil;
-	
-	@Autowired
-	AmosRequestContext amosRequestContext;
-	
 
-	public void getToken() {
-		RequestContext.setProduct(product);
-		RequestContext.setAppKey(appkey);
-		String token = amosRequestContext.getToken();
-		System.out.println("token:" + token);
-		RequestContext.setToken(token);
-		redisUtil.set("platform_token", token);
-	}
+    public void getToken() {
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+    }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -41,7 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -63,15 +62,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
     RedisUtil redisUtil;
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.product.web}")
-	String webProduct;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
 	@Autowired
 	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
@@ -84,8 +74,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
     RegUnitInfoServiceImpl regUnitInfoService;
 
-	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
 
 	@Autowired
 	private SpeUseUnitServiceImpl speUseUnitService;
@@ -94,29 +82,23 @@ public class TzBaseEnterpriseInfoServiceImpl
 	private AccessFeignService accessFeignService;
 
 	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 
 	@Autowired
 	RegUnitInfoMapper regUnitInfoMapper;
 
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
+	@Autowired
+	StartPlatformTokenService platformTokenService;
 
 	@Value("${redis.cache.failure.time}")
 	private Long redisRegionTimeSecond;
 
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
 
 	/**
 	 * 企业管理员变更缓存key前缀
 	 */
 	private final  String adminChange = "ADMIN_CHANGE_";
+
 	@Autowired
 	private EquipmentCategoryServiceImpl equipmentCategoryService;
 
@@ -313,9 +295,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
+		platformTokenService.getToken();
 
 		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
 
@@ -538,16 +518,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return String.join(",", res);
 	}
 
+	@Override
 	public Map<String, Object> adminInfoUpdate(Map<String, Object> map) {
 		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
 		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(webProduct);
-		//获取机器人的token，获取不到则去登录
-		if (ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))) {
-			loginCtiUser();
-		}
-		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
+		platformTokenService.getToken();
 		Map<String, Object> resultMap = new HashMap<>();
 		if (!ObjectUtils.isEmpty(me)) {
 			RegUnitInfo regUnitInfo = new RegUnitInfo();
@@ -572,18 +547,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return resultMap;
 	}
 
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		loninData.setPassword(passwd);
-		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
-		if(loginResult.getStatus() == 200) {
-			HashMap resultMap = (HashMap) loginResult.getResult();
-			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
-		}
-	}
 
 
 	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){

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

@@ -122,11 +122,7 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 ## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
-admin.product=AMOS-SERVICE-ADMIN
-admin.appkey=AMOS_ADMIN
-admin.user=admin_tzs
-admin.password=a1234560
-admin.product.web=AMOS-WEB-ADMIN
+
 amos.secret.key=qazknife4j.production=false
 
 knife4j.production=false