解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.DataSynchronizationImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.SjglZsjZsbtzServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationBasicServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl;
 import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
@@ -36,8 +38,11 @@ public class DemoController extends BaseController {
 
     @Autowired
     InfluxDbConnection influxDbConnection;
+    @Autowired
+    SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
 
-
+    @Autowired
+    DataSynchronizationImpl dataSynchronizationImpl;
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "demo测试prodcutcion 库")
     @GetMapping("/test")
@@ -68,4 +73,11 @@ public class DemoController extends BaseController {
             }
         }
     }
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "测试数据同步逻辑")
+    @GetMapping("/test4")
+    public void demoTest3() {
+        dataSynchronizationImpl.cacheSjglZsjZsbtz();
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/SjglZsjZsbtz.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.joda.time.DateTime;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -20,7 +21,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 @TableName("sjgl_zsj_zsbtz")
-public class SjglZsjZsbtz  {
+public class SjglZsjZsbtz implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/TpriDmpDatabook.java

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 @TableName("tpri_dmp_databook")
-public class TpriDmpDatabook  {
+public class TpriDmpDatabook implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/SjglZsjZsbtzServiceImpl.java

@@ -36,5 +36,25 @@ public class SjglZsjZsbtzServiceImpl   {
         sjglZsjZsbtzList = sjglZsjZsbtzMapper.selectList(new QueryWrapper<SjglZsjZsbtz>().eq("MACHGENRE",MACHGENRE).eq("WERKS",WERKS));
         return sjglZsjZsbtzList;
     }
+    /**
+     * @deprecated 根据场站编号获取基础设备信息
+     * @param WERKS 场站编号
+     * @return 基础设别列表
+     */
+    public List<SjglZsjZsbtz> getSjglZsjZsbtzListByWerks(String WERKS){
+        List<SjglZsjZsbtz> sjglZsjZsbtzList =  new ArrayList<>();
+        sjglZsjZsbtzList = sjglZsjZsbtzMapper.selectList(new QueryWrapper<SjglZsjZsbtz>().eq("WERKS",WERKS));
+        return sjglZsjZsbtzList;
+    }
+    /**
+     * @deprecated 根据场站编号获取基础设备信息
+     * @param WERKS 场站编号
+     * @return 基础设别列表
+     */
+    public List<SjglZsjZsbtz> getSjglZsjZsbtzList(){
+        List<SjglZsjZsbtz> sjglZsjZsbtzList =  new ArrayList<>();
+        sjglZsjZsbtzList = sjglZsjZsbtzMapper.selectList(new QueryWrapper<SjglZsjZsbtz>().isNotNull("DBID"));
+        return sjglZsjZsbtzList;
+    }
 
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationDataTaskImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.DeviceDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationTaksDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IStationDataTask;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.TpriDmpDatabook;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StationDataTaskImpl implements IStationDataTask {
+    @Autowired
+    StationBasicServiceImpl stationBasicServiceImpl;
+
+    @Autowired
+    SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
+
+    @Autowired
+    TpriDmpDatabookServiceImpl tpriDmpDatabookServiceImpl;
+
+    @Override
+    public List<StationTaksDto> getListStationBasic() {
+        List<StationTaksDto> stationTaksDtoList = new ArrayList<>();
+        List<StationBasic> stationBasicList= stationBasicServiceImpl.list();
+        stationBasicList.forEach(stationBasic -> {
+            StationTaksDto stationTaksDto = new StationTaksDto();
+            stationTaksDto.setStationNumber(stationBasic.getStationNumber());
+            stationTaksDto.setGateway(stationBasic.getGatewayId());
+            stationTaksDtoList.add(stationTaksDto);
+        });
+        return stationTaksDtoList;
+    }
+
+    @Override
+    public List<DeviceDto> getListDevice(StationTaksDto stationTaksDto) {
+        List<DeviceDto> deviceDtoList =   new ArrayList<>();
+        TpriDmpDatabook tpriDmpDatabook =  tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName("风机");
+        List<SjglZsjZsbtz> sjglZsjZsbtzList  = sjglZsjZsbtzServiceImpl .getSjglZsjZsbtzList(tpriDmpDatabook.getDataid(),stationTaksDto.getStationNumber());
+        sjglZsjZsbtzList.forEach(sjglZsjZsbtz -> {
+            DeviceDto deviceDto = new DeviceDto();
+            deviceDto.setGateway(stationTaksDto.getGateway());
+            deviceDto.setNumberName("");
+        });
+        return deviceDtoList;
+    }
+
+    @Override
+    public List<IndexDto> getIndexDto(DeviceDto deviceDto) {
+        return null;
+    }
+
+    @Override
+    public void setMonitorFanIndicator(List<IndexDto> list) {
+
+    }
+}