diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-api/src/main/java/cn/iocoder/yudao/module/bikmk/enums/ErrorCodeConstants.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-api/src/main/java/cn/iocoder/yudao/module/bikmk/enums/ErrorCodeConstants.java index a7f0761..c71e435 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-api/src/main/java/cn/iocoder/yudao/module/bikmk/enums/ErrorCodeConstants.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-api/src/main/java/cn/iocoder/yudao/module/bikmk/enums/ErrorCodeConstants.java @@ -16,6 +16,6 @@ public interface ErrorCodeConstants { ErrorCode AREA_PROJECT_NOT_EXISTS = new ErrorCode(1001000005, "信息对比不存在"); ErrorCode ENERGY_NOT_EXISTS = new ErrorCode(1001000006, "能耗不存在"); ErrorCode CONSTANT_NOT_EXISTS = new ErrorCode(1001000007, "常用数据不存在"); - ErrorCode AREA_PROJECT_SCHEDULE_NOT_EXISTS = new ErrorCode(1001000008, "常用数据不存在"); - ErrorCode AREA_PROJECT_RATIO_NOT_EXISTS = new ErrorCode(1001000009, "常用数据不存在"); + ErrorCode AREA_PROJECT_SCHEDULE_NOT_EXISTS = new ErrorCode(1001000008, "项目进度数据不存在"); + ErrorCode AREA_PROJECT_RATIO_NOT_EXISTS = new ErrorCode(1001000009, "项目占比数据不存在"); } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantBaseVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantBaseVO.java index e438eef..43cb091 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantBaseVO.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantBaseVO.java @@ -14,20 +14,24 @@ import javax.validation.constraints.*; @Data public class ConstantBaseVO { - @Schema(description = "健康度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "健康度不能为空") - private Double health; - - @Schema(description = "节电度数", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "节电度数不能为空") - private Integer degrees; - - @Schema(description = "节电金额", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "节电金额不能为空") - private Integer money; - @Schema(description = "余额", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "余额不能为空") private Integer balance; + @Schema(description = "PC用电", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "PC用电不能为空") + private Integer pckwh; + + @Schema(description = "云用电", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "云用电不能为空") + private Integer cloudkwh; + + @Schema(description = "PC金额", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "PC金额不能为空") + private Integer pcmoney; + + @Schema(description = "云金额", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "云金额不能为空") + private Integer cloudmoney; + } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExcelVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExcelVO.java index a7b0df4..9b77856 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExcelVO.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExcelVO.java @@ -19,19 +19,22 @@ public class ConstantExcelVO { @ExcelProperty("编号") private Long id; - @ExcelProperty("健康度") - private Double health; - - @ExcelProperty("节电度数") - private Integer degrees; - - @ExcelProperty("节电金额") - private Integer money; - @ExcelProperty("余额") private Integer balance; @ExcelProperty("创建时间") private LocalDateTime createTime; + @ExcelProperty("PC用电") + private Integer pckwh; + + @ExcelProperty("云用电") + private Integer cloudkwh; + + @ExcelProperty("PC金额") + private Integer pcmoney; + + @ExcelProperty("云金额") + private Integer cloudmoney; + } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExportReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExportReqVO.java index a394330..d55b629 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExportReqVO.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantExportReqVO.java @@ -13,15 +13,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data public class ConstantExportReqVO { - @Schema(description = "健康度") - private Double health; - - @Schema(description = "节电度数") - private Integer degrees; - - @Schema(description = "节电金额") - private Integer money; - @Schema(description = "余额") private Integer balance; @@ -29,4 +20,16 @@ public class ConstantExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "PC用电") + private Integer pckwh; + + @Schema(description = "云用电") + private Integer cloudkwh; + + @Schema(description = "PC金额") + private Integer pcmoney; + + @Schema(description = "云金额") + private Integer cloudmoney; + } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantPageReqVO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantPageReqVO.java index db77eba..ec98491 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantPageReqVO.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/controller/admin/constant/vo/ConstantPageReqVO.java @@ -15,15 +15,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class ConstantPageReqVO extends PageParam { - @Schema(description = "健康度") - private Double health; - - @Schema(description = "节电度数") - private Integer degrees; - - @Schema(description = "节电金额") - private Integer money; - @Schema(description = "余额") private Integer balance; @@ -31,4 +22,16 @@ public class ConstantPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "PC用电") + private Integer pckwh; + + @Schema(description = "云用电") + private Integer cloudkwh; + + @Schema(description = "PC金额") + private Integer pcmoney; + + @Schema(description = "云金额") + private Integer cloudmoney; + } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/constant/ConstantDO.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/constant/ConstantDO.java index f68a0b7..78a0243 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/constant/ConstantDO.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/dataobject/constant/ConstantDO.java @@ -28,20 +28,24 @@ public class ConstantDO extends BaseDO { @TableId private Long id; /** - * 健康度 + * 余额 */ - private Double health; + private Integer balance; /** - * 节电度数 + * PC用电 */ - private Integer degrees; + private Integer pckwh; /** - * 节电金额 + * 云用电 */ - private Integer money; + private Integer cloudkwh; /** - * 余额 + * PC金额 */ - private Integer balance; + private Integer pcmoney; + /** + * 云金额 + */ + private Integer cloudmoney; } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/constant/ConstantMapper.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/constant/ConstantMapper.java index 7a83e2c..e772ab0 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/constant/ConstantMapper.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/main/java/cn/iocoder/yudao/module/bikmk/dal/mysql/constant/ConstantMapper.java @@ -19,21 +19,23 @@ public interface ConstantMapper extends BaseMapperX { default PageResult selectPage(ConstantPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ConstantDO::getHealth, reqVO.getHealth()) - .eqIfPresent(ConstantDO::getDegrees, reqVO.getDegrees()) - .eqIfPresent(ConstantDO::getMoney, reqVO.getMoney()) .eqIfPresent(ConstantDO::getBalance, reqVO.getBalance()) .betweenIfPresent(ConstantDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ConstantDO::getPckwh, reqVO.getPckwh()) + .eqIfPresent(ConstantDO::getCloudkwh, reqVO.getCloudkwh()) + .eqIfPresent(ConstantDO::getPcmoney, reqVO.getPcmoney()) + .eqIfPresent(ConstantDO::getCloudmoney, reqVO.getCloudmoney()) .orderByDesc(ConstantDO::getId)); } default List selectList(ConstantExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ConstantDO::getHealth, reqVO.getHealth()) - .eqIfPresent(ConstantDO::getDegrees, reqVO.getDegrees()) - .eqIfPresent(ConstantDO::getMoney, reqVO.getMoney()) .eqIfPresent(ConstantDO::getBalance, reqVO.getBalance()) .betweenIfPresent(ConstantDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ConstantDO::getPckwh, reqVO.getPckwh()) + .eqIfPresent(ConstantDO::getCloudkwh, reqVO.getCloudkwh()) + .eqIfPresent(ConstantDO::getPcmoney, reqVO.getPcmoney()) + .eqIfPresent(ConstantDO::getCloudmoney, reqVO.getCloudmoney()) .orderByDesc(ConstantDO::getId)); } diff --git a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/constant/ConstantServiceImplTest.java b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/constant/ConstantServiceImplTest.java index bf4871f..5efae95 100644 --- a/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/constant/ConstantServiceImplTest.java +++ b/ruoyi-vue-pro-master/yudao-module-bikmk/yudao-module-bikmk-biz/src/test/java/cn/iocoder/yudao/module/bikmk/service/constant/ConstantServiceImplTest.java @@ -110,30 +110,34 @@ public class ConstantServiceImplTest extends BaseDbUnitTest { public void testGetConstantPage() { // mock 数据 ConstantDO dbConstant = randomPojo(ConstantDO.class, o -> { // 等会查询到 - o.setHealth(null); - o.setDegrees(null); - o.setMoney(null); o.setBalance(null); o.setCreateTime(null); + o.setPckwh(null); + o.setCloudkwh(null); + o.setPcmoney(null); + o.setCloudmoney(null); }); constantMapper.insert(dbConstant); - // 测试 health 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setHealth(null))); - // 测试 degrees 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setDegrees(null))); - // 测试 money 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setMoney(null))); // 测试 balance 不匹配 constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setBalance(null))); // 测试 createTime 不匹配 constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCreateTime(null))); + // 测试 pckwh 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setPckwh(null))); + // 测试 cloudkwh 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCloudkwh(null))); + // 测试 pcmoney 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setPcmoney(null))); + // 测试 cloudmoney 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCloudmoney(null))); // 准备参数 ConstantPageReqVO reqVO = new ConstantPageReqVO(); - reqVO.setHealth(null); - reqVO.setDegrees(null); - reqVO.setMoney(null); reqVO.setBalance(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + reqVO.setPckwh(null); + reqVO.setCloudkwh(null); + reqVO.setPcmoney(null); + reqVO.setCloudmoney(null); // 调用 PageResult pageResult = constantService.getConstantPage(reqVO); @@ -148,30 +152,34 @@ public class ConstantServiceImplTest extends BaseDbUnitTest { public void testGetConstantList() { // mock 数据 ConstantDO dbConstant = randomPojo(ConstantDO.class, o -> { // 等会查询到 - o.setHealth(null); - o.setDegrees(null); - o.setMoney(null); o.setBalance(null); o.setCreateTime(null); + o.setPckwh(null); + o.setCloudkwh(null); + o.setPcmoney(null); + o.setCloudmoney(null); }); constantMapper.insert(dbConstant); - // 测试 health 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setHealth(null))); - // 测试 degrees 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setDegrees(null))); - // 测试 money 不匹配 - constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setMoney(null))); // 测试 balance 不匹配 constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setBalance(null))); // 测试 createTime 不匹配 constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCreateTime(null))); + // 测试 pckwh 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setPckwh(null))); + // 测试 cloudkwh 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCloudkwh(null))); + // 测试 pcmoney 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setPcmoney(null))); + // 测试 cloudmoney 不匹配 + constantMapper.insert(cloneIgnoreId(dbConstant, o -> o.setCloudmoney(null))); // 准备参数 ConstantExportReqVO reqVO = new ConstantExportReqVO(); - reqVO.setHealth(null); - reqVO.setDegrees(null); - reqVO.setMoney(null); reqVO.setBalance(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + reqVO.setPckwh(null); + reqVO.setCloudkwh(null); + reqVO.setPcmoney(null); + reqVO.setCloudmoney(null); // 调用 List list = constantService.getConstantList(reqVO); 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 4efdecc..c103fe4 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 @@ -162,13 +162,54 @@ public class GoViewDataController { return success(respVO); } - @RequestMapping("/bikmk-constant-health") - @Operation(summary = "查询栏目信息") - @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk_constant_health')") + @RequestMapping("/bikmk-constant-pckwh") + @Operation(summary = "PC度数") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-constant-pckwh')") @OperateLog(enable = false) // 不记录操作日志，因为不需要 - public CommonResult bikmkConstantHealth() { - GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select health from bikmk_constant"); - return success(respVO); + public CommonResult bikmkConstantPckwh() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select pckwh from bikmk_constant"); + Object rt = respVO.getSource().get(0).get("pckwh"); + return success(rt); + } + + @RequestMapping("/bikmk-constant-pcmoney") + @Operation(summary = "PC金额") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-constant-pcmoney')") + @OperateLog(enable = false) // 不记录操作日志，因为不需要 + public CommonResult bikmkConstantPcmoney() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select pcmoney from bikmk_constant"); + Object rt = respVO.getSource().get(0).get("pcmoney"); + return success(rt); + } + + @RequestMapping("/bikmk-constant-cloudkwh") + @Operation(summary = "云度数") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-constant-cloudkwh')") + @OperateLog(enable = false) // 不记录操作日志，因为不需要 + public CommonResult bikmkConstantCloudkwh() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select cloudkwh from bikmk_constant"); + Object rt = respVO.getSource().get(0).get("cloudkwh"); + return success(rt); + } + + @RequestMapping("/bikmk-constant-cloudmoney") + @Operation(summary = "云金额") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-constant-cloudmoney')") + @OperateLog(enable = false) // 不记录操作日志，因为不需要 + public CommonResult bikmkConstantCloudmoney() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select cloudmoney from bikmk_constant"); + Object rt = respVO.getSource().get(0).get("cloudmoney"); + return success(rt); + } + + @RequestMapping("/bikmk-constant-balance") + @Operation(summary = "余额") + @PreAuthorize("@ss.hasPermission('report:go-view-data:bikmk-constant-balance')") + @OperateLog(enable = false) // 不记录操作日志，因为不需要 + public CommonResult bikmkConstantBalance() { + GoViewDataRespVO respVO = goViewDataService.getDataBySQL("select balance from bikmk_constant"); + Object rt = respVO.getSource().get(0).get("balance"); + return success(rt); } @RequestMapping("/get-by-sql") diff --git a/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/constant/index.vue b/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/constant/index.vue index 0dbb1eb..604160a 100644 --- a/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/constant/index.vue +++ b/ruoyi-vue-pro-master/yudao-ui-admin/src/views/bikmk/constant/index.vue @@ -3,15 +3,6 @@ - - - - - - - - - @@ -19,6 +10,18 @@ + + + + + + + + + + + + 搜索 重置 @@ -41,15 +44,16 @@ - - - + + + +