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

终端异常告警接口优化

Browse Source
This commit is contained in:
zhuxinyu
2023-03-29 16:06:48 +08:00
parent 0a5573804c
commit ff6f106047
9 changed files with 159 additions and 63 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/TopMsgMapper.java
View File

@@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TopMsgMapper {
Page<TopMsgPO> getTopMsg(Page<TopMsgPO> page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
List<TopMsgPO> getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
List<TopMsgPO> getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime);

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

@@ -864,7 +864,9 @@
#{item}
</foreach>
and
a.Create_Time between #{startTime} and #{endTime}
a.Create_Time between #{startTime} and #{endTime}
and
b.Run_Flag != 2
) t ORDER BY flowProportion DESC
</select>

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

@@ -5,12 +5,12 @@
<select id="getTopMsg" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
SELECT
ptm.Time_Id AS time,
COUNT(ptm.Dev_Id) AS deviceAbnormalNum,
IFNULL(COUNT(ptm.Dev_Id),3.14159)AS deviceAbnormalNum,
GROUP_CONCAT(sdd.Name) AS lineGrade
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
INNER JOIN pqs_top_msg ptm ON ptm.Dev_Id = device.Id
LEFT JOIN pqs_top_msg ptm ON ptm.Dev_Id = device.Id
LEFT JOIN pq_line_detail pld ON pld.Id=line.Id
LEFT JOIN sys_dict_data sdd ON sdd.Id=pld.Line_Grade
WHERE
@@ -46,7 +46,7 @@
WHERE
ptm.State=1
AND
ptm.Time_Id between #{startTime} and #{endTime}
ptm.Time_Id = #{startTime}
<if test="lineGrade!=null and lineGrade!=''">
AND pld.Line_Grade=#{lineGrade}
</if>

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

@@ -399,8 +399,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
@Override
public List<TopMsgPO> dailyDeviceAbnormal(DeviceInfoParam.BusinessParam param) {
List<TopMsgPO> topMsgDetails = topMsgMapper.getTopMsgDetail(param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
List<TopMsgPO> topMsgDetails = topMsgMapper.getTopMsgDetail(param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())));
return topMsgDetails;
}