保温灯，保温板单独配置

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/LampConfigController.java

@@ -36,12 +36,10 @@ public class LampConfigController {
     @PostMapping("/lsitAllLamp")
     public Result lsitAllLamp(@RequestBody Map<String, String> map, HttpServletRequest request){
         return lampConfigService.lsitAllLamp(map,request);
-
     }
     @PostMapping("/unbindingLamp")
     public Result unbindingLamp(@RequestBody Map<String, String> map, HttpServletRequest request){
         return lampConfigService.unbindingLamp(map,request);
-
     }
 
     @PostMapping("/bindingBaseLamp")
@@ -57,17 +55,20 @@ public class LampConfigController {
         for (String id : split) {
             lampConfigService.removeById(id);
         }
-
         return  new Result(10000,"删除成功",true);
-
     }
 
     // 保温灯统一配置 -配置
     @PostMapping("/allToConfig")
     public Result allToConfig(@RequestBody Map<String, Object> map, HttpServletRequest request){
         return lampConfigService.allToConfig(map,request);
-
     }
+    // 保温板统一配置 -配置
+    @PostMapping("/allToBoardGear")
+    public Result allToBoardGear(@RequestBody Map<String, Object> map, HttpServletRequest request){
+        return lampConfigService.allToBoardGear(map,request);
+    }
+
 
 
     @PostMapping("/listByUnit")

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/ILampConfigService.java

@@ -29,6 +29,8 @@ public interface ILampConfigService extends IService<LampConfig> {
 
     Result allToConfig(Map<String, Object> map, HttpServletRequest request);
 
+    Result allToBoardGear(Map<String, Object> map, HttpServletRequest request);
+
     Result listByUnit(Map<String, String> map, HttpServletRequest request);
 
     Result countByUnit(Map<String, String> map, HttpServletRequest request);
@@ -36,4 +38,6 @@ public interface ILampConfigService extends IService<LampConfig> {
     Result updateLamp(Map<String, Object> map, HttpServletRequest request);
 
     Result listByLampId(Map<String, String> map, HttpServletRequest request);
+
+
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/LampConfigServiceImpl.java

@@ -157,13 +157,13 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             Integer initDayAge =  (Integer) map.get("initDayAge");
             List<String> dayAgeList =  (List<String> )map.get("dayAgeList");
             //
-            Integer boardGear =(Integer) map.get("boardGear");
+//            Integer boardGear =(Integer) map.get("boardGear");
             String unitId =(String) map.get("unitId");
             String id = (String)map.get("id");
 
             LampConfig lampConfig = new LampConfig();
             lampConfig.setInitAge(initDayAge);
-            lampConfig.setBoardGear(boardGear);
+//            lampConfig.setBoardGear(boardGear);
             StringBuilder dayAgeListStr = new StringBuilder();
             for (String s : dayAgeList) {
                 dayAgeListStr.append(s).append(";");
@@ -176,7 +176,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             UpdateWrapper<LampConfig> wrapper = new UpdateWrapper<>();
             if (StringUtils.isBlank(id)){
                 LampConfigAll lampConfigAll = new LampConfigAll();
-                lampConfigAll.setBoardGear(boardGear);
+//                lampConfigAll.setBoardGear(boardGear);
                 lampConfigAll.setInitDayage((initDayAge));
                 lampConfigAll.setListDayage((dayAgeListStr.toString()));
 
@@ -191,13 +191,42 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             }
 
         }catch (Exception e){
-            System.out.println("----------->"+e);
+            System.out.println("----------->"+e.toString());
             return new Result(10001,"配置失败",true);
         }
 
     }
 
     @Override
+    @Transactional
+    public Result allToBoardGear(Map<String, Object> map, HttpServletRequest request) {
+        try {
+            //
+            Integer boardGear =(Integer) map.get("boardGear");
+            String unitId =(String) map.get("unitId");
+            String id = (String)map.get("id");
+            LampConfig lampConfig = new LampConfig();
+            lampConfig.setBoardGear(boardGear);
+            UpdateWrapper<LampConfig> wrapper = new UpdateWrapper<>();
+            if (StringUtils.isBlank(id)){
+                LampConfigAll lampConfigAll = new LampConfigAll();
+                lampConfigAll.setBoardGear(boardGear);
+                lampConfigAllMapper.update(lampConfigAll,new UpdateWrapper<LampConfigAll>().eq("unit_id",unitId));
+                wrapper.eq("unit_id",unitId);
+                lampConfigMapper.update(lampConfig,wrapper);
+                return new Result(10000,"全局配置成功",true);
+            }else {
+                wrapper.eq("id",id);
+                lampConfigMapper.update(lampConfig,wrapper);
+                return new Result(10000,"配置成功",true);
+            }
+        }catch (Exception e){
+            System.out.println("----------->"+e.toString());
+            return new Result(10001,"配置失败",true);
+        }
+    }
+
+    @Override
     public Result listByUnit(Map<String, String> map, HttpServletRequest request) {
         String unitId = map.get("unitId");
         QueryWrapper<LampConfig> wrapper = new QueryWrapper<>();
@@ -249,11 +278,9 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             lampConfig.setUploadStart(0);
         }
 
-
         if (ObjectUtil.isNotEmpty(unitId)){
             if (uploadStart  && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("unit_id",unitId))) {
                 return new Result(10001,"有设备未配置，请先进行配置",false);
-
             }
             lampConfigMapper.update(lampConfig,new QueryWrapper<LampConfig>().eq("unit_id",unitId));
         }else {