Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

切换mysql为达梦数据库-代码审查

Browse Source 
1.supervision-boot模块
This commit is contained in:
hongawen
2024-09-27 10:28:01 +08:00
parent 64187da4fb
commit a4c17a4ac1
205 changed files with 1180 additions and 1722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
View File

@@ -43,10 +43,10 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
* @return 结果
*/
List<LineDetailDataVO> getLineDetailInfo(@Param("lineIds") List<String> lineIds);
@Select ("select count(1) from pq_line a where a.`Level`=4 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
@Select ("select count(1) from pq_line a where a.Level=4 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
Integer getDeviceCountBySubstation(@Param("subIndex")String subIndex);
@Select ("select count(1) from pq_line a where a.`Level`=6 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
@Select ("select count(1) from pq_line a where a.Level=6 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
Integer getLineCountBySubstation(@Param("subIndex")String subIndex);

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
View File

@@ -389,7 +389,7 @@ public interface LineMapper extends BaseMapper<Line> {
"\tpq_line,\n" +
"\tpq_device\n" +
"WHERE\n" +
"\tpq_line.`Level` = 6\n" +
"\tpq_line.Level = 6\n" +
"AND SUBSTRING_INDEX(\n" +
"\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" +
"\t',' ,- 1\n" +

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
View File

@@ -10,7 +10,7 @@ FROM
SELECT
d.NAME type,
d.id typeId,
d.`Level`,
d.Level,
max( a.Occurred_Time ) occurredTime,
c.NAME subName,
b.NAME devLineName,
@@ -63,7 +63,7 @@ FROM
SELECT
f.NAME type,
f.id typeId,
f.`Level`,
f.Level,
max(a.Occurred_Time) occurredTime,
e.NAME subName,
b.NAME devLineName,
@@ -125,7 +125,7 @@ ORDER BY
SELECT
a.id,
a.occurred_time,
b.`level`,
b.level,
a.Remark,
a.flag,
b.name type,

16
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml
View File

@@ -5,14 +5,14 @@
<select id="getAlarmStrategyData" resultType="AlarmStrategyVO">
SELECT
A.`Id` id,
B.`Name` name,
A.`Integrity_Value` integrityValue,
A.`Online_Value` onlineValue,
A.`Offtime_Value` offTimeValue,
A.`Warn_Value` warnValue,
A.`Update_Time` updateTime,
C.`Name` updateBy
A.Id id,
B.Name name,
A.Integrity_Value integrityValue,
A.Online_Value onlineValue,
A.Offtime_Value offTimeValue,
A.Warn_Value warnValue,
A.Update_Time updateTime,
C.Name updateBy
FROM
pqs_alarm_strategy A,
sys_dict_data B,

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
View File

@@ -24,7 +24,7 @@
<if test="type == 1">
pq_dept_line.id unitId,
point.id pointId,
lineDetail.Time_Interval as `interval`,
lineDetail.Time_Interval as interval,
lineDetail.load_type lineTag,
dic.id voltageLevel,
dev.id devId,

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml
View File

@@ -13,11 +13,11 @@
<select id="selectLineTable" resultType="com.njcn.device.pq.pojo.po.DevFuction">
SELECT pd.id "lineId" FROM pq_device pd
inner join pq_line pl on pd.id = pl.id
where pl.`Level` = 4
where pl.Level = 4
</select>
<select id="selectDictTable" resultType="com.njcn.device.pq.pojo.po.DevFuction">
select sdd.id "fucName" from sys_dict_type sdt
inner join sys_dict_data sdd on sdd.Type_Id = sdt.Id
where sdt.`Code` = 'Dev_Fun'
where sdt.Code = 'Dev_Fun'
</select>
</mapper>

18
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml
View File

@@ -5,9 +5,9 @@
<select id="getMinDeviceLevel" resultType="DeviceOnlineDataDTO">
SELECT
a.`Id` deviceId,
e.`Line_Grade` lineGrade,
f.`Name` levelName,
a.Id deviceId,
e.Line_Grade lineGrade,
f.Name levelName,
MIN(f.Algo_Describe)
FROM
pq_line a,
@@ -32,7 +32,7 @@
<select id="getMinDeviceLevelById" resultType="DeviceOnlineDataDTO">
SELECT
a.`Id` deviceId,e.`Line_Grade` lineGrade,f.`Name` levelName,MIN(f.Algo_Describe)
a.Id deviceId,e.Line_Grade lineGrade,f.Name levelName,MIN(f.Algo_Describe)
FROM
pq_line a,
pq_line b,
@@ -50,11 +50,11 @@
<select id="getDeviceFatherData" resultType="DeviceOnlineTabVO">
SELECT
a.`Id` deviceId,
a.`Name` deviceName,
b.`Name` subName,
c.`Name` gdName,
e.`Name` provinceName
a.Id deviceId,
a.Name deviceName,
b.Name subName,
c.Name gdName,
e.Name provinceName
FROM
pq_line a,
pq_line b,

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
View File

@@ -32,7 +32,7 @@
</foreach>
AND
</if>
A1.`Level` = 6 AND A1.Id = B.Id AND
A1.Level = 6 AND A1.Id = B.Id AND
A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0 AND A1.Id = D.Id
</select>
@@ -56,7 +56,7 @@
<select id="getMonitorDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
select a.id pointId,a.name pointName,b.Time_Interval `interval`
select a.id pointId,a.name pointName,b.Time_Interval interval
from pq_line a
inner join pq_line_detail b on a.id=b.id
where a.id = #{monitorId}

26
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
View File

@@ -46,10 +46,10 @@
DISTINCT
sub.id,
sub.pid,
sub.`Level`,
sub.Level,
sub.sort,
sub.`Name`,
sdd.`Name` AS subScale
sub.Name,
sdd.Name AS subScale
FROM
pq_line line
INNER JOIN pq_line wire ON line.pid = wire.id
@@ -70,18 +70,18 @@
line.Id as 'id',
line.pid as 'pid',
line.Pids as 'pids',
line.`Name` AS 'name',
line.`Level`as 'Level',
line.Name AS 'name',
line.Levelas 'Level',
pd.Update_Time AS 'updateTime',
line.Sort as 'sort',
pd.Com_Flag as 'ComFlag',
sdd.`Name` AS 'LineScale',
device.`Name` AS 'deviceName',
sdd.Name AS 'LineScale',
device.Name AS 'deviceName',
pd.IP AS 'ip',
msdd.`Name` AS 'manufacturer',
pldsdd.`Name` AS 'lineGradeName',
pldsdd.`id` AS 'lineGrade',
pldsdd.Algo_Describe AS `algoDescribe`,
msdd.Name AS 'manufacturer',
pldsdd.Name AS 'lineGradeName',
pldsdd.id AS 'lineGrade',
pldsdd.Algo_Describe AS algoDescribe,
pld.Load_Type AS 'loadType'
FROM
pq_line AS line
@@ -92,9 +92,9 @@
LEFT JOIN sys_dict_data AS sdd ON sdd.id = pv.Scale
LEFT JOIN pq_line_detail AS pld ON line.id = pld.Id
LEFT JOIN sys_dict_data AS pldsdd ON pld.Line_Grade = pldsdd.id
LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.`id`
LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.id
WHERE
line.`Level` = 6
line.Level = 6
AND
line.id in
<foreach collection="lineIndexes" item="item" open="(" close=")" separator=",">

96
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -448,18 +448,18 @@
<select id="getBaseLineInfo" resultType="BaseLineInfo">
<!-- SELECT-->
<!-- line.Id,-->
<!-- area.`Name` provincialName,-->
<!-- gd.`Name` gdName,-->
<!-- substation.`Name` subName,-->
<!-- subscale.`Name` subScale,-->
<!-- device.`Name` deviceName,-->
<!-- area.Name provincialName,-->
<!-- gd.Name gdName,-->
<!-- substation.Name subName,-->
<!-- subscale.Name subScale,-->
<!-- device.Name deviceName,-->
<!-- pqdevice.IP networkParam,-->
<!-- pqdevice.Com_Flag comState,-->
<!-- factory.`Name` factoryName,-->
<!-- factory.Name factoryName,-->
<!-- pqdevice.Update_Time time,-->
<!-- voltage.`Name` subvName,-->
<!-- scale.`Name` subvScale,-->
<!-- line.`Name` lineName,-->
<!-- voltage.Name subvName,-->
<!-- scale.Name subvScale,-->
<!-- line.Name lineName,-->
<!-- line.Sort-->
<!-- FROM-->
<!-- pq_line line,-->
@@ -497,18 +497,18 @@
select
line.Id,
line.`Name` lineName,
area.`Name` provincialName,
gd.`Name` gdName,
substation.`Name` subName,
subscale.`Name` subScale,
device.`Name` deviceName,
line.Name lineName,
area.Name provincialName,
gd.Name gdName,
substation.Name subName,
subscale.Name subScale,
device.Name deviceName,
voltage.Name subvName,
subvscale.Name subvScale,
pqdevice.IP networkParam,
pqdevice.Com_Flag comState,
pqdevice.Update_Time time,
factory.`Name` factoryName
factory.Name factoryName
from
pq_line line,
pq_line voltage,
@@ -537,25 +537,25 @@
and device.Id = pqdevice.Id
and pqdevice.Manufacturer = factory.id
and substation.Id = pqsubstation.Id
and pqsubstation.`Scale` = subscale.Id
and pqsubstation.Scale = subscale.Id
and voltage.Id = pqvoltage.Id
and pqvoltage.`Scale` = subvscale.Id
and pqvoltage.Scale = subvscale.Id
</select>
<select id="getBaseLineAreaInfo" resultType="AreaLineInfoVO">
SELECT
line.Id lineId,
line.`Name` lineName,
gd.`Name` gdName,
line.Name lineName,
gd.Name gdName,
substation.id subId,
substation.`Name` subName,
substation.Name subName,
subscale.name subScale,
pqdevice.IP ip,
factory.`Name` manufacturer,
factory.Name manufacturer,
voltage.id voltageId,
voltage.`Name` voltageName,
scale.`Name` voltageScale,
voltage.Name voltageName,
scale.Name voltageScale,
pqdevice.run_flag,
pqdevice.com_flag,
pqsubstation.Lng,
@@ -649,8 +649,8 @@
<select id="getSubstationInfo" resultType="PollutionSubstationDTO">
SELECT A.id,
A.`Name` name,
C.`Name` voltageLevel
A.Name name,
C.Name voltageLevel
FROM pq_line A,
pq_substation B,
sys_dict_data C
@@ -662,7 +662,7 @@
<select id="getLineInfo" resultType="PollutionLineDTO">
SELECT
A.Id,
A.`Name`,
A.Name,
A1.Name busBar,
A3.Name substation,
A3.Id substationId,
@@ -707,10 +707,10 @@
<select id="getWarningSub" resultType="WarningSubstationDTO">
SELECT
A1.Id,
A1.`Name` subName,
B.`Name` scale,
A2.`Name` city,
D.`Name` province
A1.Name subName,
B.Name scale,
A2.Name city,
D.Name province
FROM
pq_line A1,
pq_line A2,
@@ -723,21 +723,21 @@
<foreach item="item" collection="list" separator="," open="(" close=")">
#{item}
</foreach>
AND A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.`Name` = D.Area_Code AND A1.Id = C.Id AND C.Scale = B.Id
AND A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Name = D.Area_Code AND A1.Id = C.Id AND C.Scale = B.Id
</select>
<select id="getOverLimitLineInfo" resultType="OverLimitLineDTO">
SELECT
A1.id,
A1.`Name` lineName,
C1.`Name` lineScale,
C2.`Name` loadType,
A1.Name lineName,
C1.Name lineScale,
C2.Name loadType,
D.Obj_Name lineObjectName,
D.Monitor_Id monitorNumber,
A4.`Name` subName,
C3.`Name` subScale,
A5.`Name` cityCompany,
F.`Name` provinceCompany,
A4.Name subName,
C3.Name subScale,
A5.Name cityCompany,
F.Name provinceCompany,
dev.Manufacturer
FROM
pq_line A1,
@@ -761,7 +761,7 @@
</foreach>
AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
AND A5.Pid = A6.Id AND A6.Name = F.Area_Code and A3.id = dev.id
</select>
<select id="getDeviceStatus" resultType="LineStateVO">
@@ -802,7 +802,7 @@
Id,
Pid,
Pids,
`Name`
Name
FROM
pq_line
WHERE
@@ -817,7 +817,7 @@
A.Id,
A.Pid,
A.Pids,
A.`Name` name,
A.Name name,
D.run_flag runFlag,
D.com_flag comFlag
FROM
@@ -972,8 +972,8 @@
Id,
Pid,
Pids,
`level`,
`Name`
level,
Name
FROM
pq_line
WHERE
@@ -1018,7 +1018,7 @@
pq_line_detail B,
pq_device C
WHERE
A1.`Level` = 6 AND A1.Id = B.Id AND
A1.Level = 6 AND A1.Id = B.Id AND
A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0
</select>
@@ -1156,7 +1156,7 @@
<select id="getLineBySubStation" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
SELECT
pq_line.id pointId,
lineDetail.Time_Interval `interval`,
lineDetail.Time_Interval interval,
dev.id devId,
device.com_flag
FROM
@@ -1177,7 +1177,7 @@
</select>
<select id="getMonitorListDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
select line.id pointId,dev.id devId,0 type,1 lineType,lineDetail.Time_Interval as `interval`
select line.id pointId,dev.id devId,0 type,1 lineType,lineDetail.Time_Interval as interval
from pq_line line
inner join pq_line_detail lineDetail on line.id = lineDetail.id
inner join pq_line subv on line.pid = subv.id
@@ -1726,7 +1726,7 @@
left join pq_line pl6 on pl5.pId = pl6.Id
left join pq_voltage pv on pv.Id = pl2.Id
left join pq_device pd on pl3.Id = pd.Id
left join sys_dict_data sdd on pv.`Scale` = sdd.Id
left join sys_dict_data sdd on pv.Scale = sdd.Id
<where>
<if test="ids!=null and ids.size() > 0">
pl.Id IN

18
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml
View File

@@ -5,9 +5,9 @@
<select id="getDeviceLogData" resultType="DeviceLogVO">
SELECT
A.`Name` name,
B.`Name` type,
C.`Name` updateBy
A.Name name,
B.Name type,
C.Name updateBy
FROM
pq_line A,
sys_dict_data B,
@@ -18,9 +18,9 @@
AND C.Id = #{updateBys}
</select>
<!-- SELECT-->
<!-- A.`Name` name,-->
<!-- B.`Name` type,-->
<!-- C.`Name` updateBy-->
<!-- A.Name name,-->
<!-- B.Name type,-->
<!-- C.Name updateBy-->
<!-- FROM-->
<!-- pq_line A,-->
<!-- sys_dict_data B,-->
@@ -40,9 +40,9 @@
<select id="getEventLogData" resultType="EventLogVO">
SELECT
A.`Name` line,
A3.`Name` substation,
A4.`Name` powerCompany
A.Name line,
A3.Name substation,
A4.Name powerCompany
FROM
pq_line A,
pq_line A1,

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsDeviceUnitMapper.xml
View File

@@ -6,7 +6,7 @@
SELECT
dev.id as id,
dev.pid as pid,
dev.NAME as `name`,
dev.NAME as name,
pd.Run_Flag as devFlag,
b.*
FROM

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
View File

@@ -4,13 +4,13 @@
<!--<select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
SELECT
sdd.`Name` "type",
sdd.Name "type",
ptl.Create_By "updateBy",
ptl.Create_Time "updateTime",
ptl.`Terminal_Describe` "remark"
ptl.Terminal_Describe "remark"
FROM
pqs_terminal_logs ptl
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.Terminal_Type
<where>
<if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')
@@ -30,13 +30,13 @@
</select>-->
<select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
SELECT
sdd.`Name` "type",
sdd.Name "type",
ptl.Create_By "updateBy",
ptl.Create_Time "updateTime",
ptl.`Terminal_Describe` "remark"
ptl.Terminal_Describe "remark"
FROM
pqs_terminal_logs ptl
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.Terminal_Type
<where>
<if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')

26
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
View File

@@ -5,17 +5,17 @@
<select id="getVersion" resultType="VersionVO">
SELECT
A.`Id` id,
B.`Name` devType,
A.`Name` name,
A.`Protocol` protocol,
A.`Date` date,
C.`Name` updateBy,
A.`Update_Time` updateTime,
A.`Remark` remark,
A.`Version_Type` versionType,
A.`Version_Flag` versionFlag,
A.`File_Name` fileName
A.Id id,
B.Name devType,
A.Name name,
A.Protocol protocol,
A.Date date,
C.Name updateBy,
A.Update_Time updateTime,
A.Remark remark,
A.Version_Type versionType,
A.Version_Flag versionFlag,
A.File_Name fileName
FROM
cld_version A,
sys_dict_data B,
@@ -27,13 +27,13 @@
AND A.Dev_Type = #{devType}
</if>
<if test="searchValue != null and searchValue != ''">
AND (A.`Name` like concat('%',#{searchValue},'%') or A.`Protocol` like concat('%',#{searchValue},'%') or A.`Remark` like concat('%',#{searchValue},'%'))
AND (A.Name like concat('%',#{searchValue},'%') or A.Protocol like concat('%',#{searchValue},'%') or A.Remark like concat('%',#{searchValue},'%'))
</if>
</select>
<select id="getProgramVersionById" resultType="ShowVersionVO">
SELECT
`File` file
File file
FROM
cld_version
WHERE Id = #{id}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml
View File

@@ -5,7 +5,7 @@
<select id="getLineIntegrityRate" resultType="LineDataIntegrity">
select line_index lineId,
avg(real_time/due_time)*100 integrityData,
sum(real_time) `real`,
sum(real_time) real,
sum(due_time) due
from r_stat_integrity_d
where line_index in

80
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
View File

@@ -5,14 +5,14 @@
<select id="getRateOfFlowData" resultType="RateOfFlowVO">
SELECT
A.`Id` id,
A.`Name` name,
A.`Type` type,
A.`Flag` flag,
A.`Combo_Type` comboType,
A.`Flow` flow,
B.`Name` updateBy,
A.`Update_Time` updateTime
A.Id id,
A.Name name,
A.Type type,
A.Flag flag,
A.Combo_Type comboType,
A.Flow flow,
B.Name updateBy,
A.Update_Time updateTime
FROM
cld_flow_meal A,
sys_user B
@@ -28,14 +28,14 @@
<select id="getRateOfFlowFlag" resultType="RateOfFlowVO">
SELECT
`Id` id,
`Name` name,
`Type` type,
`Flag` flag,
`Combo_Type` comboType,
`Flow` flow,
`Update_By` updateBy,
`Update_Time` updateTime
Id id,
Name name,
Type type,
Flag flag,
Combo_Type comboType,
Flow flow,
Update_By updateBy,
Update_Time updateTime
FROM
cld_flow_meal
WHERE Type =0 AND Flag =1
@@ -51,14 +51,14 @@
<select id="getFlowStrategy" resultType="FlowStrategyVO">
SELECT
A.`Id` id,
A.`Name` name,
A.`Flag` flag,
C.`Name` updateBy,
A.`Update_Time` updateTime,
B1.`Value` comPerData,
B2.`Value` warnPerData,
B3.`Value` alertPerData
A.Id id,
A.Name name,
A.Flag flag,
C.Name updateBy,
A.Update_Time updateTime,
B1.Value comPerData,
B2.Value warnPerData,
B3.Value alertPerData
FROM
cld_flow_strategy A,
cld_flow_strategy_dic B1,
@@ -74,11 +74,11 @@
<select id="getStrategyFlag" resultType="FlowStrategyVO">
SELECT
`Id` id,
`Name` name,
`Flag` flag,
`Update_By` updateBy,
`Update_Time` updateTime
Id id,
Name name,
Flag flag,
Update_By updateBy,
Update_Time updateTime
FROM
cld_flow_strategy
WHERE Flag =1
@@ -94,17 +94,17 @@
<select id="getFlowStrategyById" resultType="ShowFlowStrategyVO">
SELECT
A.`Id` id,
A.`Name` name,
A.`Flag` flag,
C.`Name` updateBy,
A.`Update_Time` updateTime,
A.`Com_Per` com,
A.`Warn_Per` warn,
A.`Alert_Per` alert,
B1.`Value` comPerData,
B2.`Value` warnPerData,
B3.`Value` alertPerData
A.Id id,
A.Name name,
A.Flag flag,
C.Name updateBy,
A.Update_Time updateTime,
A.Com_Per com,
A.Warn_Per warn,
A.Alert_Per alert,
B1.Value comPerData,
B2.Value warnPerData,
B3.Value alertPerData
FROM
cld_flow_strategy A,
cld_flow_strategy_dic B1,

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
View File

@@ -75,7 +75,7 @@
line.id AS lineId,
line.NAME AS lineName,
lineDetail.Power_Substation_Name AS powerSubstationName,
( SELECT id FROM pq_line WHERE `Name` = lineDetail.Power_Substation_Name ) AS Power_Substation_id
( SELECT id FROM pq_line WHERE Name = lineDetail.Power_Substation_Name ) AS Power_Substation_id
FROM
pq_line line,
pq_line voltage,
@@ -96,7 +96,7 @@
AND line.id = lineDetail.id
AND vg.Id = voltage.id
ORDER BY
substation.`Name`
substation.Name
) cc
WHERE
Power_Substation_id IS NULL;

18
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml
View File

@@ -4,11 +4,11 @@
<select id="getPointSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">
SELECT pl.`Name` AS "mName",
pl1.`Name` AS "pName",
pl2.`Name` AS "devName",
pl3.`Name` AS "subName",
pl4.`Name` AS "urbanName"
SELECT pl.Name AS "mName",
pl1.Name AS "pName",
pl2.Name AS "devName",
pl3.Name AS "subName",
pl4.Name AS "urbanName"
FROM pq_line pl
LEFT JOIN pq_line pl1 ON pl.Pid = pl1.Id
LEFT JOIN pq_line pl2 ON pl1.Pid = pl2.Id
@@ -18,9 +18,9 @@
</select>
<select id="getDeviceSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">
SELECT
pl.`Name` AS "devName",
pl1.`Name` AS "subName",
pl2.`Name` AS "urbanName"
pl.Name AS "devName",
pl1.Name AS "subName",
pl2.Name AS "urbanName"
FROM
pq_line pl
LEFT JOIN pq_line pl1 ON pl.Pid = pl1.Id
@@ -30,7 +30,7 @@
</select>
<select id="getBaseReam" resultType="com.njcn.device.pq.pojo.param.BaseReamParam">
SELECT cdm.Line_Id "id",cdm.Base_Meal_Id "baseMealId",cdm.Ream_Meal_Id "extendMealId",cfm.`Name` "baseMealName",cfm1.`Name` "extendMealName",cfm.Flow "baseMealFlow",cfm1.Flow "extendMealFlow"
SELECT cdm.Line_Id "id",cdm.Base_Meal_Id "baseMealId",cdm.Ream_Meal_Id "extendMealId",cfm.Name "baseMealName",cfm1.Name "extendMealName",cfm.Flow "baseMealFlow",cfm1.Flow "extendMealFlow"
FROM cld_dev_meal cdm
left join cld_flow_meal cfm on cdm.Base_Meal_Id = cfm.Id

38
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
View File

@@ -29,13 +29,13 @@
SELECT
device.id,
device.pid,
device.`Name`,
device.`Name` AS dataName,
device.`Level`,
device.Name,
device.Name AS dataName,
device.Level,
device.Sort,
pdevice.ip,
pdevice.Com_Flag AS comFlag,
sddManufacturer.`Name` AS manufacturer,
sddManufacturer.Name AS manufacturer,
pdevice.Update_Time AS updateTime,
min(sddLineGrade.Algo_Describe) as algoDescribe
FROM
@@ -47,7 +47,7 @@
LEFT JOIN pq_device AS pdevice ON device.id = pdevice.id
LEFT JOIN sys_dict_data AS sddManufacturer ON pdevice.Manufacturer = sddManufacturer.id
WHERE
device.`Level` = 4
device.Level = 4
AND device.id in
<foreach collection="devIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -58,12 +58,12 @@
group by
device.id,
device.pid,
device.`Name`,
device.`Level`,
device.Name,
device.Level,
device.Sort,
pdevice.ip,
pdevice.Com_Flag,
sddManufacturer.`Name`,
sddManufacturer.Name,
pdevice.Update_Time
</select>
@@ -111,10 +111,10 @@
SELECT
sub.id,
sub.pid,
sub.`Level`,
sub.Level,
sub.sort,
sub.`Name`,
sdd.`Name` AS subScale
sub.Name,
sdd.Name AS subScale
FROM
pq_line sub
LEFT JOIN pq_substation AS psub ON sub.id = psub.id
@@ -132,16 +132,16 @@
line.Id as 'id',
line.pid as 'pid',
line.Pids as 'pids',
line.`Name` AS 'name',
line.`Level`as 'Level',
line.Name AS 'name',
line.Levelas 'Level',
line.Update_Time AS 'updateTime',
line.Sort as 'sort',
pd.Call_Flag as 'ComFlag',
sdd.`Name` AS 'LineScale',
device.`Name` AS 'deviceName',
sdd.Name AS 'LineScale',
device.Name AS 'deviceName',
pd.IP AS 'ip',
msdd.`Name` AS 'manufacturer',
pldsdd.`Name` AS 'lineGrade',
msdd.Name AS 'manufacturer',
pldsdd.Name AS 'lineGrade',
pld.Load_Type AS 'loadType'
FROM
pq_line AS line
@@ -152,9 +152,9 @@
LEFT JOIN sys_dict_data AS sdd ON sdd.id = pv.Scale
LEFT JOIN pq_line_detail AS pld ON line.id = pld.Id
LEFT JOIN sys_dict_data AS pldsdd ON pld.Line_Grade = pldsdd.id
LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.`id`
LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.id
WHERE
line.`Level` = 6
line.Level = 6
AND
line.id in
<foreach collection="lineIndexes" item="item" open="(" close=")" separator=",">

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
View File

@@ -93,9 +93,9 @@ public class GridDiagramServiceImpl implements GridDiagramService {
List<RStatIntegrityD> onIntegrityByIds = new ArrayList<>();
if (CollUtil.isNotEmpty(lineIdsAll)) {
//监测点完整性
onIntegrityByIds.addAll(integrityDMapper.selectList(new QueryWrapper<RStatIntegrityD>().select("sum(real_time) as `realTime`,sum(due_time) as dueTime,line_index as lineIndex").in(CollUtil.isNotEmpty(lineIdsAll), "line_index", lineIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("line_index")));
onIntegrityByIds.addAll(integrityDMapper.selectList(new QueryWrapper<RStatIntegrityD>().select("sum(real_time) as realTime,sum(due_time) as dueTime,line_index as lineIndex").in(CollUtil.isNotEmpty(lineIdsAll), "line_index", lineIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("line_index")));
//终端在线率
onlineRateByDevIds.addAll(onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>().select("sum(online_min) as `onlineMin`,sum(offline_min) as offlineMin,dev_index as devIndex").in(CollUtil.isNotEmpty(devIdsAll), "dev_index", devIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("dev_index")));
onlineRateByDevIds.addAll(onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>().select("sum(online_min) as onlineMin,sum(offline_min) as offlineMin,dev_index as devIndex").in(CollUtil.isNotEmpty(devIdsAll), "dev_index", devIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("dev_index")));
}
Map<String, DeptGetChildrenMoreDTO> deptLineMap = deptGetChildrenMoreDTOS.stream().collect(Collectors.toMap(DeptGetChildrenMoreDTO::getUnitId, Function.identity()));
@@ -350,7 +350,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(param.getDeviceInfoParam(), Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
List<String> devIDs = generalDeviceDTOList.stream().flatMap(x -> x.getDeviceIndexes().stream()).distinct().collect(Collectors.toList());
List<RStatOnlinerateD> onlinerateDS = onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>()
.select("sum(online_min) as `onlineMin`,sum(offline_min) as offlineMin,dev_index as devIndex")
.select("sum(online_min) as onlineMin,sum(offline_min) as offlineMin,dev_index as devIndex")
.in(CollUtil.isNotEmpty(devIDs), "dev_index", devIDs)
.ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())))
.le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())))