fix(jg):事业单位、企业单位注册调整

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

@@ -19,6 +19,7 @@ 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.util.DesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +37,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl.DEFAULT_PASSWORD;
+import static com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl.SECRETKEY;
+
 /**
  * 服务实现类
  *
@@ -113,6 +117,7 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
             dto.setAdminUserId(user.getUserId());
             RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
             BeanUtils.copyProperties(dto, regUnitInfoDto);
+            this.createAppId(user, regUnitInfoDto);
             baseEnterpriseInfo = regUnitInfoService.createBaseEnterpriseInfo(regUnitInfoDto, EnterpriseEnums.SY_DW.getType());
             TzsBaseInstitution tzsBaseInstitution = new TzsBaseInstitution();
             BeanUtils.copyProperties(dto.getRegUnitMessage(), tzsBaseInstitution);
@@ -172,6 +177,16 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
         publisher.publish(new DataRefreshEvent(this,  Collections.singletonList(baseEnterpriseInfo.getSequenceNbr() + ""), DataRefreshEvent.DataType.enterprise.name(), DataRefreshEvent.Operation.INSERT));
     }
 
+    private void createAppId(AgencyUserModel user, RegUnitInfoDto regUnitInfoDto) throws Exception {
+        AgencyUserModel shadowUser = new AgencyUserModel();
+        shadowUser.setUserId(user.getUserId());
+        String appId = DesUtil.encode(user.getUserId(), SECRETKEY);
+        shadowUser.setUserName(appId);
+        shadowUser.setPassword(DEFAULT_PASSWORD);
+        Privilege.agencyUserClient.createLoginInfoAppId(shadowUser);
+        regUnitInfoDto.setAppId(appId);
+    }
+
 
     private String dealNull2EmptyString(String t) {
         return StringUtils.isEmpty(t) ? "" : t;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java

@@ -59,7 +59,7 @@ public class RegUnitInfoController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")
+    @ApiOperation(httpMethod = "POST", value = "企业单位注册", notes = "企业单位注册")
     public ResponseModel<RegUnitInfoDto> save(@RequestBody RegUnitInfoDto model) {
         try {
             model = iRegUnitInfoService.registerUnit(model);

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

@@ -842,7 +842,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             // 省内充装单位1231：生成对接数据账号
             // if (Arrays.asList(units).contains(FILLING_UNIT_TYPE) && (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide()))) {
             // 20250701 改为全部企业类型生成对接数据账号@tianbo
-            if (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide())) {
+//            if (ValidationUtil.isEmpty(regUnitInfo.getIsNationwide()) || "0".equals(regUnitInfo.getIsNationwide())) {
                 AgencyUserModel shadowUser = new AgencyUserModel();
                 shadowUser.setUserId(adminUserId);
                 String appId = DesUtil.encode(adminUserId, SECRETKEY);
@@ -850,7 +850,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
                 shadowUser.setPassword(DEFAULT_PASSWORD);
                 Privilege.agencyUserClient.createLoginInfoAppId(shadowUser);
                 regUnitInfo.setAppId(appId);
-            }
+//            }
 
             regUnitInfo.setAdminUserId(adminUserId);
             regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr().toString());