refactor(ems): 优化环境监控看板数据获取逻辑

- 修改 EmsBaseMonitorInfoController 中的 list 方法,移除预授权注解
- 在 baseAlarmInfo 页面中注释掉部分搜索条件
- 优化 board/index2.vue 中的数据获取逻辑,使用 e[0] 访问第一条数据
- 移除 RecordBusbarAlarmController 中的预授权注解- 更新 SecurityConfig,允许匿名访问更多接口
- 在 TWTempertureDataMapper 中添加新的查询方法- 更新 TWTempertureDataMapper.xml,优化 SQL 查询语句
- 修改 TWTempertureDataServiceImpl 中的数据获取逻辑
IOT
zch 1 year ago
parent a970b2889e
commit 8d771a2ae3

@ -38,7 +38,7 @@ public class EmsBaseMonitorInfoController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('ems/base:baseMonitorInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(EmsBaseMonitorInfo emsBaseMonitorInfo) public AjaxResult list(EmsBaseMonitorInfo emsBaseMonitorInfo)
{ {

@ -83,4 +83,6 @@ public interface TWTempertureDataMapper
public TWTempertureData selectLastTWTempertureDataByMonitorCode(String monitorId); public TWTempertureData selectLastTWTempertureDataByMonitorCode(String monitorId);
public List<TWTempertureData> selectLastTWTempertureDataByMonitorCodes(List<String> monitorCodes); public List<TWTempertureData> selectLastTWTempertureDataByMonitorCodes(List<String> monitorCodes);
public List<TWTempertureData> selectLastTWTempertureData(TWTempertureData tWTempertureData);
} }

@ -134,8 +134,8 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
@Override @Override
public List<TWTempertureData> selectLastTWTempertureData(TWTempertureData tWTempertureData) { public List<TWTempertureData> selectLastTWTempertureData(TWTempertureData tWTempertureData) {
try { try {
// 从数据库中查询温度数据列表 // 从数据库中查询数据列表
List<TWTempertureData> twlist = tWTempertureDataMapper.selectTWTempertureDataList(tWTempertureData); List<TWTempertureData> twlist = tWTempertureDataMapper.selectLastTWTempertureData(tWTempertureData);
if (twlist == null || twlist.isEmpty()) { if (twlist == null || twlist.isEmpty()) {
// 如果查询结果为空或列表为空,返回一个空列表 // 如果查询结果为空或列表为空,返回一个空列表
return Collections.emptyList(); return Collections.emptyList();

@ -79,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pm10 != null "> and twtd.pm10 = #{pm10}</if> <if test="pm10 != null "> and twtd.pm10 = #{pm10}</if>
<if test="standby != null "> and twtd.standby = #{standby}</if> <if test="standby != null "> and twtd.standby = #{standby}</if>
</where> </where>
order by twtd.recodeTime desc
</select> </select>
<select id="selectTWTempertureDataByObjid" parameterType="Long" resultMap="TWTempertureDataResult"> <select id="selectTWTempertureDataByObjid" parameterType="Long" resultMap="TWTempertureDataResult">
@ -184,10 +183,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectLastTWTempertureDataList" parameterType="TWTempertureData" resultMap="TWTempertureDataResult"> <select id="selectLastTWTempertureDataList" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
SELECT twtd.*,ebmi.monitor_name SELECT twtd.objid,
twtd.monitorId,
twtd.collectTime,
twtd.tempreture,
twtd.humidity,
twtd.illuminance,
twtd.noise,
twtd.concentration,
twtd.recodeTime,
twtd.alarmType,
twtd.pm1,
twtd.pm2,
twtd.pm10,
twtd.standby,
ebmi.monitor_name
FROM ( FROM (
select *, select objid,
row_number() over(partition by monitorId order by recodeTime desc) as rownum monitorId,
collectTime,
tempreture,
humidity,
illuminance,
noise,
concentration,
recodeTime,
alarmType,
pm1,
pm2,
pm10,
standby
row_number() over(partition by monitorId order by objid desc) as rownum
from T_W_TempertureData from T_W_TempertureData
) twtd ) twtd
left join ems_base_monitor_info ebmi on twtd.monitorId = ebmi.monitor_code left join ems_base_monitor_info ebmi on twtd.monitorId = ebmi.monitor_code
@ -219,5 +245,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectLastTWTempertureData" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
select *
from T_W_TempertureData
ORDER BY objid DESC
LIMIT 1000
</select>
</mapper> </mapper>

@ -125,8 +125,18 @@ public class SecurityConfig
.antMatchers("/record/recordBusbarTemp/boardTempList").permitAll() .antMatchers("/record/recordBusbarTemp/boardTempList").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/list").permitAll() .antMatchers("/ems/base/baseMonitorInfo/list").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/monitorInfoTree").permitAll() .antMatchers("/ems/base/baseMonitorInfo/monitorInfoTree").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/monitorInfo").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/**").permitAll()
.antMatchers("/ems/record/recordIOTInstant/selectLastTWTempertureData").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/list").permitAll()
.antMatchers("/ems/base/baseMonitorInfo/monitorInfo/**").permitAll()
.antMatchers("/record/recordBusbarAlarm/recordBusbarAlarmList").permitAll()
// 允许匿名访问 看板 下所有页面 // 允许匿名访问 看板 下所有页面
.antMatchers("/board/**").permitAll() .antMatchers("/board/**").permitAll()
.antMatchers("/board/index2").permitAll()
.antMatchers("/board/index1").permitAll()
.antMatchers("/board/index").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated(); .anyRequest().authenticated();

@ -110,7 +110,6 @@ public class RecordBusbarAlarmController extends BaseController
* @param recordBusbarAlarm * @param recordBusbarAlarm
* @return * @return
*/ */
@PreAuthorize("@ss.hasPermi('record:recordBusbarAlarm:list')")
@PostMapping("/recordBusbarAlarmList") @PostMapping("/recordBusbarAlarmList")
public AjaxResult recordBusbarAlarmList(RecordBusbarAlarm recordBusbarAlarm) public AjaxResult recordBusbarAlarmList(RecordBusbarAlarm recordBusbarAlarm)
{ {

@ -35,14 +35,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="报警阈值" prop="alarmValue"> <!-- <el-form-item label="报警阈值" prop="alarmValue">
<el-input <el-input
v-model="queryParams.alarmValue" v-model="queryParams.alarmValue"
placeholder="请输入报警阈值" placeholder="请输入报警阈值"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item label="判断方式" prop="judgMethod"> <el-form-item label="判断方式" prop="judgMethod">
<el-select v-model="queryParams.judgMethod" placeholder="请选择判断方式" clearable> <el-select v-model="queryParams.judgMethod" placeholder="请选择判断方式" clearable>
<el-option <el-option
@ -63,7 +63,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="createdBy"> <!-- <el-form-item label="创建人" prop="createdBy">
<el-input <el-input
v-model="queryParams.createdBy" v-model="queryParams.createdBy"
placeholder="请输入创建人" placeholder="请输入创建人"
@ -100,7 +100,7 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>

@ -178,10 +178,10 @@ export default {
}) })
selectLastTWTempertureData().then(e=>{ selectLastTWTempertureData().then(e=>{
this.data2 = { this.data2 = {
num1:e?.tempreture || 0, num1:e[0]?.tempreture || 0,
num2:e?.humidity || 0, num2:e[0]?.humidity || 0,
num3:e?.illuminance || 0, num3:e[0]?.illuminance || 0,
num4:e?.noise || 0, num4:e[0]?.noise || 0,
} }
}) })
boardTempList().then(e=>{ boardTempList().then(e=>{

Loading…
Cancel
Save