Merge remote-tracking branch 'origin/main'

.gitignore

@@ -4,11 +4,7 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
+.idea
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-.idea/
 *.iws
 *.iml
 *.ipr
@@ -39,3 +35,4 @@ build/
 ### Mac OS ###
 .DS_Store
 
+/.idea/

start/src/main/java/com/zcloud/basic/info/Application.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info;
 
 import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication;
+import com.jjb.saas.facade.starter.annotation.EnableFacadeRpcClient;
 import org.springframework.boot.SpringApplication;
 
 /**
@@ -11,9 +12,11 @@ import org.springframework.boot.SpringApplication;
         scanBasePackages = {"com.zcloud","com.jjb"},
         mapperPackages = {"com.zcloud.basic.info.persistence.mapper"}
 )
+//@EnableFacadeRpcClient
 public class Application {
 
     public static void main(String[] args) {
+
         SpringApplication.run(Application.class, args);
     }
 }

web-adapter/src/main/java/com/zcloud/basic/info/event/UserUpdateAuditStatusConsumer.java

@@ -0,0 +1,31 @@
+package com.zcloud.basic.info.event;
+
+import com.jjb.saas.framework.event.consumer.MessageConsumer;
+import com.jjb.saas.framework.event.consumer.MsgConsumer;
+import com.jjb.saas.framework.event.dto.BaseEvent;
+import com.jjb.saas.framework.event.producer.RemoteEventPublisher;
+import com.jjb.saas.system.client.user.event.UserAddEvent;
+import com.zcloud.gbscommon.event.user.ZcUserEvent;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lin
+ */
+@Component
+@MsgConsumer(tag = "zcloud:user:ev")
+public class UserUpdateAuditStatusConsumer implements MessageConsumer<ZcUserEvent> {
+//    private RemoteEventPublisher eventPublisher;
+
+//    public UserUpdateAuditStatusConsumer(RemoteEventPublisher eventPublisher) {
+//        this.eventPublisher = eventPublisher;
+//    }
+
+    @Override
+    public void consume(ZcUserEvent event) {
+
+        System.out.println(event.getName());
+    }
+
+
+}

web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java

@@ -0,0 +1,25 @@
+package com.zcloud.basic.info.facade;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade;
+import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo;
+import org.apache.dubbo.config.annotation.DubboService;
+
+import java.util.ArrayList;
+
+/**
+ *
+ * @author lin
+ */
+@DubboService
+public class ZcloudUserFacadeImpl implements ZcloudUserFacade {
+    @Override
+    public MultiResponse<ZcloudUserCo> listByUserIdAndDeptId() {
+        System.out.println("listByUserIdAndDeptId");
+        ZcloudUserCo zcloudUserCo = new ZcloudUserCo();
+        zcloudUserCo.setName("hello word");
+        ArrayList<ZcloudUserCo> objects = new ArrayList<>();
+        objects.add(zcloudUserCo);
+        return MultiResponse.of(objects);
+    }
+}

web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java

@@ -5,20 +5,32 @@ import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
+import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
+import com.jjb.saas.system.client.dept.request.DeptAddCmd;
+import com.jjb.saas.system.client.role.facade.RoleFacade;
+import com.jjb.saas.system.client.role.response.RoleCO;
+import com.jjb.saas.system.client.user.facade.UserFacade;
+import com.jjb.saas.system.client.user.request.FacadeUserAddCmd;
 import com.zcloud.basic.info.api.SysUserServiceI;
+import com.zcloud.basic.info.dto.SysCorpUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserPageQry;
 import com.zcloud.basic.info.dto.SysUserUpdateCmd;
 import com.zcloud.basic.info.dto.clientobject.SysUserCO;
+import com.zcloud.gbscommon.utils.Smb;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * web-adapter
@@ -33,10 +45,95 @@ import java.util.ArrayList;
 public class SysUserController {
     private final SysUserServiceI sysUserService;
 
+
+    @DubboReference(check = false)
+    private UserFacade userFacade;
+
+    @DubboReference(check = false)
+    private RoleFacade roleFacade;
+
+    @ApiOperation("新增-企业主账号")
+    @PostMapping("/saveCorpAccount")
+//    public SingleResponse<SysUserCO> add(@Validated @RequestBody SysUserAddCmd cmd) {
+    public Response saveCorpAccount(@Validated @RequestBody SysCorpUserAddCmd cmd) {
+        MultiResponse<RoleCO> roleCOMultiResponse = roleFacade.listRoles();
+//        List<RoleCO> data = roleCOMultiResponse.getData();
+//        FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd();
+//        facadeUserAddCmd.setAccount("wxsaas");
+//        facadeUserAddCmd.setName("wx");
+//        facadeUserAddCmd.setAppKey("722091ff53dd4abba078c2a00efd4a42");
+//        facadeUserAddCmd.setPassword("wxsaas");
+//        facadeUserAddCmd.setRoleTypeEnum("ORG_ADMIN");
+        // todo 设置 用户id 用于登录
+//        SingleResponse<Long> longSingleResponse = userFacade.addUser(facadeUserAddCmd);
+//        longSingleResponse.getData();
+        System.out.println(cmd);
+        List<RoleCO> data = roleCOMultiResponse.getData();
+        FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd();
+        facadeUserAddCmd.setAccount(cmd.getUsername());
+        facadeUserAddCmd.setName(cmd.getUsername());
+        facadeUserAddCmd.setAppKey("e6ab3c9abda747b39d7cc12b6dc0f5a0");
+        facadeUserAddCmd.setPassword("Aa12345678");
+        try {
+            Map<String, String> collect = data.stream().collect(Collectors.toMap(RoleCO::getRoleName, RoleCO::getRoleTypeEnum));
+            facadeUserAddCmd.setRoleTypeEnum("2".equals(cmd.getUserType()) ? collect.get("分公司主账号") : collect.get("相关方主账号"));
+            // todo 新增用户  GBS不适配功能
+        } catch (Exception e) {
+            // 有重复的角色名称 抛异常 联系管理员
+            throw new BizException("监测到角色名称重复，请联系管理员。");
+        }
+        sysUserService.addCorpAccount(cmd);
+        return Response.buildSuccess();
+    }
+
+    @ApiOperation("重置-企业主账号密码")
+    @PutMapping("/resetCorpAccountPassword/{corpinfoId}")
+//    public SingleResponse<SysUserCO> add(@Validated @RequestBody SysUserAddCmd cmd) {
+    public Response resetCorpAccountPassword(@PathVariable("corpinfoId") Long corpinfoId) {
+        // todo GBS不适配功能
+
+//        FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd();
+//        facadeUserAddCmd.setAccount(cmd.getUsername());
+//        facadeUserAddCmd.setName(cmd.getUsername());
+//        facadeUserAddCmd.setAppKey("e6ab3c9abda747b39d7cc12b6dc0f5a0");
+//        facadeUserAddCmd.setPassword("Aa12345678");
+
+        return Response.buildSuccess();
+    }
+
+    @ApiOperation("删除-企业主账号")
+    @PutMapping("/removeCorpAccount/{corpinfoId}")
+    public Response removeCorpAccount(@PathVariable("corpinfoId") Long corpinfoId) {
+        // todo GBS不适配功能
+        return Response.buildSuccess();
+    }
+
+    @ApiOperation("修改停用启用状态-企业主账号")
+    @PutMapping("/enabledCorpAccount/{corpinfoId}")
+    public Response enabledCorpAccount(@PathVariable("corpinfoId") Long corpinfoId) {
+        // todo GBS不适配功能
+        return Response.buildSuccess();
+    }
+
+
+
     @ApiOperation("新增")
     @PostMapping("/save")
-    public SingleResponse<SysUserCO> add(@Validated @RequestBody SysUserAddCmd cmd) {
+//    public SingleResponse<SysUserCO> add(@Validated @RequestBody SysUserAddCmd cmd) {
+    public SingleResponse<SysUserCO> add(@RequestBody SysUserAddCmd cmd) {
         SSOUser ssoUser = AuthContext.getCurrentUser();
+        MultiResponse<RoleCO> roleCOMultiResponse = roleFacade.listRoles();
+        List<RoleCO> data = roleCOMultiResponse.getData();
+        FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd();
+        facadeUserAddCmd.setAccount("wxsaas");
+        facadeUserAddCmd.setName("wx");
+        facadeUserAddCmd.setAppKey("e6ab3c9abda747b39d7cc12b6dc0f5a0");
+        facadeUserAddCmd.setPassword("Aa12345678");
+        facadeUserAddCmd.setRoleTypeEnum("FGS_DEPART_ADMIN");
+        // todo 设置 用户id 用于登录
+        SingleResponse<Long> longSingleResponse = userFacade.addUser(facadeUserAddCmd);
+        cmd.setUid(longSingleResponse.getData());
+
         return sysUserService.add(cmd);
     }
 

web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java

@@ -3,7 +3,11 @@ package com.zcloud.basic.info.command;
 import com.alibaba.cola.exception.BizException;
 import com.zcloud.basic.info.domain.gateway.SysUserGateway;
 import com.zcloud.basic.info.domain.model.SysUserE;
+import com.zcloud.basic.info.dto.SysCorpUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserAddCmd;
+import com.zcloud.basic.info.persistence.dataobject.SysUserDO;
+import com.zcloud.basic.info.persistence.repository.SysUserRepository;
+import com.zcloud.gbscommon.utils.UuidUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -20,11 +24,13 @@ import org.springframework.transaction.annotation.Transactional;
 @AllArgsConstructor
 public class SysUserAddExe {
     private final SysUserGateway sysUserGateway;
+    private final SysUserRepository sysUserRepository;
 
     @Transactional(rollbackFor = Exception.class)
     public boolean execute(SysUserAddCmd cmd) {
         SysUserE examTypeE = new SysUserE();
         BeanUtils.copyProperties(cmd, examTypeE);
+        examTypeE.setId(cmd.getUid());
         boolean res = false;
         try {
             res = sysUserGateway.add(examTypeE);
@@ -36,5 +42,18 @@ public class SysUserAddExe {
         }
         return true;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void addCorpAccount(SysCorpUserAddCmd cmd) {
+        SysUserDO sysUserDO = new SysUserDO();
+        sysUserDO.setUserId(UuidUtil.get32UUID());
+        sysUserDO.setName(cmd.getName());
+        sysUserDO.setUsername(cmd.getName());
+        sysUserDO.setUserType(cmd.getUserType());
+        sysUserDO.setCorpinfoId(cmd.getCorpinfoId());
+        sysUserDO.setDepartmentId(cmd.getDepartmentId());
+        sysUserDO.setMainCorp(1);
+        sysUserRepository.save(sysUserDO);
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java

@@ -45,10 +45,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
 
         //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
         SysUserAddCmd user = new SysUserAddCmd();
-        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
+//        to do 完善
-                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
+//        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
-                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
+//                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
-                .setDepartmentId(id);
+//                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
+//                .setDepartmentId(id);
         sysUserAddExe.execute(user);
         return SingleResponse.buildSuccess();
     }

web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java

@@ -46,10 +46,11 @@ public class CorpInfoXgfServiceImpl implements CorpInfoXgfServiceI {
         Long id = corpInfoXgfAddExe.execute(cmd);
         //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
         SysUserAddCmd user = new SysUserAddCmd();
-        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
+//       todo 再完善
-                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
+//        user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
-                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
+//                .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
-                .setDepartmentId(id);
+//                .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
+//                .setDepartmentId(id);
         sysUserAddExe.execute(user);
         return SingleResponse.buildSuccess();
     }

web-app/src/main/java/com/zcloud/basic/info/service/SysUserServiceImpl.java

@@ -7,6 +7,7 @@ import com.zcloud.basic.info.command.SysUserAddExe;
 import com.zcloud.basic.info.command.SysUserRemoveExe;
 import com.zcloud.basic.info.command.SysUserUpdateExe;
 import com.zcloud.basic.info.command.query.SysUserQueryExe;
+import com.zcloud.basic.info.dto.SysCorpUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserPageQry;
 import com.zcloud.basic.info.dto.SysUserUpdateCmd;
@@ -55,5 +56,10 @@ public class SysUserServiceImpl implements SysUserServiceI {
     public void removeBatch(Long[] ids) {
         sysUserRemoveExe.execute(ids);
     }
+
+    @Override
+    public void addCorpAccount(SysCorpUserAddCmd cmd) {
+        sysUserAddExe.addCorpAccount(cmd);
+    }
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/SysUserServiceI.java

@@ -2,6 +2,7 @@ package com.zcloud.basic.info.api;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.basic.info.dto.SysCorpUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserAddCmd;
 import com.zcloud.basic.info.dto.SysUserPageQry;
 import com.zcloud.basic.info.dto.SysUserUpdateCmd;
@@ -23,5 +24,7 @@ public interface SysUserServiceI {
     void remove(Long id);
 
     void removeBatch(Long[] ids);
+
+    void addCorpAccount(SysCorpUserAddCmd cmd);
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java

@@ -60,8 +60,8 @@ public class CorpInfoAddCmd extends Command {
     private String corpState;
     @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true)
     private String corpStateName;
-    @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true)
+    @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true)
-    private Double totalassets;
+    private BigDecimal totalAssets;
     @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true)
     private BigDecimal regcapital;
     @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
@@ -69,11 +69,13 @@ public class CorpInfoAddCmd extends Command {
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
     @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)
+    private String ecoTypeName;
     @ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
     private String contacts;
     @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
@@ -85,17 +87,14 @@ public class CorpInfoAddCmd extends Command {
     @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true)
     private Integer scaleType;
     @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     @ApiModelProperty(value = "职工人数", name = "employees", required = true)
     private Integer employees;
     @ApiModelProperty(value = "经度", name = "longitude", required = true)
     private String longitude;
     @ApiModelProperty(value = "纬度", name = "latitude", required = true)
     private String latitude;
-    @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
+
-    private String regType;
-    @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
-    private String industryDepartment;
     @ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
     private String lrName;
     @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java

@@ -63,8 +63,8 @@ public class CorpInfoUpdateCmd extends Command {
     private String corpState;
     @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true)
     private String corpStateName;
-    @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true)
+    @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true)
-    private Double totalassets;
+    private BigDecimal totalAssets;
     @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true)
     private BigDecimal regcapital;
     @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
@@ -72,11 +72,13 @@ public class CorpInfoUpdateCmd extends Command {
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
     @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)
+    private String ecoTypeName;
     @ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
     private String contacts;
     @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
@@ -88,17 +90,14 @@ public class CorpInfoUpdateCmd extends Command {
     @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true)
     private Integer scaleType;
     @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     @ApiModelProperty(value = "职工人数", name = "employees", required = true)
     private Integer employees;
     @ApiModelProperty(value = "经度", name = "longitude", required = true)
     private String longitude;
     @ApiModelProperty(value = "纬度", name = "latitude", required = true)
     private String latitude;
-    @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
+
-    private String regType;
-    @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
-    private String industryDepartment;
     @ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
     private String lrName;
     @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java

@@ -43,7 +43,7 @@ public class CorpInfoXgfAddCmd extends Command {
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
     private String code;
 
-    @ApiModelProperty(value = "通讯地址", name = "address", required = true)
+    @ApiModelProperty(value = "通讯地址,汉字160以内", name = "address", required = true)
     private String address;
 
     @ApiModelProperty(value = "邮编", name = "postalCode", required = true)
@@ -71,34 +71,37 @@ public class CorpInfoXgfAddCmd extends Command {
     @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true)
     private String corpStateName;
 
-    @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true)
+    @ApiModelProperty(value = "资产总额（万元）,10以内", name = "totalAssets", required = true)
-    private Double totalassets;
+    private BigDecimal totalAssets;
 
-    @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true)
+    @ApiModelProperty(value = "注册资金（万元）,10以内", name = "regcapital", required = true)
     private BigDecimal regcapital;
 
-    @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
+    @ApiModelProperty(value = "企事业单位经营地址,汉字30以内", name = "addressBusiness", required = true)
     private String addressBusiness;
 
-    @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
+    @ApiModelProperty(value = "企事业单位办公地址,汉字30以内", name = "addressOffice", required = true)
     private String addressOffice;
 
     @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
 
     @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
 
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
 
-    @ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
+    @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)
+    private String ecoTypeName;
+
+    @ApiModelProperty(value = "主要负责人,汉字10以内", name = "contacts", required = true)
     private String contacts;
 
     @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
     private String contactsPhone;
 
-    @ApiModelProperty(value = "安全负责人", name = "safetyName", required = true)
+    @ApiModelProperty(value = "安全负责人,汉字10以内", name = "safetyName", required = true)
     private String safetyName;
 
     @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true)
@@ -108,7 +111,7 @@ public class CorpInfoXgfAddCmd extends Command {
     private Integer scaleType;
 
     @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
-    private Double areaCovered;
+    private BigDecimal areaCovered;
 
     @ApiModelProperty(value = "职工人数", name = "employees", required = true)
     private Integer employees;
@@ -119,12 +122,6 @@ public class CorpInfoXgfAddCmd extends Command {
     @ApiModelProperty(value = "纬度", name = "latitude", required = true)
     private String latitude;
 
-    @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
-    private String regType;
-
-    @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
-    private String industryDepartment;
-
     @ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
     private String lrName;
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java

@@ -65,7 +65,7 @@ public class CorpInfoXgfUpdateCmd extends Command {
     @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true)
     private String corpStateName;
     @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true)
-    private Double totalassets;
+    private BigDecimal totalAssets;
     @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true)
     private BigDecimal regcapital;
     @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
@@ -73,11 +73,13 @@ public class CorpInfoXgfUpdateCmd extends Command {
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
     @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)
+    private String ecoTypeName;
     @ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
     private String contacts;
     @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
@@ -89,17 +91,13 @@ public class CorpInfoXgfUpdateCmd extends Command {
     @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true)
     private Integer scaleType;
     @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     @ApiModelProperty(value = "职工人数", name = "employees", required = true)
     private Integer employees;
     @ApiModelProperty(value = "经度", name = "longitude", required = true)
     private String longitude;
     @ApiModelProperty(value = "纬度", name = "latitude", required = true)
     private String latitude;
-    @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
-    private String regType;
-    @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
-    private String industryDepartment;
     @ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
     private String lrName;
     @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java

@@ -0,0 +1,43 @@
+package com.zcloud.basic.info.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 企业主账号新增数据
+ *
+ * @Author 王轩
+ * @Date 2025-10-28 16:42:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysCorpUserAddCmd extends Command {
+    @ApiModelProperty(value = "用户名", name = "username", required = true)
+    @NotEmpty(message = "用户名不能为空")
+    private String username;
+    @ApiModelProperty(value = "密码", name = "password", required = true)
+    @NotEmpty(message = "密码不能为空")
+    private String password;
+    @ApiModelProperty(value = "姓名", name = "name", required = true)
+    @NotEmpty(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "企业", name = "corpinfoId", required = true)
+    @NotNull(message = "企业id不能为空")
+    private Long corpinfoId;
+    @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
+    @NotNull(message = "部门id不能为空")
+    private Long departmentId;
+    @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true)
+    @NotEmpty(message = "1监管2企业3相关方不能为空")
+    private String userType;
+}
+

web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java

@@ -6,10 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -22,14 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(chain = true)
 public class SysUserAddCmd extends Command {
-    @ApiModelProperty(value = "GBS用户id", name = "id", required = true)
-    @NotNull(message = "GBS用户id不能为空")
-    private Long id;
-    @ApiModelProperty(value = "用户id", name = "userId", required = true)
-    @NotEmpty(message = "用户id不能为空")
-    private String userId;
     @ApiModelProperty(value = "用户名", name = "username", required = true)
     @NotEmpty(message = "用户名不能为空")
     private String username;
@@ -40,17 +31,17 @@ public class SysUserAddCmd extends Command {
     @NotEmpty(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "企业", name = "corpinfoId", required = true)
-    @NotNull(message = "企业不能为空")
+    @NotEmpty(message = "企业不能为空")
-    private Long corpinfoId;
+    private String corpinfoId;
     @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
-    @NotNull(message = "部门id不能为空")
+    @NotEmpty(message = "部门id不能为空")
-    private Long departmentId;
+    private String departmentId;
     @ApiModelProperty(value = "角色id", name = "roleIds", required = true)
     @NotEmpty(message = "角色id不能为空")
     private String roleIds;
     @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true)
     @NotEmpty(message = "1监管2企业3相关方不能为空")
-    private Integer userType;
+    private String userType;
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制", name = "status", required = true)
     @NotEmpty(message = "状态0.正常 99.锁定 2密码错误次数超过当天限制不能为空")
     private String status;
@@ -138,41 +129,6 @@ public class SysUserAddCmd extends Command {
     @ApiModelProperty(value = "所属乡镇", name = "village", required = true)
     @NotEmpty(message = "所属乡镇不能为空")
     private String village;
-    @ApiModelProperty(value = "乐观锁", name = "version", required = true)
+    private Long uid;
-    @NotEmpty(message = "乐观锁不能为空")
-    private Integer version;
-    @ApiModelProperty(value = "创建人", name = "createId", required = true)
-    @NotEmpty(message = "创建人不能为空")
-    private Integer createId;
-    @ApiModelProperty(value = "创建人姓名", name = "createName", required = true)
-    @NotEmpty(message = "创建人姓名不能为空")
-    private String createName;
-    @ApiModelProperty(value = "创建时间", name = "createTime", required = true)
-    @NotEmpty(message = "创建时间不能为空")
-    private LocalDateTime createTime;
-    @ApiModelProperty(value = "更新人", name = "updateId", required = true)
-    @NotEmpty(message = "更新人不能为空")
-    private Integer updateId;
-    @ApiModelProperty(value = "修改人名称", name = "updateName", required = true)
-    @NotEmpty(message = "修改人名称不能为空")
-    private String updateName;
-    @ApiModelProperty(value = "更新时间", name = "updateTime", required = true)
-    @NotEmpty(message = "更新时间不能为空")
-    private LocalDateTime updateTime;
-    @ApiModelProperty(value = "描述", name = "remarks", required = true)
-    @NotEmpty(message = "描述不能为空")
-    private String remarks;
-    @ApiModelProperty(value = "是否删除", name = "deleteEnum", required = true)
-    @NotEmpty(message = "是否删除不能为空")
-    private String deleteEnum;
-    @ApiModelProperty(value = "租户ID", name = "tenantId", required = true)
-    @NotEmpty(message = "租户ID不能为空")
-    private Integer tenantId;
-    @ApiModelProperty(value = "机构ID", name = "orgId", required = true)
-    @NotEmpty(message = "机构ID不能为空")
-    private Integer orgId;
-    @ApiModelProperty(value = "环境", name = "env", required = true)
-    @NotEmpty(message = "环境不能为空")
-    private String env;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java

@@ -69,7 +69,7 @@ public class CorpInfoCO extends ClientObject {
     private String corpStateName;
     //资产总额（万元）
     @ApiModelProperty(value = "资产总额（万元）")
-    private Double totalassets;
+    private BigDecimal totalAssets;
     //注册资金（万元）
     @ApiModelProperty(value = "注册资金（万元）")
     private BigDecimal regcapital;
@@ -81,13 +81,15 @@ public class CorpInfoCO extends ClientObject {
     private String addressOffice;
     //固定资产
     @ApiModelProperty(value = "固定资产")
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     //年产值
     @ApiModelProperty(value = "年产值")
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称")
+    private String ecoTypeName;
     //主要负责人
     @ApiModelProperty(value = "主要负责人")
     private String contacts;
@@ -105,7 +107,7 @@ public class CorpInfoCO extends ClientObject {
     private Integer scaleType;
     //占地面积
     @ApiModelProperty(value = "占地面积")
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     //职工人数
     @ApiModelProperty(value = "职工人数")
     private Integer employees;
@@ -115,12 +117,7 @@ public class CorpInfoCO extends ClientObject {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //单位注册登记类型
+
-    @ApiModelProperty(value = "单位注册登记类型")
-    private String regType;
-    //行业监管部门
-    @ApiModelProperty(value = "行业监管部门")
-    private String industryDepartment;
     //法定代表人
     @ApiModelProperty(value = "法定代表人")
     private String lrName;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java

@@ -71,7 +71,7 @@ public class CorpInfoXgfCO extends ClientObject {
     private String corpStateName;
     //资产总额（万元）
     @ApiModelProperty(value = "资产总额（万元）")
-    private Double totalassets;
+    private BigDecimal totalAssets;
     //注册资金（万元）
     @ApiModelProperty(value = "注册资金（万元）")
     private BigDecimal regcapital;
@@ -83,13 +83,15 @@ public class CorpInfoXgfCO extends ClientObject {
     private String addressOffice;
     //固定资产
     @ApiModelProperty(value = "固定资产")
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     //年产值
     @ApiModelProperty(value = "年产值")
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称")
+    private String ecoTypeName;
     //主要负责人
     @ApiModelProperty(value = "主要负责人")
     private String contacts;
@@ -107,7 +109,7 @@ public class CorpInfoXgfCO extends ClientObject {
     private Integer scaleType;
     //占地面积
     @ApiModelProperty(value = "占地面积")
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     //职工人数
     @ApiModelProperty(value = "职工人数")
     private Integer employees;
@@ -117,12 +119,6 @@ public class CorpInfoXgfCO extends ClientObject {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //单位注册登记类型
-    @ApiModelProperty(value = "单位注册登记类型")
-    private String regType;
-    //行业监管部门
-    @ApiModelProperty(value = "行业监管部门")
-    private String industryDepartment;
     //法定代表人
     @ApiModelProperty(value = "法定代表人")
     private String lrName;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/SysUserCO.java

@@ -17,10 +17,7 @@ import java.util.Date;
 public class SysUserCO extends ClientObject {
     //GBS用户id
     @ApiModelProperty(value = "GBS用户id")
-    private Long id;
+    private Integer id;
-    //用户id
-    @ApiModelProperty(value = "用户id")
-    private String userId;
     //用户名
     @ApiModelProperty(value = "用户名")
     private String username;
@@ -32,16 +29,16 @@ public class SysUserCO extends ClientObject {
     private String name;
     //企业
     @ApiModelProperty(value = "企业")
-    private Long corpinfoId;
+    private String corpinfoId;
     //部门id
     @ApiModelProperty(value = "部门id")
-    private Long departmentId;
+    private String departmentId;
     //角色id
     @ApiModelProperty(value = "角色id")
     private String roleIds;
     //1监管2企业3相关方
     @ApiModelProperty(value = "1监管2企业3相关方")
-    private Integer userType;
+    private String userType;
     //状态0.正常 99.锁定 2密码错误次数超过当天限制
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制")
     private String status;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -56,7 +56,7 @@ public class CorpInfoE extends BaseE {
     //企业状态名称
     private String corpStateName;
     //资产总额（万元）
-    private Double totalassets;
+    private BigDecimal totalAssets;
     //注册资金（万元）
     private BigDecimal regcapital;
     //企事业单位经营地址
@@ -64,11 +64,12 @@ public class CorpInfoE extends BaseE {
     //企事业单位办公地址
     private String addressOffice;
     //固定资产
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     //年产值
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     //经济类型
     private String ecoType;
+    private String ecoTypeName;
     //主要负责人
     private String contacts;
     //主要负责人手机号
@@ -80,17 +81,13 @@ public class CorpInfoE extends BaseE {
     //是否规模以上,1:是,2:否
     private Integer scaleType;
     //占地面积
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     //职工人数
     private Integer employees;
     //经度
     private String longitude;
     //纬度
     private String latitude;
-    //单位注册登记类型
-    private String regType;
-    //行业监管部门
-    private String industryDepartment;
     //法定代表人
     private String lrName;
     //法人手机号

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java

@@ -50,7 +50,7 @@ public class CorpInfoXgfE extends BaseE {
     //企业状态名称
     private String corpStateName;
     //资产总额（万元）
-    private Double totalassets;
+    private BigDecimal totalAssets;
     //注册资金（万元）
     private BigDecimal regcapital;
     //企事业单位经营地址
@@ -58,11 +58,13 @@ public class CorpInfoXgfE extends BaseE {
     //企事业单位办公地址
     private String addressOffice;
     //固定资产
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     //年产值
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     //经济类型
     private String ecoType;
+
+    private String ecoTypeName;
     //主要负责人
     private String contacts;
     //主要负责人手机号
@@ -74,17 +76,14 @@ public class CorpInfoXgfE extends BaseE {
     //是否规模以上,1:是,2:否
     private Integer scaleType;
     //占地面积
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     //职工人数
     private Integer employees;
     //经度
     private String longitude;
     //纬度
     private String latitude;
-    //单位注册登记类型
+
-    private String regType;
-    //行业监管部门
-    private String industryDepartment;
     //法定代表人
     private String lrName;
     //法人手机号

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java

@@ -75,7 +75,7 @@ public class CorpInfoDO extends BaseDO {
     private String corpStateName;
     //资产总额（万元）
     @ApiModelProperty(value = "资产总额（万元）")
-    private Double totalassets;
+    private BigDecimal totalAssets;
     //注册资金（万元）
     @ApiModelProperty(value = "注册资金（万元）")
     private BigDecimal regcapital;
@@ -87,13 +87,15 @@ public class CorpInfoDO extends BaseDO {
     private String addressOffice;
     //固定资产
     @ApiModelProperty(value = "固定资产")
-    private Double fixedAssets;
+    private BigDecimal fixedAssets;
     //年产值
     @ApiModelProperty(value = "年产值")
-    private Double yearOutputValue;
+    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;
+    @ApiModelProperty(value = "经济类型名称")
+    private String ecoTypeName;
     //主要负责人
     @ApiModelProperty(value = "主要负责人")
     private String contacts;
@@ -111,7 +113,7 @@ public class CorpInfoDO extends BaseDO {
     private Integer scaleType;
     //占地面积
     @ApiModelProperty(value = "占地面积")
-    private Double areaCovered;
+    private BigDecimal areaCovered;
     //职工人数
     @ApiModelProperty(value = "职工人数")
     private Integer employees;
@@ -121,12 +123,6 @@ public class CorpInfoDO extends BaseDO {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //单位注册登记类型
-    @ApiModelProperty(value = "单位注册登记类型")
-    private String regType;
-    //行业监管部门
-    @ApiModelProperty(value = "行业监管部门")
-    private String industryDepartment;
     //法定代表人
     @ApiModelProperty(value = "法定代表人")
     private String lrName;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/SysUserDO.java

@@ -16,15 +16,11 @@ import java.time.LocalDateTime;
  * @Date 2025-10-28 16:42:36
  */
 @Data
-@TableName("sys_user")
+@TableName("user")
 //@EqualsAndHashCode(callSuper = true)
 public class SysUserDO extends BaseDO {
-    //GBS用户id
-    @ApiModelProperty(value = "GBS用户id")
-    private Long id;
     //用户id
     @ApiModelProperty(value = "用户id")
-    @TableId(type = IdType.ASSIGN_ID)
     private String userId;
     //用户名
     @ApiModelProperty(value = "用户名")
@@ -46,10 +42,12 @@ public class SysUserDO extends BaseDO {
     private String roleIds;
     //1监管2企业3相关方
     @ApiModelProperty(value = "1监管2企业3相关方")
-    private Integer userType;
+    private String userType;
     //状态0.正常 99.锁定 2密码错误次数超过当天限制
     @ApiModelProperty(value = "状态0.正常 99.锁定 2密码错误次数超过当天限制")
-    private String status;
+    private int status;
+    @ApiModelProperty(value = "1主账号0个人账户")
+    private int mainCorp;
     //邮箱
     @ApiModelProperty(value = "邮箱")
     private String email;
@@ -134,43 +132,7 @@ public class SysUserDO extends BaseDO {
     //所属乡镇
     @ApiModelProperty(value = "所属乡镇")
     private String village;
-    //乐观锁
+
-    @ApiModelProperty(value = "乐观锁")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer version;
-    //创建人
-    @ApiModelProperty(value = "创建人")
-    private Long createId;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-    //更新人
-    @ApiModelProperty(value = "更新人")
-    private Long updateId;
-    //修改人名称
-    @ApiModelProperty(value = "修改人名称")
-    private String updateName;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private LocalDateTime updateTime;
-    //描述
-    @ApiModelProperty(value = "描述")
-    private String remarks;
-    //是否删除
-    @ApiModelProperty(value = "是否删除")
-    private String deleteEnum;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //机构ID
-    @ApiModelProperty(value = "机构ID")
-    private Long orgId;
-    //环境
-    @ApiModelProperty(value = "环境")
-    private String env;
 
 }