代码提交

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -21,7 +21,6 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDevice
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotoutbound.vo.IotOutboundPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.IotRyDailyReportPageReqVO;
@@ -49,7 +48,6 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyRep
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrydailyreport.IotRyDailyReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.tdparams.IotTdParamsDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotProductClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
@@ -508,9 +506,14 @@ public class IotStaticController {
                 deviceVOS.forEach(deviceVO->{
                     deviceVO.setTimestamp(deviceVO.getTs().getTime());
                     deviceVO.setValue(Objects.nonNull(deviceVO.getLogValue())?Double.valueOf(deviceVO.getLogValue()):null);
+                    rows.stream().filter(e -> e.getIdentifier().equals(deviceVO.getIdentity())).findFirst().ifPresent(deviceVO1->{
+                        deviceVO.setIdentity(deviceVO1.getModelName());
+                    });
+                    deviceVO.setSerialNumber(deviceCode);
+                    deviceVO.setDeviceName(iotDeviceDO.getDeviceName());
                 });
                 List<DeviceVO> collect = deviceVOS.stream().sorted(Comparator.comparing(DeviceVO::getTimestamp).reversed()).collect(Collectors.toList());
-                return success(ImmutableMap.of("property", rows, "data",collect));
+                return success(ImmutableMap.of( "data",collect));
             } else {
                 List<DeviceVO> deviceVOS = tdDeviceMapper.selectAllBtTime(deviceCode.toLowerCase(), start1, end1, pageSize);
                 deviceVOS.forEach(deviceVO->{

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/TDDeviceMapper.java

@@ -4,12 +4,14 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceTdVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotZHBD.DeviceLogDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.TDDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotZHBD.TDLogDO;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -132,14 +134,14 @@ public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
     List<DeviceVO> selectAllBtTimeAndIdentifier(@Param("deviceName") String tableName, @Param("identifier") String identifier,@Param("start") Timestamp start,@Param("end") Timestamp end);
 
     @Select("SELECT   ts, CAST(log_value AS FLOAT) as log_value,identity   FROM iot_log.device_${deviceName} " +
-            "WHERE ts between #{start} and #{end} ORDER BY ts DESC LIMIT #{pageSize} " )
+            "WHERE ts between #{start} and #{end} and identity not in ('online','todayoil','totaloil','distance','vehicle_name','oil1','lng','lat','today_distance','oil4','oil3','oil2')  ORDER BY ts DESC LIMIT #{pageSize} " )
     @DS("tdengine")
     @TenantIgnore
     @InterceptorIgnore(tenantLine = "true")
     List<DeviceVO> selectAllBtTime(@Param("deviceName") String tableName,@Param("start") Timestamp start,@Param("end") Timestamp end, @Param("pageSize") Integer pageSize);
 
     @Select("SELECT   ts, CAST(log_value AS FLOAT) as log_value,identity   FROM iot_log.device_${deviceName} " +
-            "WHERE ts between #{start} and #{end} and identity = #{identifier} ORDER BY ts DESC LIMIT #{pageSize} " )
+            "WHERE ts between #{start} and #{end} and identity = #{identifier} and identity not in ('online','todayoil','totaloil','distance','vehicle_name','oil1','lng','lat','today_distance','oil4','oil3','oil2') ORDER BY ts DESC LIMIT #{pageSize} " )
     @DS("tdengine")
     @TenantIgnore
     @InterceptorIgnore(tenantLine = "true")