From bb866215297cda96d1fd0c7ac49f3028f7c27107 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 3 Nov 2025 09:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/CorpInfoXgfAddExe.java | 21 +- .../basic/info/dto/CorpInfoXgfAddCmd.java | 204 ------------------ 2 files changed, 11 insertions(+), 214 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java index 7063d6f..eccda02 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -58,7 +58,16 @@ public class CorpInfoXgfAddExe { if (corpInfoId == null) { throw new BizException("保存失败"); } - List mainDepartmentList = cmd.getMainDepartmentList(); + OtaTenantAddCmd otaTenantAddCmd = new OtaTenantAddCmd(); + otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName()); + otaTenantAddCmd.setTenantId(corpInfoId); + otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName()); + otaTenantAddCmd.setPassword("123456"); + log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); + Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); + log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); + + /* List mainDepartmentList = cmd.getMainDepartmentList(); List corpFormEList = corpInfoXgfCoConvertor.converItemToData(mainDepartmentList); corpFormEList.forEach(info->{ info.setInfoId(corpInfoId); @@ -114,16 +123,8 @@ public class CorpInfoXgfAddExe { .collect(Collectors.toList()); filteredList.forEach(info->{ CorpFormGateway.add(info); - }); + });*/ - OtaTenantAddCmd otaTenantAddCmd = new OtaTenantAddCmd(); - otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName()); - otaTenantAddCmd.setTenantId(corpInfoId); - otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName()); - otaTenantAddCmd.setPassword("123456"); - log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); - Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); - log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); //处理多个 return corpInfoId; 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 a761b27..df3a36c 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,211 +43,7 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; - @ApiModelProperty(value = "通讯地址,汉字160以内", name = "address", required = true) - private String address; - @ApiModelProperty(value = "邮编", name = "postalCode", required = true) - private String postalCode; - - @ApiModelProperty(value = "所属区域,汉字160以内", name = "companyArea", required = true) - private String companyArea; - - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; - - @ApiModelProperty(value = "规模", name = "scale", required = true) - private String scale; - @ApiModelProperty(value = "规模名称,汉字6以内", name = "scaleName", required = true) - private String scaleName; - - @ApiModelProperty(value = "成立时间", name = "createDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createDate; - - @ApiModelProperty(value = "企业状态", name = "corpState", required = true) - private String corpState; - - @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true) - private String corpStateName; - - @ApiModelProperty(value = "资产总额（万元）,10以内", name = "totalAssets", required = true) - private BigDecimal totalAssets; - - @ApiModelProperty(value = "注册资金（万元）,10以内", name = "regcapital", required = true) - private BigDecimal regcapital; - - @ApiModelProperty(value = "企事业单位经营地址,汉字30以内", name = "addressBusiness", required = true) - private String addressBusiness; - - @ApiModelProperty(value = "企事业单位办公地址,汉字30以内", name = "addressOffice", required = true) - private String addressOffice; - - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; - - @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) - private String ecoType; - - @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 = "安全负责人,汉字10以内", name = "safetyName", required = true) - private String safetyName; - - @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) - private String safetyPhone; - - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) - private Integer scaleType; - - @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) - 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 = "lrName", required = true) - private String lrName; - - @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true) - private String lrMobile; - - @ApiModelProperty(value = "行业分类", name = "corpType", required = true) - private String corpType; - - @ApiModelProperty(value = "行业分类名称", name = "corpTypeName", required = true) - private String corpTypeName; - - @ApiModelProperty(value = "行业分类", name = "corpType2", required = true) - private String corpType2; - - @ApiModelProperty(value = "行业分类名称", name = "corpType2Name", required = true) - private String corpType2Name; - - @ApiModelProperty(value = "行业分类", name = "corpType3", required = true) - private String corpType3; - - @ApiModelProperty(value = "行业分类名称", name = "corpType3Name", required = true) - private String corpType3Name; - - @ApiModelProperty(value = "行业分类", name = "corpType4", required = true) - private String corpType4; - - @ApiModelProperty(value = "行业分类名称", name = "corpType4Name", required = true) - private String corpType4Name; - - @ApiModelProperty(value = "所属省名称", name = "provinceName", required = true) - private String provinceName; - - @ApiModelProperty(value = "所属省编码", name = "province", required = true) - private String province; - - @ApiModelProperty(value = "所属市级名称", name = "cityName", required = true) - private String cityName; - - @ApiModelProperty(value = "所属市级编码", name = "city", required = true) - private String city; - - @ApiModelProperty(value = "所属区县名称", name = "countryName", required = true) - private String countryName; - - @ApiModelProperty(value = "所属区县编码", name = "country", required = true) - private String country; - - @ApiModelProperty(value = "所属乡镇名称", name = "villageName", required = true) - private String villageName; - - @ApiModelProperty(value = "所属乡镇编码", name = "village", required = true) - private String village; - - @ApiModelProperty(value = "所属街道名称", name = "streetName", required = true) - private String streetName; - - @ApiModelProperty(value = "所属街道编码", name = "street", required = true) - private String street; - - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; - - @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate licenseStart; - - @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate licenseEnd; - - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; - - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) - private Integer whetherHazards; - - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) - private Integer whetherScarce; - - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; - - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; - - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; - - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; - - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) - private Integer whetherFire; - - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) - private Integer whetherConfined; - - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) - private Integer whetherPowder; - - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) - private Integer whetherLightning; - - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; - - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; - - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; - @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true) - private List employmentformList; - @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true) - private List selectfromList; - @ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true) - private List managerDepartmentList; - @ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true) - private List mainDepartmentList; - @ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true) - private List competentDeptList; - @ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true) - private List superVisecorpDeptList; - @ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true) - private List corpTypeList; }