From 69a86bfa13af1167b92859b60a599d7f2321915f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 1 Nov 2025 11:23:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5Double?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java | 10 +++++----- .../com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java | 10 +++++----- .../com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java | 10 +++++----- .../zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java | 8 ++++---- .../zcloud/basic/info/dto/clientobject/CorpInfoCO.java | 8 ++++---- .../basic/info/dto/clientobject/CorpInfoXgfCO.java | 8 ++++---- .../com/zcloud/basic/info/domain/model/CorpInfoE.java | 8 ++++---- .../zcloud/basic/info/domain/model/CorpInfoXgfE.java | 8 ++++---- .../basic/info/persistence/dataobject/CorpInfoDO.java | 8 ++++---- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index 26b419a..7655f27 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/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) - private Double totalassets; + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal totalAssets; @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) private BigDecimal regcapital; @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) @@ -69,9 +69,9 @@ 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 = "contacts", required = true) @@ -85,7 +85,7 @@ 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java index 9d28ca5..2063ac4 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java +++ b/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) - private Double totalassets; + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal totalAssets; @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) private BigDecimal regcapital; @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) @@ -72,9 +72,9 @@ 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 = "contacts", required = true) @@ -88,7 +88,7 @@ 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java index 81dd519..1487df5 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java @@ -71,8 +71,8 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true) private String corpStateName; - @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true) - private Double totalassets; + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal totalAssets; @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) private BigDecimal regcapital; @@ -84,10 +84,10 @@ public class CorpInfoXgfAddCmd extends Command { 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; @@ -108,7 +108,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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java index 768ef67..1b7143b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java +++ b/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,9 +73,9 @@ 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 = "contacts", required = true) @@ -89,7 +89,7 @@ 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java index dccf293..740451d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java +++ b/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,10 +81,10 @@ 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; @@ -105,7 +105,7 @@ public class CorpInfoCO extends ClientObject { private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 @ApiModelProperty(value = "职工人数") private Integer employees; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java index 82f0704..d4d2082 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java +++ b/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,10 +83,10 @@ 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; @@ -107,7 +107,7 @@ public class CorpInfoXgfCO extends ClientObject { private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 @ApiModelProperty(value = "职工人数") private Integer employees; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index 81a82ae..c2cc631 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/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,9 +64,9 @@ public class CorpInfoE extends BaseE { //企事业单位办公地址 private String addressOffice; //固定资产 - private Double fixedAssets; + private BigDecimal fixedAssets; //年产值 - private Double yearOutputValue; + private BigDecimal yearOutputValue; //经济类型 private String ecoType; //主要负责人 @@ -80,7 +80,7 @@ public class CorpInfoE extends BaseE { //是否规模以上,1:是,2:否 private Integer scaleType; //占地面积 - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 private Integer employees; //经度 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java index ded489b..3731326 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java +++ b/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,9 +58,9 @@ public class CorpInfoXgfE extends BaseE { //企事业单位办公地址 private String addressOffice; //固定资产 - private Double fixedAssets; + private BigDecimal fixedAssets; //年产值 - private Double yearOutputValue; + private BigDecimal yearOutputValue; //经济类型 private String ecoType; //主要负责人 @@ -74,7 +74,7 @@ public class CorpInfoXgfE extends BaseE { //是否规模以上,1:是,2:否 private Integer scaleType; //占地面积 - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 private Integer employees; //经度 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java index eae13eb..99b2a11 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java +++ b/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,10 +87,10 @@ 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; @@ -111,7 +111,7 @@ public class CorpInfoDO extends BaseDO { private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 @ApiModelProperty(value = "职工人数") private Integer employees; From 5e8f85dcbe8226a564db23116e4a46f5a592ca4d Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Sat, 1 Nov 2025 13:36:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E8=A1=A5=E5=85=85=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8E=E6=8E=A5=E5=8F=A3=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +- .../com/zcloud/basic/info/Application.java | 3 + .../event/UserUpdateAuditStatusConsumer.java | 31 ++++++ .../info/facade/ZcloudUserFacadeImpl.java | 25 +++++ .../basic/info/web/SysUserController.java | 99 ++++++++++++++++++- .../basic/info/command/SysUserAddExe.java | 19 ++++ .../info/service/CorpInfoServiceImpl.java | 9 +- .../info/service/CorpInfoXgfServiceImpl.java | 9 +- .../info/service/SysUserServiceImpl.java | 6 ++ .../basic/info/api/SysUserServiceI.java | 3 + .../basic/info/dto/SysCorpUserAddCmd.java | 43 ++++++++ .../zcloud/basic/info/dto/SysUserAddCmd.java | 56 ++--------- .../info/dto/clientobject/SysUserCO.java | 11 +-- .../persistence/dataobject/SysUserDO.java | 50 ++-------- 14 files changed, 256 insertions(+), 115 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/basic/info/event/UserUpdateAuditStatusConsumer.java create mode 100644 web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java diff --git a/.gitignore b/.gitignore index 1777b31..556e864 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,7 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -.idea/ +.idea *.iws *.iml *.ipr @@ -39,3 +35,4 @@ build/ ### Mac OS ### .DS_Store +/.idea/ diff --git a/start/src/main/java/com/zcloud/basic/info/Application.java b/start/src/main/java/com/zcloud/basic/info/Application.java index afcb0ac..96e4a5a 100644 --- a/start/src/main/java/com/zcloud/basic/info/Application.java +++ b/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); } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/event/UserUpdateAuditStatusConsumer.java b/web-adapter/src/main/java/com/zcloud/basic/info/event/UserUpdateAuditStatusConsumer.java new file mode 100644 index 0000000..c38159b --- /dev/null +++ b/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 { +// private RemoteEventPublisher eventPublisher; + +// public UserUpdateAuditStatusConsumer(RemoteEventPublisher eventPublisher) { +// this.eventPublisher = eventPublisher; +// } + + @Override + public void consume(ZcUserEvent event) { + + System.out.println(event.getName()); + } + + +} diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java new file mode 100644 index 0000000..68b6f14 --- /dev/null +++ b/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 listByUserIdAndDeptId() { + System.out.println("listByUserIdAndDeptId"); + ZcloudUserCo zcloudUserCo = new ZcloudUserCo(); + zcloudUserCo.setName("hello word"); + ArrayList objects = new ArrayList<>(); + objects.add(zcloudUserCo); + return MultiResponse.of(objects); + } +} diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java index e63632d..97d8529 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java +++ b/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 add(@Validated @RequestBody SysUserAddCmd cmd) { + public Response saveCorpAccount(@Validated @RequestBody SysCorpUserAddCmd cmd) { + MultiResponse roleCOMultiResponse = roleFacade.listRoles(); +// List 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 longSingleResponse = userFacade.addUser(facadeUserAddCmd); +// longSingleResponse.getData(); + System.out.println(cmd); + List data = roleCOMultiResponse.getData(); + FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd(); + facadeUserAddCmd.setAccount(cmd.getUsername()); + facadeUserAddCmd.setName(cmd.getUsername()); + facadeUserAddCmd.setAppKey("e6ab3c9abda747b39d7cc12b6dc0f5a0"); + facadeUserAddCmd.setPassword("Aa12345678"); + try { + Map 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 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 add(@Validated @RequestBody SysUserAddCmd cmd) { +// public SingleResponse add(@Validated @RequestBody SysUserAddCmd cmd) { + public SingleResponse add(@RequestBody SysUserAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); + MultiResponse roleCOMultiResponse = roleFacade.listRoles(); + List 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 longSingleResponse = userFacade.addUser(facadeUserAddCmd); + cmd.setUid(longSingleResponse.getData()); + return sysUserService.add(cmd); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java index b0ef769..b24145f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java +++ b/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); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index cec10a6..483403b 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/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()) - .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) - .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") - .setDepartmentId(id); +// to do 完善 +// user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName()) +// .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) +// .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") +// .setDepartmentId(id); sysUserAddExe.execute(user); return SingleResponse.buildSuccess(); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java index c2a5eb2..59701d7 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java +++ b/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()) - .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) - .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") - .setDepartmentId(id); +// todo 再完善 +// user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName()) +// .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) +// .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") +// .setDepartmentId(id); sysUserAddExe.execute(user); return SingleResponse.buildSuccess(); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/SysUserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/SysUserServiceImpl.java index e5a0ced..e42204f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/SysUserServiceImpl.java +++ b/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); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/SysUserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/SysUserServiceI.java index 9c38f05..6a50003 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/SysUserServiceI.java +++ b/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); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java new file mode 100644 index 0000000..bc971ae --- /dev/null +++ b/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; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java index 2a26d15..7119d37 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java +++ b/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 = "企业不能为空") - private Long corpinfoId; + @NotEmpty(message = "企业不能为空") + private String corpinfoId; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotNull(message = "部门id不能为空") - private Long departmentId; + @NotEmpty(message = "部门id不能为空") + 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) - @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; + private Long uid; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/SysUserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/SysUserCO.java index f9ecbf2..48402ed 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/SysUserCO.java +++ b/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; - //用户id - @ApiModelProperty(value = "用户id") - private String userId; + private Integer id; //用户名 @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; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/SysUserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/SysUserDO.java index 9cac5c5..271c55b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/SysUserDO.java +++ b/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; + } From 3c0efee6b2e1cad6426dc9dfad6c209be9f3717f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 1 Nov 2025 14:03:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/dto/CorpInfoAddCmd.java | 7 +++--- .../basic/info/dto/CorpInfoUpdateCmd.java | 7 +++--- .../basic/info/dto/CorpInfoXgfAddCmd.java | 23 ++++++++----------- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 6 ++--- .../info/dto/clientobject/CorpInfoCO.java | 9 +++----- .../info/dto/clientobject/CorpInfoXgfCO.java | 8 ++----- .../basic/info/domain/model/CorpInfoE.java | 5 +--- .../basic/info/domain/model/CorpInfoXgfE.java | 7 +++--- .../persistence/dataobject/CorpInfoDO.java | 8 ++----- 9 files changed, 29 insertions(+), 51 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index 7655f27..ab7ab04 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java @@ -74,6 +74,8 @@ public class CorpInfoAddCmd extends Command { 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) @@ -92,10 +94,7 @@ public class CorpInfoAddCmd extends Command { 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java index 2063ac4..d070ffd 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java @@ -77,6 +77,8 @@ public class CorpInfoUpdateCmd extends Command { 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) @@ -95,10 +97,7 @@ public class CorpInfoUpdateCmd extends Command { 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java index 1487df5..9b765ff 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java +++ b/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,16 +71,16 @@ 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 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) @@ -92,13 +92,16 @@ public class CorpInfoXgfAddCmd extends Command { @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) @@ -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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java index 1b7143b..e8ff392 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java @@ -78,6 +78,8 @@ public class CorpInfoXgfUpdateCmd extends Command { 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) @@ -96,10 +98,6 @@ public class CorpInfoXgfUpdateCmd extends Command { 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) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java index 740451d..96668a0 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java @@ -88,6 +88,8 @@ public class CorpInfoCO extends ClientObject { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java index d4d2082..75d33fd 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java @@ -90,6 +90,8 @@ public class CorpInfoXgfCO extends ClientObject { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -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; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index c2cc631..c4167f7 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -69,6 +69,7 @@ public class CorpInfoE extends BaseE { private BigDecimal yearOutputValue; //经济类型 private String ecoType; + private String ecoTypeName; //主要负责人 private String contacts; //主要负责人手机号 @@ -87,10 +88,6 @@ public class CorpInfoE extends BaseE { private String longitude; //纬度 private String latitude; - //单位注册登记类型 - private String regType; - //行业监管部门 - private String industryDepartment; //法定代表人 private String lrName; //法人手机号 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java index 3731326..48b8689 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java @@ -63,6 +63,8 @@ public class CorpInfoXgfE extends BaseE { private BigDecimal yearOutputValue; //经济类型 private String ecoType; + + private String ecoTypeName; //主要负责人 private String contacts; //主要负责人手机号 @@ -81,10 +83,7 @@ public class CorpInfoXgfE extends BaseE { private String longitude; //纬度 private String latitude; - //单位注册登记类型 - private String regType; - //行业监管部门 - private String industryDepartment; + //法定代表人 private String lrName; //法人手机号 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java index 99b2a11..f5a0e25 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java @@ -94,6 +94,8 @@ public class CorpInfoDO extends BaseDO { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -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;