feature(cylinder,tcm):省内充装企业注册生成对接appId

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/Constant.java

@@ -4,4 +4,5 @@ public class Constant {
 	public static final String TOKEN_PREFIX = "OPENAPI_";
 	public static final String SECRETKEY = "tzs";
 
+	public static final String PASSWORD_ENCODE_KEY = "qaz";
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/BizTokenModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 @Data
 public class BizTokenModel implements Serializable{
@@ -18,15 +18,15 @@ public class BizTokenModel implements Serializable{
 	/**
 	 * 应用编号
 	 */
-	private String appKey;
+	private String appKey = "AMOS_ADMIN";
 	/**
 	 * 客户端标识
 	 */
-	private String product;
+	private String product = "AMOS-WEB-ADMIN";
 	/**
 	 * 所属机构
 	 */
-    private String agencyCode;
+    private String agencyCode = "tzs";
 	/**
 	 * 应用用户票据，唯一标识
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OpenapiBizTokenService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
 
-import java.util.HashMap;
-import java.util.List;
-
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.cache.Redis;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
 import com.yeejoin.amos.api.openapi.face.model.OpenapiBizTokenModel;
@@ -21,6 +9,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.cache.Redis;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -37,31 +35,26 @@ public class OpenapiBizTokenService extends BaseService<OpenapiBizTokenModel, Op
     @Autowired
     private RedisTemplate redisTemplate;
 
+	public static final String DEFAULT_PASSWORD = "a1234560";
+
     public List<String> getServiceList() {
     	return baseMapper.getServiceList();
 	}
     
-    
 	public String getByAppId(String appId) {
-		// TODO Auto-generated method stub
-		OpenapiBizToken openapiBizToken = baseMapper.getByAppId(appId);
 		IdPasswordAuthModel idPasswordAuthModel = new IdPasswordAuthModel();
-		idPasswordAuthModel.setLoginId(openapiBizToken.getUserName());
-		idPasswordAuthModel.setPassword(DesUtil.encode(openapiBizToken.getPassWord(), "qaz"));
+		idPasswordAuthModel.setLoginId(appId);
+		idPasswordAuthModel.setPassword(DesUtil.encode(DEFAULT_PASSWORD, Constant.PASSWORD_ENCODE_KEY));
 		BizTokenModel bizTokenModel = new BizTokenModel();
-		bizTokenModel.setAppKey(openapiBizToken.getAppKey());
-		bizTokenModel.setProduct(openapiBizToken.getProduct());
-		bizTokenModel.setAgencyCode(openapiBizToken.getAgencyCode());
-		bizTokenModel.setAppId(openapiBizToken.getAppId());
-		bizTokenModel.setApiCompanyCode(openapiBizToken.getApiCompanyCode());
-		RequestContext.setProduct(openapiBizToken.getProduct());
-	    RequestContext.setAppKey(openapiBizToken.getAppKey());
+		bizTokenModel.setAppId(appId);
+		RequestContext.setProduct(bizTokenModel.getProduct());
+	    RequestContext.setAppKey(bizTokenModel.getAppKey());
 		FeignClientResult<HashMap<String, Object>> responseModel = Privilege.authClient.idpassword(idPasswordAuthModel);
 		HashMap<String, Object> authModel = responseModel.getResult();
 		String token = (String) authModel.get("token");
 		bizTokenModel.setToken(token);
-		String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,token);
-		this.redisTemplate.opsForValue().set(tokenKey,bizTokenModel);
+		String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, token);
+		this.redisTemplate.opsForValue().set(tokenKey, bizTokenModel);
 		return token;
 	}
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/entity/RegUnitInfo.java

@@ -204,4 +204,8 @@ public class RegUnitInfo extends BaseEntity {
      */
     private String adminIdCardPhoto;
 
+    /**
+     * 单位是省内或省外。1省外
+     */
+    private String isNationwide;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -44,6 +44,7 @@ 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.RoleModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.apache.commons.lang3.ObjectUtils;
@@ -154,6 +155,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
      */
     private static String PERSON_REGISTER_TYPE = "PERSON_REGISTER_TYPE";
 
+    public static final String SECRETKEY = "tzs";
+
+    public static final String FILLING_UNIT_TYPE = "1231";
+    public static final String DEFAULT_PASSWORD = "a1234560";
 
     @Value("${org.filter.group.seq}")
     private Long groupSeq;
@@ -911,7 +916,21 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 //				tzsUserInfo.setAmosUserName(regUnitInfo.getAdminLoginName());
 //				tzsUserInfoService.save(tzsUserInfo);
 //			}
-            regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
+
+            // 生成用户id
+            String adminUserId = userResult.getResult().getUserId();
+
+            // 省内充装单位1231：生成对接数据账号
+            if (Arrays.asList(units).contains(FILLING_UNIT_TYPE) && (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide()))) {
+                AgencyUserModel shadowUser = new AgencyUserModel();
+                shadowUser.setUserId(adminUserId);
+                String appId = DesUtil.encode(adminUserId, SECRETKEY);
+                shadowUser.setUserName(appId);
+                shadowUser.setPassword(DEFAULT_PASSWORD);
+                Privilege.agencyUserClient.createLoginInfoAppId(shadowUser);
+            }
+
+            regUnitInfo.setAdminUserId(adminUserId);
             regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr().toString());
             // 3.3 org_user 创建组织机构
             OrgUsr org = new OrgUsr();
@@ -919,8 +938,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             org.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
             org.setBizOrgName(regUnitInfo.getName());
             org.setRecDate(new Date());
-            org.setRecUserId(userResult.getResult().getUserId());
-            org.setRecUserName(userResult.getResult().getRealName());
+            org.setRecUserId(adminUserId);
+            org.setRecUserName(adminUserName);
             org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
             org.setAmosOrgCode(companyInfo.getOrgCode());
             iOrgUsrService.save(org);