From a73b47ca82ea7e077ab2f2caadfdc05c134806db Mon Sep 17 00:00:00 2001
From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com>
Date: 星期四, 23 一月 2025 14:18:58 +0800
Subject: [PATCH] !40 节能管理项目修改返回政策类型 Merge pull request !40 from 张嘉伟/zhangjw
---
zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java | 8 ++--
zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java | 15 ++++---
zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java | 2
zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java | 2
zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml | 25 +++++++-----
zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java | 6 +++
zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java | 3 +
zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java | 2
zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java | 1
zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java | 4 +-
zhitan-system/src/main/java/com/zhitan/system/service/impl/SysConfigServiceImpl.java | 1
11 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
index e793254..16fabf2 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
@@ -36,7 +36,7 @@
/**
* 鏌ヨenerclassname鑳芥簮绫诲瀷鍚嶇О涓嬫媺妗�
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:getenerclassname')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')")
@GetMapping("/getenerclassname")
public AjaxResult list()
{
@@ -82,7 +82,7 @@
/**
* 鑾峰彇energy璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:query')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')")
@GetMapping(value = "/{enerid}")
public AjaxResult getInfo(@PathVariable("enerid") Integer enerid)
{
@@ -147,7 +147,7 @@
/**
* 淇濆瓨鑳芥簮鍗曚环璁剧疆
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyPrice')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')")
@Log(title = "energy", businessType = BusinessType.UPDATE)
@PutMapping("/updateEnergyPrice")
public AjaxResult updateEnergyPrice(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException {
@@ -173,7 +173,7 @@
/**
* 淇濆瓨鑳芥簮鎶樻爣绯绘暟璁剧疆
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyCoefficient')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')")
@Log(title = "energy", businessType = BusinessType.UPDATE)
@PutMapping("/updateEnergyCoefficient")
public AjaxResult updateEnergyCoefficient(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException {
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java
index 029cf92..69c3440 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java
@@ -11,6 +11,7 @@
import com.zhitan.saving.service.IEnergySavingProgramService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -35,6 +36,7 @@
* 鍒楄〃
*/
@GetMapping("/page")
+ @PreAuthorize("@ss.hasPermi('energySavingProject:list')")
@ApiOperation(value = "鍒嗛〉鍒楄〃")
public TableDataInfo list(EnergySavingProgram energySavingProgram) {
Page<EnergySavingProgramVO> list = energySavingProgramService.selectEnergySavingProgramList(energySavingProgram);
@@ -48,6 +50,7 @@
* 璇︾粏淇℃伅
*/
@ApiOperation(value = "鏌ヨ璇︽儏")
+ @PreAuthorize("@ss.hasPermi('energySavingProject')")
@GetMapping(value = "getById")
public AjaxResult getInfo(@RequestParam("id") Long id) {
return success(energySavingProgramService.selectEnergySavingProgramById(id));
diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
index b9f6021..392d3e5 100644
--- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
@@ -1,6 +1,7 @@
package com.zhitan.peakvalley.domain.dto;
import com.zhitan.common.enums.TimeType;
+import com.zhitan.common.utils.StringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -49,17 +50,19 @@
public String getTimeType() {
-
+ String result = TimeType.DAY.name();
switch (TimeType.valueOf(this.timeType)) {
case HOUR:
case DAY:
- return TimeType.HOUR.name();
- case MONTH:
- return TimeType.DAY.name();
+ result= TimeType.HOUR.name();
+ break;
case YEAR:
- return TimeType.MONTH.name();
+ result= TimeType.MONTH.name();
+ break;
+ case MONTH:
default:
- return TimeType.DAY.name();
+ break;
}
+ return result;
}
}
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java b/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java
index c1e473b..696a5bd 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java
@@ -30,7 +30,7 @@
* 鏀跨瓥绫诲瀷
*/
@NotNull(message = "璇烽�夋嫨鏀跨瓥绫诲瀷")
- private Integer type;
+ private String type;
/**
* 鍗板彂閮ㄩ棬
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java b/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java
index f55b70b..7a563db 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java
@@ -14,7 +14,7 @@
/**
* 绫诲瀷
*/
- private Integer type;
+ private String type;
/**
* 鏍囬
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java b/zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java
index 43ef633..7490c11 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java
@@ -36,7 +36,7 @@
* 鏀跨瓥绫诲瀷
*/
@Excel(name = "鏀跨瓥绫诲瀷")
- private Integer type;
+ private String type;
/**
* 鍗板彂閮ㄩ棬
@@ -55,7 +55,7 @@
* 鏂囦欢鍦板潃
*/
@Excel(name = "鏂囦欢鍦板潃")
- private String address;
+ private String url;
/**
* 鍒犻櫎鏍囧織锛�0锛氭甯革紱1锛氬垹闄わ級
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java b/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java
index 372adc9..23db3c0 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java
@@ -33,7 +33,7 @@
* 鏀跨瓥绫诲瀷
*/
@Excel(name = "鏀跨瓥绫诲瀷")
- private Integer type;
+ private String type;
/**
* 鍗板彂閮ㄩ棬
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java b/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java
index b98001e..c70c802 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java
@@ -36,6 +36,12 @@
private String type;
/**
+ * 鏀跨瓥绫诲瀷鍚嶇О
+ */
+ private String typeName;
+
+
+ /**
* 鍗板彂閮ㄩ棬
*/
@Excel(name = "鍗板彂閮ㄩ棬")
diff --git a/zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java b/zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java
index ccac7b8..5b66537 100644
--- a/zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java
@@ -17,7 +17,6 @@
* @date 2024-12-26
*/
@Mapper
-@DataSource(value = DataSourceType.MASTER)
public interface PoliciesRegulationsManagementMapper extends BaseMapper<PoliciesRegulationsManagement> {
diff --git a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysConfigServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysConfigServiceImpl.java
index d3b2a5e..e88bbb5 100644
--- a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysConfigServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysConfigServiceImpl.java
@@ -49,7 +49,6 @@
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@Override
- @DataSource(DataSourceType.MASTER)
public SysConfig selectConfigById(Long configId)
{
SysConfig config = new SysConfig();
diff --git a/zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml b/zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml
index 90a9c2f..55755f7 100644
--- a/zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml
@@ -4,23 +4,26 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhitan.saving.mapper.PoliciesRegulationsManagementMapper">
<select id="getPageList" resultType="com.zhitan.saving.domain.vo.PoliciesRegulationsManagementPageVO">
- select id,
- title,
- type,
- dept,
- issuing_time,
- address
- from policies_regulations_management
+ select
+ prm.id,
+ prm.title,
+ prm.type,
+ prm.dept,
+ prm.issuing_time,
+ prm.url,
+ sdd.dict_label as typeName
+ from policies_regulations_management AS prm
+ left join sys_dict_data AS sdd on prm.type = sdd.dict_value
<where>
- del_flag = 0
+ prm.del_flag = 0
<if test="dto.type != null">
- and type = #{dto.type}
+ and prm.type = #{dto.type}
</if>
<if test="dto.title != null and dto.title != ''">
- and title like concat('%',#{dto.title},'%')
+ and prm.title like concat('%',#{dto.title},'%')
</if>
</where>
- order by issuing_time desc
+ order by prm.issuing_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3