From 3fff4c75639bdfee7bbff050497f296a8153787d Mon Sep 17 00:00:00 2001 From: SondonYong Date: Wed, 26 Nov 2025 15:46:29 +0800 Subject: [PATCH] =?UTF-8?q?init:=E5=9F=B9=E8=AE=AD=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A3=E7=A0=81=E7=AC=AC=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/edu/web/RiskPointController.java | 78 ------------------ .../edu/web/TrainingTypeController.java | 81 +++++++++++++++++++ .../edu/command/RiskPointUpdateExe.java | 31 ------- ...intAddExe.java => TrainingTypeAddExe.java} | 30 ++++--- ...oveExe.java => TrainingTypeRemoveExe.java} | 23 ++++-- .../edu/command/TrainingTypeUpdateExe.java | 35 ++++++++ .../convertor/RiskPointCoConvertor.java | 16 ---- .../convertor/TrainingTypeCoConvertor.java | 24 ++++++ .../edu/command/query/RiskPointQueryExe.java | 36 --------- .../command/query/TrainingTypeQueryExe.java | 54 +++++++++++++ .../edu/service/RiskPointServiceImpl.java | 56 ------------- .../edu/service/TrainingTypeServiceImpl.java | 62 ++++++++++++++ .../com/zcloud/edu/api/RiskPointServiceI.java | 20 ----- .../zcloud/edu/api/TrainingTypeServiceI.java | 29 +++++++ .../com/zcloud/edu/dto/RiskPointAddCmd.java | 30 ------- .../com/zcloud/edu/dto/RiskPointPageQry.java | 46 ----------- .../zcloud/edu/dto/RiskPointUpdateCmd.java | 31 ------- .../zcloud/edu/dto/TrainingTypeAddCmd.java | 31 +++++++ .../zcloud/edu/dto/TrainingTypePageQry.java | 28 +++++++ .../zcloud/edu/dto/TrainingTypeRemoveCmd.java | 27 +++++++ .../zcloud/edu/dto/TrainingTypeUpdateCmd.java | 34 ++++++++ .../edu/dto/clientobject/RiskPointCo.java | 17 ---- .../edu/dto/clientobject/TrainingTypeCO.java | 70 ++++++++++++++++ .../edu/domain/gateway/RiskPointGateway.java | 33 -------- .../domain/gateway/TrainingTypeGateway.java | 28 +++++++ .../zcloud/edu/domain/model/RiskPointE.java | 20 ----- .../edu/domain/model/TrainingTypeE.java | 24 ++++++ .../edu/gatewayimpl/RiskPointGatewayImpl.java | 51 ------------ .../gatewayimpl/TrainingTypeGatewayImpl.java | 56 +++++++++++++ .../persistence/dataobject/RiskPointDO.java | 16 ---- .../dataobject/TrainingTypeDO.java | 36 +++++++++ .../persistence/domainobject/RiskPointDO.java | 16 ---- .../persistence/mapper/RiskPointMapper.java | 9 --- .../mapper/TrainingTypeMapper.java | 16 ++++ .../repository/RiskPointRepository.java | 15 ---- .../repository/TrainingTypeRepository.java | 20 +++++ .../impl/RiskPointRepositoryImpl.java | 35 -------- .../impl/TrainingTypeRepositoryImpl.java | 43 ++++++++++ ...PointMapper.xml => TrainingTypeMapper.xml} | 3 +- 39 files changed, 732 insertions(+), 578 deletions(-) delete mode 100644 web-adapter/src/main/java/com/zcloud/edu/web/RiskPointController.java create mode 100644 web-adapter/src/main/java/com/zcloud/edu/web/TrainingTypeController.java delete mode 100644 web-app/src/main/java/com/zcloud/edu/command/RiskPointUpdateExe.java rename web-app/src/main/java/com/zcloud/edu/command/{RiskPointAddExe.java => TrainingTypeAddExe.java} (52%) rename web-app/src/main/java/com/zcloud/edu/command/{RiskPointRemoveExe.java => TrainingTypeRemoveExe.java} (64%) create mode 100644 web-app/src/main/java/com/zcloud/edu/command/TrainingTypeUpdateExe.java delete mode 100644 web-app/src/main/java/com/zcloud/edu/command/convertor/RiskPointCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/edu/command/convertor/TrainingTypeCoConvertor.java delete mode 100644 web-app/src/main/java/com/zcloud/edu/command/query/RiskPointQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/edu/command/query/TrainingTypeQueryExe.java delete mode 100644 web-app/src/main/java/com/zcloud/edu/service/RiskPointServiceImpl.java create mode 100644 web-app/src/main/java/com/zcloud/edu/service/TrainingTypeServiceImpl.java delete mode 100644 web-client/src/main/java/com/zcloud/edu/api/RiskPointServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/edu/api/TrainingTypeServiceI.java delete mode 100644 web-client/src/main/java/com/zcloud/edu/dto/RiskPointAddCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/edu/dto/RiskPointPageQry.java delete mode 100644 web-client/src/main/java/com/zcloud/edu/dto/RiskPointUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/TrainingTypePageQry.java create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeRemoveCmd.java create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeUpdateCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/edu/dto/clientobject/RiskPointCo.java create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/clientobject/TrainingTypeCO.java delete mode 100644 web-domain/src/main/java/com/zcloud/edu/domain/gateway/RiskPointGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/edu/domain/gateway/TrainingTypeGateway.java delete mode 100644 web-domain/src/main/java/com/zcloud/edu/domain/model/RiskPointE.java create mode 100644 web-domain/src/main/java/com/zcloud/edu/domain/model/TrainingTypeE.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/RiskPointGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/TrainingTypeGatewayImpl.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/RiskPointDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingTypeDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/domainobject/RiskPointDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/RiskPointMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingTypeMapper.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/RiskPointRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/TrainingTypeRepository.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/RiskPointRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingTypeRepositoryImpl.java rename web-infrastructure/src/main/resources/mapper/{RiskPointMapper.xml => TrainingTypeMapper.xml} (69%) diff --git a/web-adapter/src/main/java/com/zcloud/edu/web/RiskPointController.java b/web-adapter/src/main/java/com/zcloud/edu/web/RiskPointController.java deleted file mode 100644 index 7ceeb9d..0000000 --- a/web-adapter/src/main/java/com/zcloud/edu/web/RiskPointController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zcloud.edu.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.edu.api.RiskPointServiceI; -import com.zcloud.edu.dto.RiskPointAddCmd; -import com.zcloud.edu.dto.RiskPointPageQry; -import com.zcloud.edu.dto.RiskPointUpdateCmd; -import com.zcloud.edu.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-adapter/src/main/java/com/zcloud/edu/web/TrainingTypeController.java b/web-adapter/src/main/java/com/zcloud/edu/web/TrainingTypeController.java new file mode 100644 index 0000000..4ba0cb1 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/edu/web/TrainingTypeController.java @@ -0,0 +1,81 @@ +package com.zcloud.edu.web; + + +import com.zcloud.edu.api.TrainingTypeServiceI; +import com.zcloud.edu.dto.TrainingTypeAddCmd; +import com.zcloud.edu.dto.TrainingTypePageQry; +import com.zcloud.edu.dto.TrainingTypeUpdateCmd; +import com.zcloud.edu.dto.TrainingTypeRemoveCmd; +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.edu.dto.clientobject.TrainingTypeCO; +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 SondonYong +* @Date 2025-11-26 15:04:06 +*/ +@Api(tags = "培训类型信息") +@RequestMapping("/${application.gateway}/trainingType") +@RestController +@AllArgsConstructor +public class TrainingTypeController { + private final TrainingTypeServiceI trainingTypeService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody TrainingTypeAddCmd cmd) { + return trainingTypeService.add(cmd); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody TrainingTypeUpdateCmd cmd) { + trainingTypeService.edit(cmd); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody TrainingTypePageQry qry) { + return trainingTypeService.listPage(qry); + } + + @ApiOperation("所有数据") + @PostMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/getInfoById") + public SingleResponse getInfoById(@RequestParam(value = "id") Long id) { + return trainingTypeService.getInfoById(id); + } + + @ApiOperation("删除") + @PutMapping("/remove") + public Response remove(@RequestParam(value = "id") Long id) { + trainingTypeService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @PutMapping("/removeBatch") + public Response removeBatch(@Validated @RequestBody TrainingTypeRemoveCmd cmd) { + trainingTypeService.removeBatch(cmd.getIds()); + return SingleResponse.buildSuccess(); + } + +} + diff --git a/web-app/src/main/java/com/zcloud/edu/command/RiskPointUpdateExe.java b/web-app/src/main/java/com/zcloud/edu/command/RiskPointUpdateExe.java deleted file mode 100644 index dadebef..0000000 --- a/web-app/src/main/java/com/zcloud/edu/command/RiskPointUpdateExe.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.edu.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.edu.domain.gateway.RiskPointGateway; -import com.zcloud.edu.domain.model.RiskPointE; -import com.zcloud.edu.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/edu/command/RiskPointAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeAddExe.java similarity index 52% rename from web-app/src/main/java/com/zcloud/edu/command/RiskPointAddExe.java rename to web-app/src/main/java/com/zcloud/edu/command/TrainingTypeAddExe.java index 4fce6d4..afc4050 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/RiskPointAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeAddExe.java @@ -1,31 +1,34 @@ package com.zcloud.edu.command; +import com.zcloud.edu.domain.gateway.TrainingTypeGateway; +import com.zcloud.edu.domain.model.TrainingTypeE; +import com.zcloud.edu.dto.TrainingTypeAddCmd; import com.alibaba.cola.exception.BizException; -import com.zcloud.edu.domain.gateway.RiskPointGateway; -import com.zcloud.edu.domain.model.RiskPointE; -import com.zcloud.edu.dto.RiskPointAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + + + /** - * 风险点新增执行器 - * - * @author lin - */ +* web-app +* @Author SondonYong +* @Date 2025-11-26 15:04:06 +*/ @Component @AllArgsConstructor -public class RiskPointAddExe { - private final RiskPointGateway riskPointGateway; +public class TrainingTypeAddExe { + private final TrainingTypeGateway trainingTypeGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(RiskPointAddCmd cmd) { - RiskPointE examTypeE = new RiskPointE(); - BeanUtils.copyProperties(cmd, examTypeE); + public boolean execute(TrainingTypeAddCmd cmd) { + TrainingTypeE trainingTypeE = new TrainingTypeE(); + BeanUtils.copyProperties(cmd, trainingTypeE); boolean res = false; try { - res = riskPointGateway.add(examTypeE); + res = trainingTypeGateway.add(trainingTypeE); } catch (Exception e) { throw new RuntimeException(e); } @@ -35,3 +38,4 @@ public class RiskPointAddExe { return true; } } + diff --git a/web-app/src/main/java/com/zcloud/edu/command/RiskPointRemoveExe.java b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeRemoveExe.java similarity index 64% rename from web-app/src/main/java/com/zcloud/edu/command/RiskPointRemoveExe.java rename to web-app/src/main/java/com/zcloud/edu/command/TrainingTypeRemoveExe.java index 6a3e061..b62da6e 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/RiskPointRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeRemoveExe.java @@ -1,33 +1,40 @@ package com.zcloud.edu.command; +import com.zcloud.edu.domain.gateway.TrainingTypeGateway; import com.alibaba.cola.exception.BizException; -import com.zcloud.edu.domain.gateway.RiskPointGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + + + /** - * 风险点新增执行器 - * @author lin - */ +* web-app +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ @Component @AllArgsConstructor -public class RiskPointRemoveExe { - private final RiskPointGateway riskPointGateway; +public class TrainingTypeRemoveExe { + private final TrainingTypeGateway trainingTypeGateway; + @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = riskPointGateway.deletedRiskPointById(id); + boolean res = trainingTypeGateway.deletedTrainingTypeById(id); if(!res){ throw new BizException("删除失败"); } return true; } + @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = riskPointGateway.deletedRiskPointByIds(ids); + boolean res = trainingTypeGateway.deletedTrainingTypeByIds(ids); if(!res){ throw new BizException("删除失败"); } return true; } } + diff --git a/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeUpdateExe.java b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeUpdateExe.java new file mode 100644 index 0000000..9dfc9ba --- /dev/null +++ b/web-app/src/main/java/com/zcloud/edu/command/TrainingTypeUpdateExe.java @@ -0,0 +1,35 @@ +package com.zcloud.edu.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.edu.domain.gateway.TrainingTypeGateway; +import com.zcloud.edu.domain.model.TrainingTypeE; +import com.zcloud.edu.dto.TrainingTypeUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Component +@AllArgsConstructor +public class TrainingTypeUpdateExe { + private final TrainingTypeGateway trainingTypeGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(TrainingTypeUpdateCmd cmd) { + TrainingTypeE trainingTypeE = new TrainingTypeE(); + BeanUtils.copyProperties(cmd, trainingTypeE); + boolean res = trainingTypeGateway.update(trainingTypeE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/edu/command/convertor/RiskPointCoConvertor.java b/web-app/src/main/java/com/zcloud/edu/command/convertor/RiskPointCoConvertor.java deleted file mode 100644 index 0029546..0000000 --- a/web-app/src/main/java/com/zcloud/edu/command/convertor/RiskPointCoConvertor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.edu.command.convertor; - -import com.zcloud.edu.dto.clientobject.RiskPointCo; -import com.zcloud.edu.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/edu/command/convertor/TrainingTypeCoConvertor.java b/web-app/src/main/java/com/zcloud/edu/command/convertor/TrainingTypeCoConvertor.java new file mode 100644 index 0000000..4717745 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/edu/command/convertor/TrainingTypeCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.edu.command.convertor; + +import com.zcloud.edu.dto.clientobject.TrainingTypeCO; +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import org.mapstruct.Mapper; + +import java.util.List; + + + +/** +* web-app +* @Author SondonYong +* @Date 2025-11-26 15:04:06 +*/ +@Mapper(componentModel = "spring") +public interface TrainingTypeCoConvertor { + /** + * @param trainingTypeDOs + * @return + */ + List converDOsToCOs(List trainingTypeDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/RiskPointQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/RiskPointQueryExe.java deleted file mode 100644 index faf93b7..0000000 --- a/web-app/src/main/java/com/zcloud/edu/command/query/RiskPointQueryExe.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zcloud.edu.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.edu.command.convertor.RiskPointCoConvertor; -import com.zcloud.edu.dto.RiskPointPageQry; -import com.zcloud.edu.dto.clientobject.RiskPointCo; -import com.zcloud.edu.persistence.dataobject.RiskPointDO; -import com.zcloud.edu.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/edu/command/query/TrainingTypeQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/TrainingTypeQueryExe.java new file mode 100644 index 0000000..d08a838 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/edu/command/query/TrainingTypeQueryExe.java @@ -0,0 +1,54 @@ +package com.zcloud.edu.command.query; + +import com.zcloud.edu.command.convertor.TrainingTypeCoConvertor; +import com.zcloud.edu.dto.TrainingTypePageQry; +import com.zcloud.edu.dto.clientobject.TrainingTypeCO; +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import com.zcloud.edu.persistence.repository.TrainingTypeRepository; +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 2025-11-26 15:04:07 +*/ +@Component +@AllArgsConstructor +public class TrainingTypeQueryExe { + private final TrainingTypeRepository trainingTypeRepository; + private final TrainingTypeCoConvertor trainingTypeCoConvertor; + + /** + * 分页 + * + * @param trainingTypePageQry + * @return + */ + public PageResponse execute(TrainingTypePageQry trainingTypePageQry) { + Map params = PageQueryHelper.toHashMap(trainingTypePageQry); + PageResponse pageResponse = trainingTypeRepository.listPage(params); + List examCenterCOS = trainingTypeCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public SingleResponse execute(Long id) { + SingleResponse trainingTypeDO = trainingTypeRepository.getInfoById(id); + SingleResponse trainingTypeCO = new SingleResponse<>(); + TrainingTypeCO co = new TrainingTypeCO(); + BeanUtils.copyProperties(trainingTypeDO.getData(), co); + trainingTypeCO.setData(co); + return trainingTypeCO; + } + +} + diff --git a/web-app/src/main/java/com/zcloud/edu/service/RiskPointServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/RiskPointServiceImpl.java deleted file mode 100644 index 1285754..0000000 --- a/web-app/src/main/java/com/zcloud/edu/service/RiskPointServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zcloud.edu.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.edu.api.RiskPointServiceI; -import com.zcloud.edu.command.RiskPointAddExe; -import com.zcloud.edu.command.RiskPointRemoveExe; -import com.zcloud.edu.command.RiskPointUpdateExe; -import com.zcloud.edu.command.query.RiskPointQueryExe; -import com.zcloud.edu.dto.RiskPointAddCmd; -import com.zcloud.edu.dto.RiskPointPageQry; -import com.zcloud.edu.dto.RiskPointUpdateCmd; -import com.zcloud.edu.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-app/src/main/java/com/zcloud/edu/service/TrainingTypeServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/TrainingTypeServiceImpl.java new file mode 100644 index 0000000..e6d575e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/edu/service/TrainingTypeServiceImpl.java @@ -0,0 +1,62 @@ +package com.zcloud.edu.service; + +import com.zcloud.edu.api.TrainingTypeServiceI; +import com.zcloud.edu.command.TrainingTypeAddExe; +import com.zcloud.edu.command.TrainingTypeRemoveExe; +import com.zcloud.edu.command.TrainingTypeUpdateExe; +import com.zcloud.edu.command.query.TrainingTypeQueryExe; +import com.zcloud.edu.dto.TrainingTypeAddCmd; +import com.zcloud.edu.dto.TrainingTypePageQry; +import com.zcloud.edu.dto.TrainingTypeUpdateCmd; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.edu.dto.clientobject.TrainingTypeCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* web-app +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Service +@AllArgsConstructor +public class TrainingTypeServiceImpl implements TrainingTypeServiceI { + private final TrainingTypeAddExe trainingTypeAddExe; + private final TrainingTypeUpdateExe trainingTypeUpdateExe; + private final TrainingTypeRemoveExe trainingTypeRemoveExe; + private final TrainingTypeQueryExe trainingTypeQueryExe; + + @Override + public PageResponse listPage(TrainingTypePageQry qry){ + return trainingTypeQueryExe.execute(qry); + } + + @Override + public SingleResponse getInfoById(Long id){ + return trainingTypeQueryExe.execute(id); + } + + @Override + public SingleResponse add(TrainingTypeAddCmd cmd) { + trainingTypeAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(TrainingTypeUpdateCmd cmd) { + trainingTypeUpdateExe.execute(cmd); + } + + @Override + public void remove(Long id) { + trainingTypeRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + trainingTypeRemoveExe.execute(ids); + } +} + diff --git a/web-client/src/main/java/com/zcloud/edu/api/RiskPointServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/RiskPointServiceI.java deleted file mode 100644 index 609c885..0000000 --- a/web-client/src/main/java/com/zcloud/edu/api/RiskPointServiceI.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.edu.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.edu.dto.RiskPointAddCmd; -import com.zcloud.edu.dto.RiskPointPageQry; -import com.zcloud.edu.dto.RiskPointUpdateCmd; -import com.zcloud.edu.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/edu/api/TrainingTypeServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/TrainingTypeServiceI.java new file mode 100644 index 0000000..bd50b64 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/api/TrainingTypeServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.edu.api; + +import com.zcloud.edu.dto.TrainingTypeAddCmd; +import com.zcloud.edu.dto.TrainingTypePageQry; +import com.zcloud.edu.dto.TrainingTypeUpdateCmd; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.edu.dto.clientobject.TrainingTypeCO; + +/** +* web-client +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +public interface TrainingTypeServiceI { + PageResponse listPage(TrainingTypePageQry qry); + + SingleResponse getInfoById(Long id); + + SingleResponse add(TrainingTypeAddCmd cmd); + + void edit(TrainingTypeUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/edu/dto/RiskPointAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/RiskPointAddCmd.java deleted file mode 100644 index 3ab762f..0000000 --- a/web-client/src/main/java/com/zcloud/edu/dto/RiskPointAddCmd.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.edu.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/edu/dto/RiskPointPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/RiskPointPageQry.java deleted file mode 100644 index 1ef6df0..0000000 --- a/web-client/src/main/java/com/zcloud/edu/dto/RiskPointPageQry.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.edu.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/edu/dto/RiskPointUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/RiskPointUpdateCmd.java deleted file mode 100644 index 9a5b216..0000000 --- a/web-client/src/main/java/com/zcloud/edu/dto/RiskPointUpdateCmd.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.edu.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/edu/dto/TrainingTypeAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeAddCmd.java new file mode 100644 index 0000000..0d524a7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeAddCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.edu.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 2025-11-26 15:04:06 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TrainingTypeAddCmd extends Command { + + @ApiModelProperty(value = "名称", name = "name", required = true) + @NotEmpty(message = "名称不能为空") + private String name; + + @ApiModelProperty(value = "排序", name = "sort", required = true) + @NotNull(message = "排序不能为空") + private Integer sort; + +} + diff --git a/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypePageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypePageQry.java new file mode 100644 index 0000000..24aa57a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypePageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.edu.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + + +/** +* web-client +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Data +public class TrainingTypePageQry extends PageQuery { + +/** +* 查询条件操作前缀,支持以下几种数据库查询操作： +* - `like`: 模糊匹配查询，对应SQL的LIKE操作符 +* - `eq`: 等值查询，对应SQL的=操作符 +* - `gt`: 大于比较查询 +* - `lt`: 小于比较查询 +* - `ge`: 大于等于比较查询 +* - `le`: 小于等于比较查询 +* - `ne`: 不等比较查询，对应SQL的!=操作符 +*/ + private String likeTrainingTypeId; +} + diff --git a/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeRemoveCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeRemoveCmd.java new file mode 100644 index 0000000..bf8d469 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeRemoveCmd.java @@ -0,0 +1,27 @@ +package com.zcloud.edu.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 2025-11-26 15:04:07 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TrainingTypeRemoveCmd extends Command { + + @ApiModelProperty(value = "主键", name = "ids", required = true) + @NotNull(message = "主键不能为空") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeUpdateCmd.java new file mode 100644 index 0000000..fab1cac --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/TrainingTypeUpdateCmd.java @@ -0,0 +1,34 @@ +package com.zcloud.edu.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 2025-11-26 15:04:07 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TrainingTypeUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotNull(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "trainingTypeId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String trainingTypeId; + @ApiModelProperty(value = "名称", name = "name", required = true) + @NotEmpty(message = "名称不能为空") + private String name; + @ApiModelProperty(value = "排序", name = "sort", required = true) + @NotNull(message = "排序不能为空") + private Integer sort; +} + diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/RiskPointCo.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/RiskPointCo.java deleted file mode 100644 index 8509584..0000000 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/RiskPointCo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.edu.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-client/src/main/java/com/zcloud/edu/dto/clientobject/TrainingTypeCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/TrainingTypeCO.java new file mode 100644 index 0000000..ded7edd --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/TrainingTypeCO.java @@ -0,0 +1,70 @@ +package com.zcloud.edu.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author SondonYong + * @Date 2025-11-26 15:28:58 + */ +@Data +public class TrainingTypeCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String trainingTypeId; + //名称 + @ApiModelProperty(value = "名称") + private String name; + //排序 + @ApiModelProperty(value = "排序") + private Integer sort; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private Integer version; + //创建时间 + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/gateway/RiskPointGateway.java b/web-domain/src/main/java/com/zcloud/edu/domain/gateway/RiskPointGateway.java deleted file mode 100644 index 81844eb..0000000 --- a/web-domain/src/main/java/com/zcloud/edu/domain/gateway/RiskPointGateway.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.edu.domain.gateway; - - -import com.zcloud.edu.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/edu/domain/gateway/TrainingTypeGateway.java b/web-domain/src/main/java/com/zcloud/edu/domain/gateway/TrainingTypeGateway.java new file mode 100644 index 0000000..c5c38b8 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/edu/domain/gateway/TrainingTypeGateway.java @@ -0,0 +1,28 @@ +package com.zcloud.edu.domain.gateway; + +import com.zcloud.edu.domain.model.TrainingTypeE; + +/** +* web-domain +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +public interface TrainingTypeGateway { + + /** + * 新增 + */ + Boolean add(TrainingTypeE trainingTypeE) ; + + /** + * 修改 + */ + Boolean update(TrainingTypeE trainingTypeE); + + /** + * 删除 + */ + Boolean deletedTrainingTypeById(Long id); + Boolean deletedTrainingTypeByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/RiskPointE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/RiskPointE.java deleted file mode 100644 index 27aefc1..0000000 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/RiskPointE.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.edu.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-domain/src/main/java/com/zcloud/edu/domain/model/TrainingTypeE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/TrainingTypeE.java new file mode 100644 index 0000000..b839fb0 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/TrainingTypeE.java @@ -0,0 +1,24 @@ +package com.zcloud.edu.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.util.Date; + +/** +* web-domain +* @Author SondonYong +* @Date 2025-11-26 15:04:06 +*/ +@Data +public class TrainingTypeE extends BaseE { + //id + private Long id; + //业务主键id + private String trainingTypeId; + //名称 + private String name; + //排序 + private Integer sort; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/RiskPointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/RiskPointGatewayImpl.java deleted file mode 100644 index 69492c8..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/RiskPointGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.edu.gatewayimpl; - -import com.zcloud.edu.domain.gateway.RiskPointGateway; -import com.zcloud.edu.domain.model.RiskPointE; -import com.zcloud.edu.persistence.dataobject.RiskPointDO; -import com.zcloud.edu.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/edu/gatewayimpl/TrainingTypeGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/TrainingTypeGatewayImpl.java new file mode 100644 index 0000000..6ba04ba --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/TrainingTypeGatewayImpl.java @@ -0,0 +1,56 @@ +package com.zcloud.edu.gatewayimpl; + +import com.alibaba.cloud.commons.lang.StringUtils; +import com.zcloud.edu.domain.gateway.TrainingTypeGateway; +import com.zcloud.edu.domain.model.TrainingTypeE; +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import com.zcloud.edu.persistence.repository.TrainingTypeRepository; +import com.zcloud.gbscommon.utils.UuidUtil; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** +* web-infrastructure +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Service +@AllArgsConstructor +public class TrainingTypeGatewayImpl implements TrainingTypeGateway { + private final TrainingTypeRepository trainingTypeRepository; + + @Override + public Boolean add(TrainingTypeE trainingTypeE) { + TrainingTypeDO d = new TrainingTypeDO(); + BeanUtils.copyProperties(trainingTypeE, d); + + if(StringUtils.isEmpty(d.getTrainingTypeId())){ + d.setTrainingTypeId(UuidUtil.get32UUID()); + } + + trainingTypeRepository.save(d); + return true; + } + + @Override + public Boolean update(TrainingTypeE trainingTypeE) { + TrainingTypeDO d = new TrainingTypeDO(); + BeanUtils.copyProperties(trainingTypeE, d); + trainingTypeRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedTrainingTypeById(Long id) { + return trainingTypeRepository.removeById(id); + } + + @Override + public Boolean deletedTrainingTypeByIds(Long[] ids) { + return trainingTypeRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/RiskPointDO.java deleted file mode 100644 index 52e3cfc..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.edu.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/edu/persistence/dataobject/TrainingTypeDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingTypeDO.java new file mode 100644 index 0000000..aff65c4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingTypeDO.java @@ -0,0 +1,36 @@ +package com.zcloud.edu.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.*; +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 SondonYong + * @Date 2025-11-26 15:04:06 + */ +@Data +@TableName("training_type") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TrainingTypeDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String trainingTypeId; + //名称 + @ApiModelProperty(value = "名称") + private String name; + //排序 + @ApiModelProperty(value = "排序") + private Integer sort; + + public TrainingTypeDO(String trainingTypeId) { + this.trainingTypeId = trainingTypeId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/domainobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/domainobject/RiskPointDO.java deleted file mode 100644 index 5c173b9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/domainobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.edu.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/edu/persistence/mapper/RiskPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/RiskPointMapper.java deleted file mode 100644 index 1936527..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/RiskPointMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zcloud.edu.persistence.mapper; - -import com.zcloud.edu.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/edu/persistence/mapper/TrainingTypeMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingTypeMapper.java new file mode 100644 index 0000000..37df608 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingTypeMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.edu.persistence.mapper; + +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* web-infrastructure +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Mapper +public interface TrainingTypeMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/RiskPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/RiskPointRepository.java deleted file mode 100644 index 671c812..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/RiskPointRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zcloud.edu.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.edu.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/edu/persistence/repository/TrainingTypeRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/TrainingTypeRepository.java new file mode 100644 index 0000000..71442eb --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/TrainingTypeRepository.java @@ -0,0 +1,20 @@ +package com.zcloud.edu.persistence.repository; + +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import com.alibaba.cola.dto.SingleResponse; +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import java.util.Map; + +/** +* web-infrastructure +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +public interface TrainingTypeRepository extends BaseRepository { + + PageResponse listPage(Map params); + + SingleResponse getInfoById(Long id); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/RiskPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/RiskPointRepositoryImpl.java deleted file mode 100644 index 7a9f1d9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/RiskPointRepositoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.edu.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.edu.persistence.dataobject.RiskPointDO; -import com.zcloud.edu.persistence.mapper.RiskPointMapper; -import com.zcloud.edu.persistence.repository.RiskPointRepository; -import com.zcloud.edu.utils.PageQueryHelper; -import com.zcloud.edu.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/java/com/zcloud/edu/persistence/repository/impl/TrainingTypeRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingTypeRepositoryImpl.java new file mode 100644 index 0000000..1340ba7 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingTypeRepositoryImpl.java @@ -0,0 +1,43 @@ +package com.zcloud.edu.persistence.repository.impl; + +import com.jjb.saas.framework.repository.common.PageHelper; +import com.zcloud.edu.persistence.dataobject.TrainingTypeDO; +import com.zcloud.edu.persistence.mapper.TrainingTypeMapper; +import com.zcloud.edu.persistence.repository.TrainingTypeRepository; +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; + +/** +* web-infrastructure +* @Author SondonYong +* @Date 2025-11-26 15:04:07 +*/ +@Service +@RequiredArgsConstructor +public class TrainingTypeRepositoryImpl extends BaseRepositoryImpl implements TrainingTypeRepository { + private final TrainingTypeMapper trainingTypeMapper; + + @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 = trainingTypeMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public SingleResponse getInfoById(Long id) { + return SingleResponse.of(trainingTypeMapper.selectById(id)); + } +} + diff --git a/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingTypeMapper.xml similarity index 69% rename from web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml rename to web-infrastructure/src/main/resources/mapper/TrainingTypeMapper.xml index a81df80..02853d3 100644 --- a/web-infrastructure/src/main/resources/mapper/RiskPointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingTypeMapper.xml @@ -2,6 +2,7 @@ - + +