From 218ad62bce6acfb5c3299a8f2b1e56e7035285f7 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Tue, 18 Nov 2025 15:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SurvConfigController.java | 16 +++++++++++++- .../appmana/mapper/SurvConfigMapper.java | 6 +++++ .../appmana/mapper/xml/SurvConfigMapper.xml | 15 +++++++++---- .../mapper/xml/SurvMaintainRecordMapper.xml | 3 ++- .../appmana/service/ISurvConfigService.java | 6 +++++ .../service/impl/SurvConfigServiceImpl.java | 10 +++++++++ .../SurvDeviceDeployController.java | 22 +++++++++++++++++++ .../mapper/xml/SurvMaintainRecordMapper.xml | 3 ++- .../org/jeecg/common/entity/SurvConfig.java | 3 +++ .../java/org/jeecg/common/vo/dict/DictVo.java | 9 ++++++++ 10 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/dict/DictVo.java diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvConfigController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvConfigController.java index eec04ac..c0d9a7b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvConfigController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvConfigController.java @@ -2,11 +2,15 @@ package org.jeecg.modules.appmana.controller; import java.util.Arrays; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.entity.SurvConfig; +import org.jeecg.common.vo.dict.DictVo; import org.jeecg.modules.appmana.service.ISurvConfigService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -38,7 +42,7 @@ import org.jeecg.common.system.util.JwtUtil; public class SurvConfigController extends JeecgController { @Autowired private ISurvConfigService survConfigService; - + /** * 分页列表查询 * @@ -58,6 +62,16 @@ public class SurvConfigController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(survConfig, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = survConfigService.page(page, queryWrapper); + //补充字典 + if(!pageList.getRecords().isEmpty()){ + List types = pageList.getRecords().stream().map(SurvConfig::getConfigType).collect(Collectors.toList()); + List maps = survConfigService.getDictByCode("apply_config_type"); +// maps.stream().collect(Collectors.toMap()) + for (SurvConfig record : pageList.getRecords()) { + + } + } + return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvConfigMapper.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvConfigMapper.java index b90a67d..0e537e1 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvConfigMapper.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/SurvConfigMapper.java @@ -3,6 +3,10 @@ package org.jeecg.modules.appmana.mapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.entity.SurvConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.common.vo.dict.DictVo; + +import java.util.LinkedHashMap; +import java.util.List; /** * @Description: 业务参数配置表 @@ -16,4 +20,6 @@ public interface SurvConfigMapper extends BaseMapper { SurvConfig getOneByTypeWithTenant(@Param("tenantId") String tenantId, @Param("type") String type); + + List getDictByCode(String applyConfigType); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvConfigMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvConfigMapper.xml index 31621d0..2c0ad3a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvConfigMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvConfigMapper.xml @@ -2,14 +2,21 @@ - + select CONFIG_VALUE from surv_config where CONFIG_KEY = #{key} - select * from surv_config where CONFIG_TYPE = #{type} AND TENANT_ID = #{tenantId} limit 1 - + + + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml index f3afdb7..0f15c54 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml @@ -11,6 +11,7 @@ + @@ -22,7 +23,7 @@ - ID,STATION_CODE,ITEM_ID,MAINTAIN_TIME,MAINTAIN_NOTE,MAINTAIN_PERSON,MAINTAIN_DATA1,MAINTAIN_DATA2,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME + ID,STATION_CODE,ITEM_ID,MAINTAIN_TIME,MAINTAIN_NOTE,MAINTAIN_PERSON,MAINTAIN_DATA1,MAINTAIN_DATA2,MAINTAIN_DATA3,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME select STATION_NAME from surv_station_info where STATION_CODE = #{STATION_CODE} diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java index 9e72a1a..b579a96 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvConfig.java @@ -117,4 +117,7 @@ public class SurvConfig implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updatedTime; + + @TableField(exist = false) + private String configTypeName; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/dict/DictVo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/dict/DictVo.java new file mode 100644 index 0000000..544e7e9 --- /dev/null +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/dict/DictVo.java @@ -0,0 +1,9 @@ +package org.jeecg.common.vo.dict; + +import lombok.Data; + +@Data +public class DictVo { + private String value; + private String text; +}