From c91b3bdc5125e1f045e0e6db4373d4e884fafaf3 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 13 Aug 2025 10:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=9A=82=E9=99=8D=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/devcie/config/PqlineCache.java | 17 ++- .../gather/event/devcie/job/LineCacheJob.java | 23 +++- .../devcie/mapper/PqDeviceDetailMapper.java | 13 ++ .../event/devcie/mapper/PqDeviceMapper.java | 6 +- .../event/devcie/mapper/PqLineMapper.java | 3 + .../devcie/mapper/mapping/PqDeviceMapper.xml | 31 ++--- .../devcie/mapper/mapping/PqLineMapper.xml | 9 ++ .../event/devcie/pojo/dto/DeviceDTO.java | 9 +- .../event/devcie/pojo/po/PqDeviceDetail.java | 72 ++++++++++ .../gather/event/devcie/pojo/po/PqLine.java | 3 + .../event/devcie/service/PqDeviceService.java | 4 +- .../service/impl/PqDeviceServiceImpl.java | 6 +- .../transientes/filter/JwtRequestFilter.java | 58 ++++---- .../mapper/PqDevicedetailMapper.java | 8 +- .../transientes/mapper/PqsDicDataMapper.java | 14 ++ .../mapper/mapping/PqDevicedetailMapper.xml | 6 +- .../transientes/pojo/po/PqDevicedetail.java | 94 ------------- .../pojo/po/PqDevicedetailaaa.java | 94 +++++++++++++ .../event/transientes/pojo/po/PqsDicData.java | 49 +++++++ .../transientes/security/SecurityConfig.java | 4 +- .../service/PqDevicedetailService.java | 6 +- .../impl/LargeScreenCountServiceImpl.java | 130 +++++++++++++----- .../impl/PqDevicedetailServiceImpl.java | 6 +- 23 files changed, 456 insertions(+), 209 deletions(-) create mode 100644 event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicDataMapper.java delete mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetail.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetailaaa.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicData.java diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java index ec98b916..06b66ed7 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java @@ -1,5 +1,6 @@ package com.njcn.gather.event.devcie.config; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.njcn.gather.event.devcie.mapper.PqLineMapper; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -53,7 +55,20 @@ public class PqlineCache { List deptAndChildren = pqsDeptsService.findDeptAndChildren(pqsDepts.getDeptsIndex()); List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),deptslineIds); + + List result = new ArrayList<>(); + if(CollUtil.isNotEmpty(deptslineIds)){ + if(deptslineIds.size()> 1000 ){ + List> listList = CollUtil.split(deptslineIds,1000); + for(List li : listList){ + List temList = pqLineMapper.getRunMonitorIds(li); + result.addAll(temList); + } + }else { + result= pqLineMapper.getRunMonitorIds(deptslineIds); + } + } + redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),result); } List deptsList = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list(); diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java index af492cdf..e1c1ee04 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java @@ -1,6 +1,8 @@ package com.njcn.gather.event.devcie.job; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.njcn.gather.event.devcie.mapper.PqDeviceMapper; import com.njcn.gather.event.devcie.mapper.PqLineMapper; import com.njcn.gather.event.devcie.pojo.po.PqLine; import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; @@ -15,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -35,8 +38,11 @@ public class LineCacheJob { @Autowired private PqsDeptslineService pqsDeptslineService; @Autowired - private PqsDeptsService pqsDeptsService; + + @Autowired + private PqDeviceMapper pqDeviceMapper; + private final static String NAME_KEY = "LineCache:"; @Value("${SYS_TYPE_ZT}") private String sysTypeZt; @@ -51,7 +57,20 @@ public class LineCacheJob { List deptAndChildren = pqsDeptsService.findDeptAndChildren(pqsDepts.getDeptsIndex()); List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),deptslineIds); + + List result = new ArrayList<>(); + if(CollUtil.isNotEmpty(deptslineIds)){ + if(deptslineIds.size()> 1000 ){ + List> listList = CollUtil.split(deptslineIds,1000); + for(List li : listList){ + List temList = pqLineMapper.getRunMonitorIds(li); + result.addAll(temList); + } + }else { + result= pqLineMapper.getRunMonitorIds(deptslineIds); + } + } + redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),result); } List deptsList = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list(); diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java new file mode 100644 index 00000000..ae5dad90 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java @@ -0,0 +1,13 @@ +package com.njcn.gather.event.devcie.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.gather.event.devcie.pojo.po.PqDeviceDetail; + +/** + * CN_Gather + * + * @author cdf + * @date 2025/8/12 + */ +public interface PqDeviceDetailMapper extends BaseMapper { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java index 2531fc98..1ede3ce2 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * @@ -20,10 +20,10 @@ import java.util.List; public interface PqDeviceMapper extends BaseMapper { List queryListByIds(@Param("ids") List ids); - Page selectDeviceDTOPage(Page pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("devIndexs") List devIndexs, @Param("state") String state); + Page selectDeviceDTOPage(Page pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("devIndexs") List devIndexs); Page queryListByLineIds(Page pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("lineIds") List lineIds); List selectDeviceDept(); -} \ No newline at end of file +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java index 72c937f9..e0c156a4 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java @@ -22,4 +22,7 @@ public interface PqLineMapper extends BaseMapper { List getBaseLedger(@Param("ids")List ids); + + List getRunMonitorIds(@Param("ids")List ids); + } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml index 83ceb7be..f6ffc5a8 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml @@ -24,7 +24,7 @@ - DEV_INDEX, GD_INDEX, SUB_INDEX, "NAME", "STATUS", DEVTYPE, LOGONTIME, UPDATETIME, + DEV_INDEX, GD_INDEX, SUB_INDEX, "NAME", "STATUS", DEVTYPE, LOGONTIME, UPDATETIME, NODE_INDEX, PORTID, DEVFLAG, DEV_SERIES, DEV_KEY, IP, DEVMODEL, CALLFLAG, DATATYPE @@ -61,35 +61,20 @@ pq_device.DevFlag devFlag, pq_device.IP ip, pq_device.status status, - PQ_SUBSTATION.sub_index stationId, - PQ_SUBSTATION.name stationName, - PQ_GDINFORMATION.Name gdName, - PQS_DICDATA.DIC_Name MANUFACTURER_Name, PQ_DEVICEDETAIL.ThisTimeCheck thisTimeCheck, PQ_DEVICEDETAIL.NextTimeCheck nextTimeCheck, - pq_device.LogonTime logonTime + pq_device.LogonTime logonTime, + PQ_DEVICEDETAIL.MANUFACTURER FROM pq_device - LEFT JOIN PQ_SUBSTATION ON pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX - LEFT JOIN PQ_GDINFORMATION ON pq_device.GD_INDEX = PQ_GDINFORMATION.GD_INDEX - LEFT JOIN PQ_DEVICEDETAIL ON PQ_DEVICEDETAIL.dev_index = pq_device.dev_index - LEFT JOIN PQS_DICDATA on PQ_DEVICEDETAIL.MANUFACTURER = PQS_DICDATA.DIC_INDEX - where 1=1 - - AND ( - pq_device.name LIKE '%' || #{searchValue} || '%' - OR PQ_SUBSTATION.name LIKE '%' || #{searchValue} || '%' - OR PQ_GDINFORMATION.Name LIKE '%' || #{searchValue} || '%' - ) - - - and pq_device.status = #{state} - - and pq_device.DEV_INDEX in + inner JOIN PQ_DEVICEDETAIL ON PQ_DEVICEDETAIL.dev_index = pq_device.dev_index + + pq_device.DEV_INDEX in #{item} order by pq_device.updatetime + @@ -193,4 +178,4 @@ AND PQS_DEPTS.DEPTS_INDEX = PQS_DEPTSLINE.DEPTS_INDEX - \ No newline at end of file + diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml index 102ede38..0110d1f5 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml @@ -87,5 +87,14 @@ where 1=1 + + diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java index 35e75dfb..e9c0b6cb 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java @@ -3,6 +3,7 @@ package com.njcn.gather.event.devcie.pojo.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -25,11 +26,11 @@ public class DeviceDTO { private String ip; private String manufacturerName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime thisTimeCheck; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate thisTimeCheck; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime nextTimeCheck; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate nextTimeCheck; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime logonTime; diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java new file mode 100644 index 00000000..4f90719d --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java @@ -0,0 +1,72 @@ +package com.njcn.gather.event.devcie.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Date; + +/** + * CN_Gather + * + * @author cdf + * @date 2025/8/12 + */ +@TableName(value = "PQ_DEVICEDETAIL") +@Data +public class PqDeviceDetail { + + + @TableId + @TableField(value = "DEV_INDEX") + private Long devIndex; + + @TableField(value = "Manufacturer") + private String manufacturer; + + @TableField(value = "CheckFlag") + private Long checkFlag; + + @TableField(value="ThisTimeCheck") + private LocalDate ThisTimeCheck; + + @TableField(value="NextTimeCheck") + private LocalDate NextTimeCheck; + + @TableField(value="DATAPLAN") + private Long dataplan; + + @TableField(value="NEWTRAFFIC") + private Long newtraffic; + + + @TableField(value = "electroplate") + private Integer electroplate = 0; + + @TableField(value = "ONTIME") + private Integer ontime; + @TableField(value = "contract") + private String contract; + + @TableField(value = "DEV_CATENA") + private String devCatnea; + + @TableField(value = "SIM") + private String sim; + + @TableField(value = "DEV_NO") + private String devNo; + + @TableField(value = "DEV_LOCATION") + private String devLocation; + + @TableField(value = "IS_ALARM") + private Integer isAlarm; + + + + + } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java index 04201957..735a97b1 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java @@ -127,4 +127,7 @@ public class PqLine { @TableField(exist = false) private String subName; + + @TableField(exist = false) + private String deptName; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java index 537a59ca..3ca08c6f 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * @@ -20,7 +20,7 @@ public interface PqDeviceService extends IService{ List queryListByIds(List lineIds); - Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, String state); + Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs); List selectDeviceDept(); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java index 8f44a38c..f358591d 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java @@ -11,7 +11,7 @@ import com.njcn.gather.event.devcie.pojo.po.PqDevice; import com.njcn.gather.event.devcie.mapper.PqDeviceMapper; import com.njcn.gather.event.devcie.service.PqDeviceService; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * @@ -27,8 +27,8 @@ public class PqDeviceServiceImpl extends ServiceImpl i } @Override - public Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, String state) { - return this.baseMapper.selectDeviceDTOPage(pqsEventdetailPage,searchValue,devIndexs,state); + public Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs) { + return this.baseMapper.selectDeviceDTOPage(pqsEventdetailPage,searchValue,devIndexs); } @Override diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java index eae599a2..804bf34b 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java @@ -36,35 +36,35 @@ public class JwtRequestFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { - /* final String authorizationHeader = request.getHeader("Authorization"); - String username = null; - String jwt = null; - if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { - jwt = authorizationHeader.substring(7); - try { - username = jwtUtil.extractUsername(jwt); - } catch (ExpiredJwtException e) { - log.error(e.getMessage()); - sendErrorResponse(response,CommonResponseEnum.TOKEN_EXPIRE_JWT); - return; - } catch (Exception e) { - log.error(e.getMessage()); - sendErrorResponse(response,CommonResponseEnum.PARSE_TOKEN_ERROR); - return; - } - } - - if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { - UserDetails userDetails = this.userDetailsService.loadUserByUsername(username); - - if (jwtUtil.validateToken(jwt, userDetails)) { - UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = - new UsernamePasswordAuthenticationToken( - userDetails, null, userDetails.getAuthorities()); - usernamePasswordAuthenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); - SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken); - } - }*/ +// final String authorizationHeader = request.getHeader("Authorization"); +// String username = null; +// String jwt = null; +// if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { +// jwt = authorizationHeader.substring(7); +// try { +// username = jwtUtil.extractUsername(jwt); +// } catch (ExpiredJwtException e) { +// log.error(e.getMessage()); +// sendErrorResponse(response,CommonResponseEnum.TOKEN_EXPIRE_JWT); +// return; +// } catch (Exception e) { +// log.error(e.getMessage()); +// sendErrorResponse(response,CommonResponseEnum.PARSE_TOKEN_ERROR); +// return; +// } +// } +// +// if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { +// UserDetails userDetails = this.userDetailsService.loadUserByUsername(username); +// +// if (jwtUtil.validateToken(jwt, userDetails)) { +// UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = +// new UsernamePasswordAuthenticationToken( +// userDetails, null, userDetails.getAuthorities()); +// usernamePasswordAuthenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); +// SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken); +// } +// } chain.doFilter(request, response); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqDevicedetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqDevicedetailMapper.java index 1a357cd7..d3f14b43 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqDevicedetailMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqDevicedetailMapper.java @@ -1,15 +1,15 @@ package com.njcn.gather.event.transientes.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqDevicedetail; +import com.njcn.gather.event.devcie.pojo.po.PqDeviceDetail; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * * @author clam * @version V1.0.0 */ -public interface PqDevicedetailMapper extends BaseMapper { -} \ No newline at end of file +public interface PqDevicedetailMapper extends BaseMapper { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicDataMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicDataMapper.java new file mode 100644 index 00000000..fff0503a --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicDataMapper.java @@ -0,0 +1,14 @@ +package com.njcn.gather.event.transientes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.gather.event.transientes.pojo.po.PqsDicData; +import com.njcn.gather.event.transientes.pojo.po.PqsDicTreePO; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +public interface PqsDicDataMapper extends BaseMapper { + + +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqDevicedetailMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqDevicedetailMapper.xml index 8fac38ca..1eb65317 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqDevicedetailMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqDevicedetailMapper.xml @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ - DEV_INDEX, MANUFACTURER, CHECKFLAG, THISTIMECHECK, NEXTTIMECHECK, ONLINERATETJ, DATAPLAN, + DEV_INDEX, MANUFACTURER, CHECKFLAG, THISTIMECHECK, NEXTTIMECHECK, ONLINERATETJ, DATAPLAN, NEWTRAFFIC, ELECTROPLATE, ONTIME, CONTRACT, SIM, DEV_CATENA, DEV_LOCATION, DEV_NO - \ No newline at end of file + diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetail.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetail.java deleted file mode 100644 index a2852c06..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetail.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:47【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -/** - * 靠靠靠? - */ -@Data -@NoArgsConstructor -@TableName(value = "PQ_DEVICEDETAIL") -public class PqDevicedetail { - /** - * 靠靠 - */ - @TableId(value = "DEV_INDEX", type = IdType.INPUT) - private Integer devIndex; - - /** - * (靠PQS_Dicdata)靠靠縂uid - */ - @TableField(value = "MANUFACTURER") - private String manufacturer; - - /** - * 靠靠(0:靠 1:靠) - */ - @TableField(value = "CHECKFLAG") - private Integer checkflag; - - /** - * 靠靠靠 - */ - @TableField(value = "THISTIMECHECK") - private LocalDateTime thistimecheck; - - /** - * 靠靠靠(靠靠靠靠靠3靠靠靠靠靠靠靠) - */ - @TableField(value = "NEXTTIMECHECK") - private LocalDateTime nexttimecheck; - - /** - * 靠靠靠? - */ - @TableField(value = "ONLINERATETJ") - private Integer onlineratetj; - - @TableField(value = "DATAPLAN") - private Integer dataplan; - - @TableField(value = "NEWTRAFFIC") - private Integer newtraffic; - - @TableField(value = "ELECTROPLATE") - private Integer electroplate; - - @TableField(value = "ONTIME") - private Integer ontime; - - /** - * 合同 - */ - @TableField(value = "CONTRACT") - private String contract; - - /** - * sim卡号 - */ - @TableField(value = "SIM") - private String sim; - - @TableField(value = "DEV_CATENA") - private String devCatena; - - @TableField(value = "DEV_LOCATION") - private String devLocation; - - @TableField(value = "DEV_NO") - private String devNo; -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetailaaa.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetailaaa.java new file mode 100644 index 00000000..5cff653f --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetailaaa.java @@ -0,0 +1,94 @@ +//package com.njcn.gather.event.transientes.pojo.po; +// +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableField; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import java.time.LocalDateTime; +//import lombok.Data; +//import lombok.NoArgsConstructor; +// +///** +// * +// * Description: +// * Date: 2025/06/19 下午 1:47【需求编号】 +// * +// * @author clam +// * @version V1.0.0 +// */ +///** +// * 靠靠靠? +// */ +//@Data +//@NoArgsConstructor +//@TableName(value = "PQ_DEVICEDETAIL") +//public class PqDevicedetail { +// /** +// * 靠靠 +// */ +// @TableId(value = "DEV_INDEX", type = IdType.INPUT) +// private Integer devIndex; +// +// /** +// * (靠PQS_Dicdata)靠靠縂uid +// */ +// @TableField(value = "MANUFACTURER") +// private String manufacturer; +// +// /** +// * 靠靠(0:靠 1:靠) +// */ +// @TableField(value = "CHECKFLAG") +// private Integer checkflag; +// +// /** +// * 靠靠靠 +// */ +// @TableField(value = "THISTIMECHECK") +// private LocalDateTime thistimecheck; +// +// /** +// * 靠靠靠(靠靠靠靠靠3靠靠靠靠靠靠靠) +// */ +// @TableField(value = "NEXTTIMECHECK") +// private LocalDateTime nexttimecheck; +// +// /** +// * 靠靠靠? +// */ +// @TableField(value = "ONLINERATETJ") +// private Integer onlineratetj; +// +// @TableField(value = "DATAPLAN") +// private Integer dataplan; +// +// @TableField(value = "NEWTRAFFIC") +// private Integer newtraffic; +// +// @TableField(value = "ELECTROPLATE") +// private Integer electroplate; +// +// @TableField(value = "ONTIME") +// private Integer ontime; +// +// /** +// * 合同 +// */ +// @TableField(value = "CONTRACT") +// private String contract; +// +// /** +// * sim卡号 +// */ +// @TableField(value = "SIM") +// private String sim; +// +// @TableField(value = "DEV_CATENA") +// private String devCatena; +// +// @TableField(value = "DEV_LOCATION") +// private String devLocation; +// +// @TableField(value = "DEV_NO") +// private String devNo; +//} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicData.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicData.java new file mode 100644 index 00000000..ce39cde0 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicData.java @@ -0,0 +1,49 @@ +package com.njcn.gather.event.transientes.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * CN_Gather + * + * @author cdf + * @date 2025/8/12 + */ +@TableName(value = "PQS_DICDATA") +@Data +public class PqsDicData { + + @TableId + @TableField(value = "DIC_INDEX") + private String dicIndex; + + @TableField(value = "DIC_NAME") + private String dicName; + + @TableField(value = "DIC_TYPE") + private String dicType; + + @TableField(value = "DIC_NUMBER") + private Integer dicNumber; + + @TableField(value = "UPDATETIME") + private Date updateTime; + + @TableField(value = "USER_INDEX") + private String userIndex; + + //事件等级 + @TableField(value = "DIC_LEAVE") + private Integer dicLeave; + + @TableField(value = "STATE") + private Integer state; + @TableField(value = "TRIPHASE") + private Integer triphase; + + @TableField(value = "BACK_UP") + private String backUp;} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java index 53f44113..af6fd6f8 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java @@ -34,14 +34,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() .authorizeRequests() - .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent").permitAll() // 允许访问认证接口 +// .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent").permitAll() // 允许访问认证接口 .antMatchers("/**").permitAll() // 允许访问认证接口 .anyRequest().authenticated() .and() .sessionManagement() .sessionCreationPolicy(SessionCreationPolicy.STATELESS); // 使用无状态会话 - //http.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class); +// http.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class); } @Bean diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqDevicedetailService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqDevicedetailService.java index f5f37789..36d6af69 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqDevicedetailService.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqDevicedetailService.java @@ -1,16 +1,16 @@ package com.njcn.gather.event.transientes.service; -import com.njcn.gather.event.transientes.pojo.po.PqDevicedetail; +import com.njcn.gather.event.devcie.pojo.po.PqDeviceDetail; import com.baomidou.mybatisplus.extension.service.IService; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * * @author clam * @version V1.0.0 */ -public interface PqDevicedetailService extends IService{ +public interface PqDevicedetailService extends IService{ } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 8df1ee1a..f4371bfb 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -15,15 +15,10 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.gather.event.devcie.config.PqlineCache; -import com.njcn.gather.event.devcie.mapper.PqLineMapper; -import com.njcn.gather.event.devcie.mapper.PqLinedetailMapper; -import com.njcn.gather.event.devcie.mapper.PqsStationMapMapper; +import com.njcn.gather.event.devcie.mapper.*; import com.njcn.gather.event.devcie.pojo.dto.*; import com.njcn.gather.event.devcie.pojo.po.*; -import com.njcn.gather.event.transientes.mapper.PqUserLedgerMapper; -import com.njcn.gather.event.transientes.mapper.PqUserLineAssMapper; -import com.njcn.gather.event.transientes.mapper.PqsIntegrityMapper; -import com.njcn.gather.event.transientes.mapper.PqsOnlinerateMapper; +import com.njcn.gather.event.transientes.mapper.*; import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; import com.njcn.gather.event.transientes.pojo.param.MessageEventFeedbackParam; import com.njcn.gather.event.transientes.pojo.po.PqsDepts; @@ -96,6 +91,14 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { private final PqsStationMapMapper pqsStationMapMapper; + private final PqsDicDataMapper pqsDicDataMapper; + + private final PqGdCompanyMapper pqGdCompanyMapper; + + private final PqSubstationMapper pqSubstationMapper; + + private final PqDeviceDetailMapper pqDeviceDetailMapper; + @Value("${SYS_TYPE_ZT}") private String sysTypeZt; private final static String NAME_KEY = "LineCache:"; @@ -1182,29 +1185,48 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).distinct().collect(Collectors.toList()); log.info("完成从redis获取信息："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); //在运总数 - List pqDeviceList = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devIndexs) - .eq(PqDevice::getDevflag, 0).list(); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if(StrUtil.isNotBlank(largeScreenCountParam.getState())){ + lambdaQueryWrapper.eq(PqDevice::getStatus,Integer.valueOf(largeScreenCountParam.getState())); + } + if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ + lambdaQueryWrapper.eq(StrUtil.isNotEmpty(largeScreenCountParam.getSearchValue()),PqDevice::getName,largeScreenCountParam.getSearchValue()); + } + lambdaQueryWrapper.in(PqDevice::getDevIndex, devIndexs); + + List pqDeviceList = pqDeviceService.list(lambdaQueryWrapper); + log.info("完成设备查询sql："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); List runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); - List deviceDeptDTOS= pqDeviceService.selectDeviceDept(); - Map deviceDeptMap = deviceDeptDTOS.stream() - .collect(Collectors.toMap( - DeviceDeptDTO::getDevId, // key mapper - DeviceDeptDTO::getDeptName, // value mapper - (value1, value2 )->{ - return value2; - } - )); + + + List pqsDicDataList = pqsDicDataMapper.selectList(new LambdaQueryWrapper().eq(PqsDicData::getDicType,"cbb2de8a-87da-4ae9-a35c-aaab999c7bc7")); + Map pqsDicDataMap = pqsDicDataList.stream().collect(Collectors.toMap(PqsDicData::getDicIndex,Function.identity())); + + List gdList = new ArrayList<>(); + List bdList = new ArrayList<>(); + if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ + List pqGdCompanyList = pqGdCompanyMapper.selectList(new LambdaQueryWrapper().like(PqGdCompany::getName,largeScreenCountParam.getSearchValue())); + gdList = pqGdCompanyList.stream().map(PqGdCompany::getGdIndex).collect(Collectors.toList()); + List substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper().like(PqSubstation::getName,largeScreenCountParam.getSearchValue())); + bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList()); + } + if(CollUtil.isNotEmpty(runDevList)||CollUtil.isNotEmpty(gdList)||CollUtil.isNotEmpty(bdList)){ + return new Page<>(); + } + Page page = pqDeviceService.lambdaQuery().in(PqDevice::getGdIndex,gdList).in(PqDevice::getSubIndex,bdList) + .in(PqDevice::getDevIndex,runDevList).page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam))); log.info("完成设备部门查询："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList,largeScreenCountParam.getState()); + // pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList); log.info("完成设备分页查询sql："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - List deviceDTOList = pqsEventdetailPage.getRecords(); + List deviceDTOList = page.getRecords(); if(!CollectionUtils.isEmpty(deviceDTOList)){ - List devIds = deviceDTOList.stream().map(DeviceDTO::getDevId).collect(Collectors.toList()); + List devIds = deviceDTOList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); log.info("在线率查询sql开始："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - List list = pqsOnlinerateService.lambdaQuery().in(PqsOnlinerate::getDevIndex,devIds).between(PqsOnlinerate::getTimeid, startTime, endTime).list(); + List onlineList = pqsOnlinerateService.lambdaQuery().in(PqsOnlinerate::getDevIndex,devIds).between(PqsOnlinerate::getTimeid, startTime, endTime).list(); log.info("在线率查询sql结束："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); List inteList = pqLineList.stream().filter(it->devIds.contains(it.getDevIndex())).collect(Collectors.toList()); @@ -1215,29 +1237,71 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { log.info("完整性查询sql开始："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); List pqsIntegrityList = pqsIntegrityMapper.selectList(new LambdaQueryWrapper().in(PqsIntegrity::getLineIndex,inteIds).between(PqsIntegrity::getTimeID, startTime, endTime)); log.info("完整性查询sql结束："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - lineMap.forEach((dev,lineList)->{ - double rate = pqsIntegrityList.stream().filter(it->lineList.contains(it.getLineIndex())).mapToDouble(it->it.getReal()*1.0/(it.getDue()+it.getReal())).average().orElse(0.0); + double rate = pqsIntegrityList.stream().filter(it->lineList.contains(it.getLineIndex())).mapToDouble(it->it.getReal()*1.0/(it.getDue())).average().orElse(0.0); inteDevMap.put(dev,rate); }); + List deviceDetailList = pqDeviceDetailMapper.selectList(new LambdaQueryWrapper().in(PqDeviceDetail::getDevIndex,devIds)); + Map devMap = deviceDetailList.stream().collect(Collectors.toMap(PqDeviceDetail::getDevIndex,Function.identity())); - for (DeviceDTO record : pqsEventdetailPage.getRecords()) { - record.setDeptName(deviceDeptMap.get(record.getDevId())); - List tempList = list.stream().filter(temp -> Objects.equals(temp.getDevIndex(), record.getDevId())).collect(Collectors.toList()); + List gdIds = deviceDTOList.stream().map(PqDevice::getGdIndex).collect(Collectors.toList()); + List pqGdCompanyList = pqGdCompanyMapper.selectList(new LambdaQueryWrapper().in(PqGdCompany::getGdIndex,gdIds)); + Map gdMap = pqGdCompanyList.stream().collect(Collectors.toMap(PqGdCompany::getGdIndex,Function.identity())); + + List bdIds = deviceDTOList.stream().map(PqDevice::getSubIndex).collect(Collectors.toList()); + List substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper().in(PqSubstation::getSubIndex,bdIds)); + Map bdMap = substationList.stream().collect(Collectors.toMap(PqSubstation::getSubIndex,Function.identity())); + + List lineList = pqLineList.stream().filter(it->devIds.contains(it.getDevIndex())).collect(Collectors.toList()); + List deptslineList = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getLineIndex,lineList.stream().map(PqLine::getLineIndex).collect(Collectors.toList())).eq(PqsDeptsline::getSystype,sysTypeZt).list(); + + Map pqsDeptsMap = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list().stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex,Function.identity())); + + Map map = deptslineList.stream().collect(Collectors.toMap(PqsDeptsline::getLineIndex,Function.identity())); + Map temMap = new HashMap<>(); + map.forEach((lineId,deptline)->{ + String deptName = pqsDeptsMap.get(deptline.getDeptsIndex()).getDeptsname(); + temMap.put(lineId,deptName); + }); + + lineList.forEach(it->it.setDeptName(temMap.get(it.getLineIndex()))); + Map> pqLineMap = lineList.stream().collect(Collectors.groupingBy(PqLine::getDevIndex)); + + List result = new ArrayList<>(); + for(PqDevice pqDevice : deviceDTOList){ + DeviceDTO dto = new DeviceDTO(); + dto.setDevId(pqDevice.getDevIndex()); + dto.setDevName(pqDevice.getName()); + dto.setIp(pqDevice.getIp()); + List tempList = onlineList.stream().filter(temp -> Objects.equals(temp.getDevIndex(), pqDevice.getDevIndex())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(tempList)){ - double asDouble = tempList.stream().mapToDouble(temp -> { - return Double.valueOf(temp.getOnlinemin()*100) / (temp.getOfflinemin() + temp.getOnlinemin()); - }).average().getAsDouble(); - record.setOnLineRate(new BigDecimal(asDouble).setScale(2, RoundingMode.UP).doubleValue()); - record.setIntegrityRate(inteDevMap.containsKey(record.getDevId())? new BigDecimal(inteDevMap.get(record.getDevId())*100).setScale(2,RoundingMode.UP).doubleValue():0); + double asDouble = tempList.stream().mapToDouble(temp -> (double) (temp.getOnlinemin() * 100) / (temp.getOfflinemin() + temp.getOnlinemin())).average().getAsDouble(); + dto.setOnLineRate(new BigDecimal(asDouble).setScale(2, RoundingMode.UP).doubleValue()); } + dto.setIntegrityRate(inteDevMap.containsKey(pqDevice.getDevIndex())? BigDecimal.valueOf(inteDevMap.get(pqDevice.getDevIndex()) * 100).setScale(2,RoundingMode.UP).doubleValue():0); + + PqDeviceDetail pqDeviceDetail = devMap.get(pqDevice.getDevIndex().longValue()); + dto.setManufacturerName(pqDeviceDetail.getManufacturer()); + dto.setStatus(pqDevice.getStatus()); + dto.setRunFlag(pqDevice.getStatus()); + dto.setThisTimeCheck(pqDeviceDetail.getThisTimeCheck()); + dto.setNextTimeCheck(pqDeviceDetail.getNextTimeCheck()); + dto.setUpdateTime(pqDevice.getUpdatetime()); + dto.setGdName(gdMap.get(pqDevice.getGdIndex().longValue()).getName()); + dto.setStationName(bdMap.get(pqDevice.getSubIndex()).getName()); + dto.setLogonTime(pqDevice.getLogontime()); + dto.setDeptName(pqLineMap.get(pqDevice.getDevIndex()).get(0).getDeptName()); + + dto.setManufacturerName(pqsDicDataMap.get(pqDeviceDetail.getManufacturer()).getDicName()); + result.add(dto); } + pqsEventdetailPage.setRecords(result); + pqsEventdetailPage.setTotal(page.getTotal()); } log.info("所有程序结束："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - return pqsEventdetailPage; } /* @Override diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqDevicedetailServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqDevicedetailServiceImpl.java index 0d82d68b..a8f10bb3 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqDevicedetailServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqDevicedetailServiceImpl.java @@ -1,12 +1,12 @@ package com.njcn.gather.event.transientes.service.impl; +import com.njcn.gather.event.devcie.pojo.po.PqDeviceDetail; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.pojo.po.PqDevicedetail; import com.njcn.gather.event.transientes.mapper.PqDevicedetailMapper; import com.njcn.gather.event.transientes.service.PqDevicedetailService; /** - * + * * Description: * Date: 2025/06/19 下午 1:47【需求编号】 * @@ -14,6 +14,6 @@ import com.njcn.gather.event.transientes.service.PqDevicedetailService; * @version V1.0.0 */ @Service -public class PqDevicedetailServiceImpl extends ServiceImpl implements PqDevicedetailService{ +public class PqDevicedetailServiceImpl extends ServiceImpl implements PqDevicedetailService{ }