wangh
/
dlts_device_cockpit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 历史数据查询时间条件

Browse Source
master
wangh 9 months ago
parent bbd9c1efa3
commit 90c28dd7e9
4 changed files with 59 additions and 81 deletions
Show Stats Download Patch File Download Diff File

11
haiwei-admin/src/main/java/com/haiwei/RuoYiApplication.java
Unescape Escape View File

@ -16,15 +16,6 @@ public class RuoYiApplication
{ {
// System.setProperty("spring.devtools.restart.enabled", "false"); // System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + System.out.println("启动成功") ;
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
} }
} }

1
haiwei-admin/src/main/resources/application-druid.yml
Unescape Escape View File

@ -9,7 +9,6 @@ spring:
url: jdbc:sqlserver://175.27.215.92:1433;SelectMethod=cursor;DatabaseName=Hsdb url: jdbc:sqlserver://175.27.215.92:1433;SelectMethod=cursor;DatabaseName=Hsdb
# url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=Hsdb # url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=Hsdb
username: sa username: sa
# password: haiwei@123
# password: sa # password: sa
password: Hawei@123 password: Hawei@123
# 从库数据源 # 从库数据源

22
haiwei-admin/src/main/resources/banner.txt
Unescape Escape View File

@ -1,24 +1,2 @@
Application Version: ${ruoyi.version} Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version} Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //
// o8888888o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //
// ____/`---'\____ //
// .' \\| |// `. //
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 佛祖保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////

40
haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml
Unescape Escape View File

@ -20,7 +20,8 @@
) ld on ld.PID = ed.PID and ld.LatestTime = CreateTime ) ld on ld.PID = ed.PID and ld.LatestTime = CreateTime
right join EPointsInfo info on ed.PID = info.ID right join EPointsInfo info on ed.PID = info.ID
left join base_point_info ee on ee.objid = info.EID left join base_point_info ee on ee.objid = info.EID
where ee.device_name = #{deviceName} order by order_by where ee.device_name = #{deviceName}
order by order_by
</select> </select>
<select id="queryDeviceState" resultType="com.haiwei.manage.domain.DeviceState"> <select id="queryDeviceState" resultType="com.haiwei.manage.domain.DeviceState">
select case select case
@ -52,44 +53,52 @@
<select id="queryPramList" resultType="com.haiwei.manage.domain.RecordRaramData"> <select id="queryPramList" resultType="com.haiwei.manage.domain.RecordRaramData">
select * select *
from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120) time from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120)
time
FROM EPointData ed FROM EPointData ed
right join EPointsInfo info on ed.PID = info.ID right join EPointsInfo info on ed.PID = info.ID
left join base_point_info ee on ee.objid = info.EID left join base_point_info ee on ee.objid = info.EID
where info.Status = 1) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t
<where> <where>
<if test="beginTime !=null and endTime !=null"> <if test="beginTime !=null and endTime !=null">
time between #{beginTime} and #{endTime} ed.CreateTime between #{beginTime} and #{endTime}
</if> </if>
</where> </where>
) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t
</select> </select>
<select id="queryPramList_B" resultType="com.haiwei.manage.domain.RecordRaramDataB"> <select id="queryPramList_B" resultType="com.haiwei.manage.domain.RecordRaramDataB">
select * select *
from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120) time from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120)
time
FROM EPointData ed FROM EPointData ed
right join EPointsInfo info on ed.PID = info.ID right join EPointsInfo info on ed.PID = info.ID
left join base_point_info ee on ee.objid = info.EID left join base_point_info ee on ee.objid = info.EID
where info.Status = 1) a PIVOT (max(data) FOR pointname IN ( 一体机B转速, 一体机B电流, 一体机B切刀转速, 一体机B切刀电流, 一体机B机头温度, 一体机B机头压力 )) t
<where> <where>
<if test="beginTime !=null and endTime !=null"> <if test="beginTime !=null and endTime !=null">
time between #{beginTime} and #{endTime} ed.CreateTime between #{beginTime} and #{endTime}
</if> </if>
</where> </where>
) a PIVOT (max(data) FOR pointname IN ( 一体机B转速, 一体机B电流, 一体机B切刀转速, 一体机B切刀电流, 一体机B机头温度, 一体机B机头压力 )) t
</select> </select>
<select id="queryParamData" resultType="com.haiwei.manage.domain.RecordRaramData"> <select id="queryParamData" resultType="com.haiwei.manage.domain.RecordRaramData">
WITH CTE AS ( WITH CTE AS (
SELECT ROW_NUMBER() OVER (ORDER BY time) AS row_num,* SELECT ROW_NUMBER() OVER (ORDER BY time) AS row_num,*
from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120) time from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120)
time
FROM EPointData ed FROM EPointData ed
right join EPointsInfo info on ed.PID = info.ID right join EPointsInfo info on ed.PID = info.ID
left join base_point_info ee on ee.objid = info.EID left join base_point_info ee on ee.objid = info.EID
where info.Status = 1) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t
<where> <where>
<if test="beginTime !=null and endTime !=null"> <if test="beginTime !=null and endTime !=null">
time between #{beginTime} and #{endTime} ed.CreateTime between #{beginTime} and #{endTime}
</if> </if>
</where> </where>
) a PIVOT (max(data) FOR pointname IN ( 一体机A转速, 一体机A电流, 一体机A切刀转速, 一体机A切刀电流, 一体机A机头温度, 一体机A机头压力 )) t
) )
SELECT * SELECT *
FROM CTE FROM CTE
@ -100,16 +109,19 @@
<select id="queryParamData_B" resultType="com.haiwei.manage.domain.RecordRaramDataB"> <select id="queryParamData_B" resultType="com.haiwei.manage.domain.RecordRaramDataB">
WITH CTE AS ( WITH CTE AS (
SELECT ROW_NUMBER() OVER (ORDER BY time) AS row_num,* SELECT ROW_NUMBER() OVER (ORDER BY time) AS row_num,*
from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120) time from (SELECT ee.point_name + info.PointName as pointname, ed.Data as data, CONVERT(varchar, ed.CreateTime, 120)
time
FROM EPointData ed FROM EPointData ed
right join EPointsInfo info on ed.PID = info.ID right join EPointsInfo info on ed.PID = info.ID
left join base_point_info ee on ee.objid = info.EID left join base_point_info ee on ee.objid = info.EID
where info.Status = 1) a PIVOT (max(data) FOR pointname IN ( 一体机B转速, 一体机B电流, 一体机B切刀转速, 一体机B切刀电流, 一体机B机头温度, 一体机B机头压力 )) t
<where> <where>
<if test="beginTime !=null and endTime !=null"> <if test="beginTime !=null and endTime !=null">
time between #{beginTime} and #{endTime} ed.CreateTime between #{beginTime} and #{endTime}
</if> </if>
</where> </where>
) a PIVOT (max(data) FOR pointname IN ( 一体机B转速, 一体机B电流, 一体机B切刀转速, 一体机B切刀电流, 一体机B机头温度, 一体机B机头压力 )) t
) )
SELECT * SELECT *
FROM CTE FROM CTE
@ -118,6 +130,4 @@
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save