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

zbj//1.大屏获取暂降事件最新50条数据sql更改 2.资源管理 删除资源/下载资源/修改资源

Browse Source
This commit is contained in:
zhangbaojian
2023-04-19 14:23:25 +08:00
parent 92aceff1e3
commit b4bd03c545
9 changed files with 198 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java
View File

@@ -6,6 +6,7 @@ import com.njcn.device.pq.pojo.vo.EventVO;
import com.njcn.device.pq.pojo.vo.MiddleChildVO;
import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO;
import com.njcn.harmonic.pojo.po.PQSComAssesPO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -16,6 +17,7 @@ import java.util.Map;
* @author: zbj
* @date: 2023/03/31
*/
@Mapper
public interface LargeScreenMapper {
Map<String, Object> selectDownCount(@Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
@@ -24,7 +26,7 @@ public interface LargeScreenMapper {
List<Map<String, Object>> getTimeCount(@Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
List<Map<String, Object>> eventLists(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<EventVO> eventLists(@Param("startTime") String startTime, @Param("endTime") String endTime);
AllDataVO getFlagCount(@Param("lineIds") List<String> lineIds);

35
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
View File

@@ -54,25 +54,7 @@
group by day
</select>
<select id="eventLists" resultType="java.util.Map">
SELECT
ed.create_time "time",pl.`Name` "name",sdd.`Name` reason,sdd.`Name` "type",ed.feature_amplitude amplitude,ed.duration
from r_mp_event_detail ed
left join pq_line pl on pl.id = ed.measurement_point_id
left join sys_dict_data sdd on sdd.id = ed.advance_reason
left join sys_dict_data sdd2 on sdd.id = ed.advance_type
<where>
<if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
</where>
order by time desc
limit 50
</select>
<select id="getFlagCount" resultType="com.njcn.device.pq.pojo.vo.AllDataVO">
select
@@ -363,4 +345,21 @@
</if>
</select>
<select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO">
SELECT
ed.create_time "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
from r_mp_event_detail ed
left join pq_line pl on pl.id = ed.measurement_point_id
<where>
<if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
</where>
order by time desc
limit 50
</select>
</mapper>

15
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
View File

@@ -246,20 +246,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
*/
@Override
public List<EventVO> eventLists(LargeScreenParam largeScreenParam) {
//创建返回VO
List<EventVO> result = new ArrayList<>();
List<Map<String, Object>> maps = largeScreenMapper.eventLists(largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
for (Map<String, Object> map : maps) {
EventVO eventVO = new EventVO();
eventVO.setTime(map.get("time").toString());
eventVO.setName(map.get("name").toString());
eventVO.setReason(map.get("reason").toString());
eventVO.setType(map.get("type").toString());
eventVO.setAmplitude(map.get("amplitude").toString());
eventVO.setDuration(map.get("duration").toString());
result.add(eventVO);
}
return result;
return largeScreenMapper.eventLists(largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
}
/**