【fix】修改配置调试

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

@@ -43,7 +43,7 @@ public class SysBaseConfigController {
      * @param: ids
      **/
     @PostMapping("/remove")
-    public Result removeConfig(@RequestBody List<Integer> ids){
+    public Result removeConfig(@RequestBody List<String> ids){
         return sysBaseConfigService.remove(ids);
     }
 

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

@@ -19,7 +19,7 @@ public interface SysBaseConfigService extends IService<SysBaseConfig> {
 
     Result add(List<Map<String, String>> mapList);
 
-    Result remove(List<Integer> id);
+    Result remove(List<String> id);
 
     Result update(List<Map<String, String>> maps);
 

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

@@ -52,20 +52,35 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     }
 
     @Override
-    public Result remove(List<Integer> id) {
-        sysBaseConfigMapper.deleteBatchIds(id);
+    public Result remove(List<String> id) {
+        //先根据row_id查询出对应的数据
+        List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectByRowIdList(id);
+        List<Integer> ids = sysBaseConfigs.stream().map(SysBaseConfig::getId).collect(Collectors.toList());
+        sysBaseConfigMapper.deleteBatchIds(ids);
         return new Result(ResultCode.SUCCESS);
     }
 
     @Override
     public Result update(List<Map<String, String>> maps) {
-        for (Map<String, String> map : maps) {
-            String id = map.get("id");
-            SysBaseConfig baseConfigDo = sysBaseConfigMapper.selectById(id);
-            baseConfigDo.setConfigName(map.get("configName"));
-            baseConfigDo.setConfigKey(map.get("configKey"));
-            baseConfigDo.setConfigValue(map.get("configValue"));
-            sysBaseConfigMapper.updateById(baseConfigDo);
+        String rowId = maps.get(0).get("rowId");
+        List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectSysBaseConfig(rowId);
+        for (SysBaseConfig sysBaseConfig : sysBaseConfigs) {
+            if ("farmCode".equals(sysBaseConfig.getConfigKey())){
+                sysBaseConfig.setConfigValue(maps.get(0).get("farmCode"));
+            }
+            if ("ip".equals(sysBaseConfig.getConfigKey())){
+                sysBaseConfig.setConfigValue(maps.get(0).get("ip"));
+            }
+            if ("farmName".equals(sysBaseConfig.getConfigKey())){
+                sysBaseConfig.setConfigValue(maps.get(0).get("farmName"));
+            }
+            if ("port".equals(sysBaseConfig.getConfigKey())){
+                sysBaseConfig.setConfigValue(maps.get(0).get("port"));
+            }
+            if ("areaName".equals(sysBaseConfig.getConfigKey())){
+                sysBaseConfig.setConfigValue(maps.get(0).get("areaName"));
+            }
+            sysBaseConfigMapper.updateById(sysBaseConfig);
         }
         return new Result(ResultCode.SUCCESS);
     }