中山站尝试用程序采集

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;
 
 }

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();
     }
 
 }

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<MeterConfig> {
 
-    List<MeterConfig> getMeterList(Integer stationId);
+    List<MeterConfig> getMeterList();
 
 }
 

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<MeterConfig> {
 
-    List<MeterConfig> getMeterList(Integer station);
+    List<MeterConfig> getMeterList();
 
 }

device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java

@@ -20,8 +20,8 @@ public class MeterConfigServiceImpl extends ServiceImpl<MeterConfigMapper, Meter
     implements MeterConfigService{
 
     @Override
-    public List<MeterConfig> getMeterList(Integer stationId) {
+    public List<MeterConfig> getMeterList() {
-        return ((MeterConfigMapper)this.baseMapper).getMeterList(stationId);
+        return ((MeterConfigMapper)this.baseMapper).getMeterList();
     }
 }
 

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<MeterConfig> configs = meterConfigService.getMeterList(StaticPropUtil.stationId);
+        List<MeterConfig> configs = meterConfigService.getMeterList();
         int pageSize = 10; // 每页的设备数量
         int totalDevices = configs.size(); // 总设备数量
         int totalPages = (int) Math.ceil((double) totalDevices / pageSize); // 总页数

device_gather/src/main/resources/mapper/MeterConfigMapper.xml

@@ -54,6 +54,6 @@
 
     <select id="getMeterList" resultType="com.xr.device.model.entity.MeterConfig">
         select a.*,b.device_ip from meter_config a left join device_camera b
-        on a.camera_id = b.id where a.status = 1 and a.station_id = #{stationId}
+        on a.camera_id = b.id where a.status = 1
     </select>
 </mapper>