提交代码

yanzhu-bigscreen/src/api-old/device/tower/index.js

@@ -18,7 +18,7 @@ const findTowerConfigListByProjectId=(deptId, projectId)=> {
 // 查询塔基运行统计
 const findTowerStatisticsView=(deviceSn)=> {
     return request({
-      url: `bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`,
+      url: `bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`,
       method: 'get'
     })
 }
@@ -34,7 +34,7 @@ const selectDevTowerDataLimitList=(deviceSn)=> {
 // 查询塔基实时数据
 const selectDevTowerDataRunList=(deviceSn)=> {
   return request({
-    url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`,
+    url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`,
     method: 'get'
   })
 }

yanzhu-bigscreen/src/api/tower.js

@@ -20,7 +20,7 @@ const findTowerConfigListByProjectId = (data) => {
 // 查询塔基运行统计
 const findTowerStatisticsView = (deviceSn) => {
   return request({
-    url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`,
+    url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`,
     method: "get",
   });
 };
@@ -36,7 +36,7 @@ const selectDevTowerDataLimitList = (deviceSn) => {
 // 查询塔基实时数据
 const selectDevTowerDataRunList = (deviceSn) => {
   return request({
-    url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`,
+    url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`,
     method: "get",
   });
 };

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml

@@ -90,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDevTowerDataRunList" parameterType="DevTowerDataRun" resultMap="DevTowerDataRunResult">
         <include refid="selectDevTowerDataRunVo"/>
         <where>
-            dtdr.is_del=0
             <if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
             <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdr.com_id = #{comId}</if>
@@ -99,8 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
-            <if test="warnings != null  and warnings != ''"> and dtdr.warnings is not null </if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            and dtdr.is_del=0
         </where>
         order by dtdr.id desc
     </select>