diff --git a/service-oa/src/main/java/com/atguigu/process/controller/OaProcessController.java b/service-oa/src/main/java/com/atguigu/process/controller/OaProcessController.java new file mode 100644 index 0000000..30f70d9 --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/process/controller/OaProcessController.java @@ -0,0 +1,59 @@ +package com.atguigu.process.controller; + + +import com.atguigu.common.result.Result; +import com.atguigu.process.service.OaProcessService; +import com.atguigu.vo.process.ProcessQueryVo; +import com.atguigu.vo.process.ProcessVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 审批类型 前端控制器 + *

+ * + * @author yovinchen + * @since 2023-06-20 + */ +@Api(tags = "审批流管理") +@RestController +@RequestMapping(value = "/admin/process") +@SuppressWarnings({"unchecked", "rawtypes"}) +public class OaProcessController { + + @Autowired + private OaProcessService oaprocessService; + + /** + * 获取分页列表 + * + * @param page + * @param limit + * @param processQueryVo + * @return + */ + @PreAuthorize("hasAuthority('bnt.process.list')") + @ApiOperation(value = "获取分页列表") + @GetMapping("{page}/{limit}") + public Result index(@ApiParam(name = "page", value = "当前页码", required = true) @PathVariable Long page, + + @ApiParam(name = "limit", value = "每页记录数", required = true) @PathVariable Long limit, + + @ApiParam(name = "processQueryVo", value = "查询对象", required = false) ProcessQueryVo processQueryVo) { + Page pageParam = new Page<>(page, limit); + IPage pageModel = oaprocessService.selectPage(pageParam, processQueryVo); + return Result.ok(pageModel); + } + +} + diff --git a/service-oa/src/main/java/com/atguigu/process/mapper/OaProcessMapper.java b/service-oa/src/main/java/com/atguigu/process/mapper/OaProcessMapper.java new file mode 100644 index 0000000..a2ffaa1 --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/process/mapper/OaProcessMapper.java @@ -0,0 +1,24 @@ +package com.atguigu.process.mapper; + +import com.atguigu.model.process.Process; +import com.atguigu.vo.process.ProcessQueryVo; +import com.atguigu.vo.process.ProcessVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 审批类型 Mapper 接口 + *

+ * + * @author yovinchen + * @since 2023-06-20 + */ +public interface OaProcessMapper extends BaseMapper { + + //审批管理列表 + IPage selectPage(Page pageInfo, @Param("vo") ProcessQueryVo processQueryVo); + +} diff --git a/service-oa/src/main/java/com/atguigu/process/mapper/xml/OaProcessMapper.xml b/service-oa/src/main/java/com/atguigu/process/mapper/xml/OaProcessMapper.xml new file mode 100644 index 0000000..baad0da --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/process/mapper/xml/OaProcessMapper.xml @@ -0,0 +1,36 @@ + + + + + + + diff --git a/service-oa/src/main/java/com/atguigu/process/service/OaProcessService.java b/service-oa/src/main/java/com/atguigu/process/service/OaProcessService.java new file mode 100644 index 0000000..b1ec35d --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/process/service/OaProcessService.java @@ -0,0 +1,28 @@ +package com.atguigu.process.service; + +import com.atguigu.model.process.Process; +import com.atguigu.vo.process.ProcessQueryVo; +import com.atguigu.vo.process.ProcessVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 审批类型 服务类 + *

+ * + * @author yovinchen + * @since 2023-06-20 + */ +public interface OaProcessService extends IService { + /** + * 获取分页列表 + * + * @param pageParam + * @param processQueryVo + * @return + */ + + IPage selectPage(Page pageParam, ProcessQueryVo processQueryVo); +} diff --git a/service-oa/src/main/java/com/atguigu/process/service/impl/OaProcessServiceImpl.java b/service-oa/src/main/java/com/atguigu/process/service/impl/OaProcessServiceImpl.java new file mode 100644 index 0000000..c9aad45 --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/process/service/impl/OaProcessServiceImpl.java @@ -0,0 +1,39 @@ +package com.atguigu.process.service.impl; + +import com.atguigu.model.process.Process; +import com.atguigu.model.process.ProcessType; +import com.atguigu.process.mapper.OaProcessMapper; +import com.atguigu.process.service.OaProcessService; +import com.atguigu.vo.process.ProcessQueryVo; +import com.atguigu.vo.process.ProcessVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + *

+ * 审批类型 服务实现类 + *

+ * + * @author yovinchen + * @since 2023-06-20 + */ +@Service +public class OaProcessServiceImpl extends ServiceImpl implements OaProcessService { + + /** + * 获取分页列表 + * + * @param pageParam + * @param processQueryVo + * @return + */ +//审批管理列表 + @Override + public IPage selectPage(Page pageParam, ProcessQueryVo processQueryVo) { + IPage pageModel = baseMapper.selectPage(pageParam,processQueryVo); + return pageModel; + } +} diff --git a/service-oa/src/main/resources/application-dev.yml b/service-oa/src/main/resources/application-dev.yml index c9c3f5f..fdc4757 100644 --- a/service-oa/src/main/resources/application-dev.yml +++ b/service-oa/src/main/resources/application-dev.yml @@ -4,18 +4,18 @@ mybatis-plus: configuration: # 查看日志 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath:com/atguigu/auth/mapper/xml/*.xml + mapper-locations: classpath:com/atguigu/*/mapper/xml/*.xml spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://43.143.164.194:3306/guigu-oa?useSSL=false&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true -# username: admin -# password: admin - url: jdbc:mysql://localhost:3306/guigu-oa?useSSL=false&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true - username: root - password: root + url: jdbc:mysql://43.143.164.194:3306/guigu-oa?useSSL=false&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true + username: admin + password: admin +# url: jdbc:mysql://localhost:3306/guigu-oa?useSSL=false&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true +# username: root +# password: root jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 diff --git a/service-oa/src/test/java/com/atguigu/code/CodeGet.java b/service-oa/src/test/java/com/atguigu/code/CodeGet.java index 4be8cab..fa4d1a7 100644 --- a/service-oa/src/test/java/com/atguigu/code/CodeGet.java +++ b/service-oa/src/test/java/com/atguigu/code/CodeGet.java @@ -47,7 +47,7 @@ public class CodeGet { // 5、策略配置 StrategyConfig strategy = new StrategyConfig(); - strategy.setInclude("oa_process_type","oa_process_template"); + strategy.setInclude("oa_process"); //数据库表映射到实体的命名策略 strategy.setNaming(NamingStrategy.underline_to_camel); //数据库表字段映射到实体的命名策略