修改删除总卡接口，开电接口，关电接口，批量关电展示接口，批量开电展示接口

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -2300,21 +2300,22 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     @Override
     public CommonResult shutDropDownShow() {
         List<House> houses = houseService.list(new LambdaQueryWrapper<>());
-        Date date = new Date();
+//        Date date = new Date();
 //        获取已被订阅的房间
-        List<Integer> ids = houseNumberService.getNumberState(date);
+//        List<Integer> ids = houseNumberService.getNumberState(date);
 //        查询所有房间
-        List<HouseNumber> houseNumberList = houseNumberService.list(new LambdaQueryWrapper<>());
+        List<HouseNumber> list = houseNumberService.list(new LambdaQueryWrapper<>());
 
         //        重新组合没有使用过的房间
-        ArrayList<HouseNumber> list = new ArrayList<>();
-        for (HouseNumber houseNumber : houseNumberList) {
-            Integer houseNumberId = houseNumber.getId();
-            if (!ids.stream().anyMatch(id -> id.equals(houseNumberId))) {
-                list.add(houseNumber);
-            }
-        }
+//        ArrayList<HouseNumber> list = new ArrayList<>();
+//        for (HouseNumber houseNumber : houseNumberList) {
+//            Integer houseNumberId = houseNumber.getId();
+//            if (!ids.stream().anyMatch(id -> id.equals(houseNumberId))) {
+//                list.add(houseNumber);
+//            }
+//        }
 
+//        为了防止入住开电失败不能在单独开电修改
         String houseNumberIds = "";
         for (int i = 0; i < list.size(); i++) {
             HouseNumber number = list.get(i);
@@ -2350,20 +2351,20 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     @Override
     public CommonResult openDropDownShow() {
         List<House> houses = houseService.list(new LambdaQueryWrapper<>());
-        Date date = new Date();
+//        Date date = new Date();
 //        获取已被订阅的房间
-        List<Integer> ids = houseNumberService.getNumberState(date);
+//        List<Integer> ids = houseNumberService.getNumberState(date);
 //        查询所有房间
-        List<HouseNumber> houseNumberList = houseNumberService.list(new LambdaQueryWrapper<>());
+        List<HouseNumber> list = houseNumberService.list(new LambdaQueryWrapper<>());
 
         //        重新组合没有使用过的房间
-        ArrayList<HouseNumber> list = new ArrayList<>();
-        for (HouseNumber houseNumber : houseNumberList) {
-            Integer houseNumberId = houseNumber.getId();
-            if (!ids.stream().anyMatch(id -> id.equals(houseNumberId))) {
-                list.add(houseNumber);
-            }
-        }
+//        ArrayList<HouseNumber> list = new ArrayList<>();
+//        for (HouseNumber houseNumber : houseNumberList) {
+//            Integer houseNumberId = houseNumber.getId();
+//            if (!ids.stream().anyMatch(id -> id.equals(houseNumberId))) {
+//                list.add(houseNumber);
+//            }
+//        }
 
         String houseNumberIds = "";
         for (int i = 0; i < list.size(); i++) {

src/main/java/com/template/controller/TotalCardController.java

@@ -201,10 +201,11 @@ public class TotalCardController implements TotalCardControllerAPI {
             String luid = unlockingEmployee.getLuid();
             String lockUserId = unlockingEmployee.getLockUserId();
             passwordIssController.deleteLockUser(luid, lockUserId);
-            idUEs.add(unlockingEmployee.getId());
+//            idUEs.add(unlockingEmployee.getId());
+            unlockingEmployeeService.removeById(unlockingEmployee.getId());
         }
 
-        unlockingEmployeeService.removeByIds(idUEs);
+//        unlockingEmployeeService.removeByIds(idUEs);
         totalCardService.removeById(id);
         return CommonResult.ok();
 

src/main/java/com/template/services/impl/ElectricEquipmentServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.ElectricEquipmentMapper;
 import com.template.model.pojo.ElectricEquipment;
 import com.template.services.ElectricEquipmentService;
+import org.slf4j.Logger;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -132,16 +133,28 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
+//        获取编码
+        String resultCode = jsonObject.getString("resultCode");
         Boolean state = false;
-        for (int i = 0; i < meterObj.size(); i++) {
-            JSONObject object = meterObj.getJSONObject(i);
-            String meterId1 = object.getString("meterId");
-            String opState = object.getString("opState");
-            if ("Y".equals(opState)) {
-                state = true;
-            }
+        if ("1000".equals(resultCode)) {
+            state = true;
+            System.out.println(electricEquipment.getRoomNum()+"：开电成攻");
+        }else {
+            System.out.println(electricEquipment.getRoomNum()+"：开电失败");
         }
         return state;
+//        for (int i = 0; i < meterObj.size(); i++) {
+//            JSONObject object = meterObj.getJSONObject(i);
+//            String meterId1 = object.getString("meterId");
+//            String opState = object.getString("opState");
+//            if ("Y".equals(opState)) {
+//                state = true;
+//                System.out.println(electricEquipment.getRoomNum()+"：开电成攻");
+//            }else {
+//                System.out.println(electricEquipment.getRoomNum()+"：开电失败");
+//            }
+//        }
+
     }
 
     /**
@@ -162,16 +175,25 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
+        //        获取编码
+        String resultCode = jsonObject.getString("resultCode");
         Boolean state = false;
-        for (int i = 0; i < meterObj.size(); i++) {
-            JSONObject object = meterObj.getJSONObject(i);
-            String meterId1 = object.getString("meterId");
-            String opState = object.getString("opState");
-            if ("Y".equals(opState)) {
-                state = true;
-            }
+        if ("1000".equals(resultCode)) {
+            state = true;
+            System.out.println(electricEquipment.getRoomNum()+"：关电成攻");
+        }else {
+            System.out.println(electricEquipment.getRoomNum()+"：关电失败");
         }
         return state;
+//        for (int i = 0; i < meterObj.size(); i++) {
+//            JSONObject object = meterObj.getJSONObject(i);
+//            String meterId1 = object.getString("meterId");
+//            String opState = object.getString("opState");
+//            if ("Y".equals(opState)) {
+//                state = true;
+//            }
+//        }
+
     }
 
     //    @Scheduled(cron = "0 55 * * * ? ")

src/main/resources/application-dev.yml

@@ -47,11 +47,11 @@ spring:
         max-wait: 60000s
 mybatis-plus:
   mapper-locations: classpath:/mapper/template/*.xml
-  #  configuration:
+#  configuration:
   #    #开启sql打印
-  #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   #    #关闭sql打印
-  #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+  #  log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       logic-delete-value: 1