【fix】根据id查询对应配置数据

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/SysBaseConfigEntity.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.eartag2.common.dao.entity;
 
 import lombok.AllArgsConstructor;
@@ -8,12 +9,14 @@ import org.springframework.stereotype.Component;
 import javax.persistence.*;
 import java.io.Serializable;
 
+*/
 /**
  * @Description: 基础配置信息表
  * @Author: 静静
  * @CreateTime: 2022-07-19  08:44
  * @Version: 1.0
- */
+ *//*
+
 @Entity
 @Table(name = "sys_base_config")
 @AllArgsConstructor
@@ -43,3 +46,4 @@ public class SysBaseConfigEntity implements Serializable {
     @Column(name = "row_id")
     private String rowId;
 }
+*/

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/SysBaseConfigRepo.java

@@ -1,15 +1,19 @@
+/*
 package com.huimv.eartag2.common.dao.repo;
 
 import com.huimv.eartag2.common.dao.entity.SysBaseConfigEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+*/
 /**
  * @Description: 基础配置信息表
  * @Author: 静静
  * @CreateTime: 2022-07-19  08:43
  * @Version: 1.0
- */
+ *//*
+
 public interface SysBaseConfigRepo extends JpaRepository<SysBaseConfigEntity,Integer>, JpaSpecificationExecutor<SysBaseConfigEntity> {
 
 }
+*/

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/SysBaseConfigController.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.eartag2.manage.controller;
 
 import com.huimv.eartag2.common.utils.Result;
@@ -12,12 +13,14 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
+*/
 /**
  * @Description: 系统基础配置
  * @Author: 静静
  * @CreateTime: 2022-07-19  09:14
  * @Version: 1.0
- */
+ *//*
+
 @RestController
 @RequestMapping(value = "/config")
 @Slf4j
@@ -26,60 +29,71 @@ public class SysBaseConfigController {
     @Resource
     private ISysBaseConfigService sysBaseConfigService;
 
-    /**
+    */
+/**
      * @description: 【增加】
      * @author: 静静
      * @date: 2022/7/19 5:08 下午
      * @param: maps
-     **/
+     **//*
+
     @PostMapping("/add")
     public Result addConfig(@RequestBody List<Map<String, String>> maps){
         return sysBaseConfigService.add(maps);
     }
 
-    /**
+    */
+/**
      * @description: 【删除】
      * @author: 静静
      * @date: 2022/7/19 5:10 下午
      * @param: ids
-     **/
+     **//*
+
     @PostMapping("/remove")
     public Result removeConfig(@RequestBody List<Integer> ids){
         return sysBaseConfigService.remove(ids);
     }
 
-    /**
+    */
+/**
      * @description: 【修改】
      * @author: 静静
      * @date: 2022/7/19 5:10 下午
      * @param: maps
-     **/
+     **//*
+
     @PostMapping("/update")
     public Result updateConfig(@RequestBody  List<Map<String, String>> maps){
         return sysBaseConfigService.update(maps);
     }
 
-    /**
+    */
+/**
      * @description: 【查询】根据id查询配置
      * @author: 静静
      * @date: 2022/7/19 5:11 下午
      * @param: ids
-     **/
+     **//*
+
     @PostMapping("/getDateById")
     public Result getDateById(@RequestBody List<Integer> ids){
         return sysBaseConfigService.getDateById(ids);
     }
 
 
-    /**
+    */
+/**
      * @description: 【查询】 分页查询配置表
      * @author: 静静
      * @date: 2022/7/19 5:11 下午
      * @param: paramsMap
-     **/
+     **//*
+
     @PostMapping("/list")
     public Result list(@RequestBody Map<String,String> paramsMap){
         return sysBaseConfigService.list(paramsMap);
     }
 
 }
+*/

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/ISysBaseConfigService.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.eartag2.manage.service;
 
 import com.huimv.eartag2.common.utils.Result;
@@ -5,12 +6,14 @@ import com.huimv.eartag2.common.utils.Result;
 import java.util.List;
 import java.util.Map;
 
+*/
 /**
  * @Description: 基础配置增删改查相关
  * @Author: 静静
  * @CreateTime: 2022-07-19  10:42
  * @Version: 1.0
- */
+ *//*
+
 public interface ISysBaseConfigService {
     Result add(List<Map<String, String>> mapList);
 
@@ -23,3 +26,4 @@ public interface ISysBaseConfigService {
     Result getDateById(List<Integer> ids);
 
 }
+*/

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/SysBaseConfigServiceImpl.java

@@ -1,7 +1,6 @@
+/*
 package com.huimv.eartag2.manage.service.impl;
 
-import cn.hutool.db.PageResult;
-import com.huimv.eartag2.common.common.utils.PageOf;
 import com.huimv.eartag2.common.dao.entity.SysBaseConfigEntity;
 import com.huimv.eartag2.common.dao.repo.SysBaseConfigRepo;
 import com.huimv.eartag2.common.utils.Result;
@@ -20,12 +19,14 @@ import javax.persistence.criteria.Predicate;
 import java.util.*;
 import java.util.stream.Collectors;
 
+*/
 /**
  * @Description: 基础配置相关
  * @Author: 静静
  * @CreateTime: 2022-07-19  10:44
  * @Version: 1.0
- */
+ *//*
+
 @Service
 public class SysBaseConfigServiceImpl implements ISysBaseConfigService {
 
@@ -143,3 +144,4 @@ public class SysBaseConfigServiceImpl implements ISysBaseConfigService {
 
     }
 }
+*/

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/SysBaseConfigController.java

@@ -2,13 +2,10 @@ package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage.service.ISysBaseConfigService;
+import com.huimv.eartag2.manage2.service.SysBaseConfigService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -26,7 +23,7 @@ import java.util.Map;
 public class SysBaseConfigController {
 
     @Resource
-    private ISysBaseConfigService sysBaseConfigService;
+    private SysBaseConfigService sysBaseConfigService;
 
     /**
      * @description: 【增加】
@@ -67,9 +64,9 @@ public class SysBaseConfigController {
      * @date: 2022/7/19 5:11 下午
      * @param: ids
      **/
-    @PostMapping("/getDateById")
-    public Result getDateById(@RequestBody List<Integer> ids){
-        return sysBaseConfigService.getDateById(ids);
+    @GetMapping("/getDateById")
+    public Result getDateById(@Param("id") String id){
+        return sysBaseConfigService.getDateById(id);
     }
 
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/SysBaseConfigMapper.java

@@ -21,4 +21,6 @@ public interface SysBaseConfigMapper extends BaseMapper<SysBaseConfig> {
 
     List<SysBaseConfig> selectByRowIdList(@Param("rowIds") List<String> rowIds);
 
+    List<SysBaseConfig> selectSysBaseConfig(String rowId);
+
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/SysBaseConfigMapper.xml

@@ -8,17 +8,16 @@
         <result column="config_name" property="configName" />
         <result column="config_key" property="configKey" />
         <result column="config_value" property="configValue" />
-        <result column="area_name" property="areaName" />
         <result column="row_id" property="rowId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, config_name, config_key, config_value, area_name, row_id
+        id, config_name, config_key, config_value, row_id
     </sql>
 
     <select id="selectByRowIdList" resultMap="BaseResultMap" parameterType="list">
-        select id, config_name, config_key, config_value, area_name, row_id
+        select id, config_name, config_key, config_value, row_id
         from sys_base_config
 
         <where>
@@ -31,4 +30,10 @@
         </where>
     </select>
 
+    <select id="selectSysBaseConfig" resultMap="BaseResultMap" parameterType="String">
+         select id, config_name, config_key, config_value, row_id
+         from sys_base_config
+         where row_id = #{rowId}
+    </select>
+
 </mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/SysBaseConfig.java

@@ -30,8 +30,6 @@ public class SysBaseConfig implements Serializable {
 
     private String configValue;
 
-    private String areaName;
-
     private String rowId;
 
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/SysBaseConfigService.java

@@ -25,6 +25,6 @@ public interface SysBaseConfigService extends IService<SysBaseConfig> {
 
     Result list(Map<String,String> paramsMap);
 
-    Result getDateById(List<Integer> ids);
+    Result getDateById(String ids);
 
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -45,7 +45,6 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             sysBaseConfigEntity.setConfigName(stringStringMap.get("configName"));
             sysBaseConfigEntity.setConfigKey(stringStringMap.get("configKey"));
             sysBaseConfigEntity.setConfigValue(stringStringMap.get("configValue"));
-            sysBaseConfigEntity.setAreaName(stringStringMap.get("areaName"));
             sysBaseConfigEntity.setRowId(fitId);
             sysBaseConfigMapper.insert(sysBaseConfigEntity);
         }
@@ -66,7 +65,6 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             baseConfigDo.setConfigName(map.get("configName"));
             baseConfigDo.setConfigKey(map.get("configKey"));
             baseConfigDo.setConfigValue(map.get("configValue"));
-            baseConfigDo.setAreaName(map.get("areaName"));
             sysBaseConfigMapper.updateById(baseConfigDo);
         }
         return new Result(ResultCode.SUCCESS);
@@ -76,18 +74,11 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     public Result list(Map<String, String> paramsMap) {
         //先分页查询
 
-        if (paramsMap.get("ip")!= null){
-            String ip = paramsMap.get("ip");
-        }
-        Integer pageNo = Integer.valueOf(paramsMap.get("pageNo"));
-        if ( pageNo == 0){
-            pageNo = 1;
-        }
        // Page<SysBaseConfig> page = new Page<>(pageNo, Integer.valueOf(paramsMap.get("pageSize")));
         QueryWrapper<SysBaseConfig> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("farmName")),"farm_name", paramsMap.get("farmName"));
-        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("farmCode")),"farm_code", paramsMap.get("farmCode"));
-        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("ip")),"ip", paramsMap.get("ip"));
+        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("farmName")),"config_value", paramsMap.get("farmName"));
+        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("farmCode")),"config_value", paramsMap.get("farmCode"));
+        queryWrapper.like(StringUtils.isNotBlank(paramsMap.get("ip")),"config_value", paramsMap.get("ip"));
         //创建时间降序
         queryWrapper.orderByDesc("id");
 
@@ -101,8 +92,6 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         //将查询出来的数据  按照row_id进行分组
         Map<String, List<SysBaseConfig>> groupResult = sysBaseConfigs.stream().collect(Collectors.groupingBy(SysBaseConfig::getRowId));
 
-        //Map<String, List<SysBaseConfig>> groupResult = content.stream().collect(Collectors.groupingBy(SysBaseConfig::getRowId));
-
         Set<String> strings = groupResult.keySet();
 
         //最终返回的拼装好的数据
@@ -118,24 +107,21 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     }
 
     @Override
-    public Result getDateById(List<Integer> ids) {
-        ArrayList<SysBaseConfig> sysBaseConfigEntities = new ArrayList<>();
-        for (Integer id : ids) {
-            SysBaseConfig sysBaseConfig = sysBaseConfigMapper.selectById(id);
-            sysBaseConfigEntities.add(sysBaseConfig);
-        }
-        SysBaseConfigVo sysBaseConfigVo = convertSysBaseConfigVo(sysBaseConfigEntities);
+    public Result getDateById(String ids) {
+        List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectSysBaseConfig(ids);
+        SysBaseConfigVo sysBaseConfigVo = convertSysBaseConfigVo(sysBaseConfigs);
         return new Result(ResultCode.SUCCESS,sysBaseConfigVo);
     }
 
     private SysBaseConfigVo convertSysBaseConfigVo(List<SysBaseConfig> list){
         Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue));
         SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();
-        sysBaseConfigVo.setId(map.get("id"));
-        sysBaseConfigVo.setFarmCode(map.get("farmId"));
-        sysBaseConfigVo.setFarmName(map.get("configName"));
+        sysBaseConfigVo.setId(list.get(0).getRowId());
+        sysBaseConfigVo.setFarmCode(map.get("farm_code"));
+        sysBaseConfigVo.setFarmName(map.get("farm_name"));
         sysBaseConfigVo.setIp(map.get("ip"));
         sysBaseConfigVo.setPort(map.get("port"));
+        sysBaseConfigVo.setAreaName(map.get("area_name"));
         return sysBaseConfigVo;
 
     }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/vo/SysBaseConfigVo.java

@@ -25,7 +25,7 @@ public class SysBaseConfigVo {
 
     private String port;
 
-    private String remark;
+    private String areaName;
 
 
 }