diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/AreaProjectScheduleController.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/AreaProjectScheduleController.java new file mode 100644 index 0000000..513c0de --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/AreaProjectScheduleController.java @@ -0,0 +1,102 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; +import cn.iocoder.yudao.module.bikmk.convert.areaprojectschedule.AreaProjectScheduleConvert; +import cn.iocoder.yudao.module.bikmk.service.areaprojectschedule.AreaProjectScheduleService; + +@Tag(name = "管理后台 - 区域项目完成度") +@RestController +@RequestMapping("/bikmk/area-project-schedule") +@Validated +public class AreaProjectScheduleController { + + @Resource + private AreaProjectScheduleService areaProjectScheduleService; + + @PostMapping("/create") + @Operation(summary = "创建区域项目完成度") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:create')") + public CommonResult createAreaProjectSchedule(@Valid @RequestBody AreaProjectScheduleCreateReqVO createReqVO) { + return success(areaProjectScheduleService.createAreaProjectSchedule(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新区域项目完成度") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:update')") + public CommonResult updateAreaProjectSchedule(@Valid @RequestBody AreaProjectScheduleUpdateReqVO updateReqVO) { + areaProjectScheduleService.updateAreaProjectSchedule(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除区域项目完成度") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:delete')") + public CommonResult deleteAreaProjectSchedule(@RequestParam("id") Long id) { + areaProjectScheduleService.deleteAreaProjectSchedule(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得区域项目完成度") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:query')") + public CommonResult getAreaProjectSchedule(@RequestParam("id") Long id) { + AreaProjectScheduleDO areaProjectSchedule = areaProjectScheduleService.getAreaProjectSchedule(id); + return success(AreaProjectScheduleConvert.INSTANCE.convert(areaProjectSchedule)); + } + + @GetMapping("/list") + @Operation(summary = "获得区域项目完成度列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:query')") + public CommonResult> getAreaProjectScheduleList(@RequestParam("ids") Collection ids) { + List list = areaProjectScheduleService.getAreaProjectScheduleList(ids); + return success(AreaProjectScheduleConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得区域项目完成度分页") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:query')") + public CommonResult> getAreaProjectSchedulePage(@Valid AreaProjectSchedulePageReqVO pageVO) { + PageResult pageResult = areaProjectScheduleService.getAreaProjectSchedulePage(pageVO); + return success(AreaProjectScheduleConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出区域项目完成度 Excel") + @PreAuthorize("@ss.hasPermission('bikmk:area-project-schedule:export')") + @OperateLog(type = EXPORT) + public void exportAreaProjectScheduleExcel(@Valid AreaProjectScheduleExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = areaProjectScheduleService.getAreaProjectScheduleList(exportReqVO); + // 导出 Excel + List datas = AreaProjectScheduleConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "区域项目完成度.xls", "数据", AreaProjectScheduleExcelVO.class, datas); + } + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleBaseVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleBaseVO.java new file mode 100644 index 0000000..d21b61f --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleBaseVO.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 区域项目完成度 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class AreaProjectScheduleBaseVO { + + @Schema(description = "区域", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "区域不能为空") + private String region; + + @Schema(description = "计划", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "计划不能为空") + private Integer plan; + + @Schema(description = "完成", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "完成不能为空") + private Integer finish; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleCreateReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleCreateReqVO.java new file mode 100644 index 0000000..fcb3d5f --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleCreateReqVO.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 区域项目完成度创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AreaProjectScheduleCreateReqVO extends AreaProjectScheduleBaseVO { + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExcelVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExcelVO.java new file mode 100644 index 0000000..42a3cb4 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExcelVO.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 区域项目完成度 Excel VO + * + * @author 芋道源码 + */ +@Data +public class AreaProjectScheduleExcelVO { + + @ExcelProperty("编号") + private Long id; + + @ExcelProperty("区域") + private String region; + + @ExcelProperty("计划") + private Integer plan; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("完成") + private Integer finish; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExportReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExportReqVO.java new file mode 100644 index 0000000..917bd52 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleExportReqVO.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 区域项目完成度 Excel 导出 Request VO，参数和 AreaProjectSchedulePageReqVO 是一致的") +@Data +public class AreaProjectScheduleExportReqVO { + + @Schema(description = "区域") + private String region; + + @Schema(description = "计划") + private Integer plan; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "完成") + private Integer finish; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectSchedulePageReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectSchedulePageReqVO.java new file mode 100644 index 0000000..27bfa0e --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectSchedulePageReqVO.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 区域项目完成度分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AreaProjectSchedulePageReqVO extends PageParam { + + @Schema(description = "区域") + private String region; + + @Schema(description = "计划") + private Integer plan; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "完成") + private Integer finish; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleRespVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleRespVO.java new file mode 100644 index 0000000..18c59b8 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleRespVO.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 区域项目完成度 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AreaProjectScheduleRespVO extends AreaProjectScheduleBaseVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21903") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleUpdateReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleUpdateReqVO.java new file mode 100644 index 0000000..b047bd7 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/areaprojectschedule/vo/AreaProjectScheduleUpdateReqVO.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 区域项目完成度更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class AreaProjectScheduleUpdateReqVO extends AreaProjectScheduleBaseVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21903") + @NotNull(message = "编号不能为空") + private Long id; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/convert/areaprojectschedule/AreaProjectScheduleConvert.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/convert/areaprojectschedule/AreaProjectScheduleConvert.java new file mode 100644 index 0000000..efc6a2a --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/convert/areaprojectschedule/AreaProjectScheduleConvert.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.bikmk.convert.areaprojectschedule; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; + +/** + * 区域项目完成度 Convert + * + * @author 芋道源码 + */ +@Mapper +public interface AreaProjectScheduleConvert { + + AreaProjectScheduleConvert INSTANCE = Mappers.getMapper(AreaProjectScheduleConvert.class); + + AreaProjectScheduleDO convert(AreaProjectScheduleCreateReqVO bean); + + AreaProjectScheduleDO convert(AreaProjectScheduleUpdateReqVO bean); + + AreaProjectScheduleRespVO convert(AreaProjectScheduleDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/areaprojectschedule/AreaProjectScheduleDO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/areaprojectschedule/AreaProjectScheduleDO.java new file mode 100644 index 0000000..555b57a --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/areaprojectschedule/AreaProjectScheduleDO.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 区域项目完成度 DO + * + * @author 芋道源码 + */ +@TableName("bikmk_area_project_schedule") +@KeySequence("bikmk_area_project_schedule_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AreaProjectScheduleDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 区域 + */ + private String region; + /** + * 计划 + */ + private Integer plan; + /** + * 完成 + */ + private Integer finish; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/areaprojectschedule/AreaProjectScheduleMapper.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/areaprojectschedule/AreaProjectScheduleMapper.java new file mode 100644 index 0000000..e9ba108 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/areaprojectschedule/AreaProjectScheduleMapper.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.bikmk.dal.mysql.areaprojectschedule; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; + +/** + * 区域项目完成度 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface AreaProjectScheduleMapper extends BaseMapperX { + + default PageResult selectPage(AreaProjectSchedulePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(AreaProjectScheduleDO::getRegion, reqVO.getRegion()) + .eqIfPresent(AreaProjectScheduleDO::getPlan, reqVO.getPlan()) + .betweenIfPresent(AreaProjectScheduleDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(AreaProjectScheduleDO::getFinish, reqVO.getFinish()) + .orderByDesc(AreaProjectScheduleDO::getId)); + } + + default List selectList(AreaProjectScheduleExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(AreaProjectScheduleDO::getRegion, reqVO.getRegion()) + .eqIfPresent(AreaProjectScheduleDO::getPlan, reqVO.getPlan()) + .betweenIfPresent(AreaProjectScheduleDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(AreaProjectScheduleDO::getFinish, reqVO.getFinish()) + .orderByDesc(AreaProjectScheduleDO::getId)); + } + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleService.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleService.java new file mode 100644 index 0000000..7afb6c0 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleService.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.bikmk.service.areaprojectschedule; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +/** + * 区域项目完成度 Service 接口 + * + * @author 芋道源码 + */ +public interface AreaProjectScheduleService { + + /** + * 创建区域项目完成度 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createAreaProjectSchedule(@Valid AreaProjectScheduleCreateReqVO createReqVO); + + /** + * 更新区域项目完成度 + * + * @param updateReqVO 更新信息 + */ + void updateAreaProjectSchedule(@Valid AreaProjectScheduleUpdateReqVO updateReqVO); + + /** + * 删除区域项目完成度 + * + * @param id 编号 + */ + void deleteAreaProjectSchedule(Long id); + + /** + * 获得区域项目完成度 + * + * @param id 编号 + * @return 区域项目完成度 + */ + AreaProjectScheduleDO getAreaProjectSchedule(Long id); + + /** + * 获得区域项目完成度列表 + * + * @param ids 编号 + * @return 区域项目完成度列表 + */ + List getAreaProjectScheduleList(Collection ids); + + /** + * 获得区域项目完成度分页 + * + * @param pageReqVO 分页查询 + * @return 区域项目完成度分页 + */ + PageResult getAreaProjectSchedulePage(AreaProjectSchedulePageReqVO pageReqVO); + + /** + * 获得区域项目完成度列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 区域项目完成度列表 + */ + List getAreaProjectScheduleList(AreaProjectScheduleExportReqVO exportReqVO); + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImpl.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImpl.java new file mode 100644 index 0000000..315f968 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImpl.java @@ -0,0 +1,82 @@ +package cn.iocoder.yudao.module.bikmk.service.areaprojectschedule; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import cn.iocoder.yudao.module.bikmk.convert.areaprojectschedule.AreaProjectScheduleConvert; +import cn.iocoder.yudao.module.bikmk.dal.mysql.areaprojectschedule.AreaProjectScheduleMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.bikmk.enums.ErrorCodeConstants.*; + +/** + * 区域项目完成度 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class AreaProjectScheduleServiceImpl implements AreaProjectScheduleService { + + @Resource + private AreaProjectScheduleMapper areaProjectScheduleMapper; + + @Override + public Long createAreaProjectSchedule(AreaProjectScheduleCreateReqVO createReqVO) { + // 插入 + AreaProjectScheduleDO areaProjectSchedule = AreaProjectScheduleConvert.INSTANCE.convert(createReqVO); + areaProjectScheduleMapper.insert(areaProjectSchedule); + // 返回 + return areaProjectSchedule.getId(); + } + + @Override + public void updateAreaProjectSchedule(AreaProjectScheduleUpdateReqVO updateReqVO) { + // 校验存在 + validateAreaProjectScheduleExists(updateReqVO.getId()); + // 更新 + AreaProjectScheduleDO updateObj = AreaProjectScheduleConvert.INSTANCE.convert(updateReqVO); + areaProjectScheduleMapper.updateById(updateObj); + } + + @Override + public void deleteAreaProjectSchedule(Long id) { + // 校验存在 + validateAreaProjectScheduleExists(id); + // 删除 + areaProjectScheduleMapper.deleteById(id); + } + + private void validateAreaProjectScheduleExists(Long id) { + if (areaProjectScheduleMapper.selectById(id) == null) { + throw exception(AREA_PROJECT_SCHEDULE_NOT_EXISTS); + } + } + + @Override + public AreaProjectScheduleDO getAreaProjectSchedule(Long id) { + return areaProjectScheduleMapper.selectById(id); + } + + @Override + public List getAreaProjectScheduleList(Collection ids) { + return areaProjectScheduleMapper.selectBatchIds(ids); + } + + @Override + public PageResult getAreaProjectSchedulePage(AreaProjectSchedulePageReqVO pageReqVO) { + return areaProjectScheduleMapper.selectPage(pageReqVO); + } + + @Override + public List getAreaProjectScheduleList(AreaProjectScheduleExportReqVO exportReqVO) { + return areaProjectScheduleMapper.selectList(exportReqVO); + } + +} diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImplTest.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImplTest.java new file mode 100644 index 0000000..1b266fd --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/areaprojectschedule/AreaProjectScheduleServiceImplTest.java @@ -0,0 +1,175 @@ +package cn.iocoder.yudao.module.bikmk.service.areaprojectschedule; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; + +import cn.iocoder.yudao.module.bikmk.controller.admin.areaprojectschedule.vo.*; +import cn.iocoder.yudao.module.bikmk.dal.dataobject.areaprojectschedule.AreaProjectScheduleDO; +import cn.iocoder.yudao.module.bikmk.dal.mysql.areaprojectschedule.AreaProjectScheduleMapper; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static cn.iocoder.yudao.module.bikmk.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link AreaProjectScheduleServiceImpl} 的单元测试类 + * + * @author 芋道源码 + */ +@Import(AreaProjectScheduleServiceImpl.class) +public class AreaProjectScheduleServiceImplTest extends BaseDbUnitTest { + + @Resource + private AreaProjectScheduleServiceImpl areaProjectScheduleService; + + @Resource + private AreaProjectScheduleMapper areaProjectScheduleMapper; + + @Test + public void testCreateAreaProjectSchedule_success() { + // 准备参数 + AreaProjectScheduleCreateReqVO reqVO = randomPojo(AreaProjectScheduleCreateReqVO.class); + + // 调用 + Long areaProjectScheduleId = areaProjectScheduleService.createAreaProjectSchedule(reqVO); + // 断言 + assertNotNull(areaProjectScheduleId); + // 校验记录的属性是否正确 + AreaProjectScheduleDO areaProjectSchedule = areaProjectScheduleMapper.selectById(areaProjectScheduleId); + assertPojoEquals(reqVO, areaProjectSchedule); + } + + @Test + public void testUpdateAreaProjectSchedule_success() { + // mock 数据 + AreaProjectScheduleDO dbAreaProjectSchedule = randomPojo(AreaProjectScheduleDO.class); + areaProjectScheduleMapper.insert(dbAreaProjectSchedule);// @Sql: 先插入出一条存在的数据 + // 准备参数 + AreaProjectScheduleUpdateReqVO reqVO = randomPojo(AreaProjectScheduleUpdateReqVO.class, o -> { + o.setId(dbAreaProjectSchedule.getId()); // 设置更新的 ID + }); + + // 调用 + areaProjectScheduleService.updateAreaProjectSchedule(reqVO); + // 校验是否更新正确 + AreaProjectScheduleDO areaProjectSchedule = areaProjectScheduleMapper.selectById(reqVO.getId()); // 获取最新的 + assertPojoEquals(reqVO, areaProjectSchedule); + } + + @Test + public void testUpdateAreaProjectSchedule_notExists() { + // 准备参数 + AreaProjectScheduleUpdateReqVO reqVO = randomPojo(AreaProjectScheduleUpdateReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> areaProjectScheduleService.updateAreaProjectSchedule(reqVO), AREA_PROJECT_SCHEDULE_NOT_EXISTS); + } + + @Test + public void testDeleteAreaProjectSchedule_success() { + // mock 数据 + AreaProjectScheduleDO dbAreaProjectSchedule = randomPojo(AreaProjectScheduleDO.class); + areaProjectScheduleMapper.insert(dbAreaProjectSchedule);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbAreaProjectSchedule.getId(); + + // 调用 + areaProjectScheduleService.deleteAreaProjectSchedule(id); + // 校验数据不存在了 + assertNull(areaProjectScheduleMapper.selectById(id)); + } + + @Test + public void testDeleteAreaProjectSchedule_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> areaProjectScheduleService.deleteAreaProjectSchedule(id), AREA_PROJECT_SCHEDULE_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetAreaProjectSchedulePage() { + // mock 数据 + AreaProjectScheduleDO dbAreaProjectSchedule = randomPojo(AreaProjectScheduleDO.class, o -> { // 等会查询到 + o.setRegion(null); + o.setPlan(null); + o.setCreateTime(null); + o.setFinish(null); + }); + areaProjectScheduleMapper.insert(dbAreaProjectSchedule); + // 测试 region 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setRegion(null))); + // 测试 plan 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setPlan(null))); + // 测试 createTime 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setCreateTime(null))); + // 测试 finish 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setFinish(null))); + // 准备参数 + AreaProjectSchedulePageReqVO reqVO = new AreaProjectSchedulePageReqVO(); + reqVO.setRegion(null); + reqVO.setPlan(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + reqVO.setFinish(null); + + // 调用 + PageResult pageResult = areaProjectScheduleService.getAreaProjectSchedulePage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbAreaProjectSchedule, pageResult.getList().get(0)); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetAreaProjectScheduleList() { + // mock 数据 + AreaProjectScheduleDO dbAreaProjectSchedule = randomPojo(AreaProjectScheduleDO.class, o -> { // 等会查询到 + o.setRegion(null); + o.setPlan(null); + o.setCreateTime(null); + o.setFinish(null); + }); + areaProjectScheduleMapper.insert(dbAreaProjectSchedule); + // 测试 region 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setRegion(null))); + // 测试 plan 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setPlan(null))); + // 测试 createTime 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setCreateTime(null))); + // 测试 finish 不匹配 + areaProjectScheduleMapper.insert(cloneIgnoreId(dbAreaProjectSchedule, o -> o.setFinish(null))); + // 准备参数 + AreaProjectScheduleExportReqVO reqVO = new AreaProjectScheduleExportReqVO(); + reqVO.setRegion(null); + reqVO.setPlan(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + reqVO.setFinish(null); + + // 调用 + List list = areaProjectScheduleService.getAreaProjectScheduleList(reqVO); + // 断言 + assertEquals(1, list.size()); + assertPojoEquals(dbAreaProjectSchedule, list.get(0)); + } + +} diff --git a/ruoyi-vue-pro-master/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java b/ruoyi-vue-pro-master/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java index fb5bbd9..4efdecc 100644 --- a/ruoyi-vue-pro-master/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java +++ b/ruoyi-vue-pro-master/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java @@ -144,6 +144,15 @@ public class GoViewDataController { return success(respVO); } + @RequestMapping("/bikmk-area-project-schedule-list") + @Operation(summary = "查询栏目信息") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-area-project-schedule')") + @OperateLog(enable = false) // 不记录操作日志，因为不需要 + public CommonResult bikmkAreaProjectScheduleList() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select region,finish,plan from bikmk_area_project_schedule"); + return success(respVO); + } + @RequestMapping("/bikmk-area-project-ratio-list") @Operation(summary = "查询栏目信息") @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-area-project-ratio')") diff --git a/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/areaProjectSchedule/index.vue b/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/areaProjectSchedule/index.vue index 240d86e..7f3575a 100644 --- a/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/areaProjectSchedule/index.vue +++ b/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/areaProjectSchedule/index.vue @@ -6,9 +6,6 @@ - - - @@ -16,6 +13,9 @@ + + + 搜索 重置 @@ -39,13 +39,13 @@ - +