diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
index 5e512e3..d4104b0 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -194,6 +194,7 @@ public class EmsSiteConfigController extends BaseController{
     /**
      * PCS设备开关机
      */
+//    @PreAuthorize("@ss.hasPermi('system:device:onAndOff')")
     @Log(title = "开关机", businessType = BusinessType.UPDATE)
     @PostMapping("/updateDeviceStatus")
     public AjaxResult updateDeviceStatus(@Valid @RequestBody DeviceUpdateRequest request)
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
index 2c06e49..ecf1090 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
@@ -6,10 +6,21 @@ import com.xzzn.common.enums.TopicHandleType;
 import com.xzzn.common.utils.StringUtils;
 import com.xzzn.ems.domain.EmsMqttTopicConfig;
 import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper;
-import com.xzzn.ems.service.*;
+import com.xzzn.ems.service.IDDSDataProcessService;
+import com.xzzn.ems.service.IDeviceDataProcessService;
+import com.xzzn.ems.service.IEmsMqttMessageService;
+import com.xzzn.ems.service.IEmsStrategyService;
+import com.xzzn.ems.service.IFXXAlarmDataProcessService;
+import com.xzzn.ems.service.IFXXDataProcessService;
+import com.xzzn.ems.service.IMqttSyncLogService;
 import com.xzzn.framework.manager.MqttLifecycleManager;
 import com.xzzn.framework.web.service.MqttPublisher;
 import com.xzzn.framework.web.service.MqttSubscriber;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -19,9 +30,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
-
 @Service
 public class MqttMessageController implements MqttPublisher, MqttSubscriber {
 
@@ -170,6 +178,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
 
             emsMqttMessageService.insertMqttOriginalMessage(topic, payload);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("Failed to process device alarm data message: " + e.getMessage(), e);
         }
 
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java
index 18d1378..a096002 100644
--- a/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java
@@ -1,5 +1,6 @@
 package com.xzzn.common.core.modbus;
 
+import com.alibaba.fastjson2.JSON;
 import com.serotonin.modbus4j.BatchRead;
 import com.serotonin.modbus4j.BatchResults;
 import com.serotonin.modbus4j.ModbusMaster;
@@ -22,6 +23,7 @@ import com.xzzn.common.core.redis.RedisCache;
 import com.xzzn.common.enums.ModBusType;
 import com.xzzn.common.enums.RegisterType;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +49,7 @@ public class ModbusProcessor {
     private Modbus4jConnectionManager connectionManager;
 
     public boolean writeDataToDevice(DeviceConfig config) {
+        logger.info("writeDataToDevice: {}", JSON.toJSONString(config));
         ModbusMaster master = null;
         boolean result = true;
         try {
@@ -80,7 +83,12 @@ public class ModbusProcessor {
                     break;
                 }
                 case HOLDING_REGISTER: {
-                    double doubleValue = Double.parseDouble(String.valueOf(tag.getValue()));
+                    Number value = Double.parseDouble(String.valueOf(tag.getValue()));
+                    double doubleValue = value.doubleValue();
+                    // 检查是否在16位有符号整数范围内
+                    if (doubleValue < -32768 || doubleValue > 32767) {
+                        logger.warn("Value {} out of range for 16-bit signed register at address {}", doubleValue, address);
+                    }
                     writeRegisterRequest(master, config.getSlaveId(), address, (int) doubleValue);
                     break;
                 }
@@ -161,7 +169,7 @@ public class ModbusProcessor {
 
     public static void setRegisterValue(ModbusMaster master, int slaveId, int address, int value) {
         // 写入单个保持寄存器(从站, 地址, 16位整数)
-        BaseLocator<Number> holdingLocator = BaseLocator.holdingRegister(slaveId, address, DataType.TWO_BYTE_INT_UNSIGNED);
+        BaseLocator<Number> holdingLocator = BaseLocator.holdingRegister(slaveId, address, DataType.TWO_BYTE_INT_SIGNED);
         try {
             // 写入整数值到保持寄存器
             master.setValue(holdingLocator, value);
@@ -174,7 +182,7 @@ public class ModbusProcessor {
     public ModbusMaster borrowMaster(DeviceConfig config) throws Exception {
         ModbusMaster master = connectionManager.borrowMaster(config);
         // 设置了Modbus通信的超时时间为3000毫秒（3秒）。当主设备与从设备通信时，若在3秒内未收到响应，则认为通信超时并抛出异常。这有助于避免长时间等待无响应的设备。
-        master.setTimeout(5000);
+        master.setTimeout(10000);
         return master;
     }
 
@@ -339,14 +347,22 @@ public class ModbusProcessor {
             });
 
             BatchResults<String> results = master.send(batch);
-            for (TagConfig tag : tags){
-                if (tag.getBit()!=null){
-                    logger.info("批处理读取寄存器成功: {}",tag.getAddress() +"(" + tag.getBit() + "):" + results.getValue(tag.getKey()));
 
+            List<String> logInfoList = new ArrayList<>();
+            for (TagConfig tag : tags){
+                StringBuilder logInfo = new StringBuilder();
+                logInfo.append(tag.getAddress());
+                if (tag.getBit()!=null){
+//                    logger.info("批处理读取寄存器成功: {}",tag.getAddress() +"(" + tag.getBit() + "):" + results.getValue(tag.getKey()));
+                    logInfo.append("(" + tag.getBit() + "):");
                 }else {
-                    logger.info("批处理读取寄存器成功: {}",tag.getAddress() + ":" + results.getValue(tag.getKey()));
+//                    logger.info("批处理读取寄存器成功: {}",tag.getAddress() + ":" + results.getValue(tag.getKey()));
+                    logInfo.append(":");
                 }
+                logInfo.append(results.getValue(tag.getKey()));
+                logInfoList.add(logInfo.toString());
             }
+            logger.info("批处理读取寄存器成功: {}", JSON.toJSONString(logInfoList));
             return results;
         } catch (Exception e){
             logger.error("Failed to read master '{}'", slaveId, e);
diff --git a/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java b/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java
index e534010..43f4db0 100644
--- a/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java
+++ b/ems-quartz/src/main/java/com/xzzn/quartz/task/ModbusPoller.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 轮询设备-通过modbus协议读取数据
@@ -145,8 +146,9 @@ public class ModbusPoller {
                 addDeviceOfflineRecord(siteId, config.getDeviceNumber());
                 return;
             }
+            List<String> rawValuEmptyList = new ArrayList<>();
             Map<String, Object> data = modbusProcessor.readDataFromDevice(config, master);
-            // 在这里处理采集到的数据
+            // 在这里处理采集到的数据空
             config.getTags().forEach(tag -> {
                 Object rawValue = data.get(tag.getKey());
                 if (rawValue != null) {
@@ -167,10 +169,14 @@ public class ModbusPoller {
                         data.put(tag.getKey(), value);
                     }
                 } else {
-                    data.put(tag.getKey(), rawValue);
-                    log.warn("tag:{},数据为空: {}", tag.getKey(), rawValue);
+//                    data.put(tag.getKey(), rawValue);
+//                    log.warn("tag:{},数据为空: {}", tag.getKey(), rawValue);
+                    rawValuEmptyList.add("tag: " + tag.getKey() + ",数据为空: " + rawValue);
                 }
             });
+            if (!rawValuEmptyList.isEmpty()) {
+                log.warn("设备 {} 数据为空: {}", config.getDeviceName(), JSON.toJSONString(rawValuEmptyList));
+            }
             log.info("Data from {}: {}", config.getDeviceName(), data);
             String deviceNumber = config.getDeviceNumber();
             //处理数据并发送MQTT消息、保存Redis数据和数据入库
@@ -179,7 +185,7 @@ public class ModbusPoller {
     }
 
     private void processingData(Map<String, Object> data, String deviceNumber) {
-        if (data == null || data.size() == 0) {
+        if (CollectionUtils.isEmpty(data)) {
             // 增加失败计数
             int failureCount = deviceFailureCounts.getOrDefault(deviceNumber, 0) + 1;
             deviceFailureCounts.put(deviceNumber, failureCount);
@@ -213,7 +219,7 @@ public class ModbusPoller {
         try {
             mqttPublisher.publish(topic, Collections.singletonList(json).toString(), 0);
         } catch (MqttException e) {
-            log.error("MQTT消息发布失败: {}", json.toJSONString(), e);
+            log.error("MQTT消息发布失败: {}, reason code: {}", json.toJSONString(), e.getReasonCode() ,e);
         }
         log.info("已发送数据: {}", json.toJSONString());
     }
diff --git a/ems-quartz/src/main/java/com/xzzn/quartz/task/StrategyPoller.java b/ems-quartz/src/main/java/com/xzzn/quartz/task/StrategyPoller.java
index 8c5163e..4fd3f71 100644
--- a/ems-quartz/src/main/java/com/xzzn/quartz/task/StrategyPoller.java
+++ b/ems-quartz/src/main/java/com/xzzn/quartz/task/StrategyPoller.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
@@ -51,6 +52,8 @@ import org.springframework.stereotype.Component;
 public class StrategyPoller {
     private static final Logger logger = LoggerFactory.getLogger(StrategyPoller.class);
 
+    private static final ConcurrentHashMap<Long, Boolean> strategyLocks = new ConcurrentHashMap<>();
+
     // SOC 上下限值，默认为0%-100%
     private static final BigDecimal SOC_DOWN = new BigDecimal(0);
     private static final BigDecimal SOC_UP = new BigDecimal(100);
@@ -86,16 +89,23 @@ public class StrategyPoller {
         logger.info("开始执行运行策略数据轮询...");
         List<StrategyRunningVo> strategyRunningVoList = emsStrategyRunningMapper.getPendingPollerStrategy(null);
         strategyRunningVoList.forEach(strategyVo -> {
-            try {
-                CompletableFuture.runAsync(() -> {
-                            processData(strategyVo);
-                        })
-                        .exceptionally(e -> {
-                            logger.error("运行策略{}轮询异常", strategyVo.getId(), e);
-                            return null;
-                        });
-            } catch (Exception e) {
-                logger.error("运行策略{}任务失败", strategyVo.getId(), e);
+            Long strategyId = strategyVo.getId();
+            if (strategyLocks.putIfAbsent(strategyId, true) == null) {
+                try {
+                    CompletableFuture.runAsync(() -> {
+                                processData(strategyVo);
+                            })
+                            .exceptionally(e -> {
+                                logger.error("运行策略{}轮询异常", strategyVo.getId(), e);
+                                return null;
+                            })
+                            .thenRun(() -> strategyLocks.remove(strategyId));
+                } catch (Exception e) {
+                    logger.error("运行策略{}任务失败", strategyVo.getId(), e);
+                    strategyLocks.remove(strategyId);
+                }
+            } else {
+                logger.info("策略{}已在处理中，跳过重复执行", strategyId);
             }
         });
     }
@@ -159,7 +169,7 @@ public class StrategyPoller {
                     logger.info("当前站点: {} 未配置PCS设备", siteId);
                     continue;
                 }
-                // 判断SOC上限和下限是否在范围内
+                // 判断SOC上下限
                 if (isSocInRange(emsStrategyTemp)) {
                     BigDecimal avgChargeDischargePower = emsStrategyTemp.getChargeDischargePower().divide(new BigDecimal(pcsDeviceList.size()));
                     for (EmsDevicesSetting pcsDevice : pcsDeviceList) {
@@ -168,8 +178,8 @@ public class StrategyPoller {
                             logger.info("当前站点: {}, PCS设备: {} 未获取电池簇数量", siteId, pcsDevice.getDeviceId());
                             continue;
                         }
-                        // 平均功率值，根据电池簇数量进行平均分配
-                        avgChargeDischargePower = avgChargeDischargePower.divide(new BigDecimal(pcsSetting.getClusterNum()));
+                        // 功率默认放大10倍，平均功率值，根据电池簇数量进行平均分配
+                        avgChargeDischargePower = avgChargeDischargePower.multiply(new BigDecimal(10)).divide(new BigDecimal(pcsSetting.getClusterNum()));
                         // 根据充电状态，处理数据
                         if (ChargeStatus.CHARGING.getCode().equals(emsStrategyTemp.getChargeStatus())) {
                             // 发送Modbus命令控制设备-充电
@@ -189,7 +199,7 @@ public class StrategyPoller {
                                 powerDownType = lastStrategyLog.getPowerDownType();
                             }
 
-                            // 查询电网电表的正向有功功率
+                            // 查询电网电表的正向有功功率,36kW-50kW范围内，稳定运行，低于36kW，降功率，高于50kW，增加功率
                             EmsAmmeterData emsAmmeterData = emsAmmeterDataMapper.getLastData(emsStrategyTemp.getSiteId(), SiteDevice.LOAD.name());
                             if (emsAmmeterData == null || emsAmmeterData.getTotalActivePower() == null) {
                                 logger.info("当前站点: {}, 未获取到最新电表数据", emsStrategyTemp.getSiteId());
@@ -202,8 +212,8 @@ public class StrategyPoller {
                                     chargeDischargePower = chargeDischargePower.subtract(power);
                                     powerDownType = 0;
                                 } else {
-                                    // 判断是否需要增加功率
-                                    if (powerDownType != null && emsAmmeterData.getTotalActivePower().compareTo(ANTI_REVERSE_UP) < 0) {
+                                    // 判断是否需要增加功率,
+                                    if (powerDownType != null && emsAmmeterData.getTotalActivePower().compareTo(ANTI_REVERSE_UP) > 0) {
                                         if (chargeDischargePower.compareTo(avgChargeDischargePower) == 0) {
                                             // 功率增加到平均值则停止
                                             continue;
@@ -364,13 +374,19 @@ public class StrategyPoller {
             String siteId = pcsDevice.getSiteId();
             String deviceId = pcsDevice.getDeviceId();
             List<EmsStrategyLog> strategyLogList = getStrategyLog(deviceId, chargeStatus.getCode(), emsStrategyTemp, needAntiReverseFlow);
-            if (CollectionUtils.isNotEmpty(strategyLogList) && (!ChargeStatus.DISCHARGING.equals(chargeStatus) || !needAntiReverseFlow)) {
-                logger.info("当前站点: {}, PCS设备: {} 当前时间段已存在策略执行记录，不再重复执行", siteId, deviceId);
-                continue;
+            if (CollectionUtils.isNotEmpty(strategyLogList)) {
+                boolean isExist = true;
+                if (ChargeStatus.DISCHARGING.equals(chargeStatus) && needAntiReverseFlow) {
+                    isExist = false;
+                }
+                if (isExist) {
+                    logger.info("当前站点: {}, PCS设备: {} 当前时间段已存在策略执行记录，不再重复执行", siteId, deviceId);
+                    continue;
+                }
             }
 
             // 每次操作先判断设备工作状态
-            if (WorkStatus.ABNORMAL.getCode().equals(pcsDevice.getWorkStatus())) {
+            if (StringUtils.isEmpty(pcsDevice.getWorkStatus()) || WorkStatus.ABNORMAL.getCode().equals(pcsDevice.getWorkStatus())) {
                 // 设备故障，不发送指令
                 continue;
             } else if (WorkStatus.STOP.getCode().equals(pcsDevice.getWorkStatus())) {
@@ -381,6 +397,7 @@ public class StrategyPoller {
                 } else {
                     // 充、放电,则先开机设备
                     switchDevice(pcsDevice, pcsSetting, WorkStatus.NORMAL);
+                    continue;
                 }
             }
 
@@ -391,10 +408,11 @@ public class StrategyPoller {
             boolean result = modbusProcessor.writeDataToDevice(deviceConfig);
             if (!result) {
                 logger.info("当前站点: {}, PCS设备: {} modbus控制设备{}指令发送失败", siteId, deviceId, chargeStatus.getInfo());
-            }
-            if (ChargeStatus.STANDBY.equals(chargeStatus)) {
-                // 待机，先写功率值，再关机
-                switchDevice(pcsDevice, pcsSetting, WorkStatus.STOP);
+            } else {
+                if (ChargeStatus.STANDBY.equals(chargeStatus)) {
+                    // 待机，先写功率值，再关机
+                    switchDevice(pcsDevice, pcsSetting, WorkStatus.STOP);
+                }
             }
             // 记录策略执行日志
             saveStrategyLog(deviceId, chargeDischargePower, chargeStatus.getCode(), emsStrategyTemp, needAntiReverseFlow, powerDownType);
@@ -406,7 +424,7 @@ public class StrategyPoller {
         String siteId = pcsDevice.getSiteId();
         String deviceId = pcsDevice.getDeviceId();
         pcsDevice.setWorkStatus(workStatus.getCode());
-        DeviceConfig deviceConfig = getDeviceConfig(siteId, deviceId, pcsDevice, pcsSetting , null, 0);
+        DeviceConfig deviceConfig = getDeviceConfig(siteId, deviceId, pcsDevice, pcsSetting , null, 1);
         if (deviceConfig == null) {
             return;
         }
@@ -428,7 +446,7 @@ public class StrategyPoller {
         return now.equals(startLocalTime) || (now.isAfter(startLocalTime) && now.isBefore(endLocalTime));
     }
 
-    // 判断SOC上限和下限是否在范围内
+    // 判断SOC上限和下限
     private boolean isSocInRange(EmsStrategyTemp emsStrategyTemp) {
         BigDecimal socDown = SOC_DOWN;
         BigDecimal socUp = SOC_UP;
@@ -438,9 +456,20 @@ public class StrategyPoller {
         }
         // 查询电池堆(BMSD) SOC
         EmsBatteryStack emsBatteryStack = emsBatteryStackMapper.getSiteSumStackInfo(emsStrategyTemp.getSiteId());
-        if (emsBatteryStack != null && emsBatteryStack.getStackSoc() != null) {
-            return emsBatteryStack.getStackSoc().compareTo(socDown) > 0 && emsBatteryStack.getStackSoc().compareTo(socUp) < 0;
+        if (emsBatteryStack == null || emsBatteryStack.getStackSoc() == null) {
+            return true;
         }
+
+        // 充电阶段判断SOC上限值
+        if (ChargeStatus.CHARGING.getCode().equals(emsStrategyTemp.getChargeStatus()) && emsBatteryStack.getStackSoc().compareTo(socUp) >= 0) {
+            return false;
+        }
+
+        // 放电阶段判断SOC下限值
+        if (ChargeStatus.DISCHARGING.getCode().equals(emsStrategyTemp.getChargeStatus()) && emsBatteryStack.getStackSoc().compareTo(socDown) <= 0) {
+            return false;
+        }
+
         return true;
     }
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionSettingVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionSettingVo.java
index 229b60b..0105255 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionSettingVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/ProtectionSettingVo.java
@@ -9,6 +9,9 @@ public class ProtectionSettingVo {
     /** 设备 */
     private String deviceId;
 
+    /** 设备名称 */
+    private String deviceName;
+
     /** 点位 */
     private String point;
 
@@ -44,6 +47,14 @@ public class ProtectionSettingVo {
         this.deviceId = deviceId;
     }
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getPoint() {
         return point;
     }
diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointEnumMatchMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointEnumMatchMapper.java
index 7b6a7f3..f517c59 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointEnumMatchMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointEnumMatchMapper.java
@@ -65,6 +65,6 @@ public interface EmsPointEnumMatchMapper
     public int deleteEmsPointEnumMatchByIds(Long[] ids);
 
     public List<EmsPointEnumMatch> selectList(@Param("siteId") String siteId,
-                                                    @Param("deviceCategory") String deviceCategory,
-                                                    @Param("matchField") String matchField);
+                                              @Param("deviceCategory") String deviceCategory,
+                                              @Param("matchField") String matchField);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
index 2636fae..7e78490 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
@@ -622,8 +622,8 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
 
                     // 2. 处理枚举值转换
                     List<EmsPointEnumMatch> pointEnumMatchList = pointEnumMatchMap.get(fieldName);
-                    if (CollectionUtils.isNotEmpty(pointEnumMatchList)) {
-                        Object finalMatchValue = matchValue;
+                    if (CollectionUtils.isNotEmpty(pointEnumMatchList) && matchValue != null) {
+                        String finalMatchValue = String.valueOf(matchValue).replace(".0", "");
                         Optional<EmsPointEnumMatch> enumMatch = pointEnumMatchList.stream()
                                 .filter(data -> data.getDataEnumCode().equals(finalMatchValue)).findFirst();
                         if (enumMatch.isPresent()) {
@@ -928,7 +928,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
             // 点位匹配数据
             List<EmsPointMatch> pointMatchList = devicePointMatchDataProcessor.getDevicePointMatch(siteId, deviceId, DeviceMatchTable.CLUSTER.getCode());
             if (CollectionUtils.isEmpty(pointMatchList)) {
-                log.info("未找到匹配的点位数据，无法处理LOAD总表数据，siteId: " + siteId + "，deviceId: " + deviceId);
+                log.info("未找到匹配的点位数据，无法处理电池簇数据，siteId: " + siteId + "，deviceId: " + deviceId);
                 return;
             }
             Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap = devicePointMatchDataProcessor.getPointEnumMatchMap(siteId, DeviceMatchTable.CLUSTER.getCode());
@@ -969,11 +969,11 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
     }
 
     private void saveDeviceWorkStatus(String deviceId, String siteId, String workStatus) {
-        if (StringUtils.isBlank(workStatus)) {
+        if (StringUtils.isEmpty(workStatus)) {
             return;
         }
         EmsDevicesSetting emsDevicesSetting = emsDevicesSettingMapper.getDeviceBySiteAndDeviceId(deviceId, siteId);
-        emsDevicesSetting.setWorkStatus(String.valueOf(new BigDecimal(workStatus).longValue()));
+        emsDevicesSetting.setWorkStatus(workStatus);
         emsDevicesSetting.setUpdatedAt(DateUtils.getNowDate());
         emsDevicesSettingMapper.updateEmsDevicesSetting(emsDevicesSetting);
     }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
index 4d36540..22231a3 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
@@ -250,7 +250,7 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService {
         String pointEnumMatchKey = DevicePointMatchDataProcessor.getPointEnumMacthCacheKey(siteId, deviceCategory);
         List<EmsPointEnumMatch> pointEnumMatchList = emsPointEnumMatchMapper.selectList(siteId, deviceCategory, null);
         if (!CollectionUtils.isEmpty(pointEnumMatchList)) {
-            if (redisCache.hasKey(pointEnumMatchKey)) {
+            if (Boolean.TRUE.equals(redisCache.hasKey(pointEnumMatchKey))) {
                 redisCache.deleteObject(pointEnumMatchKey);
             }
             redisCache.setCacheList(pointEnumMatchKey, pointEnumMatchList);
@@ -263,8 +263,14 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService {
         if (StringUtils.isAllBlank(matchFieldEnum, dataEnum)) {
             return;
         }
-        List<EmsPointEnumMatch> pointEnumMatchList = emsPointEnumMatchMapper.selectList(savePoint.getSiteId(), savePoint.getDeviceCategory(), savePoint.getMatchField());
+        String siteId = savePoint.getSiteId();
+        List<EmsPointEnumMatch> pointEnumMatchList = emsPointEnumMatchMapper.selectList(siteId, savePoint.getDeviceCategory(), savePoint.getMatchField());
         if (CollectionUtils.isEmpty(pointEnumMatchList)) {
+            siteId = SITE_ID;
+            pointEnumMatchList = emsPointEnumMatchMapper.selectList(siteId, savePoint.getDeviceCategory(), savePoint.getMatchField());
+        }
+        if (CollectionUtils.isEmpty(pointEnumMatchList)) {
+            log.info("未查询到点位点位枚举匹配数据");
             return;
         }
         String[] matchFieldEnums = matchFieldEnum.split(SEPARATOR);
@@ -272,13 +278,21 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService {
         if (matchFieldEnums.length != dataEnums.length) {
             return;
         }
+        String finalSiteId = siteId;
         for (int i = 0; i < matchFieldEnums.length; i++) {
             String enumName = matchFieldEnums[i];
             String dataEnumCode = dataEnums[i];
             pointEnumMatchList.forEach(pointEnumMatch -> {
                 if (pointEnumMatch.getEnumName().equals(enumName)) {
                     pointEnumMatch.setDataEnumCode(dataEnumCode);
-                    emsPointEnumMatchMapper.updateDataEnumCodeById(pointEnumMatch);
+                    if (SITE_ID.equals(finalSiteId)) {
+                        EmsPointEnumMatch insertPointEnumMatch = new EmsPointEnumMatch();
+                        BeanUtils.copyProperties(pointEnumMatch, insertPointEnumMatch);
+                        insertPointEnumMatch.setSiteId(savePoint.getSiteId());
+                        emsPointEnumMatchMapper.insertEmsPointEnumMatch(insertPointEnumMatch);
+                    } else {
+                        emsPointEnumMatchMapper.updateDataEnumCodeById(pointEnumMatch);
+                    }
                 }
             });
         }
diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyLogMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyLogMapper.xml
index bcf1e0f..c78bdca 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsStrategyLogMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyLogMapper.xml
@@ -35,11 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateId != null  and templateId != ''"> and template_id = #{templateId}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="startTime != null "> and date_format(start_time, '%H:%i:%s') = date_format(#{startTime}, '%H:%i:%s')</if>
+            <if test="endTime != null "> and date_format(end_time, '%H:%i:%s') = date_format(#{endTime}, '%H:%i:%s')</if>
             <if test="chargeDischargePower != null "> and charge_discharge_power = #{chargeDischargePower}</if>
             <if test="chargeStatus != null  and chargeStatus != ''"> and charge_status = #{chargeStatus}</if>
-            <if test="executionDate != null "> and execution_date = #{executionDate}</if>
+            <if test="executionDate != null "> and execution_date = date_format(#{executionDate}, '%Y-%m-%d')</if>
             <if test="antiReverse != null "> and anti_reverse = #{antiReverse}</if>
             <if test="powerDownType != null "> and power_down_type = #{powerDownType}</if>
         </where>
@@ -132,8 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateId != null  and templateId != ''"> and template_id = #{templateId}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="startTime != null "> and start_time = date_format(#{startTime}, '%H:%i:%s')</if>
+            <if test="endTime != null "> and end_time = date_format(#{endTime}, '%H:%i:%s')</if>
             <if test="chargeDischargePower != null "> and charge_discharge_power = #{chargeDischargePower}</if>
             <if test="chargeStatus != null  and chargeStatus != ''"> and charge_status = #{chargeStatus}</if>
             <if test="executionDate != null "> and execution_date = #{executionDate}</if>