diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java index ef49d2e..2fe446f 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; +import com.xzzn.common.constant.RedisKeyConstants; import com.xzzn.common.core.redis.RedisCache; import com.xzzn.common.enums.*; import com.xzzn.common.utils.DateUtils; @@ -22,7 +23,7 @@ import java.util.*; @Service public class FXXDataProcessServiceImpl implements IFXXDataProcessService { private static final Log log = LogFactory.getLog(FXXDataProcessServiceImpl.class); - + private static final String SITE_ID = "021_FXX_01"; @Autowired private EmsBatteryClusterMapper emsBatteryClusterMapper; @@ -141,12 +142,12 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { dataStack.setCreateTime(DateUtils.getNowDate()); dataStack.setUpdateBy("system"); dataStack.setUpdateTime(DateUtils.getNowDate()); - dataStack.setSiteId("021_FXX_01"); + dataStack.setSiteId(SITE_ID); dataStack.setDeviceId(deviceId); emsBatteryStackMapper.insertEmsBatteryStack(dataStack); - redisCache.setCacheObject("STACK_021_FXX_01_"+deviceId, dataStack); + redisCache.setCacheObject(RedisKeyConstants.STACK + SITE_ID + "_" +deviceId, dataStack); } @@ -210,7 +211,7 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { data.setCreateTime(DateUtils.getNowDate()); data.setUpdateBy("system"); data.setUpdateTime(DateUtils.getNowDate()); - data.setSiteId("021_FXX_01"); + data.setSiteId(SITE_ID); data.setDeviceId(deviceId); data.setMaxCellVoltageId(StringUtils.getLong(obj.get("ZGDTDYDYD"))); data.setMinCellVoltageId(StringUtils.getLong(obj.get("ZDDTDYDYD"))); @@ -227,7 +228,7 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { } emsBatteryClusterMapper.insertEmsBatteryCluster(data); - redisCache.setCacheObject("CLUSTER_021_FXX_01_"+deviceId, data); + redisCache.setCacheObject(RedisKeyConstants.CLUSTER + SITE_ID + "_" +deviceId, data); } @@ -265,7 +266,7 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { batteryData.setDataTimestamp(new Date()); // ID字段 - batteryData.setSiteId("021_FXX_01"); + batteryData.setSiteId(SITE_ID); batteryData.setClusterDeviceId(deviceId); list.add(batteryData); @@ -273,8 +274,8 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { if (list.size() > 0 ) { emsBatteryDataMapper.insertEmsBatteryDataList(list); - redisCache.deleteList("BATTERY_021_FXX_01_"+deviceId); - redisCache.setCacheList("BATTERY_021_FXX_01_"+deviceId, list); + redisCache.deleteList(RedisKeyConstants.BATTERY + SITE_ID + "_" +deviceId); + redisCache.setCacheList(RedisKeyConstants.BATTERY + SITE_ID + "_" +deviceId, list); } } @@ -335,13 +336,13 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { pcsData.setCreateTime(DateUtils.getNowDate()); pcsData.setUpdateBy("system"); pcsData.setUpdateTime(DateUtils.getNowDate()); - pcsData.setSiteId("021_FXX_01"); + pcsData.setSiteId(SITE_ID); pcsData.setDeviceId(deviceId); pcsData.setDateMonth(DateUtils.getNowMonthLong()); pcsData.setDateDay(DateUtils.getNowDayLong()); emsPcsDataMapper.insertEmsPcsData(pcsData); - redisCache.setCacheObject("PCS_021_FXX_01_"+deviceId, pcsData); + redisCache.setCacheObject(RedisKeyConstants.PCS + SITE_ID + "_" +deviceId, pcsData); } @@ -387,7 +388,7 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { if (list.size() > 0 ) { emsPcsBranchDataMapper.insertPcsBranchDataList(list); - redisCache.setCacheObject("BRANCH_021_FXX_01_"+deviceId, list); + redisCache.setCacheObject(RedisKeyConstants.BRANCH + SITE_ID + "_" +deviceId, list); }