diff --git a/.gitignore b/.gitignore index 1777b31c..556e8640 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/.idea/easyCodeTableSettingEncode.xml b/.idea/easyCodeTableSettingEncode.xml index 3ad62cb2..de1c0db5 100644 --- a/.idea/easyCodeTableSettingEncode.xml +++ b/.idea/easyCodeTableSettingEncode.xml @@ -10,6 +10,7 @@ + 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 afcb0ac8..96e4a5a7 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 00000000..c38159b3 --- /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 00000000..68b6f14c --- /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/CorpInfoXgfController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java new file mode 100644 index 00000000..5afaa667 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java @@ -0,0 +1,82 @@ +package com.zcloud.basic.info.web; + + +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.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.basic.info.api.CorpInfoXgfServiceI; +import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd; +import com.zcloud.basic.info.dto.CorpInfoXgfPageQry; +import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Api(tags = "企业相关方信息") +@RequestMapping("/${application.gateway}/corpInfoXgf") +@RestController +@AllArgsConstructor +public class CorpInfoXgfController { + private final CorpInfoXgfServiceI corpInfoXgfService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody CorpInfoXgfAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return corpInfoXgfService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody CorpInfoXgfPageQry qry) { + return corpInfoXgfService.listPage(qry); + } + + @ApiOperation("所有数据") + @PostMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @PostMapping("/info/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(corpInfoXgfService.info(id)); + } + + @ApiOperation("删除") + @PostMapping("/remove/{id}") + public Response remove(@PathVariable("id") Long id) { + corpInfoXgfService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + corpInfoXgfService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) { + corpInfoXgfService.edit(corpInfoXgfUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 7778773d..de973b87 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -7,6 +7,8 @@ import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.system.client.dept.facade.DeptFacade; +import com.jjb.saas.system.client.dept.response.DeptCO; import com.zcloud.basic.info.api.DepartmentServiceI; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; @@ -15,6 +17,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; 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.*; @@ -33,6 +36,8 @@ import java.util.List; @AllArgsConstructor public class DepartmentController { private final DepartmentServiceI departmentService; + @DubboReference + private DeptFacade deptFacade; @ApiOperation("新增") @PostMapping("/save") @@ -49,8 +54,9 @@ public class DepartmentController { @ApiOperation("所有数据") @PostMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll() { + return deptFacade.getTreeByCurrentOrgId(); +// return MultiResponse.of(new ArrayList()); } @ApiOperation("详情") @@ -81,7 +87,7 @@ public class DepartmentController { } @ApiOperation("所有数据") @PostMapping("/listTree") - public List listTree(@Validated @RequestBody DepartmentQry qry) { + public List listTree(@Validated @RequestBody DepartmentTreeQry qry) { return departmentService.listTree(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java new file mode 100644 index 00000000..f51b0599 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java @@ -0,0 +1,91 @@ +package com.zcloud.basic.info.web; + + +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.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.basic.info.api.ImgFilesServiceI; +import com.zcloud.basic.info.dto.ImgFilesAddCmd; +import com.zcloud.basic.info.dto.ImgFilesPageQry; +import com.zcloud.basic.info.dto.ImgFilesQryCmd; +import com.zcloud.basic.info.dto.ImgFilesUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.dto.clientobject.ImgFilesInfoCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; + +/** +* web-adapter +* @Author zhangyue +* @Date 2025-10-30 16:10:05 +*/ +@Api(tags = "图片信息表") +@RequestMapping("/${application.gateway}/imgFiles") +@RestController +@AllArgsConstructor +public class ImgFilesController { + private final ImgFilesServiceI imgFilesService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated ImgFilesAddCmd cmd) { + return imgFilesService.add(cmd); + } + + @ApiOperation("批量新增") + @PostMapping("/batchSave") + public SingleResponse batchAdd(@Validated ImgFilesAddCmd cmd) { + return imgFilesService.batchAdd(cmd); + } + + + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody ImgFilesPageQry qry) { + return imgFilesService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll(ImgFilesQryCmd imgFilesQryCmd) { + return imgFilesService.listAll(imgFilesQryCmd); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new ImgFilesCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{filePath}") + public Response removeFile(@PathVariable("filePath") String filePath) { + imgFilesService.removeFile(filePath); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + imgFilesService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody ImgFilesUpdateCmd imgFilesUpdateCmd) { + imgFilesService.edit(imgFilesUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + 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 e63632d6..97d85299 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/CorpInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java index 45f005e8..5ea67fae 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 @@ -1,14 +1,20 @@ package com.zcloud.basic.info.command; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenant.request.OtaPlatformUserUpdateCmd; import com.zcloud.basic.info.domain.gateway.CorpInfoGateway; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.dto.CorpInfoUpdateCmd; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - +import lombok.extern.slf4j.Slf4j; /** * web-app @@ -18,8 +24,12 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class CorpInfoUpdateExe { private final CorpInfoGateway corpInfoGateway; + private final CorpInfoRepository corpInfoRepository; + @DubboReference + private TenantFacade tenantFacade; @Transactional(rollbackFor = Exception.class) public void execute(CorpInfoUpdateCmd corpInfoUpdateCmd) { @@ -32,9 +42,24 @@ public class CorpInfoUpdateExe { } public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) { + 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 + } } } 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 new file mode 100644 index 00000000..7063d6fe --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -0,0 +1,132 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.dept.facade.DeptFacade; +import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenant.request.FacadeTenantAddCmd; +import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; +import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor; +import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; +import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; +import com.zcloud.basic.info.domain.gateway.CorpFormGateway; +import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; +import com.zcloud.basic.info.domain.model.CorpFormE; +import com.zcloud.basic.info.domain.model.CorpInfoXgfE; +import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd; +import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:52:08 + */ +@Component +@AllArgsConstructor +@Slf4j +public class CorpInfoXgfAddExe { + private final CorpInfoXgfGateway corpInfoXgfGateway; + private final CorpFormGateway CorpFormGateway; + private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor; + @DubboReference + private TenantFacade tenantFacade; + + @Transactional(rollbackFor = Exception.class) + public Long execute(CorpInfoXgfAddCmd cmd) { + CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE(); + BeanUtils.copyProperties(cmd, corpInfoXgfE); + Long corpInfoId ; + try { + corpInfoXgfE.setType(CorpTypeEnum.serviceProvider.getCode()); + corpInfoId = corpInfoXgfGateway.addInfo(corpInfoXgfE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (corpInfoId == null) { + throw new BizException("保存失败"); + } + List mainDepartmentList = cmd.getMainDepartmentList(); + List corpFormEList = corpInfoXgfCoConvertor.converItemToData(mainDepartmentList); + corpFormEList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.MAINDEPARTMENT.getCode()); + info.setTypeName(CorpFormTypeEnum.MAINDEPARTMENT.getName()); + }); + List managerDepartmentList = corpInfoXgfCoConvertor.converItemToData(cmd.getManagerDepartmentList()); + managerDepartmentList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode()); + info.setTypeName(CorpFormTypeEnum.MANAGERDEPARTMENT.getName()); + }); + List competentDeptList = corpInfoXgfCoConvertor.converItemToData(cmd.getCompetentDeptList()); + competentDeptList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.COMPETENTDEPT.getCode()); + info.setTypeName(CorpFormTypeEnum.COMPETENTDEPT.getName()); + }); + List superVisecorpDeptList = corpInfoXgfCoConvertor.converItemToData(cmd.getSuperVisecorpDeptList()); + superVisecorpDeptList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()); + info.setTypeName(CorpFormTypeEnum.SUPERVISECORPDEPT.getName()); + }); + List corpTypeList = corpInfoXgfCoConvertor.converItemToData(cmd.getCorpTypeList()); + corpTypeList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.CORP_TYPE.getCode()); + info.setTypeName(CorpFormTypeEnum.CORP_TYPE.getName()); + }); + List employmentformList = corpInfoXgfCoConvertor.converItemToData(cmd.getEmploymentformList()); + employmentformList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.EMPLOYMENTFORM.getCode()); + info.setTypeName(CorpFormTypeEnum.EMPLOYMENTFORM.getName()); + }); + List selectfromList = corpInfoXgfCoConvertor.converItemToData(cmd.getSelectfromList()); + selectfromList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.SELECTFROM.getCode()); + info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName()); + }); + + corpFormEList.addAll(managerDepartmentList); + corpFormEList.addAll(competentDeptList); + corpFormEList.addAll(superVisecorpDeptList); + corpFormEList.addAll(corpTypeList); + corpFormEList.addAll(employmentformList); + corpFormEList.addAll(selectfromList); + + List filteredList = corpFormEList.stream() + .filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty()) + .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-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfRemoveExe.java new file mode 100644 index 00000000..a82eb434 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Component +@AllArgsConstructor +public class CorpInfoXgfRemoveExe { + private final CorpInfoXgfGateway corpInfoXgfGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = corpInfoXgfGateway.deletedCorpInfoXgfById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = corpInfoXgfGateway.deletedCorpInfoXgfByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfUpdateExe.java new file mode 100644 index 00000000..cd7ce94e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfUpdateExe.java @@ -0,0 +1,165 @@ +package com.zcloud.basic.info.command; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenant.request.OtaPlatformUserUpdateCmd; +import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; +import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; +import com.zcloud.basic.info.domain.gateway.CorpFormGateway; +import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; +import com.zcloud.basic.info.domain.model.CorpFormE; +import com.zcloud.basic.info.domain.model.CorpInfoXgfE; +import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd; +import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:52:10 + */ +@Component +@AllArgsConstructor +@Slf4j +public class CorpInfoXgfUpdateExe { + private final CorpInfoXgfGateway corpInfoXgfGateway; + private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor; + private final CorpFormGateway CorpFormGateway; + private final CorpInfoRepository corpInfoRepository; + @DubboReference + private TenantFacade tenantFacade; + @Transactional(rollbackFor = Exception.class) + public void execute(CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) { + + CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpInfoXgfUpdateCmd.getId()); + if(corpInfoDO == null) { + throw new BizException("企业信息不存在"); + } + + CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE(); + BeanUtils.copyProperties(corpInfoXgfUpdateCmd, corpInfoXgfE); + boolean res = corpInfoXgfGateway.update(corpInfoXgfE); + if (!res) { + throw new BizException("修改失败"); + } + Long corpInfoId = corpInfoXgfUpdateCmd.getId(); + List corpFormEList = new ArrayList<>(); + //股份主管部门 + List mainDepartmentList = corpInfoXgfUpdateCmd.getMainDepartmentList(); + if(CollUtil.isNotEmpty(mainDepartmentList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.MAINDEPARTMENT.getCode()); + corpFormEList = corpInfoXgfCoConvertor.converItemToData(mainDepartmentList); + corpFormEList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.MAINDEPARTMENT.getCode()); + info.setTypeName(CorpFormTypeEnum.MAINDEPARTMENT.getName()); + }); + } + //股份监管部门 + List managerDepartmentList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getManagerDepartmentList()); + if(CollUtil.isNotEmpty(managerDepartmentList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.MANAGERDEPARTMENT.getCode()); + managerDepartmentList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode()); + info.setTypeName(CorpFormTypeEnum.MANAGERDEPARTMENT.getName()); + }); + corpFormEList.addAll(managerDepartmentList); + } + //基层单位监管部门 + List competentDeptList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getCompetentDeptList()); + if(CollUtil.isNotEmpty(competentDeptList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.COMPETENTDEPT.getCode()); + competentDeptList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.COMPETENTDEPT.getCode()); + info.setTypeName(CorpFormTypeEnum.COMPETENTDEPT.getName()); + }); + corpFormEList.addAll(competentDeptList); + } + //基层单位主管部门 + List superVisecorpDeptList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getSuperVisecorpDeptList()); + if(CollUtil.isNotEmpty(superVisecorpDeptList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()); + superVisecorpDeptList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()); + info.setTypeName(CorpFormTypeEnum.SUPERVISECORPDEPT.getName()); + }); + corpFormEList.addAll(superVisecorpDeptList); + } + //集团单位 + List corpTypeList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getCorpTypeList()); + if(CollUtil.isNotEmpty(corpTypeList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.CORP_TYPE.getCode()); + corpTypeList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.CORP_TYPE.getCode()); + info.setTypeName(CorpFormTypeEnum.CORP_TYPE.getName()); + }); + corpFormEList.addAll(corpTypeList); + } + //用工形式 + List employmentformList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getEmploymentformList()); + if(CollUtil.isNotEmpty(employmentformList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.EMPLOYMENTFORM.getCode()); + employmentformList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.EMPLOYMENTFORM.getCode()); + info.setTypeName(CorpFormTypeEnum.EMPLOYMENTFORM.getName()); + }); + corpFormEList.addAll(employmentformList); + + } + //选取形式 + List selectfromList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getSelectfromList()); + if(CollUtil.isNotEmpty(selectfromList)){ + CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.SELECTFROM.getCode()); + selectfromList.forEach(info->{ + info.setInfoId(corpInfoId); + info.setType(CorpFormTypeEnum.SELECTFROM.getCode()); + info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName()); + }); + corpFormEList.addAll(selectfromList); + } + + + + List filteredList = corpFormEList.stream() + .filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty()) + .collect(Collectors.toList()); + filteredList.forEach(info->{ + CorpFormGateway.add(info); + }); + OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd(); + otaUpdateCmd.setAccount(corpInfoXgfE.getCorpName()); + otaUpdateCmd.setTenantName(corpInfoXgfE.getCorpName()); + otaUpdateCmd.setOriginalAccount(corpInfoDO.getCorpName()); + otaUpdateCmd.setPassword(corpInfoXgfUpdateCmd.getPassWord()); + log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString()); + Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd); + log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString()); + + if(!corpInfoDO.getCorpName().equals(corpInfoXgfE.getCorpName())){ + //TODO 名字有变动，发送mq + } + + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java index 2dde9080..52aaa670 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java @@ -1,12 +1,17 @@ package com.zcloud.basic.info.command; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.dept.facade.DeptFacade; +import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.FacadeUserAddCmd; +import com.jjb.saas.system.enums.org.DeptTypeEnum; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.dto.DepartmentAddCmd; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -21,11 +26,12 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class DepartmentAddExe { private final DepartmentGateway departmentGateway; -// @DubboReference -// private UserFacade userFacade; + @DubboReference + private DeptFacade deptFacade; @Transactional(rollbackFor = Exception.class) public boolean execute(DepartmentAddCmd cmd) { @@ -35,18 +41,26 @@ public class DepartmentAddExe { //a // userFacade.addUser(new FacadeUserAddCmd()); // C = examTypeE.add(a,b,c); - //TODO 需要调用GBS，新增 - boolean res = false; + Long id = null; try { - res = departmentGateway.add(examTypeE); + id = departmentGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } - if (!res) { + if (id ==null) { throw new BizException("保存失败"); } + // 需要调用GBS，新增 + FacadeAddDeptCmd deptCmd = new FacadeAddDeptCmd(); + deptCmd.setLinkId(id); + deptCmd.setLinkName(examTypeE.getName()); + deptCmd.setParentId(examTypeE.getParentId()); + deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue()); + Response response = deptFacade.addDept(deptCmd); + log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); + return true; } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java index 7de37d34..bfe7cbaa 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java @@ -3,12 +3,14 @@ package com.zcloud.basic.info.command; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.dept.facade.DeptFacade; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +30,9 @@ import java.util.Map; public class DepartmentRemoveExe { private final DepartmentGateway departmentGateway; private final DepartmentRepository departmentRepository; + @DubboReference + private DeptFacade deptFacade; + @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { @@ -42,6 +47,7 @@ public class DepartmentRemoveExe { if (!res) { throw new BizException("删除失败"); } + return true; } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentUpdateExe.java index 0f2ef173..889438d4 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentUpdateExe.java @@ -1,10 +1,16 @@ package com.zcloud.basic.info.command; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.dept.facade.DeptFacade; +import com.jjb.saas.system.client.dept.request.FacadeUpdateDeptCmd; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.dto.DepartmentUpdateCmd; +import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; +import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -20,15 +26,32 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class DepartmentUpdateExe { private final DepartmentGateway departmentGateway; + private final DepartmentRepository departmentRepository; + @DubboReference + private DeptFacade deptFacade; @Transactional(rollbackFor = Exception.class) public void execute(DepartmentUpdateCmd departmentUpdateCmd) { + DepartmentDO departmentDO = departmentRepository.getById(departmentUpdateCmd.getId()); + if(departmentDO == null){ + throw new BizException("部门信息不存在"); + } DepartmentE departmentE = new DepartmentE(); BeanUtils.copyProperties(departmentUpdateCmd, departmentE); boolean res = departmentGateway.update(departmentE); if (!res) { throw new BizException("修改失败"); } + + FacadeUpdateDeptCmd deptCmd = new FacadeUpdateDeptCmd(); + deptCmd.setLinkId(departmentE.getId()); + deptCmd.setLinkName(departmentE.getName()); + deptCmd.setParentId(departmentE.getParentId()); + deptFacade.updateDept(deptCmd); + + if(!departmentDO.getName().equals(departmentE.getName())){ + //TODO 名字不一样，发送mq + } } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesAddExe.java new file mode 100644 index 00000000..4a8a4372 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesAddExe.java @@ -0,0 +1,85 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.basic.info.command.convertor.ImgFilesCoConvertor; +import com.zcloud.basic.info.domain.gateway.ImgFilesGateway; +import com.zcloud.basic.info.domain.model.ImgFilesE; +import com.zcloud.basic.info.dto.ImgFilesAddCmd; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.dto.clientobject.ImgFilesInfoCO; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import com.zcloud.basic.info.persistence.repository.ImgFilesRepository; +import lombok.AllArgsConstructor; +import org.apache.commons.math3.analysis.function.Sin; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-10-30 16:10:00 + */ +@Component +@AllArgsConstructor +public class ImgFilesAddExe { + private final ImgFilesGateway imgFilesGateway; + private final ImgFilesCoConvertor imgFilesCoConvertor; + private final ImgFilesRepository imgFilesRepository; + + @Transactional(rollbackFor = Exception.class) + public SingleResponse execute(ImgFilesAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + Long tenantId = ssoUser.getTenantId(); + ImgFilesE imgFilesE = new ImgFilesE(); + BeanUtils.copyProperties(cmd, imgFilesE); + boolean res = false; + ImgFilesCO imgFilesCO = new ImgFilesCO(); + try { + String filePath = imgFilesE.initAdd(tenantId, imgFilesE); + imgFilesCO.setFilePath(filePath); + res = true; + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return SingleResponse.of(imgFilesCO); + } + + @Transactional(rollbackFor = Exception.class) + public SingleResponse batchExecute(ImgFilesAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + Long tenantId = ssoUser.getTenantId(); + ImgFilesE imgFilesE = new ImgFilesE(); + BeanUtils.copyProperties(cmd, imgFilesE); + boolean res = false; + ImgFilesInfoCO imgFilesCO = new ImgFilesInfoCO(); + try { + List imgFilesEList = imgFilesE.initBatchAdd(tenantId, imgFilesE); + List imgFilesDOList = imgFilesCoConvertor.converEsToDOs(imgFilesEList); + imgFilesRepository.saveBatch(imgFilesDOList); + List imgFilesCOList = imgFilesCoConvertor.converDOsToCOs(imgFilesDOList); + imgFilesCO.setFileList(imgFilesCOList); + imgFilesCO.setForeignKey(imgFilesE.getForeignKey()); + res = true; + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return SingleResponse.of(imgFilesCO); + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesRemoveExe.java new file mode 100644 index 00000000..b2359999 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.ImgFilesGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-10-30 16:10:07 + */ +@Component +@AllArgsConstructor +public class ImgFilesRemoveExe { + private final ImgFilesGateway imgFilesGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(String filePath) { + +// if (!res) { +// throw new BizException("删除失败"); +// } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = imgFilesGateway.deletedImgFilesByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesUpdateExe.java new file mode 100644 index 00000000..2bf99b4a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/ImgFilesUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.ImgFilesGateway; +import com.zcloud.basic.info.domain.model.ImgFilesE; +import com.zcloud.basic.info.dto.ImgFilesUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-10-30 16:10:08 + */ +@Component +@AllArgsConstructor +public class ImgFilesUpdateExe { + private final ImgFilesGateway imgFilesGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(ImgFilesUpdateCmd imgFilesUpdateCmd) { + ImgFilesE imgFilesE = new ImgFilesE(); + BeanUtils.copyProperties(imgFilesUpdateCmd, imgFilesE); + boolean res = imgFilesGateway.update(imgFilesE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + 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 b0ef7697..b24145f5 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/command/convertor/CorpFormCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpFormCoConvertor.java index ae196f7b..46ed047a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpFormCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpFormCoConvertor.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.command.convertor; import com.zcloud.basic.info.dto.clientobject.CorpFormCO; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO; import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; import org.mapstruct.Mapper; @@ -20,5 +21,7 @@ public interface CorpFormCoConvertor { * @return */ List converDOsToCOs(List corpFormDOs); + + List converDOsToItemCOs(List selectFromList); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoXgfCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoXgfCoConvertor.java new file mode 100644 index 00000000..6b24375f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoXgfCoConvertor.java @@ -0,0 +1,28 @@ +package com.zcloud.basic.info.command.convertor; + +import com.zcloud.basic.info.domain.model.CorpFormE; +import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Mapper(componentModel = "spring") +public interface CorpInfoXgfCoConvertor { + /** + * @param corpInfoXgfDOs + * @return + */ + List converDOsToCOs(List corpInfoXgfDOs); + + List converItemToData(List mainDepartmentList); +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/ImgFilesCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/ImgFilesCoConvertor.java new file mode 100644 index 00000000..d98e8932 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/ImgFilesCoConvertor.java @@ -0,0 +1,27 @@ +package com.zcloud.basic.info.command.convertor; + +import com.zcloud.basic.info.domain.model.ImgFilesE; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import org.mapstruct.Mapper; + +import java.util.List; + + + +/** +* web-app +* @Author zhangyue +* @Date 2025-10-30 16:10:05 +*/ +@Mapper(componentModel = "spring") +public interface ImgFilesCoConvertor { + /** + * @param imgFilesDOs + * @return + */ + List converDOsToCOs(List imgFilesDOs); + List converEsToDOs(List imgFilesEs); + +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoXgfQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoXgfQueryExe.java new file mode 100644 index 00000000..ff46cc03 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoXgfQueryExe.java @@ -0,0 +1,97 @@ +package com.zcloud.basic.info.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor; +import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; +import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; +import com.zcloud.basic.info.dto.CorpInfoXgfPageQry; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO; +import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.repository.CorpFormRepository; +import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Component +@AllArgsConstructor +public class CorpInfoXgfQueryExe { + private final CorpInfoRepository corpInfoRepository; + private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor; + private final CorpFormRepository corpFormRepository; + private final CorpFormCoConvertor corpFormCoConvertor; + + + /** + * 分页 + * + * @param corpInfoXgfPageQry + * @return + */ + public PageResponse execute(CorpInfoXgfPageQry corpInfoXgfPageQry) { + Map params = PageQueryHelper.toHashMap(corpInfoXgfPageQry); + PageResponse pageResponse = corpInfoRepository.listPage(params); + List examCenterCOS = corpInfoXgfCoConvertor.converDOsToCOs(pageResponse.getData()); + //TODo 组装营业执照和多选框 + examCenterCOS.forEach(info -> { + Long corpInfoId = info.getId(); + List typeList = Arrays.asList(CorpFormTypeEnum.MAINDEPARTMENT.getCode() + , CorpFormTypeEnum.MANAGERDEPARTMENT.getCode(), CorpFormTypeEnum.SUPERVISECORPDEPT.getCode() + , CorpFormTypeEnum.CORP_TYPE.getCode(), CorpFormTypeEnum.COMPETENTDEPT.getCode()); + List infoByTypeList = corpFormRepository.getInfoByTypeList(corpInfoId, typeList); + + Map> groupedByType = infoByTypeList.stream() + .collect(Collectors.groupingBy(CorpFormDO::getType)); + info.setManagerDepartmentList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.MAINDEPARTMENT.getCode()))); + info.setMainDepartmentList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode()))); + info.setCompetentDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.COMPETENTDEPT.getCode()))); + info.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()))); + info.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.CORP_TYPE.getCode()))); + }); + + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public CorpInfoXgfCO info(Long id) { + CorpInfoDO corpInfoDO = corpInfoRepository.getById(id); + CorpInfoXgfCO corpInfoXgfCO = new CorpInfoXgfCO(); + BeanUtils.copyProperties(corpInfoDO, corpInfoXgfCO); + //查找多选按钮 + + List employmentformList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.EMPLOYMENTFORM.getCode()); + corpInfoXgfCO.setEmploymentformList(corpFormCoConvertor.converDOsToItemCOs(employmentformList)); + List selectFromList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SELECTFROM.getCode()); + corpInfoXgfCO.setSelectfromList(corpFormCoConvertor.converDOsToItemCOs(selectFromList)); + List managerDepartmentList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.MANAGERDEPARTMENT.getCode()); + corpInfoXgfCO.setManagerDepartmentList(corpFormCoConvertor.converDOsToItemCOs(managerDepartmentList)); + + List mainDepartmentList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.MAINDEPARTMENT.getCode()); + corpInfoXgfCO.setMainDepartmentList(corpFormCoConvertor.converDOsToItemCOs(mainDepartmentList)); + + List competentDeptList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.COMPETENTDEPT.getCode()); + corpInfoXgfCO.setCompetentDeptList(corpFormCoConvertor.converDOsToItemCOs(competentDeptList)); + + List superVisecorpDeptList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()); + corpInfoXgfCO.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(superVisecorpDeptList)); + List corpTypeList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.CORP_TYPE.getCode()); + corpInfoXgfCO.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(corpTypeList)); + return corpInfoXgfCO; + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 932ce604..b46d3ba6 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -7,6 +7,7 @@ import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.dto.CorpDepartmentQry; import com.zcloud.basic.info.dto.DepartmentPageQry; import com.zcloud.basic.info.dto.DepartmentQry; +import com.zcloud.basic.info.dto.DepartmentTreeQry; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; @@ -46,7 +47,7 @@ public class DepartmentQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public List listTree(DepartmentQry departmentQry) { + public List listTree(DepartmentTreeQry departmentQry) { Map parmas = PageQueryHelper.toHashMap(departmentQry); List pageResponse = departmentRepository.listTree(parmas); if(CollUtil.isEmpty(pageResponse)) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/ImgFilesQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/ImgFilesQueryExe.java new file mode 100644 index 00000000..138b22ca --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/ImgFilesQueryExe.java @@ -0,0 +1,57 @@ +package com.zcloud.basic.info.command.query; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.basic.info.command.convertor.ImgFilesCoConvertor; +import com.zcloud.basic.info.dto.ImgFilesAddCmd; +import com.zcloud.basic.info.dto.ImgFilesPageQry; +import com.zcloud.basic.info.dto.ImgFilesQryCmd; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import com.zcloud.basic.info.persistence.repository.ImgFilesRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + + +/** +* web-app +* @Author zhangyue +* @Date 2025-10-30 16:10:07 +*/ +@Component +@AllArgsConstructor +public class ImgFilesQueryExe { + private final ImgFilesRepository imgFilesRepository; + private final ImgFilesCoConvertor imgFilesCoConvertor; + + /** + * 分页 + * + * @param imgFilesPageQry + * @return + */ + public PageResponse execute(ImgFilesPageQry imgFilesPageQry) { + Map parmas = PageQueryHelper.toHashMap(imgFilesPageQry); + PageResponse pageResponse = imgFilesRepository.listPage(parmas); + List examCenterCOS = imgFilesCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + /** + * list + * + * @param imgFilesQryCmd + * @return + */ + public MultiResponse executeList(ImgFilesQryCmd imgFilesQryCmd) { + Map parmas = PageQueryHelper.toHashMap(imgFilesQryCmd); + List imgFilesDOList = imgFilesRepository.listAll(parmas); + List imgFilesCOList = imgFilesCoConvertor.converDOsToCOs(imgFilesDOList); + return MultiResponse.of(imgFilesCOList); + } +} + 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 cec10a63..483403ba 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 new file mode 100644 index 00000000..59701d74 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java @@ -0,0 +1,78 @@ +package com.zcloud.basic.info.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.basic.info.api.CorpInfoXgfServiceI; +import com.zcloud.basic.info.command.CorpInfoXgfAddExe; +import com.zcloud.basic.info.command.CorpInfoXgfRemoveExe; +import com.zcloud.basic.info.command.CorpInfoXgfUpdateExe; +import com.zcloud.basic.info.command.SysUserAddExe; +import com.zcloud.basic.info.command.query.CorpInfoXgfQueryExe; +import com.zcloud.basic.info.domain.enums.UserTypeEnum; +import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd; +import com.zcloud.basic.info.dto.CorpInfoXgfPageQry; +import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd; +import com.zcloud.basic.info.dto.SysUserAddCmd; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.shiro.crypto.hash.SimpleHash; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-10-31 10:56:46 + */ +@Service +@AllArgsConstructor +public class CorpInfoXgfServiceImpl implements CorpInfoXgfServiceI { + private final CorpInfoXgfAddExe corpInfoXgfAddExe; + private final CorpInfoXgfUpdateExe corpInfoXgfUpdateExe; + private final CorpInfoXgfRemoveExe corpInfoXgfRemoveExe; + private final CorpInfoXgfQueryExe corpInfoXgfQueryExe; + private final SysUserAddExe sysUserAddExe; + @Override + public PageResponse listPage(CorpInfoXgfPageQry qry) { + + return corpInfoXgfQueryExe.execute(qry); + } + + @Override + public SingleResponse add(CorpInfoXgfAddCmd cmd) { + Long userId = AuthContext.getUserId(); + Long id = corpInfoXgfAddExe.execute(cmd); + //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan + SysUserAddCmd user = new SysUserAddCmd(); +// 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(); + } + + @Override + public void edit(CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) { + corpInfoXgfUpdateExe.execute(corpInfoXgfUpdateCmd); + } + + @Override + public void remove(Long id) { + corpInfoXgfRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + corpInfoXgfRemoveExe.execute(ids); + } + + @Override + public CorpInfoXgfCO info(Long id) { + return corpInfoXgfQueryExe.info(id); + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index 7378bd8a..c8256b4a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -60,7 +60,7 @@ public class DepartmentServiceImpl implements DepartmentServiceI { } @Override - public List listTree(DepartmentQry qry) { + public List listTree(DepartmentTreeQry qry) { return departmentQueryExe.listTree(qry); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/ImgFilesServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/ImgFilesServiceImpl.java new file mode 100644 index 00000000..0c9b491a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/service/ImgFilesServiceImpl.java @@ -0,0 +1,70 @@ +package com.zcloud.basic.info.service; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.api.ImgFilesServiceI; +import com.zcloud.basic.info.command.ImgFilesAddExe; +import com.zcloud.basic.info.command.ImgFilesRemoveExe; +import com.zcloud.basic.info.command.ImgFilesUpdateExe; +import com.zcloud.basic.info.command.query.ImgFilesQueryExe; +import com.zcloud.basic.info.dto.ImgFilesAddCmd; +import com.zcloud.basic.info.dto.ImgFilesPageQry; +import com.zcloud.basic.info.dto.ImgFilesQryCmd; +import com.zcloud.basic.info.dto.ImgFilesUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.dto.clientobject.ImgFilesInfoCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-10-30 16:10:08 + */ +@Service +@AllArgsConstructor +public class ImgFilesServiceImpl implements ImgFilesServiceI { + private final ImgFilesAddExe imgFilesAddExe; + private final ImgFilesUpdateExe imgFilesUpdateExe; + private final ImgFilesRemoveExe imgFilesRemoveExe; + private final ImgFilesQueryExe imgFilesQueryExe; + + @Override + public PageResponse listPage(ImgFilesPageQry qry) { + + return imgFilesQueryExe.execute(qry); + } + + @Override + public SingleResponse add(ImgFilesAddCmd cmd) { + return imgFilesAddExe.execute(cmd); + } + + @Override + public SingleResponse batchAdd(ImgFilesAddCmd cmd) { + return imgFilesAddExe.batchExecute(cmd); + } + + @Override + public void edit(ImgFilesUpdateCmd imgFilesUpdateCmd) { + imgFilesUpdateExe.execute(imgFilesUpdateCmd); + } + + @Override + public void removeFile(String filePath) { + imgFilesRemoveExe.execute(filePath); + } + + @Override + public void removeBatch(Long[] ids) { + imgFilesRemoveExe.execute(ids); + } + + @Override + public MultiResponse listAll(ImgFilesQryCmd imgFilesQryCmd) { + return imgFilesQueryExe.executeList(imgFilesQryCmd); + } +} + 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 e5a0cede..e42204f2 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/CorpInfoXgfServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoXgfServiceI.java new file mode 100644 index 00000000..374c8fe8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoXgfServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.basic.info.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd; +import com.zcloud.basic.info.dto.CorpInfoXgfPageQry; +import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +public interface CorpInfoXgfServiceI { + PageResponse listPage(CorpInfoXgfPageQry qry); + + SingleResponse add(CorpInfoXgfAddCmd cmd); + + void edit(CorpInfoXgfUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + CorpInfoXgfCO info(Long id); +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index ca417940..84362b59 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -26,7 +26,7 @@ public interface DepartmentServiceI { void removeBatch(Long[] ids); - List listTree(DepartmentQry qry); + List listTree(DepartmentTreeQry qry); DepartmentCO info(Long id); diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/ImgFilesServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/ImgFilesServiceI.java new file mode 100644 index 00000000..016b3e1d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/api/ImgFilesServiceI.java @@ -0,0 +1,32 @@ +package com.zcloud.basic.info.api; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.dto.ImgFilesAddCmd; +import com.zcloud.basic.info.dto.ImgFilesPageQry; +import com.zcloud.basic.info.dto.ImgFilesQryCmd; +import com.zcloud.basic.info.dto.ImgFilesUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.basic.info.dto.clientobject.ImgFilesInfoCO; + +/** +* web-client +* @Author zhangyue +* @Date 2025-10-30 16:10:08 +*/ +public interface ImgFilesServiceI { + PageResponse listPage(ImgFilesPageQry qry); + + SingleResponse add(ImgFilesAddCmd cmd); + SingleResponse batchAdd(ImgFilesAddCmd cmd); + + void edit(ImgFilesUpdateCmd cmd); + + void removeFile(String filePath); + + void removeBatch(Long[] ids); + + MultiResponse listAll(ImgFilesQryCmd imgFilesQryCmd); +} + 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 9c38f05a..6a50003f 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/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index c7d4b78e..ab7ab043 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 @@ -47,18 +47,21 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "所属区域", 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 = "规模名称", 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 = "corpStateCode", required = true) - private String corpStateCode; - @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true) - private Double totalassets; + @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true) + private String corpStateName; + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal totalAssets; @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) private BigDecimal regcapital; @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) @@ -66,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) @@ -82,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) @@ -144,9 +146,11 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true) private String fourtype; @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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java index a0cee94c..e92c454f 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java @@ -24,6 +24,8 @@ public class CorpInfoPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String likeCorpinfoId; - private Long corpinfoId; + private Long eqcorpinfoId; + private String likecorpName; + private String eqtype; } 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 58f0aada..d070ffd9 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 @@ -1,6 +1,7 @@ package com.zcloud.basic.info.dto; import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -49,17 +50,21 @@ public class CorpInfoUpdateCmd extends Command { @ApiModelProperty(value = "所属区域", 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 = "规模名称", 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 = "corpStateCode", required = true) - private String corpStateCode; - @ApiModelProperty(value = "资产总额（万元）", name = "totalassets", required = true) - private Double totalassets; + @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true) + private String corpStateName; + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal totalAssets; @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) private BigDecimal regcapital; @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) @@ -67,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) @@ -83,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) @@ -145,9 +149,11 @@ public class CorpInfoUpdateCmd extends Command { @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true) private String fourtype; @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; 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 new file mode 100644 index 00000000..9b765ffc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java @@ -0,0 +1,262 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.List; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-31 10:52:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CorpInfoXgfAddCmd extends Command { + @ApiModelProperty(value = "企业名称,汉字30以内", name = "corpName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpName; + + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true) + private Integer type; + + @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true) + private Integer xgfLevel; + + @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) + private Integer corOrder; + + @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + private Integer isUse; + + @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 = "subordination", required = true) + private String subordination; + + @ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true) + private String subordinationName; + + @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true) + private String fourtype; + + @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; + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfItemCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfItemCmd.java new file mode 100644 index 00000000..6718ee39 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfItemCmd.java @@ -0,0 +1,19 @@ +package com.zcloud.basic.info.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +public class CorpInfoXgfItemCmd { + + @ApiModelProperty(value = "数据字典编码", name = "itemCode", required = true) + @NotEmpty(message = "数据字典编码") + private String itemCode; + @ApiModelProperty(value = "数据字典名称", name = "itemName", required = true) + @NotEmpty(message = "数据字典名称") + private String itemName; + @ApiModelProperty(value = "排序", name = "itemOrder", required = true) + private Integer itemOrder; +} diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfPageQry.java new file mode 100644 index 00000000..e09e8692 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfPageQry.java @@ -0,0 +1,49 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Data +public class CorpInfoXgfPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + private String likeCorpName; + + @ApiModelProperty(value = "结束时间", name = "leCreateTime") + private String leCreateTime; + @ApiModelProperty(value = "开始时间", name = "geCreateTime") + private String geCreateTime; + + @ApiModelProperty(value = "所属省编码", name = "eqProvince") + private String eqProvince; + @ApiModelProperty(value = "所属市级编码", name = "eqCity") + private String eqCity; + @ApiModelProperty(value = "所属区县编码", name = "eqCountry") + private String eqCountry; + @ApiModelProperty(value = "所属乡镇编码", name = "eqVillage") + private String eqVillage; + + @ApiModelProperty(value = "所属街道编码", name = "eqStreet") + private String eqStreet; + + +} + 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 new file mode 100644 index 00000000..e8ff392a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java @@ -0,0 +1,203 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +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; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CorpInfoXgfUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + private String corpinfoId; + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true) + private Integer type; + @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true) + private Integer xgfLevel; + @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) + private Integer corOrder; + @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + private Integer isUse; + @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) + private String code; + @ApiModelProperty(value = "通讯地址", name = "address", required = true) + private String address; + @ApiModelProperty(value = "邮编", name = "postalCode", required = true) + private String postalCode; + @ApiModelProperty(value = "所属区域", 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 = "规模名称", 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 = "资产总额（万元）", name = "totalassets", required = true) + private BigDecimal totalAssets; + @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) + private BigDecimal regcapital; + @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) + private String addressBusiness; + @ApiModelProperty(value = "企事业单位办公地址", 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 = "主要负责人", name = "contacts", required = true) + private String contacts; + @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) + private String contactsPhone; + @ApiModelProperty(value = "安全负责人", 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 = "subordination", required = true) + private String subordination; + + @ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true) + private String subordinationName; + + @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true) + private String fourtype; + @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; + @ApiModelProperty(value = "密码", name = "passWord", required = true) + private String passWord; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java index d2204192..e2502ec7 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java @@ -32,7 +32,7 @@ public class CorpQualificationInfoAddCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") private Long corpinfoId; - @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) + @ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true) @NotEmpty(message = "资质名称不能为空") private String qualificationName; @ApiModelProperty(value = "证书有效期", name = "validityTime", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoPageQry.java index 95d041e9..74f3643b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoPageQry.java @@ -28,9 +28,9 @@ public class CorpQualificationInfoPageQry extends PageQuery { private Long eqCorpInfoId; @ApiModelProperty(value = "证书名称编号模糊查询", name = "keyWords") private String keyWords; - @ApiModelProperty(value = "结束时间", name = "startDate") + @ApiModelProperty(value = "结束时间", name = "leValidityTime") private String leValidityTime; - @ApiModelProperty(value = "开始时间", name = "endDate") + @ApiModelProperty(value = "开始时间", name = "geValidityTime") private String geValidityTime; // validitytime } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java index 53ae8a96..4595ab32 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java @@ -33,7 +33,7 @@ public class CorpQualificationInfoUpdateCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotEmpty(message = "企业id不能为空") private Long corpinfoId; - @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) + @ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true) @NotEmpty(message = "资质名称不能为空") private String qualificationName; @ApiModelProperty(value = "证书有效期", name = "validityTime", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java index 52bf847f..80b497ea 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java @@ -25,43 +25,43 @@ public class DepartmentAddCmd extends Command { @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private String departmentId; - @ApiModelProperty(value = "名称", name = "name", required = true) + @ApiModelProperty(value = "名称,汉字30以内", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) @NotNull(message = "父部门id不能为空") private Long parentId; - @ApiModelProperty(value = "负责人", name = "headman", required = true) + @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) private String headman; @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) private String phone; - @ApiModelProperty(value = "地址", name = "address", required = true) + @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) private String address; @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) private String level; - @ApiModelProperty(value = "部门级别名称", name = "levelName", required = true) + @ApiModelProperty(value = "部门级别名称,汉字30以内", name = "levelName", required = true) private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "0安监部门1消防部门", name = "state", required = true) + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) private Integer state; - @ApiModelProperty(value = "主管领导", name = "leaderCharge", required = true) + @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) private String leaderCharge; - @ApiModelProperty(value = "分管领导人", name = "lrman", required = true) + @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) private String lrman; @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) private Integer category; - @ApiModelProperty(value = "单位类型名称", name = "deptTypeName", required = true) + @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) private String deptTypeName; @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) private String deptType; @ApiModelProperty(value = "部门类型编码", name = "type", required = true) private String type; - @ApiModelProperty(value = "部门类型名称", name = "typeName", required = true) + @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) private String typeName; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java new file mode 100644 index 00000000..760226cc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -0,0 +1,40 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 10:10:48 + */ +@Data +public class DepartmentTreeQry { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + /** + * 名称模糊查询 + */ + @ApiModelProperty(value = "名称模糊查询", name = "likeName") + private String likeName; + + @ApiModelProperty(value = "企业id", name = "eqCorpInfoId") + private String eqCorpInfoId; + @ApiModelProperty(value = "父id", name = "eqParentId") + private String eqParentId; + + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java index 95b45745..0c3f3dbf 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -22,46 +23,46 @@ import java.time.LocalDateTime; @AllArgsConstructor public class DepartmentUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") + @NotNull(message = "主键不能为空") private Long id; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private String departmentId; - @ApiModelProperty(value = "名称", name = "name", required = true) + @ApiModelProperty(value = "名称,汉字30以内", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) private Long parentId; - @ApiModelProperty(value = "负责人", name = "headman", required = true) + @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) private String headman; @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) private String phone; - @ApiModelProperty(value = "地址", name = "address", required = true) + @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) private String address; @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) private String level; - @ApiModelProperty(value = "部门级别名称", name = "levelName", required = true) + @ApiModelProperty(value = "部门级别名称,汉字30以内", name = "levelName", required = true) private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "0安监部门1消防部门", name = "state", required = true) + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) private Integer state; - @ApiModelProperty(value = "主管领导", name = "leaderCharge", required = true) + @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) private String leaderCharge; - @ApiModelProperty(value = "分管领导人", name = "lrman", required = true) + @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) private String lrman; @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) private Integer category; - @ApiModelProperty(value = "单位类型名称", name = "deptTypeName", required = true) + @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) private String deptTypeName; @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) private String deptType; @ApiModelProperty(value = "部门类型编码", name = "type", required = true) private String type; - @ApiModelProperty(value = "部门类型名称", name = "typeName", required = true) + @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) private String typeName; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesAddCmd.java new file mode 100644 index 00000000..cd154028 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesAddCmd.java @@ -0,0 +1,51 @@ +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 org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:09:58 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ImgFilesAddCmd extends Command { + + @ApiModelProperty(value = "类型,参考 com.zcloud.imgfiles.enums.filetype", name = "type", required = true) + @NotNull(message = "类型,参考 com.zcloud.imgfiles.enums.filetype不能为空") + private Integer type; + @ApiModelProperty(value = "路径", name = "path", required = true) + @NotEmpty(message = "文件存储路径不能为空") + private String path; + + + @ApiModelProperty(value = "文件集合", name = "files") + @NotEmpty(message = "至少上传一个文件") + private MultipartFile[] files; + + + @ApiModelProperty(value = "外键", name = "foreignKey") + private String foreignKey; + + @ApiModelProperty(value = "附件名称", name = "fileName") + private String fileName; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "路径", name = "filePath") + private String filePath; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesPageQry.java new file mode 100644 index 00000000..4e5d5a07 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:10:07 + */ +@Data +public class ImgFilesPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `ImgFilesPageQry`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeImgFilesId; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesQryCmd.java new file mode 100644 index 00000000..f3782a1e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesQryCmd.java @@ -0,0 +1,36 @@ +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 org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:09:58 + */ +@Data +public class ImgFilesQryCmd extends Command { + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `ImgFilesQryCmd`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String eqImgFilesId; + private Integer eqType; + private String eqForeignKey; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesUpdateCmd.java new file mode 100644 index 00000000..164f74f6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/ImgFilesUpdateCmd.java @@ -0,0 +1,45 @@ +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; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:10:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ImgFilesUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "imgFilesId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String imgFilesId; + @ApiModelProperty(value = "路径", name = "filePath", required = true) + @NotEmpty(message = "路径不能为空") + private String filePath; + @ApiModelProperty(value = "类型,参考 com.zcloud.imgfiles.enums.filetype", name = "type", required = true) + @NotNull(message = "类型,参考 com.zcloud.imgfiles.enums.filetype不能为空") + private Integer type; + @ApiModelProperty(value = "外键", name = "foreignKey", required = true) + private String foreignKey; + @ApiModelProperty(value = "附件名称", name = "fileName", required = true) + @NotEmpty(message = "附件名称不能为空") + private String fileName; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; +} + 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 00000000..bc971ae8 --- /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 2a26d150..7119d37d 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/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java index f84a849e..96668a07 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 @@ -56,18 +56,20 @@ public class CorpInfoCO extends ClientObject { //规模 @ApiModelProperty(value = "规模") private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; //成立时间 @ApiModelProperty(value = "成立时间") private LocalDate createDate; //企业状态 @ApiModelProperty(value = "企业状态") private String corpState; - //企业状态编码 - @ApiModelProperty(value = "企业状态编码") - private String corpStateCode; + //企业状态名称 + @ApiModelProperty(value = "企业状态名称") + private String corpStateName; //资产总额（万元） @ApiModelProperty(value = "资产总额（万元）") - private Double totalassets; + private BigDecimal totalAssets; //注册资金（万元） @ApiModelProperty(value = "注册资金（万元）") private BigDecimal regcapital; @@ -79,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; @@ -103,7 +107,7 @@ public class CorpInfoCO extends ClientObject { private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 @ApiModelProperty(value = "职工人数") private Integer employees; @@ -113,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 new file mode 100644 index 00000000..75d33fdd --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java @@ -0,0 +1,280 @@ +package com.zcloud.basic.info.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Data +public class CorpInfoXgfCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //企业id + @ApiModelProperty(value = "企业id") + private String corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpName; + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + //相关方等级，1 一级相关方,2 二级相关方 + @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方") + private Integer xgfLevel; + //企业再列表中的排序 + @ApiModelProperty(value = "企业再列表中的排序") + private Integer corOrder; + //是否启用，1:启用,2:关闭 + @ApiModelProperty(value = "是否启用，1:启用,2:关闭") + private Integer isUse; + //统一社会信用代码 + @ApiModelProperty(value = "统一社会信用代码") + private String code; + //通讯地址 + @ApiModelProperty(value = "通讯地址") + private String address; + //邮编 + @ApiModelProperty(value = "邮编") + private String postalCode; + //所属区域 + @ApiModelProperty(value = "所属区域") + private String companyArea; + //开始服务日期 + @ApiModelProperty(value = "开始服务日期") + private LocalDate firstServeDate; + //规模 + @ApiModelProperty(value = "规模") + private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; + //成立时间 + @ApiModelProperty(value = "成立时间") + private LocalDate createDate; + //企业状态 + @ApiModelProperty(value = "企业状态") + private String corpState; + //企业状态名称 + @ApiModelProperty(value = "企业状态名称") + private String corpStateName; + //资产总额（万元） + @ApiModelProperty(value = "资产总额（万元）") + private BigDecimal totalAssets; + //注册资金（万元） + @ApiModelProperty(value = "注册资金（万元）") + private BigDecimal regcapital; + //企事业单位经营地址 + @ApiModelProperty(value = "企事业单位经营地址") + private String addressBusiness; + //企事业单位办公地址 + @ApiModelProperty(value = "企事业单位办公地址") + private String addressOffice; + //固定资产 + @ApiModelProperty(value = "固定资产") + private BigDecimal fixedAssets; + //年产值 + @ApiModelProperty(value = "年产值") + private BigDecimal yearOutputValue; + //经济类型 + @ApiModelProperty(value = "经济类型") + private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; + //主要负责人 + @ApiModelProperty(value = "主要负责人") + private String contacts; + //主要负责人手机号 + @ApiModelProperty(value = "主要负责人手机号") + private String contactsPhone; + //安全负责人 + @ApiModelProperty(value = "安全负责人") + private String safetyName; + //安全负责人手机号 + @ApiModelProperty(value = "安全负责人手机号") + private String safetyPhone; + //是否规模以上,1:是,2:否 + @ApiModelProperty(value = "是否规模以上,1:是,2:否") + private Integer scaleType; + //占地面积 + @ApiModelProperty(value = "占地面积") + private BigDecimal areaCovered; + //职工人数 + @ApiModelProperty(value = "职工人数") + private Integer employees; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + //法定代表人 + @ApiModelProperty(value = "法定代表人") + private String lrName; + //法人手机号 + @ApiModelProperty(value = "法人手机号") + private String lrMobile; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpTypeName; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType2; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType2Name; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType3; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType3Name; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType4; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType4Name; + //所属省名称 + @ApiModelProperty(value = "所属省名称") + private String provinceName; + //所属省编码 + @ApiModelProperty(value = "所属省编码") + private String province; + //所属市级名称 + @ApiModelProperty(value = "所属市级名称") + private String cityName; + //所属市级编码 + @ApiModelProperty(value = "所属市级编码") + private String city; + //所属区县名称 + @ApiModelProperty(value = "所属区县名称") + private String countryName; + //所属区县编码 + @ApiModelProperty(value = "所属区县编码") + private String country; + //所属乡镇名称 + @ApiModelProperty(value = "所属乡镇名称") + private String villageName; + //所属乡镇编码 + @ApiModelProperty(value = "所属乡镇编码") + private String village; + //所属街道名称 + @ApiModelProperty(value = "所属街道名称") + private String streetName; + //所属街道编码 + @ApiModelProperty(value = "所属街道编码") + private String street; + //公司简介 + @ApiModelProperty(value = "公司简介") + private String descr; + //隶属关系编码 + @ApiModelProperty(value = "隶属关系编码") + private String subordination; + //隶属关系名称 + @ApiModelProperty(value = "隶属关系名称") + private String subordinationName; + //四色图类型，1.平面四色图 + @ApiModelProperty(value = "四色图类型，1.平面四色图") + private String fourtype; + @ApiModelProperty(value = "营业执照开始时间") + private LocalDate licenseStart; + //营业执照结束时间 + @ApiModelProperty(value = "营业执照结束时间") + private LocalDate licenseEnd; + //有无职业卫生信息,1:是,2:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + private Integer whetherHygiene; + //有无重大危险源,1:是,2:否 + @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + private Integer whetherHazards; + //是否有稀缺大型应急物资或设施,1:是,2:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + private Integer whetherScarce; + //是否涉及危化品,1:是,2:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + private Integer whetherChemicals; + //有无特种设备,1:是,2:否 + @ApiModelProperty(value = "有无特种设备,1:是,2:否") + private Integer whetherSpecialequipment; + //有无特存种作业人员,1:是,2:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + private Integer whetherSpecialpeople; + //是否涉及煤气,1:是,2:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + private Integer whetherCoalgas; + //是否属于消防重点单位,1:是,2:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + private Integer whetherFire; + //是否在有限空间作业,1:是,2:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + private Integer whetherConfined; + //是否存在涉爆粉尘作业,1:是,2:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + private Integer whetherPowder; + //是否涉及防雷防静电,1:是,2:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + private Integer whetherLightning; + //是否涉及危化品管道,1:是,2:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + private Integer whetherPipeline; + //是否持有放射源,1:是,2:否 + @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + private Integer whetherActinogen; + //是否涉及液氨制冷,1:是,2:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + private Integer whetherLiquidammonia; + + //创建人 + @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 = "用工形式", 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; + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfItemCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfItemCO.java new file mode 100644 index 00000000..14c1d3ad --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfItemCO.java @@ -0,0 +1,17 @@ +package com.zcloud.basic.info.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CorpInfoXgfItemCO { + + @ApiModelProperty(value = "数据字典编码", name = "itemCode", required = true) + private String itemCode; + @ApiModelProperty(value = "数据字典名称", name = "itemName", required = true) + private String itemName; + @ApiModelProperty(value = "排序", name = "itemOrder", required = true) + private Integer itemOrder; + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + private String corpName; +} diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java index 04a3bac1..0470705b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java @@ -52,7 +52,7 @@ public class DepartmentCO extends ClientObject { @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; //0安监部门1消防部门 - @ApiModelProperty(value = "0安监部门1消防部门") + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") private Integer state; //主管领导 @ApiModelProperty(value = "主管领导") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesCO.java new file mode 100644 index 00000000..9c58fcd7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesCO.java @@ -0,0 +1,80 @@ +package com.zcloud.basic.info.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:10:04 + */ +@Data +public class ImgFilesCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String imgFilesId; + //路径 + @ApiModelProperty(value = "路径") + private String filePath; + //类型,参考 com.zcloud.imgfiles.enums.filetype + @ApiModelProperty(value = "类型,参考 com.zcloud.imgfiles.enums.filetype") + private Integer type; + //外键 + @ApiModelProperty(value = "外键") + private String foreignKey; + //附件名称 + @ApiModelProperty(value = "附件名称") + private String fileName; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + 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; + @ApiModelProperty + private List fileList; + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesInfoCO.java new file mode 100644 index 00000000..e00c3b73 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/ImgFilesInfoCO.java @@ -0,0 +1,27 @@ +package com.zcloud.basic.info.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-10-30 16:10:04 + */ +@Data +public class ImgFilesInfoCO extends ClientObject { + //主键 + @ApiModelProperty(value = "外键") + private String foreignKey; + //附件名称 + @ApiModelProperty + private List fileList; + +} + 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 f9ecbf24..48402edd 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-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpFormTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpFormTypeEnum.java new file mode 100644 index 00000000..163a155d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpFormTypeEnum.java @@ -0,0 +1,26 @@ +package com.zcloud.basic.info.domain.enums; + +import lombok.Getter; + +@Getter +public enum CorpFormTypeEnum { + SELECTFROM(0,"选取形式", "旧代码（select_from）"), + EMPLOYMENTFORM(1,"用工形式", "旧代码（employment_form）"), + BUSLICENSEEXPDATE(3,"营业执照有效期", "旧代码（license_start,license_end）,新（licensestart，licensestart）"), + MAINDEPARTMENT(4,"股份主管部门", "旧代码（main_department）,新（maindepartment）"), + MANAGERDEPARTMENT(5,"股份监管部门", "旧代码（manager_department）,新（managerdepartment）"), + COMPETENTDEPT(6,"基层单位监管部门", "旧代码（competent_dept）,新（competentdept）"), + SUPERVISECORPDEPT(7,"基层单位主管部门", "旧代码（supervise_corp_dept）,新（supervisecorpdept）"), + CORP_TYPE(8,"集团单位", "集团单位"), + BUSINESSLICENSE(2,"营业执照照片", "旧代码（business_license）"); + + private final Integer code; + private final String name; + private final String desc; + + CorpFormTypeEnum(Integer code, String name, String desc) { + this.code = code; + this.name = name; + this.desc = desc; + } +} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpStateEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpStateEnum.java new file mode 100644 index 00000000..5a71bb97 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpStateEnum.java @@ -0,0 +1,22 @@ +package com.zcloud.basic.info.domain.enums; + +import lombok.Getter; + +@Getter +public enum CorpStateEnum { + ZC(1,"filialstate01","在产"), + ZJ(2,"filialstate02","在建"), + DJ(3,"filialstate03","代建"), + TC(4,"filialstate04","停产"), + PC(5,"filialstate05","破产"), + ; + private final Integer code; + private final String bianma; + private final String name; + + CorpStateEnum(Integer code, String bianma, String name) { + this.code = code; + this.bianma = bianma; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpFormGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpFormGateway.java index bbbe3e81..c2cb4b06 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpFormGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpFormGateway.java @@ -2,6 +2,8 @@ package com.zcloud.basic.info.domain.gateway; import com.zcloud.basic.info.domain.model.CorpFormE; +import java.util.List; + /** * web-domain * @@ -26,5 +28,9 @@ public interface CorpFormGateway { Boolean deletedCorpFormById(Long id); Boolean deletedCorpFormByIds(Long[] id); + + + void deletedCorpFormByType(Long corpInfoId, List typeList); + void deletedCorpFormByType(Long corpInfoId, Integer type); } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoXgfGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoXgfGateway.java new file mode 100644 index 00000000..b9ecd83d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoXgfGateway.java @@ -0,0 +1,38 @@ +package com.zcloud.basic.info.domain.gateway; + +import com.zcloud.basic.info.domain.model.CorpInfoXgfE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +public interface CorpInfoXgfGateway { + + /** + * 新增 + */ + Boolean add(CorpInfoXgfE corpInfoXgfE); + + /** + * 新增，返回主键id + * @param corpInfoXgfE + * @return + */ + + Long addInfo(CorpInfoXgfE corpInfoXgfE); + + /** + * 修改 + */ + Boolean update(CorpInfoXgfE corpInfoXgfE); + + /** + * 删除 + */ + Boolean deletedCorpInfoXgfById(Long id); + + Boolean deletedCorpInfoXgfByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/DepartmentGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/DepartmentGateway.java index 89794a9b..d4ccc0be 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/DepartmentGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/DepartmentGateway.java @@ -13,7 +13,7 @@ public interface DepartmentGateway { /** * 新增 */ - Boolean add(DepartmentE departmentE); + Long add(DepartmentE departmentE); /** * 修改 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/ImgFilesGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/ImgFilesGateway.java new file mode 100644 index 00000000..09912e93 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/ImgFilesGateway.java @@ -0,0 +1,33 @@ +package com.zcloud.basic.info.domain.gateway; + + +import com.zcloud.basic.info.domain.model.ImgFilesE; + +import java.util.List; + +/** +* web-domain +* @Author zhangyue +* @Date 2025-10-30 16:10:06 +*/ +public interface ImgFilesGateway { + + /** + * 新增 + */ + Boolean add(ImgFilesE imgFilesE) ; + + /** + * 修改 + */ + Boolean update(ImgFilesE imgFilesE); + + /** + * 删除 + */ + Boolean deletedImgFilesById(Long id); + Boolean deletedImgFilesByIds(Long[] id); + + +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpFormE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpFormE.java index 28779973..f2a6bc3e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpFormE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpFormE.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.domain.model; import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +33,6 @@ public class CorpFormE extends BaseE { private String itemName; //排序 private Integer itemOrder; - +// CorpFormTypeEnum } 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 bd43dacc..c4167f73 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 @@ -2,6 +2,7 @@ package com.zcloud.basic.info.domain.model; import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,14 +47,16 @@ public class CorpInfoE extends BaseE { private LocalDate firstServeDate; //规模 private String scale; + //规模名称 + private String scaleName; //成立时间 private LocalDate createDate; //企业状态 private String corpState; - //企业状态编码 - private String corpStateCode; + //企业状态名称 + private String corpStateName; //资产总额（万元） - private Double totalassets; + private BigDecimal totalAssets; //注册资金（万元） private BigDecimal regcapital; //企事业单位经营地址 @@ -61,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; //主要负责人手机号 @@ -77,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; //法人手机号 @@ -168,30 +168,7 @@ public class CorpInfoE extends BaseE { private Integer whetherActinogen; //是否涉及液氨制冷,1:是,2:否 private Integer whetherLiquidammonia; - //乐观锁 - private Integer version; - //创建人 - private Long createId; - //创建人姓名 - private String createName; - //创建时间 - private LocalDateTime createTime; - //更新人 - private Long updateId; - //修改人名称 - private String updateName; - //更新时间 - private LocalDateTime updateTime; - //描述 - private String remarks; - //是否删除 - private String deleteEnum; - //租户ID - private Long tenantId; - //机构ID - private Long orgId; - //环境 - private String env; + } 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 new file mode 100644 index 00000000..48b8689d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java @@ -0,0 +1,169 @@ +package com.zcloud.basic.info.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Data +public class CorpInfoXgfE extends BaseE { + + //企业id + private String corpinfoId; + //企业名称 + private String corpName; + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + private Integer type; + //相关方等级，1 一级相关方,2 二级相关方 + private Integer xgfLevel; + //企业再列表中的排序 + private Integer corOrder; + //是否启用，1:启用,2:关闭 + private Integer isUse; + //统一社会信用代码 + private String code; + //通讯地址 + private String address; + //邮编 + private String postalCode; + //所属区域 + private String companyArea; + //开始服务日期 + private LocalDate firstServeDate; + //规模 + private String scale; + //规模名称 + private String scaleName; + //成立时间 + private LocalDate createDate; + //企业状态 + private String corpState; + //企业状态名称 + private String corpStateName; + //资产总额（万元） + private BigDecimal totalAssets; + //注册资金（万元） + private BigDecimal regcapital; + //企事业单位经营地址 + private String addressBusiness; + //企事业单位办公地址 + private String addressOffice; + //固定资产 + private BigDecimal fixedAssets; + //年产值 + private BigDecimal yearOutputValue; + //经济类型 + private String ecoType; + + private String ecoTypeName; + //主要负责人 + private String contacts; + //主要负责人手机号 + private String contactsPhone; + //安全负责人 + private String safetyName; + //安全负责人手机号 + private String safetyPhone; + //是否规模以上,1:是,2:否 + private Integer scaleType; + //占地面积 + private BigDecimal areaCovered; + //职工人数 + private Integer employees; + //经度 + private String longitude; + //纬度 + private String latitude; + + //法定代表人 + private String lrName; + //法人手机号 + private String lrMobile; + //行业分类 + private String corpType; + //行业分类名称 + private String corpTypeName; + //行业分类 + private String corpType2; + //行业分类名称 + private String corpType2Name; + //行业分类 + private String corpType3; + //行业分类名称 + private String corpType3Name; + //行业分类 + private String corpType4; + //行业分类名称 + private String corpType4Name; + //所属省名称 + private String provinceName; + //所属省编码 + private String province; + //所属市级名称 + private String cityName; + //所属市级编码 + private String city; + //所属区县名称 + private String countryName; + //所属区县编码 + private String country; + //所属乡镇名称 + private String villageName; + //所属乡镇编码 + private String village; + //所属街道名称 + private String streetName; + //所属街道编码 + private String street; + //公司简介 + private String descr; + //隶属关系编码 + private String subordination; + //隶属关系名称 + private String subordinationName; + //四色图类型，1.平面四色图 + private String fourtype; + //营业执照开始时间 + private LocalDate licenseStart; + //营业执照结束时间 + private LocalDate licenseEnd; + //有无职业卫生信息,1:是,2:否 + private Integer whetherHygiene; + //有无重大危险源,1:是,2:否 + private Integer whetherHazards; + //是否有稀缺大型应急物资或设施,1:是,2:否 + private Integer whetherScarce; + //是否涉及危化品,1:是,2:否 + private Integer whetherChemicals; + //有无特种设备,1:是,2:否 + private Integer whetherSpecialequipment; + //有无特存种作业人员,1:是,2:否 + private Integer whetherSpecialpeople; + //是否涉及煤气,1:是,2:否 + private Integer whetherCoalgas; + //是否属于消防重点单位,1:是,2:否 + private Integer whetherFire; + //是否在有限空间作业,1:是,2:否 + private Integer whetherConfined; + //是否存在涉爆粉尘作业,1:是,2:否 + private Integer whetherPowder; + //是否涉及防雷防静电,1:是,2:否 + private Integer whetherLightning; + //是否涉及危化品管道,1:是,2:否 + private Integer whetherPipeline; + //是否持有放射源,1:是,2:否 + private Integer whetherActinogen; + //是否涉及液氨制冷,1:是,2:否 + private Integer whetherLiquidammonia; + +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java index ac4de1b8..b1dd64c1 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java @@ -41,7 +41,7 @@ public class DepartmentE extends BaseE { private Integer depOrder; //是否监管部门 0-否 1-是 private Integer isSupervise; - //0安监部门1消防部门 + //安全管理部门,0安监部门1消防部门 private Integer state; //主管领导 private String leaderCharge; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java new file mode 100644 index 00000000..4b987f84 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java @@ -0,0 +1,107 @@ +package com.zcloud.basic.info.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.DateUtil; +import com.zcloud.gbscommon.utils.FileUpload; +//import com.zcloud.gbscommon.utils.Smb; +import com.zcloud.gbscommon.utils.Tools; +import lombok.Data; +import org.apache.commons.beanutils.BeanUtils; +import org.springframework.util.ObjectUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.lang.reflect.InvocationTargetException; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +/** + * web-domain + * + * @Author zhangyue + * @Date 2025-10-30 16:10:06 + */ +@Data +public class ImgFilesE extends BaseE { + //主键 + private Long id; + //业务主键id + private String imgFilesId; + //路径 + private String filePath; + //类型,参考 com.zcloud.imgfiles.enums.filetype + private Integer type; + //外键 + private String foreignKey; + //附件名称 + private String fileName; + //企业id + private Long corpinfoId; + // 文件存储路径 + private String path; + + private MultipartFile[] files; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户id + private Long tenantId; + //机构id + private Long orgId; + //环境 + private String env; + + public String initAdd(Long tenantId, ImgFilesE baseImgFilesE) throws InvocationTargetException, IllegalAccessException { + + MultipartFile[] files = baseImgFilesE.getFiles(); + List imgFilesList = new ArrayList(); + String foreignKey = ObjectUtils.isEmpty(baseImgFilesE.getForeignKey()) ? Tools.get32UUID() : baseImgFilesE.getForeignKey(); + Long corpinfoId = ObjectUtils.isEmpty(baseImgFilesE.getCorpinfoId()) ? tenantId : baseImgFilesE.getCorpinfoId(); + String filePath = corpinfoId.toString() + "/" + DateUtil.getMonth() + "/" + baseImgFilesE.getPath(); + ImgFilesE imgFile = new ImgFilesE(); + BeanUtils.copyProperties(baseImgFilesE, imgFile); + // 文件上传并获取上传路径 + String resultFilePath = FileUpload.fileUp(files[0], filePath, Tools.get32UUID()); + return filePath + resultFilePath; + } + + public List initBatchAdd(Long tenantId, ImgFilesE baseImgFilesE) throws Exception { + MultipartFile[] files = baseImgFilesE.getFiles(); + List imgFilesList = new ArrayList(); + String foreignKey = ObjectUtils.isEmpty(baseImgFilesE.getForeignKey()) ? Tools.get32UUID() : baseImgFilesE.getForeignKey(); + Long corpinfoId = ObjectUtils.isEmpty(baseImgFilesE.getCorpinfoId()) ? tenantId : baseImgFilesE.getCorpinfoId(); + String filePath = corpinfoId.toString() + "/" + DateUtil.getMonth() + "/" + baseImgFilesE.getPath(); + + for (MultipartFile file : files) { + ImgFilesE imgFile = new ImgFilesE(); + BeanUtils.copyProperties(baseImgFilesE, imgFile); + // 文件上传并获取上传路径 +// Smb.saveFile(file, filePath); + imgFile.setImgFilesId(Tools.get32UUID()); +// imgFile.setFilePath(filePath+); + imgFile.setType(baseImgFilesE.getType()); + imgFile.setForeignKey(foreignKey); + imgFile.setFileName(file.getOriginalFilename()); + imgFile.setCorpinfoId(corpinfoId); + imgFilesList.add(imgFile); + } + baseImgFilesE.setForeignKey(foreignKey); + return imgFilesList; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpFormGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpFormGatewayImpl.java index 1c101ae8..36df6ee6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpFormGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpFormGatewayImpl.java @@ -1,14 +1,18 @@ package com.zcloud.basic.info.gatewayimpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.domain.gateway.CorpFormGateway; import com.zcloud.basic.info.domain.model.CorpFormE; import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; import com.zcloud.basic.info.persistence.repository.CorpFormRepository; +import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Collections; +import java.util.List; /** * web-infrastructure @@ -25,10 +29,14 @@ public class CorpFormGatewayImpl implements CorpFormGateway { public Boolean add(CorpFormE corpFormE) { CorpFormDO d = new CorpFormDO(); BeanUtils.copyProperties(corpFormE, d); + if (StringUtils.isEmpty(d.getCorpFormId())) { + d.setCorpFormId(Tools.get32UUID()); + } corpFormRepository.save(d); return true; } + @Override public Boolean update(CorpFormE corpFormE) { CorpFormDO d = new CorpFormDO(); @@ -46,5 +54,21 @@ public class CorpFormGatewayImpl implements CorpFormGateway { public Boolean deletedCorpFormByIds(Long[] ids) { return corpFormRepository.removeByIds(Collections.singletonList(ids)); } + + @Override + public void deletedCorpFormByType(Long corpInfoId, List typeList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("info_id", corpInfoId) + .in("type", typeList); + corpFormRepository.remove(queryWrapper); + } + + @Override + public void deletedCorpFormByType(Long corpInfoId, Integer type) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("info_id", corpInfoId) + .eq("type", type); + corpFormRepository.remove(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoXgfGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoXgfGatewayImpl.java new file mode 100644 index 00000000..c8dabe86 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoXgfGatewayImpl.java @@ -0,0 +1,66 @@ +package com.zcloud.basic.info.gatewayimpl; + +import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; +import com.zcloud.basic.info.domain.model.CorpInfoXgfE; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-31 10:52:09 + */ +@Service +@AllArgsConstructor +public class CorpInfoXgfGatewayImpl implements CorpInfoXgfGateway { + private final CorpInfoRepository corpInfoRepository; + + @Override + public Boolean add(CorpInfoXgfE corpInfoXgfE) { + CorpInfoDO d = new CorpInfoDO(); + BeanUtils.copyProperties(corpInfoXgfE, d); + if(StringUtils.isEmpty(d.getCorpinfoId())){ + d.setCorpinfoId(Tools.get32UUID()); + } + corpInfoRepository.save(d); + return true; + } + + @Override + public Long addInfo(CorpInfoXgfE corpInfoXgfE) { + CorpInfoDO d = new CorpInfoDO(); + BeanUtils.copyProperties(corpInfoXgfE, d); + if(StringUtils.isEmpty(d.getCorpinfoId())){ + d.setCorpinfoId(Tools.get32UUID()); + } + corpInfoRepository.save(d); + return d.getId(); + } + + @Override + public Boolean update(CorpInfoXgfE corpInfoXgfE) { + CorpInfoDO d = new CorpInfoDO(); + BeanUtils.copyProperties(corpInfoXgfE, d); + corpInfoRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedCorpInfoXgfById(Long id) { + return corpInfoRepository.removeById(id); + } + + @Override + public Boolean deletedCorpInfoXgfByIds(Long[] ids) { + return corpInfoRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java index cb141d82..32bbab22 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java @@ -23,12 +23,12 @@ public class DepartmentGatewayImpl implements DepartmentGateway { private final DepartmentRepository departmentRepository; @Override - public Boolean add(DepartmentE departmentE) { + public Long add(DepartmentE departmentE) { DepartmentDO d = new DepartmentDO(); BeanUtils.copyProperties(departmentE, d); d.setDepartmentId(Tools.get32UUID()); departmentRepository.save(d); - return true; + return d.getId(); } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/ImgFilesGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/ImgFilesGatewayImpl.java new file mode 100644 index 00000000..0400f59b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/ImgFilesGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.basic.info.gatewayimpl; + +import com.zcloud.basic.info.domain.gateway.ImgFilesGateway; +import com.zcloud.basic.info.domain.model.ImgFilesE; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import com.zcloud.basic.info.persistence.repository.ImgFilesRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-10-30 16:10:06 +*/ +@Service +@AllArgsConstructor +public class ImgFilesGatewayImpl implements ImgFilesGateway { + private final ImgFilesRepository imgFilesRepository; + + @Override + public Boolean add(ImgFilesE imgFilesE) { + ImgFilesDO d = new ImgFilesDO(); + BeanUtils.copyProperties(imgFilesE, d); + imgFilesRepository.save(d); + return true; + } + + @Override + public Boolean update(ImgFilesE imgFilesE) { + ImgFilesDO d = new ImgFilesDO(); + BeanUtils.copyProperties(imgFilesE, d); + imgFilesRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedImgFilesById(Long id) { + return imgFilesRepository.removeById(id); + } + + @Override + public Boolean deletedImgFilesByIds(Long[] ids) { + return imgFilesRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpFormDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpFormDO.java index 18e76898..ab472f67 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpFormDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpFormDO.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; @@ -43,5 +44,8 @@ public class CorpFormDO extends BaseDO { @ApiModelProperty(value = "排序") private Integer itemOrder; + @TableField(exist = false) + private String corpName; + } 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 fa452025..f5a0e25a 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 @@ -62,18 +62,20 @@ public class CorpInfoDO extends BaseDO { //规模 @ApiModelProperty(value = "规模") private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; //成立时间 @ApiModelProperty(value = "成立时间") private LocalDate createDate; //企业状态 @ApiModelProperty(value = "企业状态") private String corpState; - //企业状态编码 - @ApiModelProperty(value = "企业状态编码") - private String corpStateCode; + //企业状态名称 + @ApiModelProperty(value = "企业状态名称") + private String corpStateName; //资产总额（万元） @ApiModelProperty(value = "资产总额（万元）") - private Double totalassets; + private BigDecimal totalAssets; //注册资金（万元） @ApiModelProperty(value = "注册资金（万元）") private BigDecimal regcapital; @@ -85,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; @@ -109,7 +113,7 @@ public class CorpInfoDO extends BaseDO { private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") - private Double areaCovered; + private BigDecimal areaCovered; //职工人数 @ApiModelProperty(value = "职工人数") private Integer employees; @@ -119,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; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java index ef8b0eb6..0f57cbfe 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java @@ -55,7 +55,7 @@ public class DepartmentDO extends BaseDO { @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; //0安监部门1消防部门 - @ApiModelProperty(value = "0安监部门1消防部门") + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") private Integer state; //主管领导 @ApiModelProperty(value = "主管领导") diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/ImgFilesDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/ImgFilesDO.java new file mode 100644 index 00000000..f46f3e6b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/ImgFilesDO.java @@ -0,0 +1,44 @@ +package com.zcloud.basic.info.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-10-30 16:10:06 +*/ +@Data +@TableName("img_files") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ImgFilesDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String imgFilesId; + //路径 + @ApiModelProperty(value = "路径") + private String filePath; + //类型,参考 com.zcloud.imgfiles.enums.filetype + @ApiModelProperty(value = "类型,参考 com.zcloud.imgfiles.enums.filetype") + private Integer type; + //外键 + @ApiModelProperty(value = "外键") + private String foreignKey; + //附件名称 + @ApiModelProperty(value = "附件名称") + private String fileName; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + + public ImgFilesDO(String imgFilesId) { + this.imgFilesId = imgFilesId; + } + +} + 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 9cac5c5c..271c55be 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; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpFormMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpFormMapper.java index bdd288ab..4aa46ea8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpFormMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpFormMapper.java @@ -3,6 +3,9 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * web-infrastructure @@ -13,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CorpFormMapper extends BaseMapper { + List selectListByType(@Param("infoId") Long infoId, @Param("typeList") List typeList); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/ImgFilesMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/ImgFilesMapper.java new file mode 100644 index 00000000..109897af --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/ImgFilesMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.basic.info.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import org.apache.ibatis.annotations.Mapper; + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-10-30 16:10:07 +*/ +@Mapper +public interface ImgFilesMapper extends BaseMapper { + + } + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpFormRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpFormRepository.java index e9dc08c0..201ce01a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpFormRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpFormRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,9 @@ import java.util.Map; */ public interface CorpFormRepository extends BaseRepository { PageResponse listPage(Map parmas); + + List getInfoByType(Long id, Integer type); + + List getInfoByTypeList(Long corpInfoId, List typeList); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/ImgFilesRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/ImgFilesRepository.java new file mode 100644 index 00000000..048de29b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/ImgFilesRepository.java @@ -0,0 +1,22 @@ +package com.zcloud.basic.info.persistence.repository; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; + +import java.util.List; +import java.util.Map; + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-10-30 16:10:07 +*/ +public interface ImgFilesRepository extends BaseRepository { + PageResponse listPage(Map parmas); + + + List listAll(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpFormRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpFormRepositoryImpl.java index 67396306..ed722cce 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpFormRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpFormRepositoryImpl.java @@ -13,6 +13,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +36,21 @@ public class CorpFormRepositoryImpl extends BaseRepositoryImpl result = corpFormMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public List getInfoByType(Long id, Integer type) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("info_id", id); + queryWrapper.eq("type", type); + queryWrapper.orderByAsc("item_order"); + List corpFormDOS = corpFormMapper.selectList(queryWrapper); + return corpFormDOS; + } + + @Override + public List getInfoByTypeList(Long corpInfoId, List typeList) { + List corpFormDOList = corpFormMapper.selectListByType(corpInfoId,typeList); + return corpFormDOList; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 9e27463b..b15db319 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -33,10 +33,6 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - if (ObjectUtil.isNotEmpty(params.get("corpinfoId"))){ - queryWrapper.eq("corpinfo_id",params.get("corpinfoId")); - } - queryWrapper.orderByDesc("create_time"); IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/ImgFilesRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/ImgFilesRepositoryImpl.java new file mode 100644 index 00000000..8b18dc0f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/ImgFilesRepositoryImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.basic.info.persistence.repository.impl; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO; +import com.zcloud.basic.info.persistence.mapper.ImgFilesMapper; +import com.zcloud.basic.info.persistence.repository.ImgFilesRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-10-30 16:10:07 + */ +@Service +@RequiredArgsConstructor +public class ImgFilesRepositoryImpl extends BaseRepositoryImpl implements ImgFilesRepository { + private final ImgFilesMapper imgFilesMapper; + + @Override + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.orderByDesc("create_time"); + IPage result = imgFilesMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAll(Map parmas) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.orderByDesc("create_time"); +// queryWrapper.select("id", "img_files_id", "file_path", "type", "foreign_key", "file_name", "corpinfo_id"); + return imgFilesMapper.selectList(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/resources/mapper/CorpFormMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpFormMapper.xml new file mode 100644 index 00000000..685322d9 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/CorpFormMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mybatis/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/CorpInfoMapper.xml rename to web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/CorpQualificationInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpQualificationInfoMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/CorpQualificationInfoMapper.xml rename to web-infrastructure/src/main/resources/mapper/CorpQualificationInfoMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/DepartmentMapper.xml rename to web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/PostMapper.xml b/web-infrastructure/src/main/resources/mapper/PostMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/PostMapper.xml rename to web-infrastructure/src/main/resources/mapper/PostMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml rename to web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/SysUserMapper.xml b/web-infrastructure/src/main/resources/mapper/SysUserMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/SysUserMapper.xml rename to web-infrastructure/src/main/resources/mapper/SysUserMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/UserQualificationInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml similarity index 100% rename from web-infrastructure/src/main/resources/mybatis/UserQualificationInfoMapper.xml rename to web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml diff --git a/web-infrastructure/src/main/resources/mybatis/CorpFormMapper.xml b/web-infrastructure/src/main/resources/mybatis/CorpFormMapper.xml deleted file mode 100644 index b5bb2b50..00000000 --- a/web-infrastructure/src/main/resources/mybatis/CorpFormMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - -