diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java index 36bebf0..7956e90 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java @@ -43,24 +43,24 @@ public class CorpInfoUpdateExe { } public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) { - CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpInfoUpdateCmd.getId()); +// CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpInfoUpdateCmd.getId()); CorpInfoE corpInfoE = new CorpInfoE(); BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE); corpInfoGateway.changeCompanyName(corpInfoE); - OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd(); - otaUpdateCmd.setAccount(corpInfoE.getCorpName()); - otaUpdateCmd.setTenantName(corpInfoE.getCorpName()); - otaUpdateCmd.setOriginalAccount(corpInfoE.getCorpName()); - log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString()); - Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd); - log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString()); - - if(!corpInfoDO.getCorpName().equals(corpInfoE.getCorpName())){ - //TODO 名字有变动,发送mq - } +// OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd(); +// otaUpdateCmd.setAccount(corpInfoE.getCorpName()); +// otaUpdateCmd.setTenantName(corpInfoE.getCorpName()); +// otaUpdateCmd.setOriginalAccount(corpInfoE.getCorpName()); +// log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString()); +// Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd); +// log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString()); +// +// if(!corpInfoDO.getCorpName().equals(corpInfoE.getCorpName())){ +// //TODO 名字有变动,发送mq +// } } public void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd) { 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 aae481a..422d759 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 @@ -41,7 +41,8 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { @Override public SingleResponse add(CorpInfoAddCmd cmd) { - Long userId = AuthContext.getUserId(); +// Long userId = AuthContext.getUserId(); + cmd.setCorpinfoId(Tools.get32UUID()); Long id = corpInfoAddExe.execute(cmd); //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan 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 ea1c447..916ad44 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 @@ -178,46 +178,46 @@ public class CorpInfoCO extends ClientObject { private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 @ApiModelProperty(value = "有无重大危险源,1:是,0:否") - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 @ApiModelProperty(value = "有无特种设备,1:是,0:否") - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 @ApiModelProperty(value = "是否持有放射源,1:是,0:否") - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version;