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

1.灿能云代码调整

Browse Source
This commit is contained in:
wr
2024-01-05 16:06:51 +08:00
parent e214e0e6af
commit e094d93c4e
10 changed files with 78 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java
View File

@@ -328,4 +328,12 @@ public class GeneralDeviceInfoController extends BaseController {
List<TopMsgPO> runLineIds = generalDeviceService.getTopMsgInfoByIds(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getTotalOnlineRates")
@ApiOperation("根据终端id集合获取总终端在线率")
public HttpResult<Float> getTotalOnlineRates(@RequestBody OnlineRateParam param) {
String methodDescribe = getMethodDescribe("getTotalOnlineRates");
Float totalOnlineRates = onlineRateMapper.getTotalOnlineRates(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,totalOnlineRates,methodDescribe);
}
}

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java
View File

@@ -28,4 +28,12 @@ public interface RStatOnlinerateDMapper extends BaseMapper<RStatOnlinerateD> {
* @return List<OnlineRate>
*/
List<RStatOnlinerateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
/**
* @Description: 根据终端id集合获取总终端在线lv
* @param param
* @Author: wr
* @Date: 2024/1/5 13:47
*/
Float getTotalOnlineRates(@Param("param") OnlineRateParam param);
}

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java
View File

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.TopMsgPO;
import com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

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

@@ -215,10 +215,10 @@
GROUP BY r.dev_index
</select>
<select id="selectDevByIds" resultType="com.njcn.device.pq.pojo.vo.DevDetail">
SELECT
SELECT DISTINCT
device.id as devIndex,
gd.NAME as gdName,
substation.NAME as bdzName,
device.id as devIndex,
device.NAME as devName,
lineDetail.Line_Grade AS lineGrade,
deviceDetail.Update_Time AS timeID,
@@ -232,19 +232,19 @@
pq_line gd,
pq_device deviceDetail,
pq_line_detail lineDetail
WHERE
<if test="ids!=null and ids.size()!=0">
device.id IN
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
AND line.pid = voltage.id
AND voltage.pid = device.id
AND device.pid = substation.id
AND substation.pid = gd.id
AND device.id = deviceDetail.id
AND line.id = lineDetail.id
<where>
<if test="ids!=null and ids.size()>0">
device.id IN
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
AND line.pid = voltage.id
AND voltage.pid = device.id
AND device.pid = substation.id
AND substation.pid = gd.id
AND device.id = deviceDetail.id
AND line.id = lineDetail.id
</where>
</select>
</mapper>

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

@@ -1426,12 +1426,12 @@
</select>
<select id="selectByIds" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
SELECT DISTINCT
line.id as lineId,
area.name as areaId,
gd.NAME gdName,
substation.NAME subName,
device.id devId,
device.NAME devName,
line.id as lineId,
line.NAME lineName,
lineDetail.Time_Interval as timeInterval,
lineDetail.PT_Type as ptType,
@@ -1454,7 +1454,7 @@
pq_device deviceDetail,
pq_line_detail lineDetail,
pq_voltage vg
WHERE
<where>
line.pid = voltage.id
AND voltage.pid = device.id
AND device.pid = substation.id
@@ -1463,12 +1463,13 @@
AND device.id = deviceDetail.id
AND line.id = lineDetail.id
AND vg.Id = voltage.id
<if test="ids!=null and ids.size()!=0">
AND line.id IN
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="ids!=null and ids.size() > 0">
AND line.id IN
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

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

@@ -4,7 +4,7 @@
<select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlinerateVO">
select
dev_index,
sum(online_min)/(sum(online_min) + sum(offline_min))*100 as online_rate
ROUND( sum(online_min)/(sum(online_min) + sum(offline_min))*100,2) as online_rate
from r_stat_onlinerate_d
<where>
<if test="param!=null and param.ids != null and param.ids.size > 0">
@@ -22,4 +22,24 @@
</where>
group by dev_index ;
</select>
<select id="getTotalOnlineRates" resultType="java.lang.Float">
select
ROUND( sum(online_min)/(sum(online_min) + sum(offline_min))*100,2) as online_rate
from r_stat_onlinerate_d
<where>
<if test="param!=null and param.ids != null and param.ids.size > 0">
AND dev_index IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test=" param.startTime != null and param.startTime !=''">
AND time_id >= #{param.startTime}
</if>
<if test="param.endTime != null and param.endTime != ''">
AND time_id &lt;= #{param.endTime}
</if>
</where>
</select>
</mapper>

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

@@ -53,7 +53,7 @@
</if>
</select>
<select id="selectByIds" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
SELECT
SELECT DISTINCT
top_id as topId,
dev.Id AS devId,
city.NAME AS cityName,