diff --git a/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java b/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java index d45a945..c7e38f2 100644 --- a/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java +++ b/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java @@ -20,7 +20,5 @@ public class StaticProperties { @Value("${python.modelPath}") private String modelPath; - @Value("${station.id}") - private Integer stationId; } diff --git a/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java b/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java index 0c746ce..d1f9275 100644 --- a/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java +++ b/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java @@ -13,14 +13,12 @@ public class StaticPropUtil { public static String modelPath; - public static Integer stationId; public static void initDingDingProp(StaticProperties dingProperties){ imgUrl = dingProperties.getImgUrl(); imgPath = dingProperties.getImgPath(); pythonPath = dingProperties.getPythonPath(); modelPath = dingProperties.getModelPath(); - stationId = dingProperties.getStationId(); } } diff --git a/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java b/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java index 6c92c59..6de48f9 100644 --- a/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java +++ b/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java @@ -15,7 +15,7 @@ import java.util.List; @Mapper public interface MeterConfigMapper extends BaseMapper { - List getMeterList(Integer stationId); + List getMeterList(); } diff --git a/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java b/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java index 34a48dc..35618a5 100644 --- a/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java +++ b/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java @@ -12,6 +12,6 @@ import java.util.List; */ public interface MeterConfigService extends IService { - List getMeterList(Integer station); + List getMeterList(); } diff --git a/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java b/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java index 3bc38cb..2338b72 100644 --- a/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java +++ b/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java @@ -20,8 +20,8 @@ public class MeterConfigServiceImpl extends ServiceImpl getMeterList(Integer stationId) { - return ((MeterConfigMapper)this.baseMapper).getMeterList(stationId); + public List getMeterList() { + return ((MeterConfigMapper)this.baseMapper).getMeterList(); } } diff --git a/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java b/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java index eff8cea..eb045ea 100644 --- a/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java +++ b/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java @@ -46,7 +46,7 @@ public class GetMeterSchedule { @Scheduled(cron = "0 0 9,15 * * ?")//每天9点和下午三点执行 public void getMeterSchedule(){ - List configs = meterConfigService.getMeterList(StaticPropUtil.stationId); + List configs = meterConfigService.getMeterList(); int pageSize = 10; // 每页的设备数量 int totalDevices = configs.size(); // 总设备数量 int totalPages = (int) Math.ceil((double) totalDevices / pageSize); // 总页数 diff --git a/device_gather/src/main/resources/mapper/MeterConfigMapper.xml b/device_gather/src/main/resources/mapper/MeterConfigMapper.xml index dc17080..b1dc5f9 100644 --- a/device_gather/src/main/resources/mapper/MeterConfigMapper.xml +++ b/device_gather/src/main/resources/mapper/MeterConfigMapper.xml @@ -54,6 +54,6 @@