nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java

@@ -1,23 +0,0 @@
-package com.nu.modules.tq.common.job;
-
-import com.nu.modules.tq.common.service.ITqDeviceInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 表设备状态信息同步
- */
-@Slf4j
-public class CollectorDataJob implements Job {
-
-    @Autowired
-    ITqDeviceInfoService service;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        service.getAllCollector();
-    }
-}

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java

@@ -1,23 +0,0 @@
-package com.nu.modules.tq.common.job;
-
-import com.nu.modules.tq.common.service.ITqDeviceInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 表设备状态信息同步
- */
-@Slf4j
-public class MeterStatusJob implements Job {
-
-    @Autowired
-    ITqDeviceInfoService service;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        service.getAllMeter();
-    }
-}

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java

@@ -1,34 +0,0 @@
-package com.nu.modules.tq.electricity.job;
-
-import com.nu.modules.tq.electricity.entity.ElectricityMeter;
-import com.nu.modules.tq.electricity.service.IElectricityMeterService;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
-
-/**
- * 电表设备抄表信息同步
- */
-@Slf4j
-public class ElectricityReadJob implements Job {
-
-    @Autowired
-    IElectricityMeterService service;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        List<ElectricityMeter> electricityList = service.findAllList();
-        if(electricityList!=null&&electricityList.size()>0){
-            for(int i=0;i< electricityList.size();i++){
-                ElectricityMeter electricityMeter = electricityList.get(i);
-                Result<String> result = service.eleRead(electricityMeter);
-                log.error("ElectricityReadJob:{}-{}", DateUtils.now(),result.getResult());
-            }
-        }
-    }
-}

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nu.modules.tq.electricity.entity.ElectricityMeter;
 import org.apache.ibatis.annotations.Param;
-import java.util.List;
 
 public interface ElectricityMeterMapper extends BaseMapper<ElectricityMeter> {
     IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, @Param("params") ElectricityMeter electricityMeter);
-    List<ElectricityMeter> findAllList();
     ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter);
     int insert(ElectricityMeter electricityMeter);
     int update(ElectricityMeter electricityMeter);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml

@@ -52,29 +52,6 @@
 		</where>
 	</select>
 
-	<select id="findAllList" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
-		select
-			a.id,
-			a.cid,
-			a.address,
-			a.ele_value as eleValue,
-			a.relay_state as relayState,
-			a.read_time as readTime,
-			a.remark,
-			b.online,
-			b.csq,
-			b.disconnect_time as disconnectTime,
-			b.connect_time as connectTime,
-			a.nu_id as nuId,
-			a.nu_name as nuName,
-			a.depart_id as departId,
-			a.depart_name as departName,
-			a.depart_server_url as departServerUrl,
-			a.old_server_url ,
-			a.sync_type
-		from nu_iot_tq_electricity_meter a
-	</select>
-
 	<select id="getElectricityMeter" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
 		select
 			id,
@@ -89,22 +66,6 @@
 		  and address = #{address}
 	</select>
 
-	<insert id="insert" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
-		insert into nu_iot_tq_water_meter(
-			cid,
-			address,
-			relay_state,
-			remark,
-			create_time
-		)
-		values(
-			#{cid},
-			#{address},
-			#{relayState},
-			#{remark},
-			now()
-		)
-	</insert>
 
 	<update id="update" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
 		update nu_iot_tq_electricity_meter

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java

@@ -6,11 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.nu.modules.tq.electricity.entity.ElectricityMeter;
 import org.jeecg.common.api.vo.Result;
 
-import java.util.List;
-
 public interface IElectricityMeterService extends IService<ElectricityMeter> {
     IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter);
-    List<ElectricityMeter> findAllList();
     Result<String> eleReset(ElectricityMeter electricityMeter);
     Result<String> eleControl(ElectricityMeter electricityMeter);
     Result<String> eleRead(ElectricityMeter electricityMeter);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java

@@ -44,16 +44,10 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
     @Autowired
     private ElectricityMeterServiceImpl syncImpl;
 
-    @Override
     public IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter){
         return baseMapper.findPage(page,electricityMeter);
     }
 
-    @Override
-    public List<ElectricityMeter> findAllList(){
-        return baseMapper.findAllList();
-    }
-
     /**
      * 清零
      */

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java

@@ -1,35 +0,0 @@
-package com.nu.modules.tq.water.job;
-
-import com.nu.modules.tq.water.entity.WaterMeter;
-import com.nu.modules.tq.water.service.IWaterMeterService;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * 水表设备抄表信息同步
- */
-@Slf4j
-public class WaterReadJob implements Job {
-
-    @Autowired
-    IWaterMeterService service;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        List<WaterMeter> waterList = service.findAllList();
-        if(waterList!=null&&waterList.size()>0){
-            for(int i=0;i< waterList.size();i++){
-                WaterMeter waterMeter = waterList.get(i);
-                Result<String> result = service.waterRead(waterMeter);
-                log.error("WaterReadJob:{}-{}", DateUtils.now(),result.getResult());
-            }
-        }
-    }
-}

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java

@@ -6,11 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nu.modules.tq.water.entity.WaterMeter;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 public interface WaterMeterMapper extends BaseMapper<WaterMeter> {
     IPage<WaterMeter> findPage(Page<WaterMeter> page, @Param("params") WaterMeter waterMeter);
-    List<WaterMeter> findAllList();
     WaterMeter getWaterMeter(WaterMeter waterMeter);
     int insert(WaterMeter waterMeter);
     int update(WaterMeter waterMeter);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml

@@ -50,19 +50,6 @@
 		</where>
 	</select>
 
-	<select id="findAllList" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
-		select
-			id,
-			cid,
-			address,
-			water_value as waterValue,
-			relay_state as relayState,
-			battery_state as batteryState,
-			read_time as readTime,
-			remark
-		from nu_iot_tq_water_meter
-	</select>
-
 	<select id="getWaterMeter" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
 		select
 			id,
@@ -78,24 +65,7 @@
 		  and address = #{address}
 	</select>
 
-	<insert id="insert" parameterType="com.nu.modules.tq.water.entity.WaterMeter">
+
-		insert into nu_iot_tq_water_meter(
-			cid,
-			address,
-			relay_state,
-			battery_state,
-			remark,
-			create_time
-			)
-			values(
-			#{cid},
-			#{address},
-			#{relayState},
-			#{batteryState},
-			#{remark},
-			now()
-		)
-	</insert>
 
 	<update id="update" parameterType="com.nu.modules.tq.water.entity.WaterMeter">
 		update nu_iot_tq_water_meter

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java

@@ -6,11 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.nu.modules.tq.water.entity.WaterMeter;
 import org.jeecg.common.api.vo.Result;
 
-import java.util.List;
-
 public interface IWaterMeterService extends IService<WaterMeter> {
     IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter);
-    List<WaterMeter> findAllList();
     Result<String> waterReset(WaterMeter waterMeter);
     Result<String> waterControl(WaterMeter waterMeter);
     Result<String> waterRead(WaterMeter waterMeter);

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java

@@ -31,16 +31,10 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
     @Autowired
     ITqApiLogService logService;
 
-    @Override
     public IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter){
         return baseMapper.findPage(page,waterMeter);
     }
 
-    @Override
-    public List<WaterMeter> findAllList(){
-        return baseMapper.findAllList();
-    }
-
     /**
      * 清零
      */