统计调整

jeecg-module-gather/src/main/java/org/jeecg/modules/deviceLog/entity/Device.java

@@ -13,6 +13,10 @@ public class Device {
 
     private String deviceType;
 
+    private String deviceIp;
+
+    private String devicePort;
+
     private String useStatus;
 
     private String freq;

jeecg-module-gather/src/main/java/org/jeecg/modules/deviceLog/mapper/xml/DeviceMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="org.jeecg.modules.deviceLog.mapper.DeviceMapper">
 
     <select id="listAll" resultType="org.jeecg.modules.deviceLog.entity.Device">
-        select id,device_title as name, device_gather as deviceType,'0' as useStatus,freq,status
+        select id,device_title as name, device_gather as deviceType,device_ip,device_port,'0' as useStatus,freq,status
         from device_gather_service
     </select>
     <select id="listStop" resultType="org.jeecg.modules.deviceLog.entity.Device">
-        select id,device_title as name, device_gather as deviceType,'0' as useStatus,freq,status
+        select id,device_title as name, device_gather as deviceType,device_ip,device_port,'0' as useStatus,freq,status
         from device_gather_service
         where status = '1'
     </select>

jeecg-module-gather/src/main/java/org/jeecg/modules/devicePoint/entity/EditBatchParam.java

@@ -17,7 +17,7 @@ import java.util.List;
 public class EditBatchParam {
 
     @ApiModelProperty(value = "设备id")
-    private String deviceId;
+    private String gatherServiceId;
 
     @ApiModelProperty(value = "设备采集点集合")
     private List<DevicePoint> devicePoints;

jeecg-module-gather/src/main/java/org/jeecg/modules/devicePoint/service/impl/DevicePointServiceImpl.java

@@ -40,10 +40,10 @@ public class DevicePointServiceImpl extends ServiceImpl<DevicePointMapper, Devic
 
     @Override
     public void editBatch(EditBatchParam editBatchParam) {
-        baseMapper.delete(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getDeviceId,editBatchParam.getDeviceId()));
+        baseMapper.delete(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getGatherServiceId,editBatchParam.getGatherServiceId()));
         if(oConvertUtils.listIsNotEmpty(editBatchParam.getDevicePoints())){
             editBatchParam.getDevicePoints().forEach(devicePoint -> {
-                devicePoint.setDeviceId(editBatchParam.getDeviceId());
+                devicePoint.setGatherServiceId(editBatchParam.getGatherServiceId());
                 baseMapper.insert(devicePoint);
             });
         }

jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/LeanModelStatistics.java

@@ -118,6 +118,10 @@ public class LeanModelStatistics {
         //遍历设备集合
         fpgLeanModellist.forEach(fpgLeanModeInfo -> {
             LambdaQueryWrapper<FpgGatherData> fpgGatherQuery = new LambdaQueryWrapper<FpgGatherData>().eq(FpgGatherData::getFpgModelState, "0");
+            // 检测是否配置设备条件
+//            if(fpgLeanModeInfo.ge){
+//
+//            }
             List<FpgGatherData> fpgGatherList = fpgGatherDataService.list(fpgGatherQuery);
             // 处理数据业务逻辑
             fpgGatherList.forEach(fpgGatherData -> { // 循环处理采集数据处理