From efc4dca17e3a42b9d9e6b14aca1c39ab8fa87236 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 15 Oct 2025 10:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigdevice/mapper/xml/TowerAlarmMapper.xml |  1 +
 .../mapper/xml/TowerViolationMapper.xml       |  4 ++-
 .../impl/LifterWorkCycleServiceImpl.java      |  7 ++++--
 .../xml/ConcreteMonitorCurrentDataMapper.xml  |  6 +++--
 ...ConcreteMonitorCurrentDataServiceImpl.java |  2 +-
 .../mapper/xml/PaveCompactionDevMapper.xml    |  5 ++--
 .../modules/pave/mapper/xml/PaveDevMapper.xml |  5 ++--
 .../PitchMixStationProdDataServiceImpl.java   | 25 ++++++++-----------
 .../mapper/xml/VehiclePositionDevMapper.xml   |  4 ++-
 .../impl/VehiclePositionDataServiceImpl.java  |  9 +------
 .../video/controller/VideoItemController.java | 12 ++++-----
 11 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
index 579878ebd..e659aec71 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
@@ -181,6 +181,7 @@
             and a.dev_sn=#{devSn}
         </if>
         AND a.add_time &gt;=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
+        AND a.add_time &lt; date_add(current_date,interval 1 day)
     </select>
     <select id="selectYesterdayAlarmCount" resultType="java.util.Map">
         select count(1) totalAlarmNum,
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml
index 3df91e05c..a5785dd44 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml
@@ -483,6 +483,7 @@
             and a.dev_sn=#{devSn}
         </if>
         AND a.add_time &gt;=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
+        AND a.add_time &lt; date_add(current_date,interval 1 day)
         )t1
         join
         (
@@ -498,13 +499,14 @@
         )t2
         join
         (
-        select count(1) violation_num_before30_day
+        select FLOOR(COUNT(1) / 30) violation_num_before30_day
         from tower_violation a
         where a.project_sn=#{projectSn}
         <if test="devSn != null and devSn != ''">
             and a.dev_sn=#{devSn}
         </if>
         and a.add_time>=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -30 DAY),'%Y-%m-%d'),' 00:00:00')
+        AND a.add_time &lt; date_add(current_date,interval 1 day)
         )t3
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java
index e84b08c44..4777439f4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java
@@ -1,7 +1,9 @@
 package com.zhgd.xmgl.modules.bigdevice.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,7 +17,6 @@ import com.zhgd.xmgl.modules.bigdevice.entity.vo.StatisticsElevatorNumVo;
 import com.zhgd.xmgl.modules.bigdevice.mapper.LifterMapper;
 import com.zhgd.xmgl.modules.bigdevice.mapper.LifterWorkCycleMapper;
 import com.zhgd.xmgl.modules.bigdevice.service.ILifterWorkCycleService;
-import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -84,6 +85,7 @@ public class LifterWorkCycleServiceImpl extends ServiceImpl<LifterWorkCycleMappe
         Integer todayRunNum = lifterWorkCycleMapper.selectCount(Wrappers.lambdaQuery(LifterWorkCycle.class)
                 .eq(LifterWorkCycle::getProjectSn, MapUtils.getString(map, "projectSn"))
                 .ge(LifterWorkCycle::getAddTime, DateUtil.today())
+                .lt(LifterWorkCycle::getAddTime, DateUtil.formatDate(DateUtil.offsetDay(new Date(), 1)))
         );
         Integer yesterdayRunNum = lifterWorkCycleMapper.selectCount(Wrappers.lambdaQuery(LifterWorkCycle.class)
                 .eq(LifterWorkCycle::getProjectSn, MapUtils.getString(map, "projectSn"))
@@ -93,8 +95,9 @@ public class LifterWorkCycleServiceImpl extends ServiceImpl<LifterWorkCycleMappe
         Integer last30DayRunNum = lifterWorkCycleMapper.selectCount(Wrappers.lambdaQuery(LifterWorkCycle.class)
                 .eq(LifterWorkCycle::getProjectSn, MapUtils.getString(map, "projectSn"))
                 .ge(LifterWorkCycle::getAddTime, DateUtil.offsetDay(date, -30))
+                .lt(LifterWorkCycle::getAddTime, DateUtil.formatDate(DateUtil.offsetDay(new Date(), 1)))
         );
-
+        last30DayRunNum = Convert.toInt(NumberUtil.div(last30DayRunNum * 1.0, 30));
         StatisticsElevatorNumVo vo = new StatisticsElevatorNumVo();
         vo.setTodayRunNum(todayRunNum);
         vo.setYesterdayRunNum(yesterdayRunNum);
diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
index 5dc78ded1..861d79fb5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
@@ -26,7 +26,7 @@
     </select>
 
     <select id="countTrend" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
-        select date_format(receive_time, '%Y-%m-%d %H:00') x,
+        select date_format(receive_time, '%H:00') x,
         ifnull(round(avg(temperature),2),0) y
         from concrete_monitor_current_data
         where project_sn = #{projectSn}
@@ -39,12 +39,14 @@
         <choose>
             <when test="date != null and date != ''">
                 and receive_time >= date_format(#{date}, '%Y-%m-%d')
+                and receive_time &lt; date_add(date_format(#{date}, '%Y-%m-%d'),interval 1 day)
             </when>
             <otherwise>
                 and receive_time >= current_date
+                and receive_time &lt; date_add(current_date,interval 1 day)
             </otherwise>
         </choose>
-        group by x
+        group by date_format(receive_time, '%Y-%m-%d %H:00')
     </select>
 
     <select id="newestCurrentData" resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
index bd4d94d4c..a7d06276a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
@@ -106,7 +106,7 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
     @Override
     public List<TrendOneVo> countTrend(HashMap<String, Object> paramMap) {
         ArrayList<TrendOneVo> list = baseMapper.countTrend(paramMap);
-        return TrendOneVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"), "HH:00");
+        return TrendOneVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "HH:00"), "HH:00");
     }
 
     @Override
diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml
index 833f25c4a..b99385921 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml
@@ -46,10 +46,11 @@
         select t1.*
         from pave_compaction_record t1
         join (
-        select dev_sn, max(id) id
+        select dev_sn, max(pave_time) pave_time
         from pave_compaction_record
         group by dev_sn
-        ) t2 on t2.id = t1.id
+        ) t2 on t2.pave_time = t1.pave_time and t2.dev_sn = t1.dev_sn
+        group by t1.dev_sn
         ) pcr on pcr.dev_sn = pcd.dev_sn and pcd.project_sn=pcd.project_sn
         ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml
index 6b2ee13ca..908488d0a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml
@@ -45,10 +45,11 @@
         select t1.*
         from pave_record t1
         join (
-        select dev_sn, max(id) id
+        select dev_sn, max(pave_time) pave_time
         from pave_record
         group by dev_sn
-        ) t2 on t2.id = t1.id
+        ) t2 on t2.pave_time = t1.pave_time and t2.dev_sn = t1.dev_sn
+        group by t1.dev_sn
         ) pr on pr.dev_sn = pd.dev_sn and pd.project_sn=pd.project_sn
         ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java
index 9406b3a81..17d62ffdb 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java
@@ -2,14 +2,17 @@ package com.zhgd.xmgl.modules.pitchmixstation.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
 import com.zhgd.xmgl.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.enums.ParamEnum;
-import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
-import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
 import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
 import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev;
 import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationMaterialData;
@@ -19,14 +22,12 @@ import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationMaterialDataM
 import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationProdDataMapper;
 import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationProdDataService;
 import com.zhgd.xmgl.util.DateUtils;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.util.PageUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.xmgl.util.RefUtil;
+import org.apache.commons.collections.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,10 +35,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.zhgd.xmgl.util.RefUtil;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-
 /**
  * @Description: 沥青拌合站生产数据
  * @author： pds
@@ -72,7 +69,7 @@ public class PitchMixStationProdDataServiceImpl extends ServiceImpl<PitchMixStat
     private QueryWrapper<PitchMixStationProdData> getQueryWrapper(HashMap<String, Object> paramMap) {
         String alias = "";
         QueryWrapper<PitchMixStationProdData> queryWrapper = QueryGenerator.initPageQueryWrapper(PitchMixStationProdData.class, paramMap, alias);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PitchMixStationProdData::getId));
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PitchMixStationProdData::getDischargeTime));
         return queryWrapper;
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml
index f93c25ca2..538ee3eec 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml
@@ -15,7 +15,9 @@
         left join worker_info wi on ci.driver_worker_id = wi.id
         left join (select t1.*
         from vehicle_position_data t1
-        join (select max(id) id from vehicle_position_data group by dev_sn) t2 on t1.id = t2.id) vpd2
+        join (select max(create_time) create_time,dev_sn from vehicle_position_data group by dev_sn) t2 on t1.create_time = t2.create_time and t1.dev_sn=t2.dev_sn
+        group by t1.dev_sn
+        ) vpd2
         on vpd2.dev_sn = vpd.dev_sn) a
         ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
index e21a3af3e..7ec030ee0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
@@ -13,22 +13,15 @@ import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.car.entity.CarInfo;
 import com.zhgd.xmgl.modules.car.mapper.CarInfoMapper;
-import com.zhgd.xmgl.modules.location.entity.LocationData;
-import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData;
-import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
-import com.zhgd.xmgl.modules.safetyhat.entity.vo.WorkerListyByRegionVo;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
-import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionAlarm;
 import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionData;
 import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev;
-import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionFence;
 import com.zhgd.xmgl.modules.vehicleposition.entity.vo.VehicleListByRegionVo;
 import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDataMapper;
 import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper;
 import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionAlarmService;
 import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDataService;
-import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
 import com.zhgd.xmgl.util.RegionUtil;
@@ -96,7 +89,7 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl<VehiclePositionD
         if (Objects.equals(MapUtils.getInteger(paramMap, "mockDesc"), 1)) {
             queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionData::getMockTime));
         } else {
-            queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionData::getId));
+            queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionData::getCreateTime));
         }
         return queryWrapper;
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java
index 7a0d6a413..27ab5dad3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java
@@ -475,14 +475,14 @@ public class VideoItemController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "serialNumber", value = "视频设备监控点编号", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "talkType", value = "对讲类型：1=设备, 2=通道, 3=国标设备广播 ，设备对讲：设备对讲：设备通过设备管理添加到平台，通道对讲：设备作为通道集成到平台，一般是通过同步设备信息将通道同步到平台", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "audioBit", value = "位数，固定：16 ，对讲时以接口返回为准", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "audioType", value = "音频编码类型，推荐值：2，对讲时以接口返回为准", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "talkType", value = "对讲类型：1=设备, 2=通道, 3=国标设备广播 ，设备对讲：设备对讲：设备通过设备管理添加到平台，通道对讲：设备作为通道集成到平台，一般是通过同步设备信息将通道同步到平台", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "audioBit", value = "位数，固定：16 ，对讲时以接口返回为准", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "audioType", value = "音频编码类型，推荐值：2，对讲时以接口返回为准", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "broadcastChannels", value = "广播通道（广播对讲时使用）", paramType = "body", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "audioBit", value = "视频设备监控点编号", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "sampleRate", value = "采样率，固定：8000 ，对讲时以接口返回为准", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "audioBit", value = "视频设备监控点编号", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "sampleRate", value = "采样率，固定：8000 ，对讲时以接口返回为准", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "talkMode", value = "对讲模式：0=对讲（默认模式）, 1=广播（从广播切换到对讲要重新设置）", paramType = "body", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "channelSeq", value = "通道序号（通道对讲时使用）", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "channelSeq", value = "通道序号（通道对讲时使用）", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping("/getTalkURLsV2")
     public Result<TalkURLsV2Vo> getTalkURLsV2(@RequestBody Map<String, Object> map) {