From 1a9f412f905441078d0205fc5a04f3e4457fd763 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Sun, 4 Jan 2026 15:52:12 +0800 Subject: [PATCH] =?UTF-8?q?init:=20=E4=BB=A3=E7=A0=81=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/nacos.yml | 6 +- .../web/CorpCertificateController.java | 83 +++++++++++++++++++ .../certificate/web/RiskPointController.java | 78 ----------------- ...AddExe.java => CorpCertificateAddExe.java} | 25 +++--- ...Exe.java => CorpCertificateRemoveExe.java} | 24 ++++-- .../command/CorpCertificateUpdateExe.java | 34 ++++++++ .../command/RiskPointUpdateExe.java | 31 ------- .../convertor/CorpCertificateCoConvertor.java | 24 ++++++ .../convertor/RiskPointCoConvertor.java | 16 ---- .../query/CorpCertificateQueryExe.java | 60 ++++++++++++++ .../command/query/RiskPointQueryExe.java | 36 -------- .../service/CorpCertificateServiceImpl.java | 70 ++++++++++++++++ .../service/RiskPointServiceImpl.java | 56 ------------- .../api/CorpCertificateServiceI.java | 34 ++++++++ .../certificate/api/RiskPointServiceI.java | 20 ----- .../dto/CorpCertificateAddCmd.java | 53 ++++++++++++ .../dto/CorpCertificateListQry.java | 28 +++++++ .../dto/CorpCertificatePageQry.java | 28 +++++++ .../dto/CorpCertificateRemoveCmd.java | 30 +++++++ .../dto/CorpCertificateUpdateCmd.java | 53 ++++++++++++ .../certificate/dto/RiskPointAddCmd.java | 30 ------- .../certificate/dto/RiskPointPageQry.java | 46 ---------- .../certificate/dto/RiskPointUpdateCmd.java | 31 ------- .../dto/clientobject/CorpCertificateCO.java | 45 ++++++++++ .../dto/clientobject/RiskPointCo.java | 17 ---- .../gateway/CorpCertificateGateway.java | 30 +++++++ .../domain/gateway/RiskPointGateway.java | 33 -------- .../domain/model/CorpCertificateE.java | 33 ++++++++ .../certificate/domain/model/RiskPointE.java | 20 ----- .../CorpCertificateGatewayImpl.java | 50 +++++++++++ .../gatewayimpl/RiskPointGatewayImpl.java | 51 ------------ .../dataobject/CorpCertificateDO.java | 50 +++++++++++ .../persistence/dataobject/RiskPointDO.java | 16 ---- .../persistence/domainobject/RiskPointDO.java | 16 ---- .../mapper/CorpCertificateMapper.java | 17 ++++ .../persistence/mapper/RiskPointMapper.java | 9 -- .../repository/CorpCertificateRepository.java | 25 ++++++ .../repository/RiskPointRepository.java | 15 ---- .../impl/CorpCertificateRepositoryImpl.java | 55 ++++++++++++ .../impl/RiskPointRepositoryImpl.java | 35 -------- .../CorpCertificateMapper.xml} | 4 +- 41 files changed, 836 insertions(+), 581 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java delete mode 100644 web-adapter/src/main/java/com/zcloud/certificate/web/RiskPointController.java rename web-app/src/main/java/com/zcloud/certificate/command/{RiskPointAddExe.java => CorpCertificateAddExe.java} (50%) rename web-app/src/main/java/com/zcloud/certificate/command/{RiskPointRemoveExe.java => CorpCertificateRemoveExe.java} (59%) create mode 100644 web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateUpdateExe.java delete mode 100644 web-app/src/main/java/com/zcloud/certificate/command/RiskPointUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/certificate/command/convertor/CorpCertificateCoConvertor.java delete mode 100644 web-app/src/main/java/com/zcloud/certificate/command/convertor/RiskPointCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java delete mode 100644 web-app/src/main/java/com/zcloud/certificate/command/query/RiskPointQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java delete mode 100644 web-app/src/main/java/com/zcloud/certificate/service/RiskPointServiceImpl.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java delete mode 100644 web-client/src/main/java/com/zcloud/certificate/api/RiskPointServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateListQry.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificatePageQry.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateRemoveCmd.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateUpdateCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/RiskPointAddCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/RiskPointPageQry.java delete mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/RiskPointUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/clientobject/CorpCertificateCO.java delete mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/clientobject/RiskPointCo.java create mode 100644 web-domain/src/main/java/com/zcloud/certificate/domain/gateway/CorpCertificateGateway.java delete mode 100644 web-domain/src/main/java/com/zcloud/certificate/domain/gateway/RiskPointGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/certificate/domain/model/CorpCertificateE.java delete mode 100644 web-domain/src/main/java/com/zcloud/certificate/domain/model/RiskPointE.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/RiskPointGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/CorpCertificateDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/RiskPointDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/domainobject/RiskPointDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/RiskPointMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/CorpCertificateRepository.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/RiskPointRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/RiskPointRepositoryImpl.java rename web-infrastructure/src/main/resources/{mybatis/RiskPointMapper.xml => mapper/CorpCertificateMapper.xml} (66%) diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index af260d4..d92b0ef 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -2,10 +2,10 @@ nacos: url: 192.168.20.100:30290 namespace: jjb-dragon application: - name: jjb-saas-zcloud-risk + name: jjb-saas-zcloud-certificate version: - gateway: risk - cn-name: 风险中心 + gateway: certificate + cn-name: 证照管理 spring: application: name: ${application.name}${application.version} diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java new file mode 100644 index 0000000..20adfdb --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java @@ -0,0 +1,83 @@ +package com.zcloud.certificate.web; + + +import com.zcloud.certificate.api.CorpCertificateServiceI; +import com.zcloud.certificate.dto.CorpCertificateAddCmd; +import com.zcloud.certificate.dto.CorpCertificatePageQry; +import com.zcloud.certificate.dto.CorpCertificateListQry; +import com.zcloud.certificate.dto.CorpCertificateUpdateCmd; +import com.zcloud.certificate.dto.CorpCertificateRemoveCmd; +import com.zcloud.certificate.dto.clientobject.CorpCertificateCO; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * web-adapter + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Api(tags = "企业证照管理") +@RequestMapping("/${application.gateway}/corpCertificate") +@RestController +@AllArgsConstructor +public class CorpCertificateController { + private final CorpCertificateServiceI corpCertificateService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody CorpCertificateAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return corpCertificateService.add(cmd); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody CorpCertificateUpdateCmd cmd) { + corpCertificateService.edit(cmd); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody CorpCertificatePageQry qry) { + return corpCertificateService.listPage(qry); + } + + @ApiOperation("所有数据") + @PostMapping("/listAll") + public MultiResponse listAll(@RequestBody CorpCertificateListQry qry) { + return corpCertificateService.list(qry); + } + + @ApiOperation("详情") + @GetMapping("/getInfoById") + public SingleResponse getInfoById(@RequestParam(value = "id") Long id) { + return corpCertificateService.getInfoById(id); + } + + @ApiOperation("删除") + @PutMapping("/remove") + public Response remove(@RequestParam(value = "id") Long id) { + corpCertificateService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @PutMapping("/removeBatch") + public Response removeBatch(@Validated @RequestBody CorpCertificateRemoveCmd cmd) { + corpCertificateService.removeBatch(cmd.getIds()); + return SingleResponse.buildSuccess(); + } + +} + diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/RiskPointController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/RiskPointController.java deleted file mode 100644 index a8c3566..0000000 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/RiskPointController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zcloud.certificate.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.zcloud.certificate.api.RiskPointServiceI; -import com.zcloud.certificate.dto.RiskPointAddCmd; -import com.zcloud.certificate.dto.RiskPointPageQry; -import com.zcloud.certificate.dto.RiskPointUpdateCmd; -import com.zcloud.certificate.dto.clientobject.RiskPointCo; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -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; - -/** - * @author lin - */ -@Api(tags = "风险点管理") -@RequestMapping("/risk/riskPoint") -@RestController -@AllArgsConstructor -public class RiskPointController { - private final RiskPointServiceI riskPointService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody RiskPointAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return riskPointService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody RiskPointPageQry qry) { - return riskPointService.listPage(qry); - } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new RiskPointCo()); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - riskPointService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - riskPointService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointService.edit(riskPointUpdateCmd); - return SingleResponse.buildSuccess(); - } -} diff --git a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointAddExe.java b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java similarity index 50% rename from web-app/src/main/java/com/zcloud/certificate/command/RiskPointAddExe.java rename to web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java index 4a4d897..e17a549 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointAddExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java @@ -1,31 +1,33 @@ package com.zcloud.certificate.command; +import com.zcloud.certificate.domain.gateway.CorpCertificateGateway; +import com.zcloud.certificate.domain.model.CorpCertificateE; +import com.zcloud.certificate.dto.CorpCertificateAddCmd; import com.alibaba.cola.exception.BizException; -import com.zcloud.certificate.domain.gateway.RiskPointGateway; -import com.zcloud.certificate.domain.model.RiskPointE; -import com.zcloud.certificate.dto.RiskPointAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + /** - * 风险点新增执行器 + * web-app * - * @author lin + * @Author SondonYong + * @Date 2026-01-04 15:42:24 */ @Component @AllArgsConstructor -public class RiskPointAddExe { - private final RiskPointGateway riskPointGateway; +public class CorpCertificateAddExe { + private final CorpCertificateGateway corpCertificateGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(RiskPointAddCmd cmd) { - RiskPointE examTypeE = new RiskPointE(); - BeanUtils.copyProperties(cmd, examTypeE); + public boolean execute(CorpCertificateAddCmd cmd) { + CorpCertificateE corpCertificateE = new CorpCertificateE(); + BeanUtils.copyProperties(cmd, corpCertificateE); boolean res = false; try { - res = riskPointGateway.add(examTypeE); + res = corpCertificateGateway.add(corpCertificateE); } catch (Exception e) { throw new RuntimeException(e); } @@ -35,3 +37,4 @@ public class RiskPointAddExe { return true; } } + diff --git a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointRemoveExe.java b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateRemoveExe.java similarity index 59% rename from web-app/src/main/java/com/zcloud/certificate/command/RiskPointRemoveExe.java rename to web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateRemoveExe.java index d09078d..e7e870d 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateRemoveExe.java @@ -1,33 +1,39 @@ package com.zcloud.certificate.command; +import com.zcloud.certificate.domain.gateway.CorpCertificateGateway; import com.alibaba.cola.exception.BizException; -import com.zcloud.certificate.domain.gateway.RiskPointGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + /** - * 风险点新增执行器 - * @author lin + * web-app + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 */ @Component @AllArgsConstructor -public class RiskPointRemoveExe { - private final RiskPointGateway riskPointGateway; +public class CorpCertificateRemoveExe { + private final CorpCertificateGateway corpCertificateGateway; + @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = riskPointGateway.deletedRiskPointById(id); - if(!res){ + boolean res = corpCertificateGateway.deletedCorpCertificateById(id); + if (!res) { throw new BizException("删除失败"); } return true; } + @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = riskPointGateway.deletedRiskPointByIds(ids); - if(!res){ + boolean res = corpCertificateGateway.deletedCorpCertificateByIds(ids); + if (!res) { throw new BizException("删除失败"); } return true; } } + diff --git a/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateUpdateExe.java b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateUpdateExe.java new file mode 100644 index 0000000..0432ad6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.certificate.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.certificate.domain.gateway.CorpCertificateGateway; +import com.zcloud.certificate.domain.model.CorpCertificateE; +import com.zcloud.certificate.dto.CorpCertificateUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Component +@AllArgsConstructor +public class CorpCertificateUpdateExe { + private final CorpCertificateGateway corpCertificateGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(CorpCertificateUpdateCmd cmd) { + CorpCertificateE corpCertificateE = new CorpCertificateE(); + BeanUtils.copyProperties(cmd, corpCertificateE); + boolean res = corpCertificateGateway.update(corpCertificateE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointUpdateExe.java b/web-app/src/main/java/com/zcloud/certificate/command/RiskPointUpdateExe.java deleted file mode 100644 index 49ea219..0000000 --- a/web-app/src/main/java/com/zcloud/certificate/command/RiskPointUpdateExe.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.certificate.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.certificate.domain.gateway.RiskPointGateway; -import com.zcloud.certificate.domain.model.RiskPointE; -import com.zcloud.certificate.dto.RiskPointUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点修改执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointUpdateExe { - private final RiskPointGateway riskPointGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(RiskPointUpdateCmd riskPointUpdateCmd) { - RiskPointE riskPointE = new RiskPointE(); - BeanUtils.copyProperties(riskPointUpdateCmd, riskPointE); - boolean res = riskPointGateway.update(riskPointE); - if (!res) { - throw new BizException("修改失败"); - } - } -} diff --git a/web-app/src/main/java/com/zcloud/certificate/command/convertor/CorpCertificateCoConvertor.java b/web-app/src/main/java/com/zcloud/certificate/command/convertor/CorpCertificateCoConvertor.java new file mode 100644 index 0000000..b9ab558 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/certificate/command/convertor/CorpCertificateCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.certificate.command.convertor; + +import com.zcloud.certificate.dto.clientobject.CorpCertificateCO; +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Mapper(componentModel = "spring") +public interface CorpCertificateCoConvertor { + /** + * @param corpCertificateDOs + * @return + */ + List converDOsToCOs(List corpCertificateDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/certificate/command/convertor/RiskPointCoConvertor.java b/web-app/src/main/java/com/zcloud/certificate/command/convertor/RiskPointCoConvertor.java deleted file mode 100644 index 4f07315..0000000 --- a/web-app/src/main/java/com/zcloud/certificate/command/convertor/RiskPointCoConvertor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.certificate.command.convertor; - -import com.zcloud.certificate.dto.clientobject.RiskPointCo; -import com.zcloud.certificate.persistence.dataobject.RiskPointDO; -import org.mapstruct.Mapper; - -import java.util.List; - -@Mapper(componentModel = "spring") -public interface RiskPointCoConvertor { - /** - * @param riskPointE - * @return - */ - List converDOsToCOs(List riskPointE); -} diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java new file mode 100644 index 0000000..5b2c5b0 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java @@ -0,0 +1,60 @@ +package com.zcloud.certificate.command.query; + +import com.alibaba.cola.dto.MultiResponse; +import com.zcloud.certificate.command.convertor.CorpCertificateCoConvertor; +import com.zcloud.certificate.dto.CorpCertificatePageQry; +import com.zcloud.certificate.dto.CorpCertificateListQry; +import com.zcloud.certificate.dto.clientobject.CorpCertificateCO; +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.zcloud.certificate.persistence.repository.CorpCertificateRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Component +@AllArgsConstructor +public class CorpCertificateQueryExe { + private final CorpCertificateRepository corpCertificateRepository; + private final CorpCertificateCoConvertor corpCertificateCoConvertor; + + /** + * 分页 + * + * @return + */ + public PageResponse execute(CorpCertificatePageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = corpCertificateRepository.listPage(params); + List examCenterCOS = corpCertificateCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public MultiResponse execute(CorpCertificateListQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List list = corpCertificateRepository.list(params); + List examCenterCOS = corpCertificateCoConvertor.converDOsToCOs(list); + return MultiResponse.of(examCenterCOS); + } + + public SingleResponse execute(Long id) { + SingleResponse corpCertificateDO = corpCertificateRepository.getInfoById(id); + CorpCertificateCO co = new CorpCertificateCO(); + BeanUtils.copyProperties(corpCertificateDO.getData(), co); + return SingleResponse.of(co); + } + +} + diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/RiskPointQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/RiskPointQueryExe.java deleted file mode 100644 index cdfc041..0000000 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/RiskPointQueryExe.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zcloud.certificate.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.certificate.command.convertor.RiskPointCoConvertor; -import com.zcloud.certificate.dto.RiskPointPageQry; -import com.zcloud.certificate.dto.clientobject.RiskPointCo; -import com.zcloud.certificate.persistence.dataobject.RiskPointDO; -import com.zcloud.certificate.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 风险点新增执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointQueryExe { - private final RiskPointRepository riskPointRepository; - private final RiskPointCoConvertor riskPointCoConvertor; - - /** - * 分页 - * - * @param riskPointPageQry - * @return - */ - public PageResponse execute(RiskPointPageQry riskPointPageQry) { - PageResponse pageResponse = riskPointRepository.listRiskPointPage(riskPointPageQry.toHashMap()); - List examCenterCOS = riskPointCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} diff --git a/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java new file mode 100644 index 0000000..fa0cbe1 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java @@ -0,0 +1,70 @@ +package com.zcloud.certificate.service; + +import com.alibaba.cola.dto.MultiResponse; +import com.zcloud.certificate.api.CorpCertificateServiceI; +import com.zcloud.certificate.command.CorpCertificateAddExe; +import com.zcloud.certificate.command.CorpCertificateRemoveExe; +import com.zcloud.certificate.command.CorpCertificateUpdateExe; +import com.zcloud.certificate.command.query.CorpCertificateQueryExe; +import com.zcloud.certificate.dto.CorpCertificateAddCmd; +import com.zcloud.certificate.dto.CorpCertificatePageQry; +import com.zcloud.certificate.dto.CorpCertificateListQry; +import com.zcloud.certificate.dto.CorpCertificateUpdateCmd; +import com.zcloud.certificate.dto.clientobject.CorpCertificateCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Service +@AllArgsConstructor +public class CorpCertificateServiceImpl implements CorpCertificateServiceI { + private final CorpCertificateAddExe corpCertificateAddExe; + private final CorpCertificateUpdateExe corpCertificateUpdateExe; + private final CorpCertificateRemoveExe corpCertificateRemoveExe; + private final CorpCertificateQueryExe corpCertificateQueryExe; + + @Override + public PageResponse listPage(CorpCertificatePageQry qry) { + return corpCertificateQueryExe.execute(qry); + } + + @Override + public MultiResponse list(CorpCertificateListQry qry) { + return corpCertificateQueryExe.execute(qry); + } + + @Override + public SingleResponse getInfoById(Long id) { + return corpCertificateQueryExe.execute(id); + } + + @Override + public SingleResponse add(CorpCertificateAddCmd cmd) { + corpCertificateAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(CorpCertificateUpdateCmd cmd) { + corpCertificateUpdateExe.execute(cmd); + } + + @Override + public void remove(Long id) { + corpCertificateRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + corpCertificateRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/certificate/service/RiskPointServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/RiskPointServiceImpl.java deleted file mode 100644 index 83df7dc..0000000 --- a/web-app/src/main/java/com/zcloud/certificate/service/RiskPointServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zcloud.certificate.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.certificate.api.RiskPointServiceI; -import com.zcloud.certificate.command.RiskPointAddExe; -import com.zcloud.certificate.command.RiskPointRemoveExe; -import com.zcloud.certificate.command.RiskPointUpdateExe; -import com.zcloud.certificate.command.query.RiskPointQueryExe; -import com.zcloud.certificate.dto.RiskPointAddCmd; -import com.zcloud.certificate.dto.RiskPointPageQry; -import com.zcloud.certificate.dto.RiskPointUpdateCmd; -import com.zcloud.certificate.dto.clientobject.RiskPointCo; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * @author lin - */ -@Service -@AllArgsConstructor -public class RiskPointServiceImpl implements RiskPointServiceI { - private final RiskPointAddExe riskPointAddExe; - private final RiskPointUpdateExe riskPointUpdateExe; - private final RiskPointRemoveExe riskPointRemoveExe; - private final RiskPointQueryExe riskPointQueryExe; - - @Override - public PageResponse listPage(RiskPointPageQry qry){ - - return riskPointQueryExe.execute(qry); - } - - @Override - public SingleResponse add(RiskPointAddCmd cmd) { - - riskPointAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointUpdateExe.execute(riskPointUpdateCmd); - } - - @Override - public void remove(Long id) { - riskPointRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - riskPointRemoveExe.execute(ids); - } - -} diff --git a/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java new file mode 100644 index 0000000..53a0abf --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java @@ -0,0 +1,34 @@ +package com.zcloud.certificate.api; + +import com.alibaba.cola.dto.MultiResponse; +import com.zcloud.certificate.dto.CorpCertificateAddCmd; +import com.zcloud.certificate.dto.CorpCertificatePageQry; +import com.zcloud.certificate.dto.CorpCertificateListQry; +import com.zcloud.certificate.dto.CorpCertificateUpdateCmd; +import com.zcloud.certificate.dto.clientobject.CorpCertificateCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +public interface CorpCertificateServiceI { + PageResponse listPage(CorpCertificatePageQry qry); + + MultiResponse list(CorpCertificateListQry qry); + + SingleResponse getInfoById(Long id); + + SingleResponse add(CorpCertificateAddCmd cmd); + + void edit(CorpCertificateUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/api/RiskPointServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/RiskPointServiceI.java deleted file mode 100644 index ce8a07f..0000000 --- a/web-client/src/main/java/com/zcloud/certificate/api/RiskPointServiceI.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.certificate.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.certificate.dto.RiskPointAddCmd; -import com.zcloud.certificate.dto.RiskPointPageQry; -import com.zcloud.certificate.dto.RiskPointUpdateCmd; -import com.zcloud.certificate.dto.clientobject.RiskPointCo; - -public interface RiskPointServiceI { - PageResponse listPage(RiskPointPageQry qry); - SingleResponse add(RiskPointAddCmd cmd); - - void edit(RiskPointUpdateCmd riskPointUpdateCmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - -} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateAddCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateAddCmd.java new file mode 100644 index 0000000..80404c7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateAddCmd.java @@ -0,0 +1,53 @@ +package com.zcloud.certificate.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.*; + +import java.util.Date; + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CorpCertificateAddCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + + @ApiModelProperty(value = "证书名称", name = "certificateName", required = true) + @NotEmpty(message = "证书名称不能为空") + private String certificateName; + + @ApiModelProperty(value = "证书编号", name = "certificateCode", required = true) + @NotEmpty(message = "证书编号不能为空") + private String certificateCode; + + @ApiModelProperty(value = "证书有效期-开始时间", name = "certificateDateStart", required = true) + @NotNull(message = "证书有效期-开始时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date certificateDateStart; + + @ApiModelProperty(value = "证书有效期-结束时间", name = "certificateDateEnd", required = true) + @NotNull(message = "证书有效期-结束时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date certificateDateEnd; + + @ApiModelProperty(value = "备注", name = "remark", required = true) + @NotEmpty(message = "备注不能为空") + private String remark; + +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateListQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateListQry.java new file mode 100644 index 0000000..067a5f1 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateListQry.java @@ -0,0 +1,28 @@ +package com.zcloud.certificate.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Data +public class CorpCertificateListQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeCorpCertificateId; +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificatePageQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificatePageQry.java new file mode 100644 index 0000000..ad99029 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificatePageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.certificate.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Data +public class CorpCertificatePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeCorpCertificateId; +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateRemoveCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateRemoveCmd.java new file mode 100644 index 0000000..a6f1eb8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateRemoveCmd.java @@ -0,0 +1,30 @@ +package com.zcloud.certificate.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.*; + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CorpCertificateRemoveCmd extends Command { + + @ApiModelProperty(value = "主键", name = "ids", required = true) + @NotNull(message = "主键不能为空") + @Size(min = 1, message = "请选择数据") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateUpdateCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateUpdateCmd.java new file mode 100644 index 0000000..e0c0d38 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateUpdateCmd.java @@ -0,0 +1,53 @@ +package com.zcloud.certificate.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.*; + +import java.util.Date; + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CorpCertificateUpdateCmd extends Command { + @ApiModelProperty(value = "主键id", name = "id", required = true) + @NotNull(message = "主键id不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "corpCertificateId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String corpCertificateId; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "证书名称", name = "certificateName", required = true) + @NotEmpty(message = "证书名称不能为空") + private String certificateName; + @ApiModelProperty(value = "证书编号", name = "certificateCode", required = true) + @NotEmpty(message = "证书编号不能为空") + private String certificateCode; + @ApiModelProperty(value = "证书有效期-开始时间", name = "certificateDateStart", required = true) + @NotNull(message = "证书有效期-开始时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date certificateDateStart; + @ApiModelProperty(value = "证书有效期-结束时间", name = "certificateDateEnd", required = true) + @NotNull(message = "证书有效期-结束时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date certificateDateEnd; + @ApiModelProperty(value = "备注", name = "remark", required = true) + @NotEmpty(message = "备注不能为空") + private String remark; +} + diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointAddCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointAddCmd.java deleted file mode 100644 index 7c7a23b..0000000 --- a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointAddCmd.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.certificate.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; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointAddCmd extends Command { - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty(message = "风险点名字不能为空") - private String riskPointName; -// @ApiModelProperty(value = "部门Id", name = "deptId", required = true) -// @NotEmpty -// private String deptId; - @NotEmpty(message = "部门名字不能为空") - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointPageQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointPageQry.java deleted file mode 100644 index 3975a3e..0000000 --- a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointPageQry.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.certificate.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -@Data -public class RiskPointPageQry extends PageQuery { - @ApiModelProperty(value = "风险点名称") - private String likeRiskPointName; - @ApiModelProperty(value = "部门名称") - private String eqDeptName; - - public Map toHashMap() { - Map map = new HashMap<>(); - Class clazz = this.getClass(); - - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - - Class superClass = clazz.getSuperclass(); - if (superClass != null) { - Field[] superFields = superClass.getDeclaredFields(); - for (Field field : superFields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - return map; - } -} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointUpdateCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointUpdateCmd.java deleted file mode 100644 index a69022f..0000000 --- a/web-client/src/main/java/com/zcloud/certificate/dto/RiskPointUpdateCmd.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.certificate.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; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointUpdateCmd extends Command { - @ApiModelProperty(value = "风险点id", name = "id", required = true) - @NotEmpty - private String id; - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty - private String riskPointName; - - @NotEmpty - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/CorpCertificateCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/CorpCertificateCO.java new file mode 100644 index 0000000..167d48f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/CorpCertificateCO.java @@ -0,0 +1,45 @@ +package com.zcloud.certificate.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.time.LocalDateTime; +import java.time.LocalDate; + +/** + * web-client + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Data +public class CorpCertificateCO extends ClientObject { + //主键id + @ApiModelProperty(value = "主键id") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String corpCertificateId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //证书名称 + @ApiModelProperty(value = "证书名称") + private String certificateName; + //证书编号 + @ApiModelProperty(value = "证书编号") + private String certificateCode; + //证书有效期-开始时间 + @ApiModelProperty(value = "证书有效期-开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate certificateDateStart; + //证书有效期-结束时间 + @ApiModelProperty(value = "证书有效期-结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate certificateDateEnd; + //备注 + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/RiskPointCo.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/RiskPointCo.java deleted file mode 100644 index 41416b1..0000000 --- a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/RiskPointCo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.certificate.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskPointCo extends ClientObject { - @ApiModelProperty(value = "id") - private Long id; - @ApiModelProperty(value = "风险点名称") - private String riskPointName; - @ApiModelProperty(value = "部门名称") - private String deptName; - @ApiModelProperty(value = "创建人") - private String createName; -} diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/CorpCertificateGateway.java b/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/CorpCertificateGateway.java new file mode 100644 index 0000000..ef679b5 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/CorpCertificateGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.certificate.domain.gateway; + +import com.zcloud.certificate.domain.model.CorpCertificateE; + +/** + * web-domain + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +public interface CorpCertificateGateway { + + /** + * 新增 + */ + Boolean add(CorpCertificateE corpCertificateE); + + /** + * 修改 + */ + Boolean update(CorpCertificateE corpCertificateE); + + /** + * 删除 + */ + Boolean deletedCorpCertificateById(Long id); + + Boolean deletedCorpCertificateByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/RiskPointGateway.java b/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/RiskPointGateway.java deleted file mode 100644 index 6465e69..0000000 --- a/web-domain/src/main/java/com/zcloud/certificate/domain/gateway/RiskPointGateway.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.certificate.domain.gateway; - - -import com.zcloud.certificate.domain.model.RiskPointE; - -/** - * 领域getway - * @author lin - */ -public interface RiskPointGateway { - - /** - * 新增 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean add(RiskPointE riskPointE) ; - - /** - * 修改 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean update(RiskPointE riskPointE); - - /** - * 删除 - * @param id - * @return 结果 - */ - Boolean deletedRiskPointById(Long id); - Boolean deletedRiskPointByIds(Long[] id); -} diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/model/CorpCertificateE.java b/web-domain/src/main/java/com/zcloud/certificate/domain/model/CorpCertificateE.java new file mode 100644 index 0000000..b30af7c --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/certificate/domain/model/CorpCertificateE.java @@ -0,0 +1,33 @@ +package com.zcloud.certificate.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.util.Date; + +/** + * web-domain + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Data +public class CorpCertificateE extends BaseE { + //主键id + private Long id; + //业务主键id + private String corpCertificateId; + //企业id + private Long corpinfoId; + //证书名称 + private String certificateName; + //证书编号 + private String certificateCode; + //证书有效期-开始时间 + private Date certificateDateStart; + //证书有效期-结束时间 + private Date certificateDateEnd; + //备注 + private String remark; +} + diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/model/RiskPointE.java b/web-domain/src/main/java/com/zcloud/certificate/domain/model/RiskPointE.java deleted file mode 100644 index f9a4227..0000000 --- a/web-domain/src/main/java/com/zcloud/certificate/domain/model/RiskPointE.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.certificate.domain.model; - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 领域模型，根据领域模型驱动设计 - * - * @author lin - */ -@Data -@Entity -@EqualsAndHashCode(callSuper = true) -public class RiskPointE extends BaseE { - private Long id; - private String riskPointName; - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java new file mode 100644 index 0000000..39a1de8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.certificate.gatewayimpl; + +import com.zcloud.certificate.domain.gateway.CorpCertificateGateway; +import com.zcloud.certificate.domain.model.CorpCertificateE; +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.zcloud.certificate.persistence.repository.CorpCertificateRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Service +@AllArgsConstructor +public class CorpCertificateGatewayImpl implements CorpCertificateGateway { + private final CorpCertificateRepository corpCertificateRepository; + + @Override + public Boolean add(CorpCertificateE corpCertificateE) { + CorpCertificateDO d = new CorpCertificateDO(); + BeanUtils.copyProperties(corpCertificateE, d); + corpCertificateRepository.save(d); + return true; + } + + @Override + public Boolean update(CorpCertificateE corpCertificateE) { + CorpCertificateDO d = new CorpCertificateDO(); + BeanUtils.copyProperties(corpCertificateE, d); + corpCertificateRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedCorpCertificateById(Long id) { + return corpCertificateRepository.removeById(id); + } + + @Override + public Boolean deletedCorpCertificateByIds(Long[] ids) { + return corpCertificateRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/RiskPointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/RiskPointGatewayImpl.java deleted file mode 100644 index 4b4dbdf..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/RiskPointGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.certificate.gatewayimpl; - -import com.zcloud.certificate.domain.gateway.RiskPointGateway; -import com.zcloud.certificate.domain.model.RiskPointE; -import com.zcloud.certificate.persistence.dataobject.RiskPointDO; -import com.zcloud.certificate.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * 持久层实现 - * - * @author lin - */ - -@Service -@AllArgsConstructor -public class RiskPointGatewayImpl implements RiskPointGateway { - private final RiskPointRepository riskPointRepository; - - @Override - public Boolean add(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.save(d); - return true; - } - - @Override - public Boolean update(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedRiskPointById(Long id) { - return riskPointRepository.removeById(id); - } - - @Override - public Boolean deletedRiskPointByIds(Long[] ids) { - return riskPointRepository.removeByIds(Arrays.asList(ids)); - } - - -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/CorpCertificateDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/CorpCertificateDO.java new file mode 100644 index 0000000..396a55b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/CorpCertificateDO.java @@ -0,0 +1,50 @@ +package com.zcloud.certificate.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.*; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * web-infrastructure + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Data +@TableName("corp_certificate") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class CorpCertificateDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String corpCertificateId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //证书名称 + @ApiModelProperty(value = "证书名称") + private String certificateName; + //证书编号 + @ApiModelProperty(value = "证书编号") + private String certificateCode; + //证书有效期-开始时间 + @ApiModelProperty(value = "证书有效期-开始时间") + private Date certificateDateStart; + //证书有效期-结束时间 + @ApiModelProperty(value = "证书有效期-结束时间") + private Date certificateDateEnd; + //备注 + @ApiModelProperty(value = "备注") + private String remark; + + public CorpCertificateDO(String corpCertificateId) { + this.corpCertificateId = corpCertificateId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/RiskPointDO.java deleted file mode 100644 index 2ea57cf..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.certificate.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("risk_point") -public class RiskPointDO extends BaseDO { - - private String riskPointName; - - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/domainobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/domainobject/RiskPointDO.java deleted file mode 100644 index dd288a7..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/domainobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.certificate.persistence.domainobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("risk_point") -public class RiskPointDO extends BaseDO { - - private String riskPointName; - - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java new file mode 100644 index 0000000..4846093 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.certificate.persistence.mapper; + +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author SondonYong + * @Date 2026-01-04 15:42:24 + */ +@Mapper +public interface CorpCertificateMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/RiskPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/RiskPointMapper.java deleted file mode 100644 index e581c86..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/RiskPointMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zcloud.certificate.persistence.mapper; - -import com.zcloud.certificate.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RiskPointMapper extends BaseMapper { -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/CorpCertificateRepository.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/CorpCertificateRepository.java new file mode 100644 index 0000000..d4d4833 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/CorpCertificateRepository.java @@ -0,0 +1,25 @@ +package com.zcloud.certificate.persistence.repository; + +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.alibaba.cola.dto.SingleResponse; +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; + +import java.util.Map; +import java.util.List; + +/** + * web-infrastructure + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +public interface CorpCertificateRepository extends BaseRepository { + + PageResponse listPage(Map params); + + List list(Map params); + + SingleResponse getInfoById(Long id); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/RiskPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/RiskPointRepository.java deleted file mode 100644 index 75b5510..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/RiskPointRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zcloud.certificate.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.certificate.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.Map; - -/** - * @author lin - */ -public interface RiskPointRepository extends BaseRepository { - PageResponse listRiskPointPage(Map parmas); -} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java new file mode 100644 index 0000000..01db271 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java @@ -0,0 +1,55 @@ +package com.zcloud.certificate.persistence.repository.impl; + +import com.jjb.saas.framework.repository.common.PageHelper; +import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.zcloud.certificate.persistence.mapper.CorpCertificateMapper; +import com.zcloud.certificate.persistence.repository.CorpCertificateRepository; +import com.alibaba.cola.dto.SingleResponse; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.List; + +/** + * web-infrastructure + * + * @Author SondonYong + * @Date 2026-01-04 15:42:25 + */ +@Service +@RequiredArgsConstructor +public class CorpCertificateRepositoryImpl extends BaseRepositoryImpl implements CorpCertificateRepository { + private final CorpCertificateMapper corpCertificateMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = corpCertificateMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List list(Map params) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + List result = corpCertificateMapper.selectList(queryWrapper); + return result; + } + + @Override + public SingleResponse getInfoById(Long id) { + return SingleResponse.of(corpCertificateMapper.selectById(id)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/RiskPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/RiskPointRepositoryImpl.java deleted file mode 100644 index f94fa02..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/RiskPointRepositoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.certificate.persistence.repository.impl; - -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.certificate.persistence.dataobject.RiskPointDO; -import com.zcloud.certificate.persistence.mapper.RiskPointMapper; -import com.zcloud.certificate.persistence.repository.RiskPointRepository; -import com.zcloud.certificate.utils.PageQueryHelper; -import com.zcloud.certificate.utils.Query; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author lin - */ -@Service -@RequiredArgsConstructor -public class RiskPointRepositoryImpl extends BaseRepositoryImpl implements RiskPointRepository { - private final RiskPointMapper riskPointMapper; - - @Override - public PageResponse listRiskPointPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); - IPage result = riskPointMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} diff --git a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml similarity index 66% rename from web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml rename to web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml index d474d1c..b057dfd 100644 --- a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml @@ -2,6 +2,6 @@ - - + +