diff --git a/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java b/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java index 91290ce0..f68986e1 100644 --- a/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java +++ b/detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java @@ -31,6 +31,7 @@ public enum BaseReportKeyEnum { DAY("day","日"), YEAR_MONTH_DAY("year-month-day","年-月-日"), REPORT_DATE("reportDate","年-月-日"), + GD_NAME("gdName","供电部门"), SUB_NAME("subName","变电站"), CHECK_BY("checkBy","检测人"), AUDIT_BY("auditBy","负责人、审核人"), diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index 1e6d3837..f89112d9 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -2010,6 +2010,8 @@ public class PqReportServiceImpl extends ServiceImpl i baseModelMap.put(BaseReportKeyEnum.SAMPLE_ID.getKey(), StrUtil.isEmpty(pqDevVO.getName()) ? StrPool.TAB : pqDevVO.getName()); // 报告日期 baseModelMap.put(BaseReportKeyEnum.REPORT_DATE.getKey(), DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN)); + // 供电部门 + baseModelMap.put(BaseReportKeyEnum.GD_NAME.getKey(), pqDevVO.getGdName()); // 变电站名称 baseModelMap.put(BaseReportKeyEnum.SUB_NAME.getKey(), pqDevVO.getSubName()); // 检测人 diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index a3ce2ac7..9629b77d 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -1993,7 +1993,6 @@ public class ResultServiceImpl implements IResultService { String resultTemp = singlePhaseData.get(ItemReportKeyEnum.RESULT.getKey()); if (StrUtil.isNotBlank(resultTemp)) { allResult.add(resultTemp); - // 收集特殊情况 if ("无法比较".equals(resultTemp)) { String numOfDataStr = singlePhaseData.get(ItemReportKeyEnum.NUM_OF_DATA.getKey()); @@ -2440,10 +2439,13 @@ public class ResultServiceImpl implements IResultService { } dataMap.put(ItemReportKeyEnum.TEST.getKey(), testValue); + // 误差 - 根据参数决定是否格式化 String errorValue = String.valueOf(detectionData.getErrorData()); - if (decimalPlaces != null && detectionData.getErrorData() != null) { + if (decimalPlaces != null && detectionData.getErrorData() != null ) { errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces); + }else{ + errorValue = "/"; } dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue); @@ -2451,6 +2453,8 @@ public class ResultServiceImpl implements IResultService { String errorScope = String.valueOf(detectionData.getRadius()); if (decimalPlaces != null && detectionData.getRadius() != null) { errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces); + }else{ + errorScope = "/"; } dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope); @@ -2573,6 +2577,8 @@ public class ResultServiceImpl implements IResultService { String errorValue = String.valueOf(detectionData.getErrorData()); if (decimalPlaces != null && detectionData.getErrorData() != null) { errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces); + }else{ + errorValue = "/"; } dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue); @@ -2580,6 +2586,8 @@ public class ResultServiceImpl implements IResultService { String errorScope = String.valueOf(detectionData.getRadius()); if (decimalPlaces != null && detectionData.getRadius() != null) { errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces); + }else{ + errorScope = "/"; } dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope); diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index e07a1902..632165dd 100644 --- a/entrance/src/main/resources/application.yml +++ b/entrance/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.1.24:13306/pqs9100_client1?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.1.24:13306/pqs91002?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true username: root password: njcnpqs # url: jdbc:mysql://localhost:3306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT diff --git a/event_smart/.gitignore b/event_smart/.gitignore deleted file mode 100644 index 549e00a2..00000000 --- a/event_smart/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/event_smart/pom.xml b/event_smart/pom.xml deleted file mode 100644 index 4081d6ae..00000000 --- a/event_smart/pom.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - 4.0.0 - - com.njcn.gather - CN_Gather - 1.0.0 - - - event_smart - - - - - com.njcn - njcn-common - 0.0.1 - - - - com.njcn - common-redis - 1.0.0 - - - - - - - org.springframework.boot - spring-boot-starter-websocket - 2.7.12 - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - 3.5.1 - - - - - com.njcn - spingboot2.3.12 - 2.3.12 - - - - com.njcn - mybatis-plus - 0.0.1 - - - - - com.oracle.database.jdbc - ojdbc8 - 21.6.0.0 - - - com.oracle.database.nls - orai18n - 21.1.0.0 - - - - - org.springframework.boot - spring-boot-starter-security - - - - - io.jsonwebtoken - jjwt-api - 0.11.5 - - - io.jsonwebtoken - jjwt-impl - 0.11.5 - runtime - - - io.jsonwebtoken - jjwt-jackson - 0.11.5 - runtime - - - - com.njcn - common-event - 1.0.0 - - - common-microservice - com.njcn - - - common-web - com.njcn - - - - - - com.google.guava - guava - 32.1.3-jre - - - - - - - - event_smart - - - org.springframework.boot - spring-boot-maven-plugin - - - package - - repackage - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - - src/main/resources - - **/* - - - - src/main/java - - **/*.xml - - - - - - - diff --git a/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java b/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java deleted file mode 100644 index c6746a64..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.event; - -import com.njcn.event.file.component.WavePicComponent; -import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; - -@Slf4j -@SpringBootApplication(scanBasePackages = "com.njcn") -//@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = WavePicComponent.class)) -@MapperScan("com.njcn.**.mapper") -public class EventSmartApplication { - - public static void main(String[] args) { - SpringApplication.run(EventSmartApplication.class, args); - } - -} 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 deleted file mode 100644 index 06b66ed7..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java +++ /dev/null @@ -1,84 +0,0 @@ -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; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.njcn.gather.event.transientes.service.PqsDeptsService; -import com.njcn.redis.utils.RedisUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -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; - -/** - * Description: - * Date: 2025/07/28 上午 9:32【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Component -@Slf4j -public class PqlineCache { - @Autowired - private PqLineMapper pqLineMapper; - @Autowired - private RedisUtil redisUtil; - @Autowired - private PqsDeptslineService pqsDeptslineService; - @Autowired - - private PqsDeptsService pqsDeptsService; - private final static String NAME_KEY = "LineCache:"; - @Value("${SYS_TYPE_ZT}") - private String sysTypeZt; - @PostConstruct - public void init() { - log.info("系统启动中。。。加载pqline"); - List pqLines = pqLineMapper.selectList(null); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"pqLineList",pqLines); - List list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState, 1).list(); - for (PqsDepts pqsDepts : list) { - 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()); - - 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(); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"AllDept",deptsList); - } - - @PreDestroy - public void destroy() { - log.info("系统运行结束"); - redisUtil.deleteKeysByString(NAME_KEY); - } - -} 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 deleted file mode 100644 index e1c1ee04..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java +++ /dev/null @@ -1,80 +0,0 @@ -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; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.njcn.gather.event.transientes.service.PqsDeptsService; -import com.njcn.redis.utils.RedisUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -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; - -/** - * Description: - * Date: 2025/08/05 上午 10:17【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Component -@EnableScheduling -public class LineCacheJob { - @Autowired - private PqLineMapper pqLineMapper; - @Autowired - private RedisUtil redisUtil; - @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; - @Scheduled(cron="0 0 1 * * ?" ) // 每3钟执行一次 - public void lineCache(){ - redisUtil.deleteKeysByString(NAME_KEY); - - List pqLines = pqLineMapper.selectList(null); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"pqLineList",pqLines); - List list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState, 1).list(); - for (PqsDepts pqsDepts : list) { - 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()); - - 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(); - redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"AllDept",deptsList); - - } -} 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 deleted file mode 100644 index ae5dad90..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 1ede3ce2..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO; -import com.njcn.gather.event.devcie.pojo.po.PqDevice; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:47【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqDeviceMapper extends BaseMapper { - List queryListByIds(@Param("ids") List ids); - - 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(); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqGdCompanyMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqGdCompanyMapper.java deleted file mode 100644 index 2142505e..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqGdCompanyMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO; -import com.njcn.gather.event.devcie.pojo.po.PqGdCompany; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:48【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqGdCompanyMapper extends BaseMapper { - -} 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 deleted file mode 100644 index c6c10758..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:43【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqLineMapper extends BaseMapper { - - List getBaseLineInfo(@Param("ids")List ids); - - - List getBaseLedger(@Param("ids")List ids,@Param("searchValue")String searchValue); - - - List getRunMonitorIds(@Param("ids")List ids); - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLinedetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLinedetailMapper.java deleted file mode 100644 index 4f5f06d4..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLinedetailMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.po.PqLinedetail; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface PqLinedetailMapper extends BaseMapper { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqSubstationMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqSubstationMapper.java deleted file mode 100644 index bb0b22af..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqSubstationMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:48【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqSubstationMapper extends BaseMapper { - List queryListByIds(@Param("ids")List ids); -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqsStationMapMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqsStationMapMapper.java deleted file mode 100644 index 969cce23..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqsStationMapMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.event.devcie.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.pojo.po.PqsStationMap; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:43【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsStationMapMapper extends BaseMapper { - - -} 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 deleted file mode 100644 index f6ffc5a8..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - DEV_INDEX, GD_INDEX, SUB_INDEX, "NAME", "STATUS", DEVTYPE, LOGONTIME, UPDATETIME, - NODE_INDEX, PORTID, DEVFLAG, DEV_SERIES, DEV_KEY, IP, DEVMODEL, CALLFLAG, DATATYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index f8a35416..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - LINE_INDEX, GD_INDEX, SUB_INDEX, SUBV_INDEX, DEV_INDEX, "NAME", PT1, PT2, CT1, CT2, - DEVCMP, DLCMP, JZCMP, XYCMP, SUBV_NO, "SCALE", SUBV_NAME - - - - - - - - - - - - diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqSubstationMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqSubstationMapper.xml deleted file mode 100644 index b48f14dd..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqSubstationMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - SUB_INDEX, GD_INDEX, "NAME", "SCALE" - - - - \ No newline at end of file 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 deleted file mode 100644 index e9c0b6cb..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -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; - -/** - * Description: - * Date: 2025/06/27 下午 3:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class DeviceDTO { - private Integer devId; - private String devName; - private Integer stationId; - private String stationName; - private String gdName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - private String devFlag; - private String ip; - private String manufacturerName; - - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate thisTimeCheck; - - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate nextTimeCheck; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime logonTime; - - private String deptName; - //通讯状态 - private Integer runFlag=0; - //装置通讯状态(0:中断;1:正常) - private Integer status; - private double onLineRate=0.00; - private double integrityRate = 0.00; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDeptDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDeptDTO.java deleted file mode 100644 index 6ff622c9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDeptDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.devcie.pojo.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2025/06/27 下午 3:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class DeviceDeptDTO { - private Integer devId; - private String deptId; - private String deptName; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java deleted file mode 100644 index 3c83a84e..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.njcn.gather.event.devcie.pojo.dto; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @Author: cdf - * @CreateTime: 2025-06-25 - * @Description: - */ -@Data -public class LedgerBaseInfoDTO { - private String gdName; - private String gdIndex; - - private Integer lineId; - - private String lineName; - - private Integer busBarId; - - private String busBarName; - - private Integer devId; - - private String devName; - - private String objName; - - private Integer stationId; - - private String stationName; - //通讯状态 - private Integer runFlag=0; - - private Integer eventCount; - - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/PqsDeptDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/PqsDeptDTO.java deleted file mode 100644 index 7d4a0e6b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/PqsDeptDTO.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.njcn.gather.event.devcie.pojo.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2025/07/29 下午 3:15【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class PqsDeptDTO { - /** - * 部门表Guid - */ - private String deptsIndex; - - /** - * 部门名称 - */ - - private String deptsname; - - /** - * 排序 - */ - - private Integer deptsDesc; - - /** - * (关联表PQS_User)用户表Guid - */ - - private String userIndex; - - /** - * 更新时间 - */ - - private LocalDateTime updatetime; - - /** - * 部门描述 - */ - - private String deptsDescription; - - /** - * 角色状态0:删除;1:正常; - */ - - private Integer state; - - /** - * 行政区域 - */ - - private String area; - - private String areaName; - - - private Integer customDept; - - - private String parentnodeid; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/SubstationDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/SubstationDTO.java deleted file mode 100644 index 8023e860..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/SubstationDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.event.devcie.pojo.dto; - -import lombok.Data; - -/** - * Description: - * Date: 2025/06/27 下午 3:37【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class SubstationDTO { - - private Integer stationId; - private String stationName; - private String gdName; - private double longitude; - private double latitude; - private Integer runFlag=0;; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDevice.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDevice.java deleted file mode 100644 index e3e1411b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDevice.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.njcn.gather.event.devcie.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_DEVICE") -public class PqDevice { - /** - * 靠靠 - */ - @TableId(value = "DEV_INDEX", type = IdType.INPUT) - private Integer devIndex; - - /** - * 靠靠靠 - */ - @TableField(value = "GD_INDEX") - private Integer gdIndex; - - /** - * 靠靠? - */ - @TableField(value = "SUB_INDEX") - private Integer subIndex; - - /** - * 靠靠 - */ - @TableField(value = "\"NAME\"") - private String name; - - /** - * 靠靠靠(0:靠;1:靠) - */ - @TableField(value = "\"STATUS\"") - private Integer status; - - /** - * (靠縋QS_Dicdata)靠靠Guid - */ - @TableField(value = "DEVTYPE") - private String devtype; - - /** - * 靠靠 - */ - @TableField(value = "LOGONTIME") - private LocalDateTime logontime; - - /** - * 靠靠靠 - */ - @TableField(value = "UPDATETIME") - private LocalDateTime updatetime; - - /** - * 靠縉odeInformation)靠靠靠,靠靠靠靠靠靠靠? - */ - @TableField(value = "NODE_INDEX") - private Integer nodeIndex; - - /** - * 靠ID,靠靠靠 - */ - @TableField(value = "PORTID") - private Long portid; - - /** - * 靠靠(0:靠;1:靠;2:靠) - */ - @TableField(value = "DEVFLAG") - private Integer devflag; - - /** - * 靠靠?靠3ds靠 - */ - @TableField(value = "DEV_SERIES") - private String devSeries; - - /** - * 靠靠,靠3ds靠 - */ - @TableField(value = "DEV_KEY") - private String devKey; - - /** - * IP靠 - */ - @TableField(value = "IP") - private String ip; - - /** - * 靠靠(0:靠靠;1:靠靠) - */ - @TableField(value = "DEVMODEL") - private Integer devmodel; - - /** - * 靠靠? - */ - @TableField(value = "CALLFLAG") - private Integer callflag; - - /** - * 靠靠(0:靠靠;1:靠靠;2:靠靠) - */ - @TableField(value = "DATATYPE") - private Integer datatype; -} \ No newline at end of file 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 deleted file mode 100644 index 4f90719d..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java +++ /dev/null @@ -1,72 +0,0 @@ -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/PqGdCompany.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqGdCompany.java deleted file mode 100644 index ff088f3b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqGdCompany.java +++ /dev/null @@ -1,27 +0,0 @@ -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; - -/** - * CN_Gather - * - * @author cdf - * @date 2025/8/9 - */ -@Data -@TableName(value = "PQ_GDINFORMATION") -public class PqGdCompany { - - @TableId - @TableField(value="GD_INDEX") - private Long gdIndex; - - @TableField(value="NAME") - private String name; - - @TableField(value="PROVINCE_INDEX") - private Long provinceIndex; -} 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 deleted file mode 100644 index 735a97b1..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.njcn.gather.event.devcie.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 lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.data.annotation.Transient; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:43【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -/** - * 靠靠? - */ -@Data -@NoArgsConstructor -@TableName(value = "PQ_LINE") -public class PqLine { - /** - * 靠靠 - */ - @TableId(value = "LINE_INDEX", type = IdType.INPUT) - private Integer lineIndex; - - /** - * 靠靠靠 - */ - @TableField(value = "GD_INDEX") - private Integer gdIndex; - - /** - * 靠靠? - */ - @TableField(value = "SUB_INDEX") - private Integer subIndex; - - /** - * 靠靠 - */ - @TableField(value = "SUBV_INDEX") - private Integer subvIndex; - - /** - * 靠靠 - */ - @TableField(value = "DEV_INDEX") - private Integer devIndex; - - /** - * 靠靠 - */ - @TableField(value = "\"NAME\"") - private String name; - - /** - * PT靠靠 - */ - @TableField(value = "PT1") - private Double pt1; - - /** - * PT靠靠 - */ - @TableField(value = "PT2") - private Double pt2; - - /** - * CT靠靠 - */ - @TableField(value = "CT1") - private Double ct1; - - /** - * CT靠靠 - */ - @TableField(value = "CT2") - private Double ct2; - - /** - * 靠靠 - */ - @TableField(value = "DEVCMP") - private Double devcmp; - - /** - * 靠靠 - */ - @TableField(value = "DLCMP") - private Double dlcmp; - - /** - * 靠靠 - */ - @TableField(value = "JZCMP") - private Double jzcmp; - - /** - * 靠靠 - */ - @TableField(value = "XYCMP") - private Double xycmp; - - /** - * 靠?靠靠靠靠靠靠? - */ - @TableField(value = "SUBV_NO") - private Integer subvNo; - - /** - * (靠PQS_Dictionary?靠靠Guid - */ - @TableField(value = "\"SCALE\"") - private String scale; - - /** - * 靠靠 - */ - @TableField(value = "SUBV_NAME") - private String subvName; - - @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/pojo/po/PqLinedetail.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLinedetail.java deleted file mode 100644 index 4ec977b9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLinedetail.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.njcn.gather.event.devcie.pojo.po; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -@Data -@TableName("PQ_LINEDETAIL") -public class PqLinedetail { - - @TableId(value = "LINE_INDEX", type = IdType.INPUT) - private Integer lineIndex; - - private Integer gdIndex; - - private Integer subIndex; - - private String lineName; - - private Integer pttype; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date lastTime; - - private Integer tinterval; - - private String loadtype; - - private String businesstype; - - private String remark; - - private String monitorId; - - private Integer powerid; - - private String objname; - - @TableField(fill = FieldFill.INSERT) - private Integer statflag; - - private String lineGrade; - - private String powerSubstationName; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqSubstation.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqSubstation.java deleted file mode 100644 index 47828b04..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqSubstation.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.njcn.gather.event.devcie.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 lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:48【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -/** - * 靠靠靠 - */ -@Data -@NoArgsConstructor -@TableName(value = "PQ_SUBSTATION") -public class PqSubstation { - /** - * 靠靠? - */ - @TableId(value = "SUB_INDEX", type = IdType.INPUT) - private Integer subIndex; - - /** - * 靠靠靠 - */ - @TableField(value = "GD_INDEX") - private Integer gdIndex; - - /** - * 靠靠? - */ - @TableField(value = "\"NAME\"") - private String name; - - @TableField(value = "\"SCALE\"") - private String scale; -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsDeptsline.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsDeptsline.java deleted file mode 100644 index 98a4f2f9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsDeptsline.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.njcn.gather.event.devcie.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 lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * Description: - * Date: 2025/06/19 下午 3:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@NoArgsConstructor -@TableName(value = "PQS_DEPTSLINE") -public class PqsDeptsline { - /** - * 部门表Guid - */ - @TableField(value = "DEPTS_INDEX") - private String deptsIndex; - - @TableField(value = "LINE_INDEX") - private Integer lineIndex; - - @TableField(value = "SYSTYPE") - private String systype; -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsStationMap.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsStationMap.java deleted file mode 100644 index d1305506..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsStationMap.java +++ /dev/null @@ -1,58 +0,0 @@ -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.util.Date; - -/** - * CN_Gather - * - * @author cdf - * @date 2025/8/11 - */ -@TableName(value="PQS_MAP") -@Data -public class PqsStationMap { - - - @TableId - @TableField(value = "MAP_INDEX") - private String mapIndex; - - - @TableField(value = "SUB_INDEX") - private Long subIndex; - - - @TableField(value = "GD_INDEX") - private Long gdIndex; - - //经度 - - @TableField(value = "LONGITUDE") - private Float longItude; - - //纬度 - - @TableField(value = "LATITUDE") - private Float latItude; - - //数据状态 - - @TableField(value = "STATE") - private Long state; - - //用户ID - - @TableField(value = "USER_INDEX") - private String userIndex; - - //更新时间 - - @TableField(value = "UPDATETIME") - private Date updateTime; - -} 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 deleted file mode 100644 index 3ca08c6f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.gather.event.devcie.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO; -import com.njcn.gather.event.devcie.pojo.po.PqDevice; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:47【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqDeviceService extends IService{ - - List queryListByIds(List lineIds); - - Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs); - - List selectDeviceDept(); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqLineService.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqLineService.java deleted file mode 100644 index c23f9201..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqLineService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.gather.event.devcie.service; - -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.baomidou.mybatisplus.extension.service.IService; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:43【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqLineService extends IService{ - - - List getBaseLineInfo(List ids); - - List getBaseLedger(@Param("ids") List ids, @Param("searchValue") String searchValue); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqSubstationService.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqSubstationService.java deleted file mode 100644 index 8b4f1515..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqSubstationService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.devcie.service; - -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:48【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqSubstationService extends IService{ - - List queryListByIds(List lineIds); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqsDeptslineService.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqsDeptslineService.java deleted file mode 100644 index 0551d851..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqsDeptslineService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.devcie.service; - -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.baomidou.mybatisplus.extension.service.IService; - /** - * - * Description: - * Date: 2025/06/19 下午 3:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsDeptslineService extends IService{ - - -} 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 deleted file mode 100644 index f358591d..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.njcn.gather.event.devcie.service.impl; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO; -import org.springframework.stereotype.Service; - -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqDeviceServiceImpl extends ServiceImpl implements PqDeviceService{ - - @Override - public List queryListByIds(List lineIds) { - return this.baseMapper.queryListByIds(lineIds); - } - - @Override - public Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs) { - return this.baseMapper.selectDeviceDTOPage(pqsEventdetailPage,searchValue,devIndexs); - } - - @Override - public List selectDeviceDept() { - return this.baseMapper.selectDeviceDept(); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqLineServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqLineServiceImpl.java deleted file mode 100644 index 9bb15d80..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqLineServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.njcn.gather.event.devcie.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.devcie.mapper.PqLineMapper; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.service.PqLineService; -import org.springframework.util.CollectionUtils; - -/** - * - * Description: - * Date: 2025/06/19 下午 1:43【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqLineServiceImpl extends ServiceImpl implements PqLineService{ - - - @Override - public List getBaseLineInfo(List ids){ - List ledgerBaseInfoDTOS = new ArrayList<>(); - - if(CollectionUtils.isEmpty(ids)){ - return ledgerBaseInfoDTOS; - } - if(ids.size()>1000){ - List> listIds = CollUtil.split(ids,1000); - for(List itemIds : listIds){ - List temp =this.baseMapper.getBaseLineInfo(itemIds); - ledgerBaseInfoDTOS.addAll(temp); - } - }else { - List temp =this.baseMapper.getBaseLineInfo(ids); - ledgerBaseInfoDTOS.addAll(temp); - } - return ledgerBaseInfoDTOS; - } - - @Override - public List getBaseLedger(List ids,String searchValue) { - List ledgerBaseInfoDTOS = new ArrayList<>(); - - if(CollectionUtils.isEmpty(ids)){ - return ledgerBaseInfoDTOS; - } - if(ids.size()>1000){ - List> listIds = CollUtil.split(ids,1000); - for(List itemIds : listIds){ - List temp =this.baseMapper.getBaseLedger(itemIds,searchValue); - ledgerBaseInfoDTOS.addAll(temp); - } - }else { - List temp =this.baseMapper.getBaseLedger(ids,searchValue); - ledgerBaseInfoDTOS.addAll(temp); - } - return ledgerBaseInfoDTOS; - }; - - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqSubstationServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqSubstationServiceImpl.java deleted file mode 100644 index 71d5582f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqSubstationServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.gather.event.devcie.service.impl; - -import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import com.njcn.gather.event.devcie.mapper.PqSubstationMapper; -import com.njcn.gather.event.devcie.service.PqSubstationService; -/** - * - * Description: - * Date: 2025/06/19 下午 1:48【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqSubstationServiceImpl extends ServiceImpl implements PqSubstationService{ - - @Override - public List queryListByIds(List lineIds) { - return this.baseMapper.queryListByIds(lineIds); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqsDeptslineServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqsDeptslineServiceImpl.java deleted file mode 100644 index 94a07f1e..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqsDeptslineServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.njcn.gather.event.devcie.service.impl; - -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsDeptslineMapper; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -/** - * - * Description: - * Date: 2025/06/19 下午 3:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsDeptslineServiceImpl extends ServiceImpl implements PqsDeptslineService{ - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java deleted file mode 100644 index 1d064686..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java +++ /dev/null @@ -1,367 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.event.file.pojo.dto.WaveDataDTO; -import com.njcn.gather.event.devcie.mapper.PqLineMapper; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.mapper.PqUserLedgerMapper; -import com.njcn.gather.event.transientes.mapper.PqUserLineAssMapper; -import com.njcn.gather.event.transientes.pojo.param.MonitorTerminalParam; -import com.njcn.gather.event.transientes.pojo.param.SimulationMsgParam; -import com.njcn.gather.event.transientes.pojo.po.*; -import com.njcn.gather.event.transientes.service.*; -import com.njcn.gather.event.transientes.service.impl.MsgEventInfoServiceImpl; -import com.njcn.gather.event.transientes.websocket.WebSocketServer; -import com.njcn.redis.utils.RedisUtil; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.njcn.gather.event.transientes.pojo.constant.RedisConstant.REDIS_DEPT_INDEX; - -/** - * @Author: cdf - * @CreateTime: 2025-06-23 - * @Description: - */ -@Api(tags = "暂降接收") -@RequestMapping("accept") -@RestController -@RequiredArgsConstructor -@Slf4j -public class EventGateController extends BaseController { - private final MsgEventInfoServiceImpl msgEventInfoServiceImpl; - private final PqUserLineAssMapper pqUserLineAssMapper; - private final PqUserLedgerMapper pqUserLedgerMapper; - @Value("${SYS_TYPE_ZT}") - private String sysTypeZt; - - private final WebSocketServer webSocketServer; - - private final PqsDeptslineService pqsDeptslineService; - - private final PqsDeptsService pqsDeptsService; - - private final PqsUserService pqsUserService; - - private final PqsUsersetService pqsUsersetService; - - private final PqLineMapper pqLineMapper; - - private final EventGateService eventGateService; - - private final MsgEventConfigService msgEventConfigService; - - private final MsgEventInfoService msgEventInfoService; - - private final RedisUtil redisUtil; - - - @OperateInfo - @GetMapping("/eventMsg") - @ApiOperation("接收远程推送的暂态事件") - @ApiImplicitParam(name = "eventMsg", value = "暂态事件json字符", required = true) - public HttpResult eventMsg(@RequestParam("msg") String msg) { - String methodDescribe = getMethodDescribe("eventMsg"); - log.info("收到前置推送暂降事件:"+msg); - - JSONObject jsonObject; - try { - //下面一行代码正式环境需要放开 - jsonObject = new JSONObject(msg); - //下面一行代码正式环境需要放开 - //jsonObject = test(); - - if (msgEventConfigService.getEventType().contains(jsonObject.get("wavetype").toString()) - && Float.parseFloat(jsonObject.get("eventvalue").toString()) <= msgEventConfigService.getEventValue() - && (Float.parseFloat(jsonObject.get("persisttime").toString())*1000) >= msgEventConfigService.getEventDuration()) { - //过滤重要暂降事件 - Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString()); - List assList = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().eq(PqUserLineAssPO::getLineIndex,lineId)); - - String str ="/"; - if(CollUtil.isNotEmpty(assList)){ - List userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - List poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().select(PqUserLedgerPO::getId,PqUserLedgerPO::getCustomerName).in(PqUserLedgerPO::getId,userIds)); - str = poList.stream().map(PqUserLedgerPO::getCustomerName).collect(Collectors.joining(StrUtil.COMMA)); - } - - List deptsList = (List)redisUtil.getObjectByKey(REDIS_DEPT_INDEX+ StrUtil.DASHED+"AllDept"); - Map deptsMap = deptsList.stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex,dept->dept)); - - List deptslineList = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex,lineId).list(); - List deptIds = deptslineList.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toList()); - Set set =getAllParentIdsWithChildrenBatch(deptIds,deptsMap); - jsonObject.putOpt("objName",str); - jsonObject.putOpt("dept", String.join(StrUtil.COMMA, set)); - - webSocketServer.sendMessageToAll(jsonObject.toString()); - } - - } catch (Exception e) { - e.printStackTrace(); - log.error("暂降json格式异常!{}", e.getMessage()); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - public Set getAllParentIdsRecursive(String deptId, Map deptMap, Set result) { - if (deptId == null || result.contains(deptId)) { - return result; - } - - result.add(deptId); // 添加当前ID - PqsDepts dept = deptMap.get(deptId); - if (dept != null && dept.getParentnodeid() != null) { - getAllParentIdsRecursive(dept.getParentnodeid(), deptMap, result); // 递归处理父节点 - } - return result; - } - - // 批量处理入口方法 - public Set getAllParentIdsWithChildrenBatch(Collection deptIds, Map deptMap) { - Set result = new HashSet<>(); - for (String deptId : deptIds) { - getAllParentIdsRecursive(deptId, deptMap, result); - } - return result; - } - - @OperateInfo - @GetMapping("/testEvent") - @ApiOperation("接收远程推送的暂态事件") - public HttpResult testEvent() { - String methodDescribe = getMethodDescribe("testEvent"); - log.info("模拟测试发送暂降事件-------------------------"); - - JSONObject jsonObject; - try { - //下面一行代码正式环境需要放开 - jsonObject = test(); - - if (msgEventConfigService.getEventType().contains(jsonObject.get("wavetype").toString()) &&Float.parseFloat(jsonObject.get("eventvalue").toString()) <= msgEventConfigService.getEventValue()) { - webSocketServer.sendMessageToAll(jsonObject.toString()); - - //开始发送短信 - try { - sendMessage(jsonObject); - }catch (Exception e){ - log.error("短信组装发送失败!失败原因{}",e.getMessage()); - } - - } - - } catch (Exception e) { - log.error("暂降json格式异常!{}", e.getMessage()); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - - //测试模拟,正式环境删除 - private PqsEventdetail createEvent(JSONObject jsonObject, LocalDateTime now) { - PqsEventdetail pqsEventdetail = new PqsEventdetail(); - pqsEventdetail.setEventdetailIndex(jsonObject.get("eventdetail_index").toString()); - pqsEventdetail.setLineid(Integer.valueOf(jsonObject.get("lineid").toString())); - pqsEventdetail.setTimeid(now); - pqsEventdetail.setMs(new BigDecimal(jsonObject.get("ms").toString())); - pqsEventdetail.setWavetype(Integer.valueOf(jsonObject.get("wavetype").toString())); - pqsEventdetail.setPersisttime(Double.valueOf(jsonObject.get("persisttime").toString())); - pqsEventdetail.setEventvalue(Double.valueOf(jsonObject.get("eventvalue").toString())); - pqsEventdetail.setEventreason(jsonObject.get("eventreason").toString()); - pqsEventdetail.setEventtype(jsonObject.get("eventtype").toString()); - - return pqsEventdetail; - } - - //测试模拟,正式环境删除 - private JSONObject test() { - /*----------------------------------------------------------------------------------------*/ - //以下部分为测试数据后续删除 - List pqLineList = pqLineMapper.selectList(new LambdaQueryWrapper<>()); - List lineList = pqLineList.stream().map(PqLine::getLineIndex).collect(Collectors.toList()); - List baseInfoDTOList = pqLineMapper.getBaseLineInfo(lineList); - Map map = baseInfoDTOList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - Random random = new Random(); - Integer lineId = lineList.get(random.nextInt(lineList.size())); - LedgerBaseInfoDTO dto = map.get(lineId); - - LocalDateTime now = LocalDateTime.now(); - String timeStr = DateUtil.format(now, DatePattern.NORM_DATETIME_PATTERN); - Long ms = (long) random.nextInt(999); - - Integer[] temArr = new Integer[]{1, 3}; - Integer wave = random.nextInt(2); - - - Double per = (double)random.nextInt(5000); - - double minV = 0.1; - double maxV = 0.9; - Double eventValue = minV + (maxV - minV) * Math.random(); - - String id = IdUtil.simpleUUID(); - - JSONObject tem = new JSONObject(); - tem.set("eventdetail_index", id); - tem.set("lineid", lineId.toString()); - tem.set("timeid", timeStr); - tem.set("ms", ms.toString()); - tem.set("wavetype", temArr[wave]); - tem.set("persisttime", per.toString()); - tem.set("eventvalue", eventValue); - tem.set("eventreason", "97a56e0f-b546-4c1e-b27c-52463fc1d82f"); - tem.set("eventtype", "676683a0-7f80-43e6-8df8-bea8ed235d67"); - tem.set("gdname", "测试供电公司"); - tem.set("bdname", dto.getStationName()); - tem.set("pointname", dto.getLineName()); - - /* PqsEventdetail pqsEventdetail = createEvent(tem, now); - if (msgEventConfigService.getEventType().contains(tem.get("wavetype").toString())) { - webSocketServer.sendMessageToAll(tem.toString()); - } - pqsEventdetailService.save(pqsEventdetail);*/ - /*----------------------------------------------------------------------------------------*/ - - return tem; - } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getTransientAnalyseWave") - @ApiOperation("暂态事件波形分析") - public HttpResult getTransientAnalyseWave(@RequestBody MonitorTerminalParam param) { - String methodDescribe = getMethodDescribe("getTransientAnalyseWave"); - WaveDataDTO wave = eventGateService.getTransientAnalyseWave(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, wave, methodDescribe); - } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/simulationSend") - @ApiOperation("模拟发送短信") - public HttpResult simulationSend(@RequestBody @Validated SimulationMsgParam param) { - String methodDescribe = getMethodDescribe("simulationSend"); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - - private void sendMessage(JSONObject jsonObject) throws Exception{ - Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString()); - List pqLineDept = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - Set deptIds = pqLineDept.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toSet()); - Set resultIds = getAllParentDeptIds(deptIds); - - List pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).in(PqsUserSet::getDeptsIndex, resultIds).list(); - if (CollUtil.isEmpty(pqsUserSetList)) { - //当前事件未找到用户信息,判断为不需要发送短信用户 - return; - } - List pqsUserList = pqsUserService.lambdaQuery().select(PqsUser::getUserIndex,PqsUser::getPhone,PqsUser::getName).in(PqsUser::getUserIndex, pqsUserSetList.stream().map(PqsUserSet::getUserIndex).collect(Collectors.toList())).list(); - List userIds = pqsUserList.stream().map(PqsUser::getUserIndex).collect(Collectors.toList()); - List poList = pqsUserSetList.stream().filter(it -> userIds.contains(it.getUserIndex())).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(poList)) { - StringBuilder stringBuilder = new StringBuilder(jsonObject.get("timeid").toString()); - List list = pqLineMapper.getBaseLineInfo(Stream.of(lineId).collect(Collectors.toList())); - LedgerBaseInfoDTO ledgerBaseInfoDTO = list.get(0); - BigDecimal bigDecimal = new BigDecimal(jsonObject.get("eventvalue").toString()).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); - stringBuilder.append(".").append(jsonObject.get("ms").toString()).append(", ").append(ledgerBaseInfoDTO.getStationName()).append(ledgerBaseInfoDTO.getLineName()) - .append("发生暂降事件,事件特征幅值").append(bigDecimal).append("%,持续时间:").append(jsonObject.get("persisttime").toString()).append("S"); - //TODO 发送短信 - // System.out.println(stringBuilder); - - List resultList = new ArrayList<>(); - for (PqsUser user : pqsUserList) { - MsgEventInfo msgEventInfo = new MsgEventInfo(); - msgEventInfo.setEventIndex(jsonObject.get("eventdetail_index").toString()); - msgEventInfo.setMsgContent(stringBuilder.toString()); - msgEventInfo.setMsgIndex(IdUtil.simpleUUID()); - msgEventInfo.setPhone(user.getPhone()); - msgEventInfo.setSendResult(0); - msgEventInfo.setUserId(user.getUserIndex()); - msgEventInfo.setUserName(user.getName()); - msgEventInfo.setIsHandle(0); - msgEventInfo.setSendTime(LocalDateTime.now()); - resultList.add(msgEventInfo); - } - msgEventInfoService.saveBatch(resultList); - } - } - - /** - * 获取远程短信平台token - */ - private String apiToken() { - - return "token"; - } - - private boolean apiSend(){ - return false; - } - - - public Set getAllParentDeptIds(Set deptIds) { - // 首次获取直接父级 - List allDeptList = pqsDeptsService.lambdaQuery().list(); - // 递归获取所有父级 - Set result = recursivelyGetParentIds(deptIds, allDeptList); - return result; - } - - /** - * 递归获取所有父级ID - * - * @param currentParentIds 当前层级的父级ID集合 - * @return 所有层级的父级ID集合 - */ - private Set recursivelyGetParentIds(Set currentParentIds, List allDeptList) { - Set result = new HashSet<>(currentParentIds); - Set nextLevelParentIds = new HashSet<>(); - List parentDeptList = allDeptList.stream().filter(it -> currentParentIds.contains(it.getDeptsIndex())).collect(Collectors.toList()); - for (PqsDepts pqsDepts : parentDeptList) { - if (!pqsDepts.getParentnodeid().equals("0")) { - nextLevelParentIds.add(pqsDepts.getParentnodeid()); - } - } - // 如果有更高层级的父级,继续递归 - if (!nextLevelParentIds.isEmpty()) { - Set deeperParentIds = recursivelyGetParentIds(nextLevelParentIds, allDeptList); - result.addAll(deeperParentIds); - } - return result; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventRightController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventRightController.java deleted file mode 100644 index 534f35f2..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventRightController.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.event.file.pojo.dto.WaveDataDTO; -import com.njcn.gather.event.devcie.mapper.PqLineMapper; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqGdCompany; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.param.MonitorTerminalParam; -import com.njcn.gather.event.transientes.pojo.param.SimulationMsgParam; -import com.njcn.gather.event.transientes.pojo.po.*; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import com.njcn.gather.event.transientes.pojo.vo.UserLedgerStatisticVO; -import com.njcn.gather.event.transientes.service.*; -import com.njcn.gather.event.transientes.service.impl.MsgEventInfoServiceImpl; -import com.njcn.gather.event.transientes.websocket.WebSocketServer; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Author: cdf - * @CreateTime: 2025-06-23 - * @Description: - */ -@Api(tags = "暂降接收") -@RequestMapping("right") -@RestController -@RequiredArgsConstructor -@Slf4j -public class EventRightController extends BaseController { - - private final EventRightService eventRightService; - - - @OperateInfo - @PostMapping("/rightEvent") - @ApiOperation("右侧表头") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightEvent(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightEvent"); - UserLedgerStatisticVO userLedgerStatisticVO = eventRightService.userLedgerStatisticClone(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userLedgerStatisticVO, methodDescribe); - } - - - @OperateInfo - @PostMapping("/rightImportUser") - @ApiOperation("右侧重要用户") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightImportUser(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightImportUser"); - List result = eventRightService.rightImportUser(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/rightEventOpen") - @ApiOperation("右侧表头点击事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightEventOpen(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightEventOpen"); - Page page = eventRightService.rightEventOpenClone(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - @OperateInfo - @PostMapping("/rightEventOpenClone") - @ApiOperation("右侧表头点击事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightEventOpenClone(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightEventOpenClone"); - Page page = eventRightService.rightEventOpen(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - @OperateInfo - @PostMapping("/rightEventOpenForDetail") - @ApiOperation("右侧表头点击事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightEventOpenForDetail(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightEventOpenForDetail"); - Page page = eventRightService.rightEventOpenForDetail(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - - - @OperateInfo - @PostMapping("/rightEventDevOpen") - @ApiOperation("右侧表头终端点击事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightEventDevOpen(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightEventDevOpen"); - Page page = eventRightService.rightEventDevOpen(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - - @OperateInfo - @PostMapping("/rightImportOpenDetail") - @ApiOperation("右侧表头终端点击事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "", required = true) - public HttpResult rightImportOpenDetail(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightImportOpenDetail"); - PqUserLedgerPO po = eventRightService.rightImportOpenDetail(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe); - } - - - @GetMapping("gdSelect") - public HttpResult> gdSelect() { - String methodDescribe = getMethodDescribe("gdSelect"); - List list = eventRightService.gdSelect(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - - - @GetMapping("bdSelect") - public HttpResult> bdSelect() { - String methodDescribe = getMethodDescribe("bdSelect"); - List list = eventRightService.bdSelect(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java deleted file mode 100644 index 25476197..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java +++ /dev/null @@ -1,265 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.OperateType; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -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.MsgEventInfo; -import com.njcn.gather.event.transientes.pojo.vo.*; -import com.njcn.gather.event.transientes.service.LargeScreenCountService; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * Description: - * Date: 2025/06/19 下午 3:00【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Slf4j -@Api(tags = "大屏统计") -@RestController -@RequestMapping("/largescreen") -@RequiredArgsConstructor -public class LargeScreenCountController extends BaseController { - - private final LargeScreenCountService largeScreenCountService; - - @OperateInfo - @PostMapping("/initLedger") - @ApiOperation("台账规模统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult initLedger(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("initLedger"); - largeScreenCountService.initLedger(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - @OperateInfo - @PostMapping("/ledgercount") - @ApiOperation("台账规模统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult scaleStatistics(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("scaleStatistics"); - LedgerCountVO result = largeScreenCountService.scaleStatistics(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/alarmAnalysis") - @ApiOperation("告警统计分析") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult alarmAnalysis(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("alarmAnalysis"); - AlarmAnalysisVO result = largeScreenCountService.alarmAnalysis(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - @OperateInfo - @PostMapping("/alarmAnalysisDetail") - @ApiOperation("告警统计分析详情") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult alarmAnalysisDetail(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("alarmAnalysisDetail"); - AlarmAnalysisVO result = largeScreenCountService.alarmAnalysisDetail(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - - @OperateInfo - @PostMapping("/eventTablePage") - @ApiOperation("告警统计分析详情") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> eventTablePage(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("alarmAnalysisDetail"); - Page result = largeScreenCountService.eventTablePage(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/eventTrend") - @ApiOperation("暂降事件趋势") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> eventTrend(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("eventTrend"); - List result = largeScreenCountService.eventTrend(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/eventList") - @ApiOperation("暂降事件列表") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> eventList(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("eventList"); - Page result = largeScreenCountService.eventList(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - - @OperateInfo - @PostMapping("/noDealEventList") - @ApiOperation("未处理暂降事件列表") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> noDealEventList(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("noDealEventList"); - List result = largeScreenCountService.noDealEventList(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - @OperateInfo - @PostMapping("/mapCount") - @ApiOperation("地图统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> mapCount(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("mapCount"); - List result = largeScreenCountService.mapCount(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - - @OperateInfo(operateType= OperateType.UPDATE) - @PostMapping("/lookEvent") - @ApiOperation("处理暂降事件") - @ApiImplicitParam(name = "eventIds", value = "暂降事件id", required = true) - public HttpResult lookEvent(@RequestBody List eventIds) { - String methodDescribe = getMethodDescribe("lookEvent"); - boolean result = largeScreenCountService.lookEvent(eventIds); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @GetMapping("/eventMsgDetail") - @ApiOperation("暂降事件列表详情按钮") - @ApiImplicitParam(name = "eventId", value = "暂降事件id", required = true) - public HttpResult eventMsgDetail(@RequestParam("eventId")String eventId) { - String methodDescribe = getMethodDescribe("eventMsgDetail"); - EventMsgDetailVO result = largeScreenCountService.eventMsgDetail(eventId); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/msgSendList") - @ApiOperation("远程通知列表") - @ApiImplicitParam(name = "largeScreenCountParam", value = "参数", required = true) - public HttpResult> msgSendList(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("msgSendList"); - List result = largeScreenCountService.msgSendList(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/hasSendMsgPage") - @ApiOperation("已发送短信列表") - @ApiImplicitParam(name = "largeScreenCountParam", value = "参数", required = true) - public HttpResult> hasSendMsgPage(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("hasSendMsgPage"); - Page result = largeScreenCountService.hasSendMsgPage(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo(operateType = OperateType.ADD) - @PostMapping("/msgHandle") - @ApiOperation("短信处理") - @ApiImplicitParam(name = "eventId", value = "暂降事件id", required = true) - public HttpResult msgHandle(@RequestBody @Validated MessageEventFeedbackParam messageEventFeedbackParam) { - String methodDescribe = getMethodDescribe("msgHandle"); - largeScreenCountService.msgHandle(messageEventFeedbackParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); - } - - - @OperateInfo - @PostMapping("/devFlagCount") - @ApiOperation("终端运行统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult devFlagCount(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("devFlagCount"); - DeviceCountVO deviceCountVO = largeScreenCountService.devFlagCount(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deviceCountVO, methodDescribe); - } - @OperateInfo - @PostMapping("/devDetail") - @ApiOperation("终端运行统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> devDetail(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("devDetail"); - List deviceDTOList = largeScreenCountService.devDetail(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deviceDTOList, methodDescribe); - } - - @OperateInfo - @PostMapping("/areaDevCount") - @ApiOperation("区域终端统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> areaDevCount(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("areaDevCount"); - List result = largeScreenCountService.regionDevCount(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/substationCount") - @ApiOperation("变电站统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> substationCount(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("substationCount"); - List result = largeScreenCountService.substationCount(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo - @PostMapping("/regionDevCount") - @ApiOperation("区域终端统计") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> rightUserStatistic(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("rightUserStatistic"); - List result = largeScreenCountService.regionDevCount(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - - - - @OperateInfo - @PostMapping("/eventPage") - @ApiOperation("分页查询暂降事件") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> eventPage(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("eventPage"); - Page result = largeScreenCountService.eventPage(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - @OperateInfo - @PostMapping("/devicePage") - @ApiOperation("终端分页查询") - @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true) - public HttpResult> devicePage(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("devicePage"); - Page result = largeScreenCountService.devicePage(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo(operateType= OperateType.UPDATE) - @PostMapping("/userEventList") - @ApiOperation("查询暂降事件") - @ApiImplicitParam(name = "eventIds", value = "暂降事件id", required = true) - public HttpResult> userEventList(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("userEventList"); - Page result = largeScreenCountService.userEventList(largeScreenCountParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java deleted file mode 100644 index 9fdbc7d9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.OperateType; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; -import com.njcn.gather.event.transientes.service.MsgEventConfigService; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Author: cdf - * @CreateTime: 2025-06-27 - * @Description: - */ -@Api(tags = "暂降平台配置") -@RequestMapping("config") -@RestController -@RequiredArgsConstructor -@Slf4j -public class MsgEventConfigController extends BaseController { - - private final MsgEventConfigService msgEventConfigService; - - @OperateInfo(operateType = OperateType.ADD) - @PostMapping("/eventConfig") - @ApiOperation("暂降平台配置") - @ApiImplicitParam(name = "msgEventConfig", value = "实体", required = true) - @Transactional(rollbackFor = Exception.class) - public HttpResult eventConfig(@RequestBody @Validated MsgEventConfig msgEventConfig) { - String methodDescribe = getMethodDescribe("eventConfig"); - msgEventConfigService.eventConfig(msgEventConfig); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); - } - - @OperateInfo - @GetMapping("/queryConfig") - @ApiOperation("接收远程推送的暂态事件") - public HttpResult queryConfig() { - String methodDescribe = getMethodDescribe("queryConfig"); - MsgEventConfig msgEventConfig = msgEventConfigService.queryConfig(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, msgEventConfig, methodDescribe); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqUserLedgerController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqUserLedgerController.java deleted file mode 100644 index f1791052..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqUserLedgerController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.transientes.pojo.param.PqUserLedgerParam; -import com.njcn.gather.event.transientes.pojo.po.PqUserLedgerPO; -import com.njcn.gather.event.transientes.service.PqUserLedgerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@RestController -@RequestMapping("/pqUser/ledger") -public class PqUserLedgerController { - - @Autowired - private PqUserLedgerService pqUserLedgerService; - - // 添加记录 - @PostMapping("addLedger") - public boolean addLedger(@RequestBody PqUserLedgerParam ledgerParam) { - return pqUserLedgerService.addLedger(ledgerParam); - } - - // 更新记录 - @PostMapping("updateLedger") - public boolean updateLedger(@RequestBody PqUserLedgerParam ledgerParam) { - return pqUserLedgerService.updateLedger(ledgerParam); - } - - // 删除记录 - @PostMapping("deleteLedger") - public boolean deleteLedger(@RequestBody List ids) { - return pqUserLedgerService.deleteLedger(ids); - } - - // 查询单条记录 - @GetMapping("/getLedgerById") - public PqUserLedgerPO getLedgerById(@PathVariable String id) { - return pqUserLedgerService.getLedgerById(id); - } - - // 查询所有记录 - @GetMapping - public Page pageList(@RequestBody PqUserLedgerParam ledgerParam) { - return pqUserLedgerService.pageList(ledgerParam); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqsDicTreeController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqsDicTreeController.java deleted file mode 100644 index 43fb1776..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/PqsDicTreeController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.njcn.gather.event.transientes.controller; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.gather.event.transientes.pojo.po.PqsDicTreePO; -import com.njcn.gather.event.transientes.pojo.vo.PqsDicTreeVO; -import com.njcn.gather.event.transientes.service.PqsDicTreeService; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-08-01 - * @Description: - */ -@Api(tags = "字典树") -@RequestMapping("dicTree") -@RestController -@RequiredArgsConstructor -@Slf4j -public class PqsDicTreeController extends BaseController { - - private final PqsDicTreeService pqsDicTreeService; - - - @OperateInfo - @GetMapping("/getDicTree") - @ApiOperation("获取树结构") - public HttpResult> getDicTree(@RequestParam("code") String code){ - String methodDescribe = getMethodDescribe("getDicTree"); - - List pqsDicTreePOList = pqsDicTreeService.getDicTree(code); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqsDicTreePOList, methodDescribe); - } - -} 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 deleted file mode 100644 index 9b7f32ca..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/filter/JwtRequestFilter.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.njcn.gather.event.transientes.filter; - -import cn.hutool.json.JSONObject; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.gather.event.transientes.utils.JwtUtil; -import io.jsonwebtoken.ExpiredJwtException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@Component -@Slf4j -public class JwtRequestFilter extends OncePerRequestFilter { - - private final UserDetailsService userDetailsService; - private final JwtUtil jwtUtil; - - public JwtRequestFilter(UserDetailsService userDetailsService, JwtUtil jwtUtil) { - this.userDetailsService = userDetailsService; - this.jwtUtil = jwtUtil; - } - - @Override - 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); - } - } - chain.doFilter(request, response); - } - - private void sendErrorResponse(HttpServletResponse response, CommonResponseEnum error) throws IOException { - response.setStatus(HttpServletResponse.SC_OK); - response.setContentType("application/json;charset=UTF-8"); - - HttpResult httpResult = new HttpResult<>(); - httpResult.setCode(error.getCode()); - httpResult.setMessage(error.getMessage()); - - response.getWriter().write(new JSONObject(httpResult, false).toString()); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/ControllerUtil.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/ControllerUtil.java deleted file mode 100644 index b029ee80..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/ControllerUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.gather.event.transientes.handler; - -import com.njcn.common.pojo.constant.LogInfo; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.MethodArgumentNotValidException; - -import java.lang.reflect.Method; -import java.util.Objects; - -/** - * @author hongawen - * @version 1.0.0 - * @date 2021年06月22日 10:25 - */ -@Slf4j -public class ControllerUtil { - - /** - * 针对methodArgumentNotValidException 异常的处理 - * @author cdf - */ - public static String getMethodArgumentNotValidException(MethodArgumentNotValidException methodArgumentNotValidException) { - String operate = LogInfo.UNKNOWN_OPERATE; - Method method = null; - try { - method = methodArgumentNotValidException.getParameter().getMethod(); - if (!Objects.isNull(method) && method.isAnnotationPresent(ApiOperation.class)) { - ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); - operate = apiOperation.value(); - } - }catch (Exception e){ - log.error("根据方法参数非法异常获取@ApiOperation注解值失败,参数非法异常信息:{},方法名:{},异常信息:{}",methodArgumentNotValidException.getMessage(),method,e.getMessage()); - } - return operate; - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/GlobalBusinessExceptionHandler.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/GlobalBusinessExceptionHandler.java deleted file mode 100644 index 67b60f3b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/GlobalBusinessExceptionHandler.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.njcn.gather.event.transientes.handler; - -import cn.hutool.core.text.StrFormatter; -import cn.hutool.core.util.StrUtil; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.LogUtil; -import com.njcn.web.utils.HttpResultUtil; -import com.njcn.web.utils.HttpServletUtil; -import com.njcn.web.utils.ReflectCommonUtil; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.json.JSONException; -import org.springframework.validation.ObjectError; -import org.springframework.web.HttpMediaTypeNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.util.NestedServletException; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * 全局通用业务异常处理器 - * - * @author hongawen - * @version 1.0.0 - * @date 2021年04月20日 18:04 - */ -@Slf4j -@AllArgsConstructor -@RestControllerAdvice -public class GlobalBusinessExceptionHandler { - - - - private final ThreadPoolExecutor executor = new ThreadPoolExecutor( - 4, 8, 30, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(100), - // 队列满时由主线程执行 - new ThreadPoolExecutor.CallerRunsPolicy() - ); - - - /** - * 捕获业务功能异常,通常为业务数据抛出的异常 - * - * @param businessException 业务异常 - */ - @ExceptionHandler(BusinessException.class) - public HttpResult handleBusinessException(BusinessException businessException) { - String operate = ReflectCommonUtil.getMethodDescribeByException(businessException); - // recodeBusinessExceptionLog(businessException, businessException.getMessage()); - return HttpResultUtil.assembleBusinessExceptionResult(businessException, null, operate); - } - - - /** - * 空指针异常捕捉 - * - * @param nullPointerException 空指针异常 - */ - @ExceptionHandler(NullPointerException.class) - public HttpResult handleNullPointerException(NullPointerException nullPointerException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.NULL_POINTER_EXCEPTION.getMessage(), nullPointerException); - //recodeBusinessExceptionLog(nullPointerException, CommonResponseEnum.NULL_POINTER_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NULL_POINTER_EXCEPTION, null, ReflectCommonUtil.getMethodDescribeByException(nullPointerException)); - } - - /** - * 算数运算异常 - * - * @param arithmeticException 算数运算异常,由于除数为0引起的异常 - */ - @ExceptionHandler(ArithmeticException.class) - public HttpResult handleArithmeticException(ArithmeticException arithmeticException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.ARITHMETIC_EXCEPTION.getMessage(), arithmeticException); - // recodeBusinessExceptionLog(arithmeticException, CommonResponseEnum.ARITHMETIC_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.ARITHMETIC_EXCEPTION, null, ReflectCommonUtil.getMethodDescribeByException(arithmeticException)); - } - - /** - * 类型转换异常捕捉 - * - * @param classCastException 类型转换异常 - */ - @ExceptionHandler(ClassCastException.class) - public HttpResult handleClassCastException(ClassCastException classCastException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.CLASS_CAST_EXCEPTION.getMessage(), classCastException); - // recodeBusinessExceptionLog(classCastException, CommonResponseEnum.CLASS_CAST_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.CLASS_CAST_EXCEPTION, null, ReflectCommonUtil.getMethodDescribeByException(classCastException)); - } - - - /** - * 索引下标越界异常捕捉 - * - * @param indexOutOfBoundsException 索引下标越界异常 - */ - @ExceptionHandler(IndexOutOfBoundsException.class) - public HttpResult handleIndexOutOfBoundsException(IndexOutOfBoundsException indexOutOfBoundsException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.INDEX_OUT_OF_BOUNDS_EXCEPTION.getMessage(), indexOutOfBoundsException); - // recodeBusinessExceptionLog(indexOutOfBoundsException, CommonResponseEnum.INDEX_OUT_OF_BOUNDS_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.INDEX_OUT_OF_BOUNDS_EXCEPTION, null, ReflectCommonUtil.getMethodDescribeByException(indexOutOfBoundsException)); - } - - /** - * 前端请求后端,请求中参数的媒体方式不支持异常 - * - * @param httpMediaTypeNotSupportedException 请求中参数的媒体方式不支持异常 - */ - @ExceptionHandler(HttpMediaTypeNotSupportedException.class) - public HttpResult httpMediaTypeNotSupportedExceptionHandler(HttpMediaTypeNotSupportedException httpMediaTypeNotSupportedException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.HTTP_MEDIA_TYPE_NOT_SUPPORTED_EXCEPTION.getMessage(), httpMediaTypeNotSupportedException); - // 然后提取错误提示信息进行返回 - // recodeBusinessExceptionLog(httpMediaTypeNotSupportedException, CommonResponseEnum.HTTP_MEDIA_TYPE_NOT_SUPPORTED_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.HTTP_MEDIA_TYPE_NOT_SUPPORTED_EXCEPTION, null, ReflectCommonUtil.getMethodDescribeByException(httpMediaTypeNotSupportedException)); - } - - /** - * 前端请求后端,参数校验异常捕捉 - * RequestBody注解参数异常 - * - * @param methodArgumentNotValidException 参数校验异常 - */ - @ExceptionHandler(MethodArgumentNotValidException.class) - public HttpResult methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException methodArgumentNotValidException) { - // 从异常对象中拿到allErrors数据 - String messages = methodArgumentNotValidException.getBindingResult().getAllErrors() - .stream().map(ObjectError::getDefaultMessage).collect(Collectors.joining(";")); - // 然后提取错误提示信息进行返回 - LogUtil.njcnDebug(log, "参数校验异常,异常为:{}", messages); - // recodeBusinessExceptionLog(methodArgumentNotValidException, CommonResponseEnum.METHOD_ARGUMENT_NOT_VALID_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.METHOD_ARGUMENT_NOT_VALID_EXCEPTION, messages, ControllerUtil.getMethodArgumentNotValidException(methodArgumentNotValidException)); - } - - /** - * 前端请求后端,参数校验异常捕捉 - * PathVariable注解、RequestParam注解参数异常 - * - * @param constraintViolationException 参数校验异常 - */ - @ExceptionHandler(ConstraintViolationException.class) - public HttpResult constraintViolationExceptionExceptionHandler(ConstraintViolationException constraintViolationException) { - String exceptionMessage = constraintViolationException.getMessage(); - StringBuilder messages = new StringBuilder(); - if (exceptionMessage.indexOf(StrUtil.COMMA) > 0) { - String[] tempMessage = exceptionMessage.split(StrUtil.COMMA); - Stream.of(tempMessage).forEach(message -> { - messages.append(message.substring(message.indexOf(StrUtil.COLON) + 2)).append(';'); - }); - } else { - messages.append(exceptionMessage.substring(exceptionMessage.indexOf(StrUtil.COLON) + 2)); - } - // 然后提取错误提示信息进行返回 - LogUtil.njcnDebug(log, "参数校验异常,异常为:{}", messages); - // recodeBusinessExceptionLog(constraintViolationException, CommonResponseEnum.METHOD_ARGUMENT_NOT_VALID_EXCEPTION.getMessage()); - List> constraintViolationList = new ArrayList<>(constraintViolationException.getConstraintViolations()); - ConstraintViolation constraintViolation = constraintViolationList.get(0); - Class rootBeanClass = constraintViolation.getRootBeanClass(); - //判断校验参数异常捕获的根源是controller还是service处 - if (rootBeanClass.getName().endsWith("Controller")) { - String methodName = constraintViolation.getPropertyPath().toString().substring(0, constraintViolation.getPropertyPath().toString().indexOf(StrUtil.DOT)); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.METHOD_ARGUMENT_NOT_VALID_EXCEPTION, messages.toString(), ReflectCommonUtil.getMethodDescribeByClassAndMethodName(rootBeanClass, methodName)); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.METHOD_ARGUMENT_NOT_VALID_EXCEPTION, messages.toString(), ReflectCommonUtil.getMethodDescribeByException(constraintViolationException)); - } - - } - - - /** - * 索引下标越界异常捕捉 - * - * @param illegalArgumentException 参数校验异常 - */ - @ExceptionHandler(IllegalArgumentException.class) - public HttpResult handleIndexOutOfBoundsException(IllegalArgumentException illegalArgumentException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.ILLEGAL_ARGUMENT_EXCEPTION.getMessage(), illegalArgumentException); - // recodeBusinessExceptionLog(illegalArgumentException, CommonResponseEnum.ILLEGAL_ARGUMENT_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.ILLEGAL_ARGUMENT_EXCEPTION, illegalArgumentException.getMessage(), ReflectCommonUtil.getMethodDescribeByException(illegalArgumentException)); - } - - - /** - * 未声明异常捕捉 - * - * @param exception 未声明异常 - */ - @ExceptionHandler(Exception.class) - public HttpResult handleException(Exception exception) { - //针对fallbackFactory降级异常特殊处理 - Exception tempException = exception; - String exceptionCause = CommonResponseEnum.UN_DECLARE.getMessage(); - String code = CommonResponseEnum.UN_DECLARE.getCode(); - if (exception instanceof NestedServletException) { - Throwable cause = exception.getCause(); - if (cause instanceof AssertionError) { - if (cause.getCause() instanceof BusinessException) { - tempException = (BusinessException) cause.getCause(); - BusinessException tempBusinessException = (BusinessException) cause.getCause(); - exceptionCause = tempBusinessException.getMessage(); - code = tempBusinessException.getCode(); - } - } - } - LogUtil.logExceptionStackInfo(exceptionCause, tempException); - // recodeBusinessExceptionLog(exception, exceptionCause); - //判断方法上是否有自定义注解,做特殊处理 -// Method method = ReflectCommonUtil.getMethod(exception); -// if (!Objects.isNull(method)){ -// if(method.isAnnotationPresent(ReturnMsg.class)){ -// return HttpResultUtil.assembleResult(code, null, StrFormatter.format("{}",exceptionCause)); -// } -// } - return HttpResultUtil.assembleResult(code, null, StrFormatter.format("{}{}{}", ReflectCommonUtil.getMethodDescribeByException(tempException), StrUtil.C_COMMA, exceptionCause)); - } - - - /** - * json解析异常 - * - * @param jsonException json参数 - */ - @ExceptionHandler(JSONException.class) - public HttpResult handleIndexOutOfBoundsException(JSONException jsonException) { - LogUtil.logExceptionStackInfo(CommonResponseEnum.JSON_CONVERT_EXCEPTION.getMessage(), jsonException); - // recodeBusinessExceptionLog(jsonException, CommonResponseEnum.JSON_CONVERT_EXCEPTION.getMessage()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.JSON_CONVERT_EXCEPTION, jsonException.getMessage(), ReflectCommonUtil.getMethodDescribeByException(jsonException)); - } -/* - private void recodeBusinessExceptionLog(Exception businessException, String methodDescribe) { - HttpServletRequest httpServletRequest = HttpServletUtil.getRequest(); - Future future = executor.submit(() -> { - HttpServletUtil.setRequest(httpServletRequest); - sysLogAuditService.recodeBusinessExceptionLog(businessException, methodDescribe); - }); - try { - // 抛出 ExecutionException - future.get(); - } catch (ExecutionException | InterruptedException e) { - log.error("保存审计日志异常,异常为:" + e.getMessage()); - } - }*/ - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/SqlExecuteTimeInterceptor.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/SqlExecuteTimeInterceptor.java deleted file mode 100644 index 6e334dc7..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/handler/SqlExecuteTimeInterceptor.java +++ /dev/null @@ -1,57 +0,0 @@ -//package com.njcn.gather.event.transientes.handler; -// -//import org.apache.ibatis.executor.statement.StatementHandler; -//import org.apache.ibatis.plugin.*; -//import org.apache.ibatis.session.ResultHandler; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.stereotype.Component; -// -//import java.sql.Statement; -//import java.util.Properties; -// -///** -// * @Author: cdf -// * @CreateTime: 2025-07-14 -// * @Description: -// */ -//@Intercepts({ -// @Signature(type = StatementHandler.class, method = "query", args = {Statement.class, ResultHandler.class}), -// @Signature(type = StatementHandler.class, method = "update", args = {Statement.class}), -// @Signature(type = StatementHandler.class, method = "batch", args = {Statement.class}) -//}) -//@Component -//public class SqlExecuteTimeInterceptor implements Interceptor { -// private static final Logger logger = LoggerFactory.getLogger(SqlExecuteTimeInterceptor.class); -// -// @Override -// public Object intercept(Invocation invocation) throws Throwable { -// long startTime = System.currentTimeMillis(); -// try { -// return invocation.proceed(); -// } finally { -// long endTime = System.currentTimeMillis(); -// long executeTime = endTime - startTime; -// -// // 获取 SQL 语句 -// StatementHandler statementHandler = (StatementHandler) invocation.getTarget(); -// String sql = statementHandler.getBoundSql().getSql(); -// -// // 打印执行时间和 SQL -// logger.info("SQL 执行时间: {}ms, SQL: {}", executeTime, sql); -// } -// } -// -// @Override -// public Object plugin(Object target) { -// if (target instanceof StatementHandler) { -// return Plugin.wrap(target, this); -// } -// return target; -// } -// -// @Override -// public void setProperties(Properties properties) { -// // 可配置参数 -// } -//} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MessageEventFeedbackMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MessageEventFeedbackMapper.java deleted file mode 100644 index 4e8fcbee..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MessageEventFeedbackMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.MessageEventFeedback; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ - -public interface MessageEventFeedbackMapper extends BaseMapper { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java deleted file mode 100644 index 4635dae7..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; -import org.apache.ibatis.annotations.Mapper; - -/** - * MSG_EVENT_CONFIG表Mapper接口 - */ -@Mapper -public interface MsgEventConfigMapper extends BaseMapper { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java deleted file mode 100644 index 8810dc44..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MsgEventInfoMapper extends BaseMapper { -} 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 deleted file mode 100644 index d3f14b43..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqDevicedetailMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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 { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLedgerMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLedgerMapper.java deleted file mode 100644 index 49f8f062..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLedgerMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqUserLedgerPO; -import com.njcn.gather.event.transientes.pojo.po.PqUserLineAssPO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PqUserLedgerMapper extends BaseMapper { - - - List getUserByParam(@Param("lineIds") List lineIds, @Param("searchValue")String searchValue); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLineAssMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLineAssMapper.java deleted file mode 100644 index 6a34f75f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqUserLineAssMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqUserLineAssPO; - -public interface PqUserLineAssMapper extends BaseMapper { - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptsMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptsMapper.java deleted file mode 100644 index cbeedc80..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptsMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.dto.PqsDeptDTO; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 3:57【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsDeptsMapper extends BaseMapper { - List findDeptAndChildren(@Param("deptId") String deptId); - - List getDeptList(@Param("deptIds") List deptIds); -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptslineMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptslineMapper.java deleted file mode 100644 index 95817310..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDeptslineMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.transientes.pojo.po.PqsUserSet; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 3:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsDeptslineMapper extends BaseMapper { - - List getPhoneUser(@Param("lineId")String lineId); -} \ No newline at end of file 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 deleted file mode 100644 index fff0503a..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicDataMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -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/PqsDicTreeMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicTreeMapper.java deleted file mode 100644 index 0213c4ac..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsDicTreeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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 PqsDicTreeMapper extends BaseMapper { - - @Select("SELECT ID,NAME,CODE,PARENT_ID as parentId,level FROM PQS_DICTREE " + - "START WITH CODE = #{code} " + - "CONNECT BY PRIOR ID = PARENT_ID") - List selectChildrenByCode(@Param("code") String code); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java deleted file mode 100644 index 6ef98e98..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import org.apache.ibatis.annotations.Param; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/20 上午 10:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsEventdetailMapper extends BaseMapper { -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsIntegrityMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsIntegrityMapper.java deleted file mode 100644 index 93bd8e94..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsIntegrityMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsIntegrity; -import com.njcn.gather.event.transientes.pojo.po.PqsOnlinerate; - -/** - * - * Description: - * Date: 2025/07/29 下午 6:40【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsIntegrityMapper extends BaseMapper { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsOnlinerateMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsOnlinerateMapper.java deleted file mode 100644 index 6a8b76da..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsOnlinerateMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsOnlinerate; - -/** - * - * Description: - * Date: 2025/07/29 下午 6:40【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsOnlinerateMapper extends BaseMapper { -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserMapper.java deleted file mode 100644 index 8a615066..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsUser; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface PqsUserMapper extends BaseMapper { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserSetMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserSetMapper.java deleted file mode 100644 index 43845092..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsUserSetMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.gather.event.transientes.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsUserSet; - -/** - * @Author: cdf - * @CreateTime: 2025-06-24 - * @Description: - */ -public interface PqsUserSetMapper 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 deleted file mode 100644 index 1eb65317..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqDevicedetailMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - DEV_INDEX, MANUFACTURER, CHECKFLAG, THISTIMECHECK, NEXTTIMECHECK, ONLINERATETJ, DATAPLAN, - NEWTRAFFIC, ELECTROPLATE, ONTIME, CONTRACT, SIM, DEV_CATENA, DEV_LOCATION, DEV_NO - - diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqUserLedger.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqUserLedger.xml deleted file mode 100644 index d1049a9a..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqUserLedger.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptsMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptsMapper.xml deleted file mode 100644 index 7b696aac..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptsMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - DEPTS_INDEX, DEPTSNAME, DEPTS_DESC, USER_INDEX, UPDATETIME, DEPTS_DESCRIPTION, "STATE", - AREA, CUSTOM_DEPT, PARENTNODEID - - - - - - \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptslineMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptslineMapper.xml deleted file mode 100644 index ca2cd53f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsDeptslineMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - DEPTS_INDEX, LINE_INDEX, SYSTYPE - - - - \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsEventdetailMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsEventdetailMapper.xml deleted file mode 100644 index 0daa0b55..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsEventdetailMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EVENTDETAIL_INDEX, LINEID, TIMEID, MS, "DESCRIBE", WAVETYPE, PERSISTTIME, EVENTVALUE, - EVENTREASON, EVENTTYPE, EVENTASS_INDEX, DQTIME, DEALTIME, DEALFLAG, NUM, FILEFLAG, - FIRSTTIME, FIRSTTYPE, FIRSTMS, WAVENAME, ENERGY, SEVERITY, LOOK_FLAG - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsOnlinerateMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsOnlinerateMapper.xml deleted file mode 100644 index 06632555..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/mapping/PqsOnlinerateMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN - - \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/DicTreeEnum.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/DicTreeEnum.java deleted file mode 100644 index a565113a..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/DicTreeEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.gather.event.transientes.pojo; - -import lombok.Getter; - -@Getter -public enum DicTreeEnum { - - BJ_USER("BJ_USER","半导体及精密加工"), - OI_USER("OI_USER","其他敏感用户"), - OT_USER("OT_USER","其他干扰源用户"), - - - ; - - private final String code; - - private final String dicName; - - - DicTreeEnum(String code, String dicName) { - this.code = code; - this.dicName = dicName; - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/constant/RedisConstant.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/constant/RedisConstant.java deleted file mode 100644 index e25d4168..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/constant/RedisConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.constant; - -import lombok.Getter; - -/** - * @Author: cdf - * @CreateTime: 2025-07-30 - * @Description: - */ - -public class RedisConstant { - - public static final String REDIS_DEPT_INDEX ="LineCache:"; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java deleted file mode 100644 index a9acae8b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -/** - * Description: - * Date: 2025/06/19 下午 3:38【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class LargeScreenCountParam extends BaseParam { - @ApiModelProperty(name="deptId",value="部门id") - private String deptId; - @ApiModelProperty(name="type",value="类型(1年 2季度 3月份 4周 5日)") - private Integer type; - - @ApiModelProperty(name="eventtype",value="类型(0 暂降事件 1远程通知)") - private Integer eventtype; - - @ApiModelProperty(name="eventDeep",value="0.普通事件 1.严重事件 null.全部事件") - private Integer eventDeep; - - @ApiModelProperty(name="t通讯状态",value="0.离线 1.在线") - private String state; - - private Integer sendResult; - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate startTime; - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate endTime; - - @ApiModelProperty(value = "字典树 对象大类") - private String bigObjType; - @ApiModelProperty(value = "字典树 对象大小") - private String smallObjType; - - private List eventIds; - - private Integer gdIndex; - - private Integer bdId; - - private String devName; - - private Float eventValueMin; - - private Float eventValueMax; - - private Float eventDurationMin; - - private Float eventDurationMax; - - @ApiModelProperty(value = "导出标识") - private Boolean exportFlag = false; - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MessageEventFeedbackParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MessageEventFeedbackParam.java deleted file mode 100644 index de0902a4..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MessageEventFeedbackParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.time.LocalDate; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -@Data -public class MessageEventFeedbackParam { - - @NotBlank(message = "暂降事件id不可为空") - private String eventIndex; - - @NotNull(message = "是否影响敏感用户不可为空") - @ApiModelProperty(value = " 0.否 1.是") - private Integer isSensitive; - - @ApiModelProperty(value = "方案") - private String influenceFactors; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "处理时间") - private LocalDate dealDate; - - @ApiModelProperty(value = "原因") - private String dealScheme; - - private String remark; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MonitorTerminalParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MonitorTerminalParam.java deleted file mode 100644 index 951c7a17..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MonitorTerminalParam.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * <监测点波形入参> - * - * @author wr - * @createTime: 2023-03-23 - */ -@Data -public class MonitorTerminalParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id") - @NotBlank(message = "id不能为空") - private String id; - - @ApiModelProperty(value = "区分主配网(0:主网 1:配网)") - @NotNull(message = "区分类别不能为空") - private Integer type; - - @ApiModelProperty(value = "区分系统(0:pq 1:pms)") - @NotNull(message = "区分系统不能为空") - private Integer systemType; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MsgEventConfigParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MsgEventConfigParam.java deleted file mode 100644 index bf8919af..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/MsgEventConfigParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-07-01 - * @Description: - */ -@Data -public class MsgEventConfigParam { - - - /** - * 主键ID - */ - private String id; - - /** - * 严重通知标识 - */ - @NotNull(message = "严重通知标识不可为空") - private Integer seriousNotice; - - /** - * 普通通知标识 - */ - @NotNull(message = "普通通知标识不可为空") - private Integer normalNotic; - - /** - * 语音类型 - */ - @NotNull(message = "语音类型不可为空") - private Integer voiceType; - - /** - * 屏幕通知标识 - */ - @NotNull(message = "屏幕通知标识不可为空") - private Integer screenNotic; - - @NotBlank(message = "事件类型不可为空") - private List eventTypeList; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/PqUserLedgerParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/PqUserLedgerParam.java deleted file mode 100644 index 17d8cd93..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/PqUserLedgerParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.web.pojo.param.BaseParam; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@Data -public class PqUserLedgerParam extends BaseParam { - private static final long serialVersionUID = 1L; - - - private String id; - - private String powerSupplyArea; - - private String customerName; - - private String electricityAddress; - - private String industryType; - - private String voltageLevel; - - private String importantLevel; - - private String substationName; - - private String busbarName; - - private String operationUnit; - - private String manufacturer; - - private String bigObjType; - - private String smallObjType; - - private Integer isShow; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/SimulationMsgParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/SimulationMsgParam.java deleted file mode 100644 index b9184d94..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/SimulationMsgParam.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.param; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @Author: cdf - * @CreateTime: 2025-07-01 - * @Description: - */ -@Data -public class SimulationMsgParam { - - @NotBlank(message = "号码不可为空") - private String phone; - - @NotBlank(message = "短信内容不可为空") - private String msg; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MessageEventFeedback.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MessageEventFeedback.java deleted file mode 100644 index c699277d..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MessageEventFeedback.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: 暂降远程通知反馈 - */ -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -@Data -@TableName("MSG_EVENT_FEEDBACK") -public class MessageEventFeedback { - - @TableId(type = IdType.INPUT) - private String id; - - private String eventIndex; - - private Integer isSensitive; - - private String influenceFactors; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dealDate; - - private String dealScheme; - - private String remark; - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java deleted file mode 100644 index 89b1b5ae..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -/** - * @Author: cdf - * @CreateTime: 2025-06-27 - * @Description: - */ -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.List; - -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * MSG_EVENT_CONFIG表实体类 - */ -@Data -@TableName("MSG_EVENT_CONFIG") -@ToString -public class MsgEventConfig implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 主键ID - */ - @TableId("ID") - private String id; - - /** - * 严重通知标识 - */ - @TableField("SERIOUS_NOTICE") - @NotNull(message = "严重通知标识不可为空") - private Integer seriousNotice; - - /** - * 普通通知标识 - */ - @TableField("NORMAL_NOTIC") - @NotNull(message = "普通通知标识不可为空") - private Integer normalNotic; - - /** - * 语音类型 - */ - @TableField("VOICE_TYPE") - @NotNull(message = "语音类型不可为空") - private Integer voiceType; - - /** - * 屏幕通知标识 - */ - @TableField("SCREEN_NOTIC") - @NotNull(message = "屏幕通知标识不可为空") - private Integer screenNotic; - - /** - * 暂降类型,以逗号隔开 - */ - private String eventType; - - /** - * 暂降残余电压告警阈值 - */ - private Float eventValue; - - /** - * 暂降持续时间告警阈值 - */ - private Integer eventDuration; - - - @NotEmpty(message = "事件类型不可为空") - @TableField(exist = false) - private List eventTypeList; - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java deleted file mode 100644 index 042333da..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -/** - * @Author: cdf - * @CreateTime: 2025-06-25 - * @Description: - */ - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 消息事件信息实体 - */ -@Data -@TableName("MSG_EVENT_INFO") -public class MsgEventInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 消息索引 - */ - private String msgIndex; - - /** - * 用户ID - */ - private String userId; - - private String userName; - - /** - * 发送时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime sendTime; - - /** - * 消息内容 - */ - private String msgContent; - - /** - * 事件索引 - */ - private String eventIndex; - - /** - * 手机号 - */ - private String phone; - - /** - * 发送结果 - */ - private Integer sendResult; - - /** - * 是否反馈 - */ - private Integer isHandle; -} 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 deleted file mode 100644 index 5cff653f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqDevicedetailaaa.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; -//} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLedgerPO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLedgerPO.java deleted file mode 100644 index 590dbf1b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLedgerPO.java +++ /dev/null @@ -1,110 +0,0 @@ -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 com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@Data -@TableName(value = "pq_user_ledger") -public class PqUserLedgerPO implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId - @TableField(value = "id") - private String id; - - @TableField(value = "POWER_SUPPLY_AREA") - private String powerSupplyArea; - - @TableField(value = "CUSTOMER_NAME") - private String customerName; - - @TableField(value = "ELECTRICITY_ADDRESS") - private String electricityAddress; - - @TableField(value = "INDUSTRY_TYPE") - private String industryType; - - @TableField(value = "VOLTAGE_LEVEL") - private String voltageLevel; - - @TableField(value = "IMPORTANT_LEVEL") - private String importantLevel; - - @TableField(value = "SUBSTATION_NAME") - private String substationName; - - @TableField(value = "BUSBAR_NAME") - private String busbarName; - - @TableField(value = "OPERATION_UNIT") - private String operationUnit; - - @TableField(value = "MANUFACTURER") - private String manufacturer; - - @TableField(value = "BIG_OBJ_TYPE") - private String bigObjType; - - @TableField(value = "SMALL_OBJ_TYPE") - private String smallObjType; - - /** - * 设备或对象的分类小类 - */ - @TableField(value = "CREATE_BY") - private String createBy; - - @TableField(value = "UPDATE_BY") - private String updateBy; - - - /** - * 创建时间(自动填充) - */ - @TableField(value = "CREATE_TIME") - private LocalDateTime createTime; - - /** - * 更新时间(自动填充) - */ - @TableField(value = "UPDATE_TIME") - private LocalDateTime updateTime; - - @TableField(value = "IS_SHOW") - private Integer isShow; - - @TableField(exist = false) - private Integer eventCount = 0; - - @TableField(exist = false) - private List eventIds; - - @TableField(exist = false) - private String deptName; - - @TableField(exist = false) - private String gdName; - - @TableField(exist = false) - private String station; - - @TableField(exist = false) - private String info; - - @TableField(exist = false) - private List eventList; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLineAssPO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLineAssPO.java deleted file mode 100644 index bfe88251..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqUserLineAssPO.java +++ /dev/null @@ -1,26 +0,0 @@ -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; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@Data -@TableName(value = "pq_user_line_ass") -public class PqUserLineAssPO { - - @TableField(value = "USER_INDEX") - private String userIndex; - - @TableField(value = "LINE_INDEX") - private Integer lineIndex; - - - @TableField(exist = false) - private String userName; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDepts.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDepts.java deleted file mode 100644 index 3ff734cf..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDepts.java +++ /dev/null @@ -1,79 +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 下午 3:57【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -/** - * 部门表 - */ -@Data -@NoArgsConstructor -@TableName(value = "PQS_DEPTS") -public class PqsDepts { - /** - * 部门表Guid - */ - @TableId(value = "DEPTS_INDEX", type = IdType.INPUT) - private String deptsIndex; - - /** - * 部门名称 - */ - @TableField(value = "DEPTSNAME") - private String deptsname; - - /** - * 排序 - */ - @TableField(value = "DEPTS_DESC") - private Integer deptsDesc; - - /** - * (关联表PQS_User)用户表Guid - */ - @TableField(value = "USER_INDEX") - private String userIndex; - - /** - * 更新时间 - */ - @TableField(value = "UPDATETIME") - private LocalDateTime updatetime; - - /** - * 部门描述 - */ - @TableField(value = "DEPTS_DESCRIPTION") - private String deptsDescription; - - /** - * 角色状态0:删除;1:正常; - */ - @TableField(value = "\"STATE\"") - private Integer state; - - /** - * 行政区域 - */ - @TableField(value = "AREA") - private String area; - - @TableField(value = "CUSTOM_DEPT") - private Integer customDept; - - @TableField(value = "PARENTNODEID") - private String parentnodeid; -} \ No newline at end of file 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 deleted file mode 100644 index ce39cde0..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicData.java +++ /dev/null @@ -1,49 +0,0 @@ -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/pojo/po/PqsDicTreePO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicTreePO.java deleted file mode 100644 index 1636464a..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsDicTreePO.java +++ /dev/null @@ -1,48 +0,0 @@ -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; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@Data -@TableName(value = "PQS_DICTREE") -public class PqsDicTreePO { - @TableId // 标记主键字段 - @TableField(value ="ID") // 显式指定列名(默认按字段名映射,可省略) - private String id; - - @TableField(value ="NAME") - private String name; - - @TableField(value ="CODE") - private String code; - - @TableField(value ="PARENT_ID") - private String parentId; - - @TableField(value ="DIC_VALUE") - private String dicValue; - - @TableField(value ="CREATE_BY") - private String createBy; - - @TableField(value ="CREATE_TIME") - private Date createTime; - - @TableField(value ="UPDATE_BY") - private String updateBy; - - @TableField(value ="UPDATE_TIME") - private Date updateTime; - - @TableField(exist = false) - private Integer level; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java deleted file mode 100644 index e84a8ffe..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java +++ /dev/null @@ -1,108 +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.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * Description: - * Date: 2025/06/20 上午 10:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@NoArgsConstructor -@TableName(value = "PQS_EVENTDETAIL") -public class PqsEventdetail { - @TableId(value = "EVENTDETAIL_INDEX", type = IdType.INPUT) - private String eventdetailIndex; - - @TableField(value = "LINEID") - private Integer lineid; - - @TableField(value = "TIMEID") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime timeid; - - @TableField(value = "MS") - private BigDecimal ms; - - @TableField(value = "\"DESCRIBE\"") - private String describe; - - @TableField(value = "WAVETYPE") - private Integer wavetype; - - @TableField(value = "PERSISTTIME") - private Double persisttime; - - @TableField(value = "EVENTVALUE") - private Double eventvalue; - - @TableField(value = "EVENTREASON") - private String eventreason; - - @TableField(value = "EVENTTYPE") - private String eventtype; - - @TableField(value = "EVENTASS_INDEX") - private String eventassIndex; - - @TableField(value = "DQTIME") - private Double dqtime; - - @TableField(value = "DEALTIME") - private LocalDateTime dealtime; - - @TableField(value = "DEALFLAG") - private Integer dealflag; - - @TableField(value = "NUM") - private BigDecimal num; - - @TableField(value = "FILEFLAG") - private Integer fileflag; - - @TableField(value = "FIRSTTIME") - private LocalDateTime firsttime; - - @TableField(value = "FIRSTTYPE") - private String firsttype; - - @TableField(value = "FIRSTMS") - private BigDecimal firstms; - - @TableField(value = "WAVENAME") - private String wavename; - - @TableField(value = "ENERGY") - private Double energy; - - @TableField(value = "SEVERITY") - private Double severity; - - @TableField(value = "LOOK_FLAG") - private Integer lookFlag; - - @TableField(value = "NOTICE_FLAG") - private Integer noticeFlag; - - @TableField(exist = false) - private Integer eventSeverity; - - @TableField(exist = false) - private String stationName; - - @TableField(exist = false) - private String busBarName; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsIntegrity.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsIntegrity.java deleted file mode 100644 index 163575fa..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsIntegrity.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.time.LocalDate; -import java.util.Date; - -/** - * CN_Gather - * - * @author cdf - * @date 2025/8/9 - */ - - -@TableName(value="PQS_INTEGRITY") -@Data -public class PqsIntegrity { - - @TableField(value="TIMEID") - private LocalDate timeID; - - @TableField(value="Line_index") - private Integer lineIndex; - - @TableField(value="due") - private Integer due; - - @TableField(value="real") - private Integer real; - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsOnlinerate.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsOnlinerate.java deleted file mode 100644 index 94a4b7f9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsOnlinerate.java +++ /dev/null @@ -1,34 +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/07/29 下午 6:40【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@NoArgsConstructor -@TableName(value = "PQS_ONLINERATE") -public class PqsOnlinerate { - @TableField(value = "TIMEID" ) - private LocalDateTime timeid; - - @TableField(value = "DEV_INDEX") - private Integer devIndex; - - @TableField(value = "ONLINEMIN") - private Integer onlinemin; - - @TableField(value = "OFFLINEMIN") - private Integer offlinemin; -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUser.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUser.java deleted file mode 100644 index 7da057cc..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUser.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.po; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - -import java.util.Date; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -@Data -@TableName("PQS_USER") -public class PqsUser { - - @TableId(type = IdType.INPUT) - private String userIndex; - - private String name; - - private String loginname; - - private String password; - - private String phone; - - private String email; - - @TableField(fill = FieldFill.INSERT) - private Date registertime; - - private Date psdvalidity; - - private Date logintime; - - private Integer state; - - private Integer mark; - - private String limitIpstart; - - private String limitIpend; - - private String limitTime; - - private Integer loginErrorTimes; - - @TableField("CASUAL_USER") - private Integer casualUser; - - private Date firsterrorTime; - - - private Date lockTime; - - private String referralCode; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUserSet.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUserSet.java deleted file mode 100644 index 897806ca..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsUserSet.java +++ /dev/null @@ -1,49 +0,0 @@ -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.io.Serializable; - -/** - * @Author: cdf - * @CreateTime: 2025-06-24 - * @Description: - */ -@Data -@TableName("PQS_USERSET") -public class PqsUserSet implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 用户设置索引 - */ - @TableId("USERSET_INDEX") - private String usersetIndex; - - /** - * 用户索引 - */ - @TableField("USER_INDEX") - private String userIndex; - - /** - * 是否通知(0-否,1-是) - */ - @TableField("ISNOTICE") - private Integer isNotice; - - /** - * 角色组索引 - */ - @TableField("ROLEGP_INDEX") - private String roleGpIndex; - - /** - * 部门索引 - */ - @TableField("DEPTS_INDEX") - private String deptsIndex; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java deleted file mode 100644 index d998dc52..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Description: - * Date: 2025/06/20 上午 9:29【需求编号】 - * - * @author clam - * @version V1.0.0 - */ - -@Data -public class AlarmAnalysisVO { - @ApiModelProperty(name="eventCount",value="暂降次数") - private Integer eventCount; - @ApiModelProperty(name="aLarmCount",value="告警事件统计") - private Integer aLarmCount; - @ApiModelProperty(name="warnCount",value="预警事件统计") - private Integer warnCount; - @ApiModelProperty(name="noticeCount",value="远程通知统计") - private Integer noticeCount; - @ApiModelProperty(name="lookALarmCount",value="告警事件处置数") - private Integer lookALarmCount; - @ApiModelProperty(name="lookWarnCount",value="预警事件处置数") - private Integer lookWarnCount; - @ApiModelProperty(name="lookNoticeCount",value="远程通知处置数") - private Integer lookNoticeCount; - - List eventdetails; - List aLarmEvent; - List warnEvent; - List noticeEvent; - List lookALarmEvent; - List lookWarnEvent; - List lookNoticeEvent; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/DeviceCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/DeviceCountVO.java deleted file mode 100644 index 751d0ad8..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/DeviceCountVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import lombok.Data; - -/** - * Description: - * Date: 2025/07/28 上午 8:50【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class DeviceCountVO { - private Integer allCount; - private Integer onLine; - private Integer offLine; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java deleted file mode 100644 index 04e4af09..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -/** - * Description: - * Date: 2025/06/20 下午 2:50【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class EventDetailVO { - - private String eventdetail_index; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime timeid; - - private BigDecimal ms; - - private String wavetype; - - private Double eventvalue; - - private Integer lookFlag; - - private Integer noticeFlag; - - private Integer lineid; - - private String pointname; - private String gdName; - private String busName; - private String devName; - - private String persisttime; - - - private String bdname; - - private String objName; - - private Integer needDealFlag; - private long msgEventInfoSize; - //1告警,2预警 - private Integer eventSeverity; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventMsgDetailVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventMsgDetailVO.java deleted file mode 100644 index c9acc436..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventMsgDetailVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: 暂降远程通知详情 - */ -@Data -public class EventMsgDetailVO { - - private String eventIndex; - - private Integer isSensitive; - - private String influenceFactors; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dealDate; - - private String dealScheme; - - private String remark; - - private String objName; - - private List msgList; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventTrendVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventTrendVO.java deleted file mode 100644 index 6b5e427d..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventTrendVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import lombok.Data; - -import java.time.LocalDate; - -/** - * Description: - * Date: 2025/06/20 上午 11:33【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class EventTrendVO { - private LocalDate localDate; - private Integer eventCount; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/LedgerCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/LedgerCountVO.java deleted file mode 100644 index 529b6121..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/LedgerCountVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO; -import lombok.Data; - -import java.util.List; - -/** - * Description: - * Date: 2025/06/19 下午 3:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class LedgerCountVO { - - private long allSubCount; - private long allDevCount; - private long allLineCount; - private long runDevCount; - private long runSubCount; - private long runLineCount; - - private List allSubList; - private List allDevList; - private List allLineList; - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java deleted file mode 100644 index e6822664..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * Description: - * Date: 2025/06/26 上午 8:50【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class MapCountVO { - private String deptsIndex; - private String deptsName; - private Integer lineCount; - private Integer eventCount; - private Integer noticeCount; - - private List lineList = new ArrayList<>(); - private List eventList = new ArrayList<>(); - private List noticeList = new ArrayList<>(); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/PqsDicTreeVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/PqsDicTreeVO.java deleted file mode 100644 index e68176a1..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/PqsDicTreeVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-08-01 - * @Description: - */ -@Data -public class PqsDicTreeVO { - - private String id; - - private String name; - - private String code; - - private String parentId; - - private String dicValue; - - private String createBy; - - private Date createTime; - - private String updateBy; - - private Date updateTime; - - private List children; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/RegionDevCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/RegionDevCountVO.java deleted file mode 100644 index 418da5cd..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/RegionDevCountVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -/** - * Description: - * Date: 2025/07/28 上午 10:26【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class RegionDevCountVO { - - /** - * 部门表Guid - */ - private String deptsIndex; - - /** - * 部门名称 - */ - private String deptsname; - private String areaName; - private Integer allCount; - private Integer onLine; - private Integer offLine; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/SubStationCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/SubStationCountVO.java deleted file mode 100644 index 74a8347e..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/SubStationCountVO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.sound.sampled.Line; -import javax.sound.sampled.LineEvent; -import java.util.List; - -/** - * Description: - * Date: 2025/07/29 上午 11:03【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class SubStationCountVO { - private Integer stationId; - private String stationName; - private String gdName; - private double longitude; - private double latitude; - private Integer lineCount; - private Integer eventCount; - - private List lineEventDetails; - - - @Data - @AllArgsConstructor - @NoArgsConstructor - public static class LineEventDetail { - private String gdName; - private String gdIndex; - - private Integer lineId; - - private String lineName; - - private Integer busBarId; - - private String busBarName; - - private Integer devId; - - private String devName; - - private String objName; - - private Integer stationId; - - private String stationName; - //通讯状态 - private Integer runFlag=0; - - private Integer eventCount; - - private List pqsEventdetails; - } - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/UserLedgerStatisticVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/UserLedgerStatisticVO.java deleted file mode 100644 index 4bba3e9f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/UserLedgerStatisticVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.njcn.gather.event.transientes.pojo.vo; - -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: 大屏右侧实体 - */ -@Data -public class UserLedgerStatisticVO { - - @ApiModelProperty(value = "半导体及精密加工大类id") - private String importId; - - private Integer importNum = 0; - - private Integer importDevNum = 0; - - @ApiModelProperty(value = "其他敏感用户大类id") - private String otherImportId; - - private Integer otherImportNum = 0; - - private Integer otherImportDevNum = 0; - - @ApiModelProperty(value = "其他干扰源大类id") - private String otherId; - - private Integer otherNum = 0; - - private Integer otherDevNum = 0; - - private List innerList = new ArrayList<>(); - - - - @Data - public static class Inner{ - - private String treeId; - - private String parentId; - - private String customId; - - private String name; - - private String code; - - private Integer count; - - private List eventList; - - private List children; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthController.java deleted file mode 100644 index ecd02fe2..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.njcn.gather.event.transientes.security; - -import cn.hutool.json.JSONObject; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.PubUtils; -import com.njcn.gather.event.transientes.utils.JwtUtil; -import com.njcn.redis.utils.RedisUtil; -import com.njcn.web.controller.BaseController; -import com.njcn.web.utils.HttpResultUtil; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.constraints.NotBlank; - -@RestController -@Slf4j -@RequiredArgsConstructor -public class AuthController extends BaseController { - - private final String eventRedisKey = "event_smart_"; - - - private final AuthenticationManager authenticationManager; - - - private final JwtUtil jwtUtil; - - private final RedisUtil redisUtil; - - - - - - @PostMapping("/cn_authenticate") - @ApiOperation("登录认证") - public HttpResult createAuthenticationToken(@RequestBody @Validated AuthRequest authRequest) { - String methodDescribe = getMethodDescribe("createAuthenticationToken"); - //log.info("Authentication request - username: {}, password: {}",authRequest.getUsername(),authRequest.getPassword()); - try { - boolean hasFlag = redisUtil.hasKey(eventRedisKey+authRequest.getUsername()); - if(hasFlag){ - String pass = redisUtil.getRawValue(eventRedisKey+authRequest.getUsername()); - - // 执行认证,内部会调用 UserDetailsService 加载用户信息 - Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(authRequest.getUsername(),pass)); - - // 将认证信息存入 SecurityContext - SecurityContextHolder.getContext().setAuthentication(authentication); - - // 直接从 Authentication 对象中获取已加载的 UserDetails,避免重复查询 - MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal(); - - // 获取用户部门(假设 CustomUserDetails 包含部门信息) - String department = userDetails.getDeptId(); - - final String jwt = jwtUtil.generateToken(userDetails); - - AuthResponse authResponse = new AuthResponse(); - authResponse.setToken(jwt); - authResponse.setDeptId(department); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, authResponse, methodDescribe); - }else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } catch (Exception e) { - e.printStackTrace(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } -} - -// 认证请求类 -class AuthRequest { - - @NotBlank(message = "用户名不可为空") - private String username; - private String password; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthResponse.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthResponse.java deleted file mode 100644 index dfc8b226..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/AuthResponse.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.gather.event.transientes.security; - -import lombok.Data; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -@Data -public class AuthResponse { - - private String token; - - private String deptId; - - private String roleId; - - private String userIndex; -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetails.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetails.java deleted file mode 100644 index 60596855..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetails.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.njcn.gather.event.transientes.security; - -import lombok.Data; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.util.Collection; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -@Data -public class MyUserDetails implements UserDetails { - - private String userId; // 用户唯一标识 - private String username; // 用户名 - private String password; // 密码 - private String deptId; // 部门信息 - private Collection authorities; // 权限集合 - private boolean accountNonExpired; // 账户是否未过期 - private boolean accountNonLocked; // 账户是否未锁定 - private boolean credentialsNonExpired; // 凭证是否未过期 - private boolean enabled; // 账户是否启用 - - public MyUserDetails(String userId,String username, String password, String deptId,Collection authorities) { - this.userId = userId; - this.username = username; - this.password = password; - this.deptId = deptId; - this.authorities = authorities; - } - - @Override - public String getPassword() { - return this.password; - } - - @Override - public String getUsername() { - return this.username; - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return true; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return true; - } -} \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetailsService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetailsService.java deleted file mode 100644 index 1e3ee432..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/MyUserDetailsService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.njcn.gather.event.transientes.security; - -import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.gather.event.transientes.mapper.PqsUserMapper; -import com.njcn.gather.event.transientes.mapper.PqsUserSetMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsUser; -import com.njcn.gather.event.transientes.pojo.po.PqsUserSet; -import com.njcn.redis.utils.RedisUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Objects; - -@Service -@RequiredArgsConstructor -public class MyUserDetailsService implements UserDetailsService { - - private final PqsUserMapper pqsUserMapper; - - private final PqsUserSetMapper pqsUserSetMapper; - - private final RedisUtil redisUtil; - - - - @Override - public MyUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - - - if("system_event".equals(username)){ - return new MyUserDetails("12345678910","system_event", "@#001njcnpqs","10001", - new ArrayList<>()); - } - - - if(redisUtil.hasKey("event_smart_"+username)){ - String password = redisUtil.getRawValue("event_smart_"+username); - // 这里应该从数据库中获取用户信息,本示例使用硬编码用户 - PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - String encodedPassword = passwordEncoder.encode(password); - - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - userWrapper.eq(PqsUser::getLoginname,username); - PqsUser pqsUser = pqsUserMapper.selectOne(userWrapper); - if(Objects.isNull(pqsUser)){ - throw new UsernameNotFoundException("User not found with username: " + username); - } - - LambdaQueryWrapper userSetWrapper = new LambdaQueryWrapper<>(); - userSetWrapper.eq(PqsUserSet::getUserIndex,pqsUser.getUserIndex()); - PqsUserSet pqsUserSet = pqsUserSetMapper.selectOne(userSetWrapper); - String deptId = pqsUserSet.getDeptsIndex(); - - - return new MyUserDetails(pqsUser.getUserIndex(),pqsUser.getLoginname(), encodedPassword,deptId, - new ArrayList<>()); - }else { - throw new UsernameNotFoundException("User not found with username: " + username); - } - } -} 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 deleted file mode 100644 index cd84fbea..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/security/SecurityConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.njcn.gather.event.transientes.security; - -import com.njcn.gather.event.transientes.filter.JwtRequestFilter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; - -@Configuration -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - @Autowired - private UserDetailsService userDetailsService; - - @Autowired - private JwtRequestFilter jwtRequestFilter; - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable() - .authorizeRequests() - .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent","/accept/eventMsg").permitAll() // 允许访问认证接口 - //.antMatchers("/**").permitAll() // 允许访问认证接口 - .anyRequest().authenticated() - .and() - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS); // 使用无状态会话 - - http.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class); - } - - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/CommGeneralService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/CommGeneralService.java deleted file mode 100644 index 3687175f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/CommGeneralService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import cn.hutool.core.util.StrUtil; -import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.redis.utils.RedisUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -import static com.njcn.gather.event.transientes.pojo.constant.RedisConstant.REDIS_DEPT_INDEX; - -/** - * @Author: cdf - * @CreateTime: 2025-06-25 - * @Description: - */ -@Service -@RequiredArgsConstructor -public class CommGeneralService { - @Value("${SYS_TYPE_ZT}") - private String sysTypeZt; - - private final PqsDeptslineService pqsDeptslineService; - private final PqsDeptsService pqsDeptsService; - private final RedisUtil redisUtil; - - /** - * 根据部门id获取部门所拥有的监测点 - * @param largeScreenCountParam - * @return - */ - public List getLineIdsByDept(LargeScreenCountParam largeScreenCountParam){ - List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - return deptslineIds; - - } - - - public List getLineIdsByRedis(String deptId){ - List deptLineIds = (List) redisUtil.getObjectByKey( REDIS_DEPT_INDEX+ StrUtil.DASHED+deptId); - return deptLineIds; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventGateService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventGateService.java deleted file mode 100644 index c66e416b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventGateService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.njcn.event.file.pojo.dto.WaveDataDTO; -import com.njcn.gather.event.transientes.pojo.param.MonitorTerminalParam; - -public interface EventGateService { - - - /** - * 功能描述: 暂态事件波形分析 - * @param param - * @return - */ - WaveDataDTO getTransientAnalyseWave(MonitorTerminalParam param); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventRightService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventRightService.java deleted file mode 100644 index dc0e2ecd..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/EventRightService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.event.file.pojo.dto.WaveDataDTO; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.po.PqGdCompany; -import com.njcn.gather.event.devcie.pojo.po.PqSubstation; -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.param.MonitorTerminalParam; -import com.njcn.gather.event.transientes.pojo.param.PqUserLedgerParam; -import com.njcn.gather.event.transientes.pojo.po.PqUserLedgerPO; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import com.njcn.gather.event.transientes.pojo.vo.UserLedgerStatisticVO; - -import java.util.List; - -public interface EventRightService { - - - UserLedgerStatisticVO userLedgerStatistic(LargeScreenCountParam param); - - - Page rightEventOpen(LargeScreenCountParam param); - - Page rightEventOpenForDetail(LargeScreenCountParam param); - - - Page rightEventDevOpen(LargeScreenCountParam param); - - - - - List rightImportUser(LargeScreenCountParam param); - - - PqUserLedgerPO rightImportOpenDetail(LargeScreenCountParam param); - - - - List gdSelect(); - - List bdSelect(); - - - - - /*-------------------------------------------------------*/ - UserLedgerStatisticVO userLedgerStatisticClone(LargeScreenCountParam param); - - Page rightEventOpenClone(LargeScreenCountParam param); - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java deleted file mode 100644 index d99666a6..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -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.MsgEventInfo; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.pojo.vo.*; - -import java.util.List; - -/** - * Description: - * Date: 2025/06/19 下午 3:05【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface LargeScreenCountService { - - void initLedger(LargeScreenCountParam largeScreenCountParam); - - LedgerCountVO scaleStatistics(LargeScreenCountParam largeScreenCountParam); - - AlarmAnalysisVO alarmAnalysis(LargeScreenCountParam largeScreenCountParam); - - List eventTrend(LargeScreenCountParam largeScreenCountParam); - - Page eventList(LargeScreenCountParam largeScreenCountParam); - - List noDealEventList(LargeScreenCountParam largeScreenCountParam); - - - boolean lookEvent(List ids); - - List mapCount(LargeScreenCountParam largeScreenCountParam); - - EventMsgDetailVO eventMsgDetail(String eventId); - - List msgSendList(LargeScreenCountParam largeScreenCountParam); - - Page hasSendMsgPage(LargeScreenCountParam largeScreenCountParam); - - boolean msgHandle(MessageEventFeedbackParam messageEventFeedbackParam); - - - AlarmAnalysisVO alarmAnalysisDetail(LargeScreenCountParam largeScreenCountParam); - - Page eventTablePage(LargeScreenCountParam largeScreenCountParam); - - DeviceCountVO devFlagCount(LargeScreenCountParam largeScreenCountParam); - - List devDetail(LargeScreenCountParam largeScreenCountParam); - - List regionDevCount(LargeScreenCountParam largeScreenCountParam); - - List substationCount(LargeScreenCountParam largeScreenCountParam); - - Page eventPage(LargeScreenCountParam largeScreenCountParam); - - Page devicePage(LargeScreenCountParam largeScreenCountParam); - - Page userEventList(LargeScreenCountParam largeScreenCountParam); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MessageEventFeedbackService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MessageEventFeedbackService.java deleted file mode 100644 index 0f84c599..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MessageEventFeedbackService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.po.MessageEventFeedback; - -public interface MessageEventFeedbackService extends IService { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java deleted file mode 100644 index bdb2b548..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; - -import java.util.List; - -public interface MsgEventConfigService extends IService { - - boolean eventConfig(MsgEventConfig msgEventConfig); - - - MsgEventConfig queryConfig(); - - List getEventType(); - - Float getEventValue(); - - Integer getEventDuration(); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java deleted file mode 100644 index 2cb0d588..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; - -import java.util.List; - -public interface MsgEventInfoService extends IService { - - List getMsgByIds(List ids); -} 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 deleted file mode 100644 index 36d6af69..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqDevicedetailService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -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{ - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqUserLedgerService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqUserLedgerService.java deleted file mode 100644 index 27413c34..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqUserLedgerService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.gather.event.transientes.service; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.param.PqUserLedgerParam; -import com.njcn.gather.event.transientes.pojo.po.PqUserLedgerPO; - -import java.util.List; - -public interface PqUserLedgerService extends IService { - // 添加记录 - boolean addLedger(PqUserLedgerParam ledgerParam); - - // 更新记录 - boolean updateLedger(PqUserLedgerParam ledgerParam); - - // 删除记录(物理删除) - boolean deleteLedger(List ids); - - // 查询单条记录 - PqUserLedgerPO getLedgerById(String id); - - // 查询所有记录 - Page pageList(PqUserLedgerParam param); -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDeptsService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDeptsService.java deleted file mode 100644 index 16b20b00..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDeptsService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.njcn.gather.event.devcie.pojo.dto.PqsDeptDTO; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.baomidou.mybatisplus.extension.service.IService; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/19 下午 3:57【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsDeptsService extends IService{ - - - List findDeptAndChildren( String deptId); - - List getDeptList( List deptIds); - - } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDicTreeService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDicTreeService.java deleted file mode 100644 index 1ffbe5ca..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsDicTreeService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.po.PqsDicTreePO; -import com.njcn.gather.event.transientes.pojo.vo.PqsDicTreeVO; - -import java.util.List; - -public interface PqsDicTreeService extends IService { - - - - List getDicTree(String code); - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsEventdetailService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsEventdetailService.java deleted file mode 100644 index 3292298b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsEventdetailService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/20 上午 10:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsEventdetailService extends IService{ - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsOnlinerateService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsOnlinerateService.java deleted file mode 100644 index 557b6356..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsOnlinerateService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.njcn.gather.event.transientes.pojo.po.PqsOnlinerate; -import com.baomidou.mybatisplus.extension.service.IService; - /** - * - * Description: - * Date: 2025/07/29 下午 6:40【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsOnlinerateService extends IService{ - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUserService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUserService.java deleted file mode 100644 index d901ad34..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUserService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.njcn.gather.event.transientes.pojo.po.PqsUser; - -/** - * Description: - * Date: 2025/06/27 上午 9:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsUserService extends IService { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java deleted file mode 100644 index 127df983..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.gather.event.transientes.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.event.transientes.pojo.po.PqsUserSet; - -/** - * - * Description: - * Date: 2025/06/26 下午 2:27【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface PqsUsersetService extends IService{ - - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventGateServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventGateServiceImpl.java deleted file mode 100644 index e06bb8b3..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventGateServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.utils.PubUtils; -import com.njcn.event.file.component.WaveFileComponent; -import com.njcn.event.file.pojo.dto.WaveDataDTO; -import com.njcn.event.file.pojo.enums.WaveFileResponseEnum; -import com.njcn.gather.event.devcie.mapper.PqLinedetailMapper; -import com.njcn.gather.event.devcie.pojo.po.PqDevice; -import com.njcn.gather.event.devcie.pojo.po.PqLine; -import com.njcn.gather.event.devcie.pojo.po.PqLinedetail; -import com.njcn.gather.event.devcie.service.PqDeviceService; -import com.njcn.gather.event.devcie.service.PqLineService; -import com.njcn.gather.event.transientes.pojo.param.MonitorTerminalParam; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.service.EventGateService; -import com.njcn.gather.event.transientes.service.PqsEventdetailService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.io.InputStream; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Author: cdf - * @CreateTime: 2025-06-30 - * @Description: - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EventGateServiceImpl implements EventGateService { - - private final PqsEventdetailService pqsEventdetailService; - private final PqDeviceService pqDeviceService; - private final WaveFileComponent waveFileComponent; - private final PqLineService pqLineService; - private final PqLinedetailMapper pqLinedetailMapper; - @Value("${WAVEPATH}") - private String WAVEPATH; - @Override - public WaveDataDTO getTransientAnalyseWave(MonitorTerminalParam param) { - WaveDataDTO waveDataDTO; - //获取暂降事件 - PqsEventdetail eventDetail = pqsEventdetailService.getById(param.getId()); - Integer lineid = eventDetail.getLineid(); - PqLine pqLine = pqLineService.getById(lineid); - PqLinedetail pqLinedetail = pqLinedetailMapper.selectById(lineid); - PqDevice device = pqDeviceService.getById(pqLine.getDevIndex()); - String waveName = eventDetail.getWavename(); - String cfgPath, datPath; - if (StrUtil.isBlank(waveName)) { - throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); - } - cfgPath = WAVEPATH+"/"+device.getIp()+"/"+waveName+".CFG"; - datPath = WAVEPATH+"/"+device.getIp()+"/"+waveName+".DAT"; - log.info("本地磁盘波形文件路径----" + cfgPath); - InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); - InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); - if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { - throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); - } - waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1); - - waveDataDTO = waveFileComponent.getValidData(waveDataDTO); - - waveDataDTO.setPtType(pqLinedetail.getPttype()); - waveDataDTO.setPt(pqLine.getPt1()/ pqLine.getPt2()); - waveDataDTO.setCt(pqLine.getCt1()/ pqLine.getCt2()); - waveDataDTO.setMonitorName(pqLine.getName()); - return waveDataDTO; - - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java deleted file mode 100644 index f2210606..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java +++ /dev/null @@ -1,994 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.LocalDateTimeUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.gather.event.devcie.mapper.PqDeviceMapper; -import com.njcn.gather.event.devcie.mapper.PqGdCompanyMapper; -import com.njcn.gather.event.devcie.mapper.PqSubstationMapper; -import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO; -import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO; -import com.njcn.gather.event.devcie.pojo.po.*; -import com.njcn.gather.event.devcie.service.PqLineService; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.mapper.PqUserLedgerMapper; -import com.njcn.gather.event.transientes.mapper.PqUserLineAssMapper; -import com.njcn.gather.event.transientes.mapper.PqsDicTreeMapper; -import com.njcn.gather.event.transientes.pojo.DicTreeEnum; -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.po.*; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import com.njcn.gather.event.transientes.pojo.vo.LedgerCountVO; -import com.njcn.gather.event.transientes.pojo.vo.UserLedgerStatisticVO; -import com.njcn.gather.event.transientes.service.*; -import com.njcn.redis.utils.RedisUtil; -import com.njcn.web.factory.PageFactory; -import io.swagger.models.auth.In; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author: cdf - * @CreateTime: 2025-06-30 - * @Description: - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EventRightServiceImpl implements EventRightService { - - - private final PqUserLineAssMapper pqUserLineAssMapper; - - private final PqUserLedgerMapper pqUserLedgerMapper; - - private final PqsDicTreeMapper pqsDicTreeMapper; - - private final PqsEventdetailService pqsEventdetailService; - - private final MsgEventConfigService msgEventConfigService; - - private final PqLineService pqLineService; - - private final PqSubstationMapper pqSubstationMapper; - private final CommGeneralService commGeneralService; - - private final PqGdCompanyMapper pqGdCompanyMapper; - - private final PqsDeptslineService pqsDeptslineService; - - private final PqsDeptsService pqsDeptsService; - @Value("${SYS_TYPE_ZT}") - private String sysTypeZt; - - - - @Override - public UserLedgerStatisticVO userLedgerStatistic(LargeScreenCountParam param) { - UserLedgerStatisticVO result = new UserLedgerStatisticVO(); - - // 1. 获取字典树数据 - List dicTreeList = getAllDicTrees(); - Map treeMap = getDicTreeMap(dicTreeList); - setResultIds(result, treeMap); - - // 2. 获取线路ID列表 - List lineIds = commGeneralService.getLineIdsByDept(param); - if (CollUtil.isEmpty(lineIds)) { - return result; - } - - // 3. 获取用户线路关联数据 - List assList = getUserLineAssociations(lineIds); - if (CollUtil.isEmpty(assList)) { - return result; - } - - // 4. 获取用户台账信息 - Set assUserIds = assList.stream() - .map(PqUserLineAssPO::getUserIndex) - .collect(Collectors.toSet()); - List userLedgers = getUserLedgers(new ArrayList<>(assUserIds),null,false); - if (CollUtil.isEmpty(userLedgers)) { - return result; - } - - // 5. 获取事件和线路数据 - List events = getEventsInTimeRange(param, lineIds); - List lines = getLines(lineIds); - - // 6. 按用户类型分组处理 - Map> userMap = userLedgers.stream() - .collect(Collectors.groupingBy(PqUserLedgerPO::getBigObjType)); - - // 7. 构建结果 - buildResult(result, treeMap, userMap, assList, events, lines,dicTreeList); - - return result; - } - - - private List getAllDicTrees(){ - return pqsDicTreeMapper.selectList(new LambdaQueryWrapper<>()); - } - - private Map getDicTreeMap(List dicTreeList) { - List touList = dicTreeList.stream().filter(it -> Objects.equals(it.getCode(), DicTreeEnum.BJ_USER.getCode())||Objects.equals(it.getCode(), DicTreeEnum.OI_USER.getCode())||Objects.equals(it.getCode(), DicTreeEnum.OT_USER.getCode())).collect(Collectors.toList()); - Map treeMap = touList.stream().collect(Collectors.toMap(PqsDicTreePO::getCode, Function.identity())); - return treeMap; - } - - private void setResultIds (UserLedgerStatisticVO result,Map treeMap){ - treeMap.forEach((tree, obj) -> { - if (tree.equals(DicTreeEnum.BJ_USER.getCode())) { - result.setImportId(obj.getId()); - } else if (tree.equals(DicTreeEnum.OI_USER.getCode())) { - result.setOtherImportId(obj.getId()); - } else if (tree.equals(DicTreeEnum.OT_USER.getCode())) { - result.setOtherId(obj.getId()); - } - }); - } - - - private List getUserLineAssociations(List lineIds){ - LambdaQueryWrapper assQuery = new LambdaQueryWrapper<>(); - // assQuery.in(PqUserLineAssPO::getLineIndex, lineIds); - - if(lineIds.size()>1000){ - List> lineList = CollUtil.split(lineIds, 1000); - assQuery.and(w -> { - for (List ids : lineList) { - w.or(wIn -> wIn.in(PqUserLineAssPO::getLineIndex, ids)); - } - }); - }else { - assQuery.in(PqUserLineAssPO::getLineIndex, lineIds); - } - - return pqUserLineAssMapper.selectList(assQuery); - } - - private List getEventsInTimeRange(LargeScreenCountParam param,List lineIds){ - //查询时间段的暂降事件 - LambdaQueryWrapper eventQuery = new LambdaQueryWrapper<>(); - eventQuery.between(PqsEventdetail::getTimeid, DateUtil.parse(param.getSearchBeginTime()), DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))) - .in(PqsEventdetail::getWavetype, msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()); - if (lineIds.size() > 1000) { - List> listLineIds = CollUtil.split(lineIds, 1000); - eventQuery.and(w -> { - for (List ids : listLineIds) { - w.or(wIn -> wIn.in(PqsEventdetail::getLineid, ids)); - } - }); - } else { - eventQuery.in(PqsEventdetail::getLineid, lineIds); - } - List eventdetailList = pqsEventdetailService.list(eventQuery); - if(CollUtil.isNotEmpty(eventdetailList)){ - eventdetailList.forEach(it->it.setPersisttime(BigDecimal.valueOf(it.getPersisttime() / 1000).setScale(3,RoundingMode.HALF_UP).doubleValue())); - } - return eventdetailList; - } - - private List getUserLedgers(List assUserIds,LargeScreenCountParam param,boolean queryFlag){ - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - if(assUserIds.size()>1000){ - List> assUserIdsList = CollUtil.split(assUserIds, 1000); - userWrapper.and(w -> { - for (List ids : assUserIdsList) { - w.or(wIn -> wIn.in(PqUserLedgerPO::getId, ids)); - } - }); - }else { - userWrapper.in(PqUserLedgerPO::getId, assUserIds); - } - if(queryFlag){ - if(StrUtil.isNotBlank(param.getBigObjType())){ - //对象大类不为空 - userWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType()); - } - if(StrUtil.isNotBlank(param.getSmallObjType())){ - //对象大类不为空 - userWrapper.eq(PqUserLedgerPO::getSmallObjType,param.getSmallObjType()); - } - if(Objects.nonNull(param.getGdIndex())){ - userWrapper.eq(PqUserLedgerPO::getPowerSupplyArea,param.getGdIndex()); - } - if(StrUtil.isNotBlank(param.getSearchValue())){ - userWrapper.like(PqUserLedgerPO::getCustomerName,param.getSearchValue()); - } - } - return pqUserLedgerMapper.selectList(userWrapper); - } - private List getLines(List lineIds){ - LambdaQueryWrapper lineQuery = new LambdaQueryWrapper<>(); - if (lineIds.size() > 1000) { - List> listLineIds = CollUtil.split(lineIds, 1000); - - lineQuery.and(w -> { - for (List ids : listLineIds) { - w.or(wIn -> wIn.in(PqLine::getLineIndex, ids)); - } - }); - } else { - lineQuery.in(PqLine::getLineIndex, lineIds); - } - return pqLineService.list(lineQuery); - } - - - private void buildResult(UserLedgerStatisticVO result,Map treeMap,Map> userMap,List assList,List eventdetailList, List lineList,List dicTreePOList){ - List innerList = new ArrayList<>(); - Map allTreeMap = dicTreePOList.stream().collect(Collectors.toMap(PqsDicTreePO::getId,dept->dept)); - - treeMap.forEach((tree, obj) -> { - //获取对象大类的用户 - List oneList = userMap.get(obj.getId()); - - if (tree.equals(DicTreeEnum.BJ_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setImportNum(count[0]); - result.setImportDevNum(count[1]); - } else if (tree.equals(DicTreeEnum.OI_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setOtherImportNum(count[0]); - result.setOtherImportDevNum(count[1]); - } else if (tree.equals(DicTreeEnum.OT_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setOtherNum(count[0]); - result.setOtherDevNum(count[1]); - } - - UserLedgerStatisticVO.Inner inner = new UserLedgerStatisticVO.Inner(); - inner.setName(obj.getName()); - - inner.setCount(0); - - List childrenList = new ArrayList<>(); - if(CollUtil.isNotEmpty(oneList)) { - Map> smallMap = oneList.stream().collect(Collectors.groupingBy(PqUserLedgerPO::getSmallObjType)); - smallMap.forEach((key, userList) -> { - UserLedgerStatisticVO.Inner item = new UserLedgerStatisticVO.Inner(); - Integer[] count = getEventCount(userList, assList, eventdetailList, false); - item.setCount(count[0]); - item.setTreeId(key); - item.setParentId(obj.getId()); - item.setName(allTreeMap.containsKey(key) ? allTreeMap.get(key).getName() : "/"); - childrenList.add(item); - }); - inner.setChildren(childrenList); - innerList.add(inner); - } - }); - - result.setInnerList(innerList); - } - - - private void buildResultClone(UserLedgerStatisticVO result,Map treeMap,Map> userMap,List assList,List eventdetailList, List lineList,List dicTreePOList){ - List innerList = new ArrayList<>(); - Map allTreeMap = dicTreePOList.stream().collect(Collectors.toMap(PqsDicTreePO::getId,dept->dept)); - - treeMap.forEach((tree, obj) -> { - //获取对象大类的用户 - List oneList = userMap.get(obj.getId()); - - - if (tree.equals(DicTreeEnum.BJ_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setImportNum(oneList.size()); - result.setImportDevNum(count[1]); - } else if (tree.equals(DicTreeEnum.OI_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setOtherImportNum(oneList.size()); - result.setOtherImportDevNum(count[1]); - } else if (tree.equals(DicTreeEnum.OT_USER.getCode())) { - Integer[] count = getEventCount(oneList, assList, eventdetailList,true); - result.setOtherNum(oneList.size()); - result.setOtherDevNum(count[1]); - } - - UserLedgerStatisticVO.Inner inner = new UserLedgerStatisticVO.Inner(); - inner.setName(obj.getName()); - - inner.setCount(0); - - List childrenList = new ArrayList<>(); - if(CollUtil.isNotEmpty(oneList)) { - Map> smallMap = oneList.stream().collect(Collectors.groupingBy(PqUserLedgerPO::getSmallObjType)); - smallMap.forEach((key, userList) -> { - UserLedgerStatisticVO.Inner item = new UserLedgerStatisticVO.Inner(); - Integer[] count = getEventCount(userList, assList, eventdetailList, false); - item.setCount(count[0]); - item.setTreeId(key); - item.setParentId(obj.getId()); - item.setName(allTreeMap.containsKey(key) ? allTreeMap.get(key).getName() : "/"); - childrenList.add(item); - }); - inner.setChildren(childrenList); - innerList.add(inner); - } - }); - - result.setInnerList(innerList); - } - - -/* @Override - public Page rightEventOpen(LargeScreenCountParam param) { - Page result = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)); - - // 1. 获取线路ID - List lineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); - if (CollUtil.isEmpty(lineIds)) { - return result; - } - - // 2. 获取用户线路关联 - List assList = getUserLineAssociations(lineIds); - if (CollUtil.isEmpty(assList)) { - return result; - } - - // 3. 获取用户台账 - List userLedgers = getFilteredUserLedgers(assList, param); - if (CollUtil.isEmpty(userLedgers)) { - return result; - } - - // 4. 获取事件数据 - List lineUseList = assList.stream() - .map(PqUserLineAssPO::getLineIndex) - .distinct() - .collect(Collectors.toList()); - - Page eventPage = getEventsPage(param, lineUseList); - if (CollUtil.isEmpty(eventPage.getRecords())) { - return result; - } - - // 5. 构建结果 - buildEventDetailResult(result, eventPage, assList, userLedgers); - - return result; - }*/ - - - - - @Override - public Page rightEventOpen(LargeScreenCountParam param) { - Page result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)); - List deptLineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); - if(CollUtil.isEmpty(deptLineIds)){ - return result; - } - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - PqSubstation pqSubstation = null; - if(Objects.nonNull(param.getBdId())){ - pqSubstation = pqSubstationMapper.selectOne(new LambdaQueryWrapper().eq(PqSubstation::getSubIndex,param.getBdId())); - if(Objects.isNull(pqSubstation)){ - return result; - } - queryWrapper.in(PqLine::getSubIndex, pqSubstation.getSubIndex()); - - } - PqGdCompany pqGdCompany = null; - if(Objects.nonNull(param.getGdIndex())){ - pqGdCompany = pqGdCompanyMapper.selectOne(new LambdaQueryWrapper().eq(PqGdCompany::getGdIndex,param.getGdIndex())); - if(Objects.isNull(pqGdCompany)){ - return result; - } - queryWrapper.in(PqLine::getGdIndex, pqGdCompany.getGdIndex()); - } - - if(Objects.nonNull(param.getBdId()) || Objects.nonNull(param.getGdIndex())) { - - if(deptLineIds.size()>1000){ - List> assUserIdsList = CollUtil.split(deptLineIds, 1000); - queryWrapper.and(w -> { - for (List ids : assUserIdsList) { - w.or(wIn -> wIn.in(PqLine::getLineIndex, ids)); - } - }); - }else { - queryWrapper.in(PqLine::getLineIndex, deptLineIds); - } - - List pqLineList = pqLineService.list(queryWrapper); - deptLineIds = pqLineList.stream().map(PqLine::getLineIndex).distinct().collect(Collectors.toList()); - } - - if(CollUtil.isEmpty(deptLineIds)){ - return result; - } - - - - //获取用户监测点关系符合部门监测点的 - List assList = getUserLineAssociations(deptLineIds); - if(CollUtil.isEmpty(assList)){ - return result; - } - List userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - if(CollUtil.isEmpty(userIds)){ - return result; - } - //获取符合条件的用户 - List pqUserLedgerPOList =getUserLedgers(userIds,param,true); - - if(CollUtil.isEmpty(pqUserLedgerPOList)){ - return result; - } - Map pqMap = pqUserLedgerPOList.stream().collect(Collectors.toMap(PqUserLedgerPO::getId,Function.identity())); - List pUserIds = pqUserLedgerPOList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - List assListLast = assList.stream().filter(it->pUserIds.contains(it.getUserIndex())).collect(Collectors.toList()); - List lineUseList = assListLast.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - - //查询时间段的暂降事件 - LambdaQueryWrapper eventQuery = new LambdaQueryWrapper<>(); - eventQuery.between(PqsEventdetail::getTimeid, DateUtil.parse(param.getSearchBeginTime()), DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))) - .in(PqsEventdetail::getWavetype, msgEventConfigService.getEventType()).orderByDesc(PqsEventdetail::getTimeid) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()); - - if (lineUseList.size() > 1000) { - List> listLineIds = CollUtil.split(lineUseList, 1000); - eventQuery.and(w -> { - for (List ids : listLineIds) { - w.or(wIn -> wIn.in(PqsEventdetail::getLineid, ids)); - } - }); - } else { - eventQuery.in(PqsEventdetail::getLineid, lineUseList); - } - Page page = pqsEventdetailService.page(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),eventQuery); - List temResultList = page.getRecords(); - if(CollUtil.isEmpty(temResultList)){ - return result; - } - - List ids = temResultList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List dtoList = pqLineService.getBaseLineInfo(ids); - Map lineMap = dtoList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId,Function.identity())); - Map> temMap = assListLast.stream().filter(it->ids.contains(it.getLineIndex())).collect(Collectors.groupingBy(PqUserLineAssPO::getLineIndex,Collectors.mapping(PqUserLineAssPO::getUserIndex,Collectors.toList()))); - - List resultList = new ArrayList<>(); - for(PqsEventdetail pqsEventdetail : temResultList){ - EventDetailVO eventDetailVO = new EventDetailVO(); - BeanUtil.copyProperties(pqsEventdetail,eventDetailVO); - List userTemIds = temMap.get(pqsEventdetail.getLineid()); - String objName = userTemIds.stream().map(it->pqMap.get(it).getCustomerName()).collect(Collectors.joining("; ")); - eventDetailVO.setObjName(objName); - LedgerBaseInfoDTO dto = lineMap.get(pqsEventdetail.getLineid()); - eventDetailVO.setBdname(dto.getStationName()); - eventDetailVO.setGdName(dto.getGdName()); - eventDetailVO.setBusName(dto.getBusBarName()); - eventDetailVO.setLineid(dto.getLineId()); - eventDetailVO.setPointname(dto.getLineName()); - eventDetailVO.setEventdetail_index(pqsEventdetail.getEventdetailIndex()); - eventDetailVO.setDevName(dto.getDevName()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(pqsEventdetail.getPersisttime() / 1000).setScale(3,RoundingMode.HALF_UP).toString()); - resultList.add(eventDetailVO); - } - result.setTotal(page.getTotal()); - result.setRecords(resultList); - return result; - } - - - @Override - public Page rightEventOpenForDetail(LargeScreenCountParam param) { - - Page result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)); - - //查询时间段的暂降事件 - LambdaQueryWrapper eventQuery = new LambdaQueryWrapper<>(); - eventQuery.between(PqsEventdetail::getTimeid, DateUtil.parse(param.getSearchBeginTime()), DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))) - .in(PqsEventdetail::getWavetype, msgEventConfigService.getEventType()).orderByDesc(PqsEventdetail::getTimeid) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getEventdetailIndex,param.getEventIds()); - - Page page = pqsEventdetailService.page(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),eventQuery); - List temResultList = page.getRecords(); - if(CollUtil.isEmpty(temResultList)){ - return result; - } - - List ids = temResultList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List dtoList = pqLineService.getBaseLineInfo(ids); - Map lineMap = dtoList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId,Function.identity())); - - //获取用户监测点关系符合部门监测点的 - List assList = getUserLineAssociations(ids); - if(CollUtil.isEmpty(assList)){ - return result; - } - List userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - if(CollUtil.isEmpty(userIds)){ - return result; - } - Map> temMap = assList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getLineIndex,Collectors.mapping(PqUserLineAssPO::getUserIndex,Collectors.toList()))); - - //获取符合条件的用户 - List pqUserLedgerPOList =getUserLedgers(userIds,param,true); - - if(CollUtil.isEmpty(pqUserLedgerPOList)){ - return result; - } - Map pqMap = pqUserLedgerPOList.stream().collect(Collectors.toMap(PqUserLedgerPO::getId,Function.identity())); - - List resultList = new ArrayList<>(); - for(PqsEventdetail pqsEventdetail : temResultList){ - EventDetailVO eventDetailVO = new EventDetailVO(); - BeanUtil.copyProperties(pqsEventdetail,eventDetailVO); - List userTemIds = temMap.get(pqsEventdetail.getLineid()); - String objName = userTemIds.stream().map(it->pqMap.get(it).getCustomerName()).collect(Collectors.joining("; ")); - eventDetailVO.setObjName(objName); - LedgerBaseInfoDTO dto = lineMap.get(pqsEventdetail.getLineid()); - eventDetailVO.setBdname(dto.getStationName()); - eventDetailVO.setGdName(dto.getGdName()); - eventDetailVO.setBusName(dto.getBusBarName()); - eventDetailVO.setLineid(dto.getLineId()); - eventDetailVO.setPointname(dto.getLineName()); - eventDetailVO.setEventdetail_index(pqsEventdetail.getEventdetailIndex()); - eventDetailVO.setDevName(dto.getDevName()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(pqsEventdetail.getPersisttime() / 1000).setScale(3,RoundingMode.HALF_UP).toString()); - resultList.add(eventDetailVO); - } - result.setTotal(page.getTotal()); - result.setRecords(resultList); - return result; - } - - @Override - public Page rightEventDevOpen(LargeScreenCountParam param) { - Page result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)); - List lineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); - if(CollUtil.isEmpty(lineIds)){ - return result; - } - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - PqSubstation pqSubstation = null; - if(Objects.nonNull(param.getBdId())){ - pqSubstation = pqSubstationMapper.selectOne(new LambdaQueryWrapper().eq(PqSubstation::getSubIndex,param.getBdId())); - if(Objects.isNull(pqSubstation)){ - return result; - } - queryWrapper.in(PqLine::getSubIndex, pqSubstation.getSubIndex()); - - } - PqGdCompany pqGdCompany = null; - if(Objects.nonNull(param.getGdIndex())){ - pqGdCompany = pqGdCompanyMapper.selectOne(new LambdaQueryWrapper().eq(PqGdCompany::getGdIndex,param.getGdIndex())); - if(Objects.isNull(pqGdCompany)){ - return result; - } - queryWrapper.in(PqLine::getGdIndex, pqGdCompany.getGdIndex()); - } - - if(Objects.nonNull(param.getBdId()) || Objects.nonNull(param.getGdIndex())) { - - if(lineIds.size()>1000){ - List> assUserIdsList = CollUtil.split(lineIds, 1000); - queryWrapper.and(w -> { - for (List ids : assUserIdsList) { - w.or(wIn -> wIn.in(PqLine::getLineIndex, ids)); - } - }); - }else { - queryWrapper.in(PqLine::getLineIndex, lineIds); - } - - List pqLineList = pqLineService.list(queryWrapper); - lineIds = pqLineList.stream().map(PqLine::getLineIndex).distinct().collect(Collectors.toList()); - } - - if(CollUtil.isEmpty(lineIds)){ - return result; - } - - List assPOList =getUserLineAssociations(lineIds); - if(CollUtil.isEmpty(assPOList)){ - return result; - } - - List userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - - if(userIds.size() > 1000){ - List> userIdList = CollUtil.split(userIds,1000); - lambdaQueryWrapper.and(ad->{ - for(List ids : userIdList){ - ad.or(o->o.in(PqUserLedgerPO::getId,ids)); - } - }); - }else { - lambdaQueryWrapper.in(PqUserLedgerPO::getId,userIds); - } - - if(StrUtil.isNotBlank(param.getBigObjType())){ - //对象大类不为空 - lambdaQueryWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType()); - } - if(StrUtil.isNotBlank(param.getSmallObjType())){ - //对象大类不为空 - lambdaQueryWrapper.eq(PqUserLedgerPO::getSmallObjType,param.getSmallObjType()); - } - - if(Objects.nonNull(param.getGdIndex())){ - lambdaQueryWrapper.eq(PqUserLedgerPO::getPowerSupplyArea,param.getGdIndex()); - } - - if(StrUtil.isNotBlank(param.getSearchValue())){ - lambdaQueryWrapper.eq(PqUserLedgerPO::getCustomerName,param.getSearchValue()); - } - - List userList = pqUserLedgerMapper.selectList(lambdaQueryWrapper); - if(CollUtil.isEmpty(userList)){ - return result; - } - List userTemIds = userList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - - List aassList = assPOList.stream().filter(it->userTemIds.contains(it.getUserIndex())).collect(Collectors.toList()); - List ids = aassList.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - List eventdetailList = getEventsInTimeRange(param,ids); - if(CollUtil.isEmpty(eventdetailList)){ - return result; - } - List temLineIds = eventdetailList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List lastUserList = aassList.stream().filter(it->temLineIds.contains(it.getLineIndex())).map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - - Page page = pqUserLedgerMapper.selectPage(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),new LambdaQueryWrapper().in(PqUserLedgerPO::getId,lastUserList).orderByAsc(PqUserLedgerPO::getSmallObjType,PqUserLedgerPO::getUpdateTime)); - if(CollUtil.isEmpty(page.getRecords())){ - return page; - } - - List lastIds = page.getRecords().stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - List lastAssList = aassList.stream().filter(it->lastIds.contains(it.getUserIndex())).collect(Collectors.toList()); - - List monitorIds = lastAssList.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - List pqLineList = pqLineService.list(new LambdaQueryWrapper().in(PqLine::getLineIndex,monitorIds)); - - List pqSubstationList = pqSubstationMapper.selectList(new LambdaQueryWrapper().in(PqSubstation::getSubIndex,pqLineList.stream().map(PqLine::getSubIndex).collect(Collectors.toList()))); - Map subMap = pqSubstationList.stream().collect(Collectors.toMap(PqSubstation::getSubIndex,sub->sub)); - pqLineList.forEach(it->it.setSubName(subMap.get(it.getSubIndex()).getName())); - - Map> objMap = lastAssList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getUserIndex,Collectors.mapping(PqUserLineAssPO::getLineIndex,Collectors.toList()))); - Map> lastMap = new HashMap<>(); - objMap.forEach((k,vList)->{ - lastMap.put(k,pqLineList.stream().filter(it->vList.contains(it.getLineIndex())).collect(Collectors.toList())); - }); - page.getRecords().forEach(item-> { - if(objMap.containsKey(item.getId())){ - List countObj = eventdetailList.stream().filter(it->objMap.get(item.getId()).contains(it.getLineid())).collect(Collectors.toList()); - item.setEventCount(countObj.size()); - item.setEventIds(countObj.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList())); - - if(param.getExportFlag()){ - item.setEventList(countObj); - if(lastMap.containsKey(item.getId())){ - List abList = lastMap.get(item.getId()); - Map lineMap= abList.stream().collect(Collectors.toMap(PqLine::getLineIndex,Function.identity())); - for(PqsEventdetail pqsEventdetail:countObj){ - if(lineMap.containsKey(pqsEventdetail.getLineid())){ - PqLine pqLine = lineMap.get(pqsEventdetail.getLineid()); - pqsEventdetail.setBusBarName(pqLine.getSubvName()); - pqsEventdetail.setStationName(pqLine.getSubName()); - } - - } - } - } - - } - if(lastMap.containsKey(item.getId())){ - List abList = lastMap.get(item.getId()); - item.setSubstationName(abList.stream().map(PqLine::getSubName).distinct().collect(Collectors.joining(StrUtil.COMMA))); - item.setInfo(abList.stream().map(items->items.getSubName()+"_"+items.getSubvName()).distinct().collect(Collectors.joining("; "))); - } - }); - return page; - } - - - - @Override - public List rightImportUser(LargeScreenCountParam param) { - List result = new ArrayList<>(); - List deptLineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); - if(CollUtil.isEmpty(deptLineIds)){ - return result; - } - - List assPOList = getUserLineAssociations(deptLineIds); - if(CollUtil.isEmpty(assPOList)){ - return result; - } - List userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - - LambdaQueryWrapper userQuery = new LambdaQueryWrapper<>(); - if(userIds.size() > 1000){ - List> userIdList = CollUtil.split(userIds,1000); - userQuery.and(ad->{ - for(List ids : userIdList){ - ad.or(o->o.in(PqUserLedgerPO::getId,ids)); - } - }); - }else { - userQuery.in(PqUserLedgerPO::getId,userIds); - } - userQuery.eq(PqUserLedgerPO::getIsShow,1); - List poList = pqUserLedgerMapper.selectList(userQuery); - if(CollUtil.isEmpty(poList)){ - return result; - } - - List ids = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - List assTemList = assPOList.stream().filter(it->ids.contains(it.getUserIndex())).collect(Collectors.toList()); - - //获取监测id,用于查询暂降表 - List lineIds = assTemList.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - - List eventList = pqsEventdetailService.lambdaQuery(). - in(PqsEventdetail::getLineid,lineIds) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .between(PqsEventdetail::getTimeid,DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).list(); - if(CollUtil.isEmpty(eventList)){ - poList.forEach(item->{ - UserLedgerStatisticVO.Inner inner = new UserLedgerStatisticVO.Inner(); - inner.setCustomId(item.getId()); - inner.setName(item.getCustomerName()); - inner.setCount(0); - result.add(inner); - }); - return result; - } - - Map> assMap = assTemList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getUserIndex,Collectors.mapping(PqUserLineAssPO::getLineIndex,Collectors.toList()))); - poList.forEach(item->{ - UserLedgerStatisticVO.Inner inner = new UserLedgerStatisticVO.Inner(); - inner.setCustomId(item.getId()); - inner.setName(item.getCustomerName()); - List LIds = assMap.get(item.getId()); - List eventIds = eventList.stream().filter(it -> LIds.contains(it.getLineid())).map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - inner.setEventList(eventIds); - inner.setCount(eventIds.size()); - result.add(inner); - }); - return result; - } - - @Override - public PqUserLedgerPO rightImportOpenDetail(LargeScreenCountParam param) { - List deptLineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); - if(CollUtil.isEmpty(deptLineIds)){ - return null; - } - - PqUserLedgerPO po = pqUserLedgerMapper.selectOne(new LambdaQueryWrapper().eq(PqUserLedgerPO::getId,param.getSearchValue())); - - PqsDicTreePO pqsDicTreePO = pqsDicTreeMapper.selectOne(new LambdaQueryWrapper().eq(PqsDicTreePO::getId,po.getSmallObjType())); - po.setSmallObjType(pqsDicTreePO.getName()); - List pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().eq(PqUserLineAssPO::getUserIndex,po.getId())); - List lastAss = pqUserLineAssPOS.stream().filter(it->deptLineIds.contains(it.getLineIndex())).collect(Collectors.toList()); - - List lineIds = lastAss.stream().map(PqUserLineAssPO::getLineIndex).collect(Collectors.toList()); - List ledgerBaseInfoDTOList = pqLineService.getBaseLedger(lineIds,null); - po.setGdName(ledgerBaseInfoDTOList.stream().map(LedgerBaseInfoDTO::getGdName).distinct().collect(Collectors.joining(";"))); - po.setSubstationName(ledgerBaseInfoDTOList.stream().map(LedgerBaseInfoDTO::getStationName).distinct().collect(Collectors.joining(";"))); - po.setBusbarName(ledgerBaseInfoDTOList.stream().map(it->it.getStationName()+"_"+it.getBusBarName()).distinct().collect(Collectors.joining(";"))); - - return po; - } - - @Override - public List gdSelect() { - return pqGdCompanyMapper.selectList(null); - } - - @Override - public List bdSelect() { - return pqSubstationMapper.selectList(null); - } - - private Integer[] getEventCount(List oneList, List assList, List pqsEventdetailList,boolean devFlag) { - Integer[] count = new Integer[]{0, 0}; - //用户的id - if(CollUtil.isNotEmpty(oneList)){ - List userIds = oneList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - //获取用户关联监测点 - List lineTemIds = assList.stream().filter(it -> userIds.contains(it.getUserIndex())).map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - //用户的暂降事件次数 - List eventdetailList = pqsEventdetailList.stream().filter(it -> lineTemIds.contains(it.getLineid())).collect(Collectors.toList()); - count[0] = eventdetailList.size(); - if(devFlag) { - List lastLineIds = eventdetailList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List userLastIds = assList.stream().filter(it->lastLineIds.contains(it.getLineIndex())).map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - long devCount = oneList.stream().filter(it->userLastIds.contains(it.getId())).count(); - count[1] = (int) devCount; - } - } - return count; - } - - @Override - public UserLedgerStatisticVO userLedgerStatisticClone(LargeScreenCountParam param) { - UserLedgerStatisticVO result = new UserLedgerStatisticVO(); - - // 1. 获取字典树数据 - List dicTreeList = getAllDicTrees(); - Map treeMap = getDicTreeMap(dicTreeList); - setResultIds(result, treeMap); - - // 2. 获取线路ID列表 - List lineIds = commGeneralService.getLineIdsByDept(param); - if (CollUtil.isEmpty(lineIds)) { - return result; - } - - // 3. 获取用户线路关联数据 - List assList = getUserLineAssociations(lineIds); - if (CollUtil.isEmpty(assList)) { - return result; - } - - // 4. 获取用户台账信息 - Set assUserIds = assList.stream() - .map(PqUserLineAssPO::getUserIndex) - .collect(Collectors.toSet()); - List userLedgers = getUserLedgers(new ArrayList<>(assUserIds),null,false); - if (CollUtil.isEmpty(userLedgers)) { - return result; - } - - // 5. 获取事件和线路数据 - List events = getEventsInTimeRange(param, lineIds); - List lines = getLines(lineIds); - - // 6. 按用户类型分组处理 - Map> userMap = userLedgers.stream() - .collect(Collectors.groupingBy(PqUserLedgerPO::getBigObjType)); - - // 7. 构建结果 - buildResultClone(result, treeMap, userMap, assList, events, lines,dicTreeList); - - return result; - } - - @Override - public Page rightEventOpenClone(LargeScreenCountParam param) { - Page result = new Page<>(); - - // 2. 获取线路ID列表 - List lineIds = commGeneralService.getLineIdsByDept(param); - if (CollUtil.isEmpty(lineIds)) { - return result; - } - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - PqSubstation pqSubstation = null; - if(Objects.nonNull(param.getBdId())){ - pqSubstation = pqSubstationMapper.selectOne(new LambdaQueryWrapper().eq(PqSubstation::getSubIndex,param.getBdId())); - if(Objects.isNull(pqSubstation)){ - return result; - } - queryWrapper.in(PqLine::getSubIndex, pqSubstation.getSubIndex()); - - } - PqGdCompany pqGdCompany = null; - if(Objects.nonNull(param.getGdIndex())){ - pqGdCompany = pqGdCompanyMapper.selectOne(new LambdaQueryWrapper().eq(PqGdCompany::getGdIndex,param.getGdIndex())); - if(Objects.isNull(pqGdCompany)){ - return result; - } - queryWrapper.in(PqLine::getGdIndex, pqGdCompany.getGdIndex()); - } - - if(Objects.nonNull(param.getBdId()) || Objects.nonNull(param.getGdIndex())) { - List pqLineList = pqLineService.list(queryWrapper); - lineIds = pqLineList.stream().map(PqLine::getLineIndex).distinct().collect(Collectors.toList()); - } - - if(CollUtil.isEmpty(lineIds)){ - return result; - } - - // 3. 获取用户线路关联数据 - List assList = getUserLineAssociations(lineIds); - if (CollUtil.isEmpty(assList)) { - return result; - } - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.orderByAsc(PqUserLedgerPO::getSmallObjType,PqUserLedgerPO::getUpdateTime); - if(StrUtil.isNotBlank(param.getBigObjType())){ - //对象大类不为空 - lambdaQueryWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType()); - } - if(StrUtil.isNotBlank(param.getSmallObjType())){ - //对象大类不为空 - lambdaQueryWrapper.eq(PqUserLedgerPO::getSmallObjType,param.getSmallObjType()); - } - if(Objects.nonNull(param.getGdIndex())){ - lambdaQueryWrapper.eq(PqUserLedgerPO::getPowerSupplyArea,param.getGdIndex()); - } - if(StrUtil.isNotBlank(param.getSearchValue())){ - lambdaQueryWrapper.like(PqUserLedgerPO::getCustomerName,param.getSearchValue()); - } - List assIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - if(assIds.size()>1000){ - List> userIds = CollUtil.split(assIds, 1000); - lambdaQueryWrapper.and(w -> { - for (List ids : userIds) { - w.or(wIn -> wIn.in(PqUserLedgerPO::getId, ids)); - } - }); - }else { - lambdaQueryWrapper.in(PqUserLedgerPO::getId, assIds); - } - - Page page = pqUserLedgerMapper.selectPage(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),lambdaQueryWrapper); - if(CollUtil.isEmpty(page.getRecords())){ - return result; - } - List userIds = page.getRecords().stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - List assPOList = assList.stream().filter(it->userIds.contains(it.getUserIndex())).collect(Collectors.toList()); - List lineTemIds = assPOList.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - - List ledgerList = pqLineService.getBaseLedger(lineTemIds,null); - - List pqsDeptslineList = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getLineIndex,lineTemIds).eq(PqsDeptsline::getSystype,sysTypeZt).list(); - Map deptLineMap = pqsDeptslineList.stream().collect(Collectors.toMap(PqsDeptsline::getLineIndex,dept->dept)); - - Map deptTemMap = new HashMap<>(); - List pqsDeptsList = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list(); - Map deptMap = pqsDeptsList.stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex,dept->dept)); - deptLineMap.forEach((k,v)->{ - deptTemMap.put(k,deptMap.get(v.getDeptsIndex()).getDeptsname()); - }); - - - Map> assMap = assPOList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getUserIndex,Collectors.mapping(PqUserLineAssPO::getLineIndex,Collectors.toList()))); - - for(PqUserLedgerPO po :page.getRecords()){ - if(assMap.containsKey(po.getId())){ - List temIds = assMap.get(po.getId()); - List temList = ledgerList.stream().filter(it->temIds.contains(it.getLineId())).collect(Collectors.toList()); - po.setGdName(temList.stream().map(LedgerBaseInfoDTO::getGdName).distinct().collect(Collectors.joining(";"))); - po.setStation(temList.stream().map(LedgerBaseInfoDTO::getStationName).distinct().collect(Collectors.joining(";"))); - po.setInfo(temList.stream().map(it->it.getStationName()+"_"+it.getBusBarName()).distinct().collect(Collectors.joining(";"))); - po.setDeptName(temList.stream().map(LedgerBaseInfoDTO::getLineId).distinct().map(deptTemMap::get).distinct().collect(Collectors.joining(";"))); - } - - } - - return page; - } - -} 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 deleted file mode 100644 index c523963c..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ /dev/null @@ -1,1547 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.*; -import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.github.yulichang.wrapper.segments.Fun; -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.*; -import com.njcn.gather.event.devcie.pojo.dto.*; -import com.njcn.gather.event.devcie.pojo.po.*; -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; -import com.njcn.gather.event.transientes.pojo.po.MessageEventFeedback; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.pojo.po.*; -import com.njcn.gather.event.transientes.pojo.vo.*; -import com.njcn.gather.event.devcie.service.*; -import com.njcn.gather.event.transientes.service.*; -import com.njcn.gather.event.devcie.service.PqsDeptslineService; -import com.njcn.gather.event.transientes.utils.JwtUtil; -import com.njcn.redis.utils.RedisUtil; -import com.njcn.web.factory.PageFactory; -import io.swagger.models.auth.In; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * Description: - * Date: 2025/06/19 下午 3:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class LargeScreenCountServiceImpl implements LargeScreenCountService { - - private final PqsDeptslineService pqsDeptslineService; - private final PqsDeptsService pqsDeptsService; - private final PqLineService pqLineService; - private final PqSubstationService pqSubstationService; - private final PqDeviceService pqDeviceService; - private final PqsEventdetailService pqsEventdetailService; - private final PqLineMapper pqLineMapper; - private final MsgEventInfoService msgEventInfoService; - private final MessageEventFeedbackService messageEventFeedbackService; - private final CommGeneralService commGeneralService; - private final MsgEventConfigService msgEventConfigService; - private final PqsUsersetService pqsUsersetService; - private final PqsUserService pqsUserService; - private final PqLinedetailMapper pqLinedetailMapper; - private final RedisUtil redisUtil; - private final PqsOnlinerateService pqsOnlinerateService; - - private final PqsIntegrityMapper pqsIntegrityMapper; - - private final PqUserLedgerMapper pqUserLedgerMapper; - - private final PqUserLineAssMapper pqUserLineAssMapper; - - 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:"; - - - private List lineIds = new ArrayList<>(); - - - @Override - public void initLedger(LargeScreenCountParam largeScreenCountParam) { - lineIds = commGeneralService.getLineIdsByDept(largeScreenCountParam); - } - - @Override - public LedgerCountVO scaleStatistics(LargeScreenCountParam largeScreenCountParam) { - LedgerCountVO ledgerCountVO = new LedgerCountVO(); - //根据用户获取当前部门及子部门id - //lineIds = commGeneralService.getLineIdsByDept(largeScreenCountParam); - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - } - List pqLineList = new ArrayList<>(); - if(lineIds.size()>1000){ - List> listIds = CollUtil.split(lineIds,1000); - for(List itemIds : listIds){ - List temp =pqLineService.lambdaQuery().in(PqLine::getLineIndex, itemIds).list(); - pqLineList.addAll(temp); - } - }else { - List temp = pqLineService.lambdaQuery().in(PqLine::getLineIndex, lineIds).list(); - pqLineList.addAll(temp); - } - //统计总数 - List allLineIds = pqLineList.stream().map(PqLine::getLineIndex).collect(Collectors.toList()); - List allSubList = pqLineList.stream().map(PqLine::getSubIndex).distinct().collect(Collectors.toList()); - long allSubCount =allSubList.stream().count(); - List devList = pqLineList.stream().map(PqLine::getDevIndex).distinct().collect(Collectors.toList()); - long allDevCount = devList.stream().count(); - - long allLineCount = pqLineList.stream().map(PqLine::getLineIndex).distinct().count(); - //在运总数 - List list = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devList).eq(PqDevice::getDevflag, 0).list(); - List runDevList = list.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); - long runDevCount = runDevList.stream().count(); - List runSubList = list.stream().map(PqDevice::getSubIndex).distinct().collect(Collectors.toList()); - long runSubCount = runSubList.stream().count(); - List ledgerBaseInfoDTOS = pqLineService.getBaseLineInfo(allLineIds); - List runLineList = ledgerBaseInfoDTOS.stream().filter(temp->Objects.equals(temp.getRunFlag(),1)).map(LedgerBaseInfoDTO::getLineId).collect(Collectors.toList()); - - long runLineCount = runLineList.stream().count(); - - - - ledgerCountVO.setAllSubCount(allSubCount); - ledgerCountVO.setAllDevCount(allDevCount); - ledgerCountVO.setAllLineCount(allLineCount); - ledgerCountVO.setRunDevCount(runDevCount); - ledgerCountVO.setRunSubCount(runSubCount); - ledgerCountVO.setRunLineCount(runLineCount); - - ledgerBaseInfoDTOS.stream().forEach(temp->temp.setRunFlag(runLineList.contains(temp.getLineId())?1:0)); - ledgerCountVO.setAllLineList(ledgerBaseInfoDTOS); - List deviceDTOS = pqDeviceService.queryListByIds(devList); - deviceDTOS =deviceDTOS.stream().distinct().collect(Collectors.toList()); - deviceDTOS.forEach(temp-> temp.setRunFlag(runDevList.contains(temp.getDevId())?1:0)); - ledgerCountVO.setAllDevList(deviceDTOS); - List substationDTOS = pqSubstationService.queryListByIds(allSubList); - substationDTOS.forEach(temp->temp.setRunFlag(runSubList.contains(temp.getStationId())?1:0)); - ledgerCountVO.setAllSubList(substationDTOS); - return ledgerCountVO; - } - - @Override - public AlarmAnalysisVO alarmAnalysis(LargeScreenCountParam largeScreenCountParam) { - AlarmAnalysisVO alarmAnalysisVO = new AlarmAnalysisVO(); - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - - //根据用户获取当前部门及子部门id - - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - - } - List eventdetails = new ArrayList<>(); - if(lineIds.size()>1000){ - List> listIds = CollUtil.split(lineIds,1000); - for(List itemIds : listIds){ - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid,startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,listIds) - .orderByDesc(PqsEventdetail::getTimeid).list() - ; - eventdetails.addAll(temp); - } - }else { - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,lineIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - - Integer eventCount = eventdetails.size(); - // 告警 - List aLarmEvent = eventdetails.stream().filter(temp -> temp.getEventvalue() < 0.5).collect(Collectors.toList()); - // 预警 - List warnEvent = eventdetails.stream().filter(temp -> temp.getEventvalue() >= 0.5&& temp.getEventvalue() <0.9).collect(Collectors.toList()); - List eventIds = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - //通知 - - List msgEventInfoList =msgEventInfoService.getMsgByIds(eventIds); - msgEventInfoList = msgEventInfoList.stream().sorted(Comparator.comparing(MsgEventInfo::getSendTime,Comparator.reverseOrder())).collect(Collectors.toList()); - - - - List lookALarmEvent = aLarmEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 )).collect(Collectors.toList()); - List lookWarnEvent = warnEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 ) ).collect(Collectors.toList()); - List handleMsg = msgEventInfoList.stream().filter(temp -> Objects.equals(temp.getIsHandle(), 1)).collect(Collectors.toList()); - - Integer aLarmCount =aLarmEvent.size(); - Integer warnCount =warnEvent.size(); - Integer noticeCount =msgEventInfoList.size(); - Integer lookALarmCount =lookALarmEvent.size(); - Integer lookWarnCount =lookWarnEvent.size(); - Integer lookNoticeCount =handleMsg.size(); - - alarmAnalysisVO.setEventCount(eventCount); - alarmAnalysisVO.setALarmCount(aLarmCount); - alarmAnalysisVO.setWarnCount(warnCount); - alarmAnalysisVO.setNoticeCount(noticeCount); - alarmAnalysisVO.setLookALarmCount(lookALarmCount); - alarmAnalysisVO.setLookWarnCount(lookWarnCount); - alarmAnalysisVO.setLookNoticeCount(lookNoticeCount); - -// -// alarmAnalysisVO.setEventdetails(change(eventdetails,msgEventInfoList)); -// alarmAnalysisVO.setALarmEvent(change(aLarmEvent,msgEventInfoList)); -// alarmAnalysisVO.setWarnEvent(change(warnEvent,msgEventInfoList)); -// alarmAnalysisVO.setNoticeEvent(msgEventInfoList); -// alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent,msgEventInfoList)); -// alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent,msgEventInfoList)); -// alarmAnalysisVO.setLookNoticeEvent(handleMsg); - - - - return alarmAnalysisVO; - } - - @Override - public List eventTrend(LargeScreenCountParam largeScreenCountParam) { - List eventTrendVOList = new ArrayList<>(); - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - // List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - //获取对应监测点id - //List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - //List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - - } - LocalDate startDate = LocalDate.parse(DateUtil.format(startTime, DatePattern.NORM_DATE_PATTERN)); - LocalDate endDate = LocalDate.parse(DateUtil.format(endTime, DatePattern.NORM_DATE_PATTERN)); - List eventdetails = new ArrayList<>(); - if(lineIds.size()>1000){ - List> listIds = CollUtil.split(lineIds,1000); - for(List itemIds : listIds){ - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,listIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - }else { - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,lineIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - - if (Objects.equals(largeScreenCountParam.getEventtype(), 1)) { - List eventIds = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - //通知 - List msgEventInfoList =msgEventInfoService.getMsgByIds(eventIds); - // 使用 for 循环处理日期范围 - for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) { - EventTrendVO eventTrendVO = new EventTrendVO(); - eventTrendVO.setLocalDate(date); - LocalDate finalDate = date; - List collect = msgEventInfoList.stream().filter(temp -> Objects.equals(DateUtil.format(temp.getSendTime(), DatePattern.NORM_DATE_PATTERN), DateUtil.format(finalDate.atStartOfDay(), DatePattern.NORM_DATE_PATTERN))).collect(Collectors.toList()); - eventTrendVO.setEventCount(collect.size()); - eventTrendVOList.add(eventTrendVO); - } - - - } else { - - // 使用 for 循环处理日期范围 - for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) { - EventTrendVO eventTrendVO = new EventTrendVO(); - eventTrendVO.setLocalDate(date); - LocalDate finalDate = date; - List collect = eventdetails.stream().filter(temp -> Objects.equals(DateUtil.format(temp.getTimeid(), DatePattern.NORM_DATE_PATTERN), DateUtil.format(finalDate.atStartOfDay(), DatePattern.NORM_DATE_PATTERN))).collect(Collectors.toList()); - eventTrendVO.setEventCount(collect.size()); - eventTrendVOList.add(eventTrendVO); - } - } - - - - return eventTrendVOList; - } - - @Override - public Page eventList(LargeScreenCountParam largeScreenCountParam) { - Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - //根据用户获取当前部门及子部门id - //List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - //获取对应监测点id - //List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - //List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).distinct().collect(Collectors.toList()); - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - - } - List pqLineList = pqLineService.getBaseLineInfo(lineIds); - Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (lineIds.size()>1000) { - List> idPartitions = CollUtil.split(lineIds,1000); - - queryWrapper.lambda() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .and(ew->{ - for(List pList: idPartitions){ - ew.or(w->w.in(PqsEventdetail::getLineid, pList)); - } - }).orderByDesc(PqsEventdetail::getTimeid); - - - } else { - queryWrapper.lambda() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getLineid, lineIds) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .orderByDesc(PqsEventdetail::getTimeid); - } - //查询需要发送短息处理的部门反推监测点 - - List noticeLineIds = new ArrayList<>(); - List pqsUserList = pqsUserService.lambdaQuery().eq(PqsUser::getState, 1).list(); - if(!CollectionUtils.isEmpty(pqsUserList)){ - List collect = pqsUserList.stream().map(PqsUser::getUserIndex).collect(Collectors.toList()); - List pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).in(PqsUserSet::getUserIndex,collect).list(); - List noticeDept = pqsUserSetList.stream().map(temp -> { - return pqsDeptsService.findDeptAndChildren(temp.getDeptsIndex()); - }).flatMap(Collection::stream).distinct().collect(Collectors.toList()); - //获取对应监测点id - if(!CollectionUtils.isEmpty(noticeDept)){ - List noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - noticeLineIds = noticeLine.stream().map(PqsDeptsline::getLineIndex).distinct().collect(Collectors.toList()); - } - - } - - IPage list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper); - List finalNoticeLineIds = noticeLineIds; - List collect = list.getRecords().stream().map(temp -> { - EventDetailVO eventDetailVO = new EventDetailVO(); - eventDetailVO.setEventdetail_index(temp.getEventdetailIndex()); - eventDetailVO.setTimeid(temp.getTimeid()); - eventDetailVO.setMs(temp.getMs()); - eventDetailVO.setWavetype(temp.getWavetype().toString()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(temp.getPersisttime() / 1000).setScale(3, RoundingMode.HALF_UP).toString()); - eventDetailVO.setEventvalue(temp.getEventvalue()); - eventDetailVO.setLookFlag(temp.getLookFlag()); - eventDetailVO.setNoticeFlag(temp.getNoticeFlag()); - if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){ - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName()); - } - eventDetailVO.setNeedDealFlag(finalNoticeLineIds.contains(temp.getLineid())?1:0); - return eventDetailVO; - }).collect(Collectors.toList()); - Page returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - returnpage.setRecords(collect); - returnpage.setTotal(list.getTotal()); - return returnpage; - } - - @Override - public List noDealEventList(LargeScreenCountParam largeScreenCountParam) { - List result = new ArrayList<>(); - DateTime startTime = DateUtil.beginOfDay(DateUtil.parse(largeScreenCountParam.getSearchBeginTime())); - DateTime endTime = DateUtil.endOfDay(DateUtil.parse(largeScreenCountParam.getSearchEndTime())); - - List deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId()); - if (CollUtil.isEmpty(deptslineIds)) { - return result; - } - List allList = new ArrayList<>(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(deptslineIds.size()>1000){ - List> idList = CollUtil.split(deptslineIds,1000); - for(List ids:idList){ - lambdaQueryWrapper.clear(); - lambdaQueryWrapper.between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .in(PqsEventdetail::getLineid, ids) - .and(wrapper -> wrapper.eq(PqsEventdetail::getLookFlag, 0).or().isNull(PqsEventdetail::getLookFlag)); - List eventList = pqsEventdetailService.list(lambdaQueryWrapper); - allList.addAll(eventList); - } - }else { - lambdaQueryWrapper.between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid, deptslineIds) - .and(wrapper -> wrapper.eq(PqsEventdetail::getLookFlag, 0).or().isNull(PqsEventdetail::getLookFlag)); - List eventList = pqsEventdetailService.list(lambdaQueryWrapper); - allList.addAll(eventList); - } - - - if (CollUtil.isNotEmpty(allList)) { - List ids = allList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List pqLineList = pqLineService.getBaseLineInfo(ids); - Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - Map userMap; - Map> assMap; - List assList = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getLineIndex,ids)); - if (CollUtil.isNotEmpty(assList)) { - List userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - List poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().in(PqUserLedgerPO::getId,userIds)); - userMap = poList.stream().collect(Collectors.toMap(PqUserLedgerPO::getId,Function.identity())); - assMap = assList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getLineIndex)); - }else { - userMap = new HashMap<>(); - assMap = new HashMap<>(); - } - - for(PqsEventdetail it : allList){ - EventDetailVO eventDetailVO = new EventDetailVO(); - eventDetailVO.setEventdetail_index(it.getEventdetailIndex()); - eventDetailVO.setTimeid(it.getTimeid()); - eventDetailVO.setMs(it.getMs()); - eventDetailVO.setWavetype(it.getWavetype().toString()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(it.getPersisttime() / 1000).setScale(3, RoundingMode.HALF_UP).toString()); - eventDetailVO.setEventvalue(it.getEventvalue()); - if (ledgerBaseInfoDTOMap.containsKey(it.getLineid())) { - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(it.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - } - if(assMap.containsKey(eventDetailVO.getLineid())) { - List temList = assMap.get(eventDetailVO.getLineid()).stream().map(PqUserLineAssPO::getUserIndex).collect(Collectors.toList()); - String str = temList.stream().map(its -> userMap.containsKey(its)?userMap.get(its).getCustomerName() + "; ":"/").collect(Collectors.joining()); - eventDetailVO.setObjName(str); - } - result.add(eventDetailVO); - } - } - result = result.stream().sorted(Comparator.comparing(EventDetailVO::getTimeid)).collect(Collectors.toList()); - return result; - } - - @Override - public boolean lookEvent(List ids) { - if(ids.size()>1000){ - List> eventIds = CollUtil.split(ids,1000); - for(List needIds : eventIds){ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(PqsEventdetail::getEventdetailIndex, needIds).set(PqsEventdetail::getLookFlag, DataStateEnum.ENABLE.getCode()); - pqsEventdetailService.update(updateWrapper); - } - }else { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(PqsEventdetail::getEventdetailIndex, ids).set(PqsEventdetail::getLookFlag, DataStateEnum.ENABLE.getCode()); - pqsEventdetailService.update(updateWrapper); - } - return true; - } - - @Override - public List mapCount(LargeScreenCountParam largeScreenCountParam) { - List result = new ArrayList<>(); - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - //根据用户获取当前部门及子部门id - List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - deptAndChildren.remove(largeScreenCountParam.getDeptId()); - //获取对应监测点id - List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - if (CollectionUtils.isEmpty(deptslines)) { - throw new BusinessException("部门下暂无监测点"); - } - - - List list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list(); - Map stringPqsDeptsMap = list.stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex, Function.identity(), (key1, key2) -> key2)); - Map> collect = deptslines.stream().collect(Collectors.groupingBy(PqsDeptsline::getDeptsIndex)); - - List ids = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - List ledgerBaseInfoDTOS = pqLineService.getBaseLineInfo(ids); - - collect.forEach((k, v) -> { - List temList = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - MapCountVO mapCountVO = new MapCountVO(); - mapCountVO.setDeptsIndex(k); - mapCountVO.setDeptsName(stringPqsDeptsMap.get(k).getDeptsname()); - - List temLedger = ledgerBaseInfoDTOS.stream().filter(it->temList.contains(it.getLineId())).collect(Collectors.toList()); - mapCountVO.setLineList(temLedger); - mapCountVO.setLineCount(temLedger.size()); - List deptslineIds = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - List eventdetails = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .in(PqsEventdetail::getLineid, deptslineIds).list(); - mapCountVO.setEventCount(eventdetails.size()); - - List eveIdndex = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - List temp = new ArrayList<>(); - if(!CollectionUtils.isEmpty(eveIdndex)){ - temp =msgEventInfoService.getMsgByIds(eveIdndex); - } - List change = change(eventdetails,temp); - - mapCountVO.setEventList(change); - mapCountVO.setNoticeCount(temp.size()); - mapCountVO.setNoticeList(temp); - result.add(mapCountVO); - }); - return result; - } - - @Override - public EventMsgDetailVO eventMsgDetail(String eventId) { - EventMsgDetailVO eventMsgDetailVO = new EventMsgDetailVO(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(MessageEventFeedback::getEventIndex, eventId); - MessageEventFeedback messageEventFeedback = messageEventFeedbackService.getOne(lambdaQueryWrapper); - if (Objects.nonNull(messageEventFeedback)) { - BeanUtil.copyProperties(messageEventFeedback, eventMsgDetailVO); - if(messageEventFeedback.getIsSensitive() == 1){ - PqsEventdetail pqsEventdetail = pqsEventdetailService.lambdaQuery().eq(PqsEventdetail::getEventdetailIndex,eventId).one(); - PqLinedetail pqLinedetail = pqLinedetailMapper.selectById(pqsEventdetail.getLineid()); - eventMsgDetailVO.setObjName(pqLinedetail.getObjname()); - } - } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(MsgEventInfo::getEventIndex, eventId); - List msgEventInfoList = msgEventInfoService.list(queryWrapper); - eventMsgDetailVO.setMsgList(msgEventInfoList); - - return eventMsgDetailVO; - } - - @Override - public List msgSendList(LargeScreenCountParam largeScreenCountParam) { - List result = new ArrayList<>(); - // List ids = commGeneralService.getLineIdsByDept(largeScreenCountParam); - if (CollUtil.isEmpty(lineIds)) { - return result; - } - List allEventList = new ArrayList<>(); - if (lineIds.size() > 1000) { - List> listIds = CollUtil.split(lineIds, 1000); - for (List itemIds : listIds) { - List pqsEventdetailList = pqsEventdetailService.lambdaQuery().in(PqsEventdetail::getLineid, itemIds).select(PqsEventdetail::getEventdetailIndex).list(); - allEventList.addAll(pqsEventdetailList); - } - } else { - List pqsEventdetailList = pqsEventdetailService.lambdaQuery().in(PqsEventdetail::getLineid, lineIds).select(PqsEventdetail::getEventdetailIndex).list(); - allEventList.addAll(pqsEventdetailList); - } - if (CollUtil.isEmpty(allEventList)) { - return result; - } - - List eventIds = allEventList.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - result =msgEventInfoService.getMsgByIds(eventIds); - result = result.stream().sorted(Comparator.comparing(MsgEventInfo::getSendTime, Comparator.reverseOrder())).collect(Collectors.toList()); - if (result.size() > 200) { - result = result.subList(0, 200); - } - return result; - } - - @Override - public Page hasSendMsgPage(LargeScreenCountParam largeScreenCountParam) { - DateTime start = DateUtil.beginOfDay(DateUtil.parse(largeScreenCountParam.getSearchBeginTime())); - DateTime end = DateUtil.endOfDay(DateUtil.parse(largeScreenCountParam.getSearchEndTime())); - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(!StringUtils.isEmpty(largeScreenCountParam.getSendResult()),MsgEventInfo::getSendResult,largeScreenCountParam.getSendResult()); - lambdaQueryWrapper.orderByDesc(MsgEventInfo::getSendTime).between(MsgEventInfo::getSendTime,start,end); - return msgEventInfoService.page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)),lambdaQueryWrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean msgHandle(MessageEventFeedbackParam messageEventFeedbackParam) { - - PqsEventdetail pqsEventdetail = pqsEventdetailService.lambdaQuery().eq(PqsEventdetail::getEventdetailIndex,messageEventFeedbackParam.getEventIndex()).one(); - if(Objects.isNull(pqsEventdetail.getLookFlag())|| pqsEventdetail.getLookFlag() == 0){ - throw new BusinessException(CommonResponseEnum.FAIL,"当前事件暂未处理,请先处理!"); - } - - MessageEventFeedback messageEventFeedback = messageEventFeedbackService.lambdaQuery().eq(MessageEventFeedback::getEventIndex, messageEventFeedbackParam.getEventIndex()).one(); - if (Objects.nonNull(messageEventFeedback)) { - throw new BusinessException(CommonResponseEnum.FAIL,"请勿重复处理!"); - } - MessageEventFeedback po = new MessageEventFeedback(); - BeanUtil.copyProperties(messageEventFeedbackParam, po); - po.setId(IdUtil.simpleUUID()); - messageEventFeedbackService.save(po); - pqsEventdetailService.lambdaUpdate().set(PqsEventdetail::getNoticeFlag,DataStateEnum.ENABLE.getCode()).eq(PqsEventdetail::getEventdetailIndex,messageEventFeedbackParam.getEventIndex()).update(); - msgEventInfoService.lambdaUpdate().set(MsgEventInfo::getIsHandle,DataStateEnum.ENABLE.getCode()).eq(MsgEventInfo::getEventIndex,messageEventFeedbackParam.getEventIndex()).update(); - return true; - } - - @Override - public AlarmAnalysisVO alarmAnalysisDetail(LargeScreenCountParam largeScreenCountParam) { - AlarmAnalysisVO alarmAnalysisVO = new AlarmAnalysisVO(); - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - - //根据用户获取当前部门及子部门id - //List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - //获取对应监测点id - //List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - //List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - - } - List eventdetails = new ArrayList<>(); - if(lineIds.size()>1000){ - List> listIds = CollUtil.split(lineIds,1000); - for(List itemIds : listIds){ - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid,startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,listIds) - .orderByDesc(PqsEventdetail::getTimeid).list() - ; - eventdetails.addAll(temp); - } - }else { - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,lineIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - - Integer eventCount = eventdetails.size(); - // 告警 - List aLarmEvent = eventdetails.stream().filter(temp -> temp.getEventvalue() < 0.5).collect(Collectors.toList()); - // 预警 - List warnEvent = eventdetails.stream().filter(temp -> temp.getEventvalue() >= 0.5&& temp.getEventvalue() <0.9).collect(Collectors.toList()); - List eventIds = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); - //通知 - List msgEventInfoList =msgEventInfoService.getMsgByIds(eventIds); - - msgEventInfoList = msgEventInfoList.stream().sorted(Comparator.comparing(MsgEventInfo::getSendTime,Comparator.reverseOrder())).collect(Collectors.toList()); - - - - List lookALarmEvent = aLarmEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 )).collect(Collectors.toList()); - List lookWarnEvent = warnEvent.stream().filter(temp ->Objects.equals(temp.getLookFlag(),1 ) ).collect(Collectors.toList()); - List handleMsg = msgEventInfoList.stream().filter(temp -> Objects.equals(temp.getIsHandle(), 1)).collect(Collectors.toList()); - - Integer aLarmCount =aLarmEvent.size(); - Integer warnCount =warnEvent.size(); - Integer noticeCount =msgEventInfoList.size(); - Integer lookALarmCount =lookALarmEvent.size(); - Integer lookWarnCount =lookWarnEvent.size(); - Integer lookNoticeCount =handleMsg.size(); - - alarmAnalysisVO.setEventCount(eventCount); - alarmAnalysisVO.setALarmCount(aLarmCount); - alarmAnalysisVO.setWarnCount(warnCount); - alarmAnalysisVO.setNoticeCount(noticeCount); - alarmAnalysisVO.setLookALarmCount(lookALarmCount); - alarmAnalysisVO.setLookWarnCount(lookWarnCount); - alarmAnalysisVO.setLookNoticeCount(lookNoticeCount); - - - alarmAnalysisVO.setEventdetails(change(eventdetails,msgEventInfoList)); - alarmAnalysisVO.setALarmEvent(change(aLarmEvent,msgEventInfoList)); - alarmAnalysisVO.setWarnEvent(change(warnEvent,msgEventInfoList)); - alarmAnalysisVO.setNoticeEvent(msgEventInfoList); - alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent,msgEventInfoList)); - alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent,msgEventInfoList)); - alarmAnalysisVO.setLookNoticeEvent(handleMsg); - - - - return alarmAnalysisVO; - } - - @Override - public Page eventTablePage(LargeScreenCountParam largeScreenCountParam) { - Page result = new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)); - //起始时间 - LocalDateTime startTime; - //结束时间 - LocalDateTime endTime; - if (largeScreenCountParam.getType() == 3) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfMonth(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else if (largeScreenCountParam.getType() == 4) { - //起始时间 - startTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.beginOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - //结束时间 - endTime = LocalDateTimeUtil.parse(DateUtil.format(DateUtil.endOfWeek(new Date()), DatePattern.NORM_DATETIME_FORMATTER), DatePattern.NORM_DATETIME_FORMATTER); - } else { - throw new BusinessException("统计类型有误类型"); - } - - //List lineIds = commGeneralService.getLineIdsByDept(largeScreenCountParam); - if (CollectionUtils.isEmpty(lineIds)) { - throw new BusinessException("部门下暂无监测点"); - } - - - - List eventType = msgEventConfigService.getEventType(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper - .between(PqsEventdetail::getTimeid,startTime, endTime) - .in(PqsEventdetail::getWavetype,eventType) - .orderByDesc(PqsEventdetail::getTimeid); - if(Objects.nonNull(largeScreenCountParam.getEventDeep())){ - if (largeScreenCountParam.getEventDeep() == 0) { - lambdaQueryWrapper.ge(PqsEventdetail::getEventvalue, 0.5).lt(PqsEventdetail::getEventvalue, 0.9); - } else if (largeScreenCountParam.getEventDeep() == 1) { - lambdaQueryWrapper.lt(PqsEventdetail::getEventvalue, 0.5); - } - } - if(lineIds.size()>1000){ - List> splitList = CollUtil.split(lineIds,1000); - lambdaQueryWrapper.and(ew->{ - for (int i = 0; i < splitList.size(); i++) { - List batch = splitList.get(i); - if (i == 0) { - ew.in(PqsEventdetail::getLineid, batch); // 第一个条件不加 or - } else { - ew.or().in(PqsEventdetail::getLineid, batch); // 后续条件加 or - } - } - }); - }else { - lambdaQueryWrapper.in(PqsEventdetail::getLineid, lineIds); - } - Page page = pqsEventdetailService.page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)),lambdaQueryWrapper); - result.setTotal(page.getTotal()); - if(CollUtil.isEmpty(page.getRecords())){ - return result; - } - List ids = page.getRecords().stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List pqLineList = pqLineService.getBaseLineInfo(ids); - Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - List resultList = new ArrayList<>(); - for(PqsEventdetail pqsEventdetail : page.getRecords()){ - EventDetailVO eventDetailVO = new EventDetailVO(); - BeanUtil.copyProperties(pqsEventdetail,eventDetailVO); - if(ledgerBaseInfoDTOMap.containsKey(pqsEventdetail.getLineid())){ - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(pqsEventdetail.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName()); - } - resultList.add(eventDetailVO); - } - result.setRecords(resultList); - return result; - } - - @Override - public DeviceCountVO devFlagCount(LargeScreenCountParam largeScreenCountParam) { - DeviceCountVO deviceCountVO = new DeviceCountVO(); - List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - List deptslineIds = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); - List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); - - //在运总数 - List list = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devIndexs).eq(PqDevice::getDevflag, 0).list(); - - long onLine = list.stream().filter(temp -> Objects.equals(temp.getStatus(), 1)).count(); - long Offline = list.stream().filter(temp -> Objects.equals(temp.getStatus(), 0)).count(); - deviceCountVO.setAllCount(list.size()); - // deviceCountVO.setOnLine((int) onLine); - // deviceCountVO.setOffLine((int) Offline); - - //临时调整 - deviceCountVO.setOnLine(list.size()); - deviceCountVO.setOffLine(0); - - return deviceCountVO; - } - - @Override - public List devDetail(LargeScreenCountParam largeScreenCountParam) { - DeviceCountVO deviceCountVO = new DeviceCountVO(); - List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - List deptslineIds = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); - -// List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); -// List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); -// List deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); - List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); - - - List deviceDTOList = pqDeviceService.queryListByIds(devIndexs); - deviceDTOList = deviceDTOList.stream().filter(temp->Objects.equals(temp.getDevFlag(),0)).collect(Collectors.toList()); - return deviceDTOList; - } - - @Override - public List regionDevCount(LargeScreenCountParam largeScreenCountParam) { - List result = new ArrayList<>(); - List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - List deptAndChildren = pqsDeptsService.findDeptAndChildren(largeScreenCountParam.getDeptId()); - if(deptAndChildren.size()>1){ - deptAndChildren.remove(largeScreenCountParam.getDeptId()); - } - List pqDeviceList = pqDeviceService.lambdaQuery().eq(PqDevice::getDevflag, 0).list(); - -// List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); - List list = pqsDeptsService.getDeptList(deptAndChildren); - list.forEach(temp->{ - RegionDevCountVO regionDevCountVO = new RegionDevCountVO(); - regionDevCountVO.setDeptsIndex(temp.getDeptsIndex()); - regionDevCountVO.setDeptsname(temp.getDeptsname()); - regionDevCountVO.setAreaName(temp.getAreaName()); - List deptslineIds =(List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+temp.getDeptsIndex()); - List collect = pqLineList.stream().filter(pqLine -> deptslineIds.contains(pqLine.getLineIndex())).collect(Collectors.toList()); - List devIndexs = collect.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); - List tempDeviceList = pqDeviceList.stream().filter(pqDevice -> devIndexs.contains(pqDevice.getDevIndex())).collect(Collectors.toList()); - //在运总数 - //TODO 零时调整 - //long onLine = tempDeviceList.stream().filter(pqDevice -> Objects.equals(pqDevice.getStatus(), 1)).count(); - //long Offline = tempDeviceList.stream().filter(pqDevice ->Objects.equals(pqDevice.getStatus(), 0)).count(); - regionDevCountVO.setAllCount(tempDeviceList.size()); - - regionDevCountVO.setOnLine((int) tempDeviceList.size()); - regionDevCountVO.setOffLine((int) 0); - result.add(regionDevCountVO); - }); - return result; - } - - private List getUserLineAssociations(List lineIds){ - LambdaQueryWrapper assQuery = new LambdaQueryWrapper<>(); - assQuery.in(PqUserLineAssPO::getLineIndex, lineIds); - - if(lineIds.size()>1000){ - List> lineList = CollUtil.split(lineIds, 1000); - assQuery.and(w -> { - for (List ids : lineList) { - w.or(wIn -> wIn.in(PqUserLineAssPO::getLineIndex, ids)); - } - }); - }else { - assQuery.in(PqUserLineAssPO::getLineIndex, lineIds); - } - - return pqUserLineAssMapper.selectList(assQuery); - } - - private List getUserLedgers(List assUserIds){ - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - if(assUserIds.size()>1000){ - List> assUserIdsList = CollUtil.split(assUserIds, 1000); - userWrapper.and(w -> { - for (List ids : assUserIdsList) { - w.or(wIn -> wIn.in(PqUserLedgerPO::getId, ids)); - } - }); - }else { - userWrapper.in(PqUserLedgerPO::getId, assUserIds); - } - return pqUserLedgerMapper.selectList(userWrapper); - } - @Override - public List substationCount(LargeScreenCountParam largeScreenCountParam) { - LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); - - List deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId()); - if(CollUtil.isEmpty(deptslineIds)){ - return new ArrayList<>(); - } - //查询暂态事件 - List eventdetails = new ArrayList<>(); - if(deptslineIds.size()>1000){ - List> listIds = CollUtil.split(deptslineIds,1000); - for(List itemIds : listIds){ - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid,startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,itemIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - }else { - List temp = pqsEventdetailService.lambdaQuery() - .between(PqsEventdetail::getTimeid, startTime, endTime) - .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .in(PqsEventdetail::getLineid,deptslineIds) - .orderByDesc(PqsEventdetail::getTimeid).list(); - eventdetails.addAll(temp); - } - - if(CollUtil.isEmpty(eventdetails)){ - return new ArrayList<>(); - } - - List lineIds = eventdetails.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - //List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - //pqLineList = pqLineList.stream().filter(temp->lineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); - - List assPOList = getUserLineAssociations(lineIds); - List userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList()); - - Map> lineAssMap = assPOList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getLineIndex,Collectors.mapping(PqUserLineAssPO::getUserIndex,Collectors.toList()))); - - List pqUserLedgerPOList = getUserLedgers(userIds); - - List subStationCountVOS = new ArrayList<>(); - List ledgerBaseInfoDTOS = pqLineService.getBaseLedger(lineIds,null); - //Map ledgerBaseInfoDTOMap = ledgerBaseInfoDTOS.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - List subIndexs = ledgerBaseInfoDTOS.stream().map(LedgerBaseInfoDTO::getStationId).collect(Collectors.toList()); - List pqsStationMapList = pqsStationMapMapper.selectList(new LambdaQueryWrapper().in(PqsStationMap::getSubIndex,subIndexs).eq(PqsStationMap::getState,1)); - Map stationMapMap = pqsStationMapList.stream().collect(Collectors.toMap(PqsStationMap::getSubIndex,dept->dept)); - - Map> substationDTOMap= ledgerBaseInfoDTOS.stream().collect(Collectors.groupingBy(LedgerBaseInfoDTO::getStationId)); - - Map> collect = eventdetails.stream().collect(Collectors.groupingBy(PqsEventdetail::getLineid)); - - substationDTOMap.forEach((k,v)->{ - LedgerBaseInfoDTO ledgerBaseInfoDTO = v.get(0); - SubStationCountVO subStationCountVO = new SubStationCountVO(); - subStationCountVO.setStationId(k); - subStationCountVO.setStationName(ledgerBaseInfoDTO.getStationName()); - subStationCountVO.setGdName(ledgerBaseInfoDTO.getGdName()); - - if(stationMapMap.containsKey(k.longValue())){ - PqsStationMap pqsStationMap = stationMapMap.get(k.longValue()); - if(Objects.nonNull(pqsStationMap.getLongItude())){ - subStationCountVO.setLongitude(pqsStationMap.getLongItude()); - }else { - subStationCountVO.setLongitude(0); - } - - if(Objects.nonNull(pqsStationMap.getLatItude())){ - subStationCountVO.setLatitude(pqsStationMap.getLatItude()); - }else { - subStationCountVO.setLatitude(0); - } - }else { - subStationCountVO.setLongitude(0); - subStationCountVO.setLatitude(0); - } - List tempLineIds = v.stream().map(LedgerBaseInfoDTO::getLineId).collect(Collectors.toList()); - subStationCountVO.setLineCount(tempLineIds.size()); - List tempEventList = eventdetails.stream().filter(temp -> tempLineIds.contains(temp.getLineid())).collect(Collectors.toList()); - subStationCountVO.setEventCount(tempEventList.size()); - v.forEach(item->{ - String obj = ""; - if(lineAssMap.containsKey(item.getLineId())){ - List userIndex = lineAssMap.get(item.getLineId()); - obj = pqUserLedgerPOList.stream().filter(it->userIndex.contains(it.getId())).map(PqUserLedgerPO::getCustomerName).collect(Collectors.joining(";")); - } - item.setObjName(StrUtil.isNotBlank(obj)? obj:"/"); - item.setEventCount(collect.get(item.getLineId()).size()); - }); - subStationCountVO.setLineEventDetails(v); - subStationCountVOS.add(subStationCountVO); - }); - return subStationCountVOS; - } - - @Override - public Page eventPage(LargeScreenCountParam largeScreenCountParam) { - Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); - - List deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId()); - - List ledgerList = new ArrayList<>(); - List pqUserLedgerPOList = new ArrayList<>(); - List assList = new ArrayList<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper - .between(PqsEventdetail::getTimeid, startTime, endTime) - .gt(PqsEventdetail::getPersisttime,msgEventConfigService.getEventDuration()) - .le(PqsEventdetail::getEventvalue,msgEventConfigService.getEventValue()) - .orderByDesc(PqsEventdetail::getTimeid); - - if(Objects.nonNull(largeScreenCountParam.getEventtype())){ - queryWrapper.eq(PqsEventdetail::getWavetype,largeScreenCountParam.getEventtype()); - }else { - queryWrapper.in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()); - } - - if(Objects.nonNull(largeScreenCountParam.getEventDurationMin()) ||Objects.nonNull(largeScreenCountParam.getEventDurationMax())){ - queryWrapper.gt(Objects.nonNull(largeScreenCountParam.getEventDurationMin()),PqsEventdetail::getPersisttime,largeScreenCountParam.getEventDurationMin()); - queryWrapper.lt(Objects.nonNull(largeScreenCountParam.getEventDurationMax()),PqsEventdetail::getPersisttime,largeScreenCountParam.getEventDurationMax()); - } - - if(Objects.nonNull(largeScreenCountParam.getEventValueMin()) ||Objects.nonNull(largeScreenCountParam.getEventValueMax())){ - queryWrapper.gt(Objects.nonNull(largeScreenCountParam.getEventValueMin()),PqsEventdetail::getEventvalue,largeScreenCountParam.getEventValueMin()); - queryWrapper.lt(Objects.nonNull(largeScreenCountParam.getEventValueMax()),PqsEventdetail::getEventvalue,largeScreenCountParam.getEventValueMax()); - } - - if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.select(PqUserLedgerPO::getId,PqUserLedgerPO::getCustomerName); - lambdaQueryWrapper.like(PqUserLedgerPO::getCustomerName,largeScreenCountParam.getSearchValue()); - List lineTemUserIds = new ArrayList<>(); - pqUserLedgerPOList = pqUserLedgerMapper.selectList(lambdaQueryWrapper); - if(CollUtil.isNotEmpty(pqUserLedgerPOList)) { - List userIds = pqUserLedgerPOList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); - assList = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getUserIndex, userIds)); - List assIds = assList.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); - lineTemUserIds = deptslineIds.stream().filter(assIds::contains).collect(Collectors.toList()); - } - - ledgerList = pqLineService.getBaseLedger(deptslineIds,largeScreenCountParam.getSearchValue()); - lineTemUserIds.addAll(ledgerList.stream().map(LedgerBaseInfoDTO::getLineId).collect(Collectors.toList())); - if(CollUtil.isEmpty(lineTemUserIds)){ - return new Page<>(); - } - if (lineTemUserIds.size()>1000) { - List> idPartitions = CollUtil.split(lineTemUserIds,1000); - queryWrapper.and(ew->{ - for(List pList: idPartitions){ - ew.or(w->w.in(PqsEventdetail::getLineid, pList)); - } - }); - } else { - queryWrapper.in(PqsEventdetail::getLineid, lineTemUserIds); - } - - }else { - if (deptslineIds.size()>1000) { - List> idPartitions = CollUtil.split(deptslineIds,1000); - queryWrapper.and(ew->{ - for(List pList: idPartitions){ - ew.or(w->w.in(PqsEventdetail::getLineid, pList)); - } - }); - } else { - queryWrapper.in(PqsEventdetail::getLineid, deptslineIds); - } - } - - IPage list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper); - if(CollUtil.isEmpty(list.getRecords())){ - return new Page<>(); - } - List pageLineIds = list.getRecords().stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - List pageLedger = pqLineService.getBaseLedger(pageLineIds,null); - Map ledgerBaseInfoDTOMap = pageLedger.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - List assLastList = pqUserLedgerMapper.getUserByParam(pageLineIds,null); - Map> mapObj = assLastList.stream().collect(Collectors.groupingBy(PqUserLineAssPO::getLineIndex,Collectors.mapping(PqUserLineAssPO::getUserName,Collectors.toList()))); - - List collect = list.getRecords().stream().map(temp -> { - EventDetailVO eventDetailVO = new EventDetailVO(); - eventDetailVO.setEventdetail_index(temp.getEventdetailIndex()); - eventDetailVO.setTimeid(temp.getTimeid()); - eventDetailVO.setMs(temp.getMs()); - eventDetailVO.setWavetype(temp.getWavetype().toString()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(temp.getPersisttime() / 1000).setScale(3, RoundingMode.HALF_UP).toString()); - eventDetailVO.setEventvalue(temp.getEventvalue()); - eventDetailVO.setLookFlag(temp.getLookFlag()); - eventDetailVO.setNoticeFlag(temp.getNoticeFlag()); - if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){ - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName()); - } - String objName ="/"; - if(mapObj.containsKey(eventDetailVO.getLineid())){ - objName = String.join(";", mapObj.get(eventDetailVO.getLineid())); - } - eventDetailVO.setObjName(objName); - return eventDetailVO; - }).collect(Collectors.toList()); - Page returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - returnpage.setRecords(collect); - returnpage.setTotal(list.getTotal()); - return returnpage; - } - @Override - public Page devicePage(LargeScreenCountParam largeScreenCountParam) { - TimeInterval timeInterval = new TimeInterval(); - log.info("开始查询:"+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); - Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - - - List deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId()); - - - if(Objects.isNull(largeScreenCountParam.getGdIndex())){ - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); - }else { - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex()) && Objects.equals(temp.getGdIndex(),largeScreenCountParam.getGdIndex())).collect(Collectors.toList()); - } - if(CollUtil.isEmpty(pqLineList)){ - return new Page<>(); - } - - List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).distinct().collect(Collectors.toList()); - log.info("完成从redis获取信息:"+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - //在运总数 - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StrUtil.isNotBlank(largeScreenCountParam.getState())){ - - if(largeScreenCountParam.getState().equals("0")){ - return new Page<>(); - } - } - if(StrUtil.isNotBlank(largeScreenCountParam.getDevName())){ - lambdaQueryWrapper.like(StrUtil.isNotEmpty(largeScreenCountParam.getDevName()),PqDevice::getName,largeScreenCountParam.getDevName()); - } - 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()); - if(CollUtil.isEmpty(runDevList)){ - return new Page<>(); - } - - 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 bdList = new ArrayList<>(); - if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ - List substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper().like(PqSubstation::getName,largeScreenCountParam.getSearchValue())); - bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList()); - } - - Page page = pqDeviceService.lambdaQuery().in(CollUtil.isNotEmpty(bdList),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); - log.info("完成设备分页查询sql:"+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - - List deviceDTOList = page.getRecords(); - if(!CollectionUtils.isEmpty(deviceDTOList)){ - - //临时处理 - deviceDTOList.forEach(it->it.setStatus(1)); - - List devIds = deviceDTOList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); - log.info("在线率查询sql开始:"+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); - 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()); - Map> lineMap = inteList.stream().collect(Collectors.groupingBy(PqLine::getDevIndex,Collectors.mapping(PqLine::getLineIndex,Collectors.toList()))); - List inteIds = inteList.stream().map(PqLine::getLineIndex).collect(Collectors.toList()); - - Map inteDevMap = new HashMap<>(); - 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())).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())); - - 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 -> (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()); - - if(pqsDicDataMap.containsKey(pqDeviceDetail.getManufacturer())){ - 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 - public Page devicePage(LargeScreenCountParam largeScreenCountParam) { - LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); - Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); - List deptslineIds = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); - - - if(Objects.isNull(largeScreenCountParam.getGdIndex())){ - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); - }else { - pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex()) && Objects.equals(temp.getGdIndex(),largeScreenCountParam.getGdIndex())).collect(Collectors.toList()); - } - if(CollUtil.isEmpty(pqLineList)){ - return new Page<>(); - } - - List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).distinct().collect(Collectors.toList()); - //在运总数 - List pqDeviceList = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devIndexs).eq(PqDevice::getDevflag, 0).list(); - List runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); - - pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList,largeScreenCountParam.getState()); - List deviceDTOList = pqsEventdetailPage.getRecords(); - if(!CollectionUtils.isEmpty(deviceDTOList)){ - List devIds = deviceDTOList.stream().map(DeviceDTO::getDevId).collect(Collectors.toList()); - List list = pqsOnlinerateService.lambdaQuery().in(PqsOnlinerate::getDevIndex,devIds).between(PqsOnlinerate::getTimeid, startTime, endTime).list(); - - List inteList = pqLineList.stream().filter(it->devIds.contains(it.getDevIndex())).collect(Collectors.toList()); - Map> lineMap = inteList.stream().collect(Collectors.groupingBy(PqLine::getDevIndex,Collectors.mapping(PqLine::getLineIndex,Collectors.toList()))); - List inteIds = inteList.stream().map(PqLine::getLineIndex).collect(Collectors.toList()); - - Map inteDevMap = new HashMap<>(); - List pqsIntegrityList = pqsIntegrityMapper.selectList(new LambdaQueryWrapper().in(PqsIntegrity::getLineIndex,inteIds)); - 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); - inteDevMap.put(dev,rate); - }); - - - for (DeviceDTO record : pqsEventdetailPage.getRecords()) { - List tempList = list.stream().filter(temp -> Objects.equals(temp.getDevIndex(), record.getDevId())).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); - } - - } - } - - - return pqsEventdetailPage; - }*/ - - @Override - public Page userEventList(LargeScreenCountParam largeScreenCountParam) { - Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - - List eventIds = largeScreenCountParam.getEventIds(); - if (CollectionUtils.isEmpty(eventIds)){ - return new Page<>(); - } - - - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (eventIds.size()>1000) { - List> idPartitions = CollUtil.split(eventIds,1000); - - queryWrapper.lambda() - .and(ew->{ - for(List pList: idPartitions){ - ew.or(w->w.in(PqsEventdetail::getEventdetailIndex, pList)); - } - }).orderByDesc(PqsEventdetail::getTimeid); - - - } else { - queryWrapper.lambda() - .in(PqsEventdetail::getEventdetailIndex, eventIds) - .orderByDesc(PqsEventdetail::getTimeid); - } - IPage list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper); - List indexIds = list.getRecords().stream().map(PqsEventdetail::getLineid).collect(Collectors.toList()); - List pqLineList = pqLineService.getBaseLineInfo(indexIds); - Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - List collect = list.getRecords().stream().map(temp -> { - EventDetailVO eventDetailVO = new EventDetailVO(); - eventDetailVO.setEventdetail_index(temp.getEventdetailIndex()); - eventDetailVO.setTimeid(temp.getTimeid()); - eventDetailVO.setMs(temp.getMs()); - eventDetailVO.setWavetype(temp.getWavetype().toString()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(temp.getPersisttime() / 1000).setScale(3, RoundingMode.HALF_UP).toString()); - eventDetailVO.setEventvalue(temp.getEventvalue()); - eventDetailVO.setLookFlag(temp.getLookFlag()); - eventDetailVO.setNoticeFlag(temp.getNoticeFlag()); - if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){ - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName()); - } - return eventDetailVO; - }).collect(Collectors.toList()); - Page returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - returnpage.setRecords(collect); - returnpage.setTotal(list.getTotal()); - return returnpage; - } - - private List change(List list,List handleMsg){ - List result = new ArrayList<>(); - if(CollectionUtils.isEmpty(list)){ - return result; - } - List lineidList = list.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); - - - List pqLineList = pqLineService.getBaseLineInfo(lineidList); - Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); - - result = list.stream().map(temp -> { - EventDetailVO eventDetailVO = new EventDetailVO(); - eventDetailVO.setEventdetail_index(temp.getEventdetailIndex()); - eventDetailVO.setTimeid(temp.getTimeid()); - eventDetailVO.setMs(temp.getMs()); - eventDetailVO.setWavetype(temp.getWavetype().toString()); - eventDetailVO.setPersisttime(BigDecimal.valueOf(temp.getPersisttime() / 1000).setScale(3, RoundingMode.HALF_UP).toString()); - eventDetailVO.setEventvalue(temp.getEventvalue()); - eventDetailVO.setLookFlag(temp.getLookFlag()); - eventDetailVO.setNoticeFlag(temp.getNoticeFlag()); - if( temp.getEventvalue()< 0.5){ - eventDetailVO.setEventSeverity(1); - }else{ - eventDetailVO.setEventSeverity(2); - } - eventDetailVO.setMsgEventInfoSize(handleMsg.stream().filter(msg->Objects.equals(msg.getEventIndex(),temp.getEventdetailIndex())).count()); - if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){ - LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid()); - eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); - eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); - eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName()); - eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName()); - eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName()); - } - return eventDetailVO; - }).collect(Collectors.toList()); - - return result; - } - - - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MessageEventFeedbackServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MessageEventFeedbackServiceImpl.java deleted file mode 100644 index 13f21ad3..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MessageEventFeedbackServiceImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.MessageEventFeedbackMapper; -import com.njcn.gather.event.transientes.pojo.po.MessageEventFeedback; -import com.njcn.gather.event.transientes.service.MessageEventFeedbackService; -import org.springframework.stereotype.Service; - -/** - * @Author: cdf - * @CreateTime: 2025-06-26 - * @Description: - */ -@Service -public class MessageEventFeedbackServiceImpl extends ServiceImpl implements MessageEventFeedbackService { -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java deleted file mode 100644 index f1759345..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.MsgEventConfigMapper; -import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; -import com.njcn.gather.event.transientes.service.MsgEventConfigService; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - - -/** - * @Author: cdf - * @CreateTime: 2025-06-27 - * @Description: - */ -@Service -@Lazy(false) // 确保服务在启动时立即初始化 -public class MsgEventConfigServiceImpl extends ServiceImpl implements MsgEventConfigService { - - /** - * 暂降类型 - */ - public List eventType = Stream.of("1","3").collect(Collectors.toList()); - - /** - * 暂降残余电压阈值 只查询小于0.7的暂降事件 - */ - public Float eventValue = 0.7f; - - /** - * 暂降残余电压阈值 只查询大于50ms的暂降事件 - */ - public Integer eventDuration = 50; - - - - @Transactional(rollbackFor = Exception.class) - @Override - public boolean eventConfig(MsgEventConfig msgEventConfig) { - this.remove(new LambdaQueryWrapper<>()); - msgEventConfig.setId(IdUtil.simpleUUID()); - String tem = String.join(StrUtil.COMMA, msgEventConfig.getEventTypeList()); - msgEventConfig.setEventType(tem); - this.save(msgEventConfig); - eventType = msgEventConfig.getEventTypeList(); - eventValue = msgEventConfig.getEventValue(); - eventDuration= msgEventConfig.getEventDuration(); - return true; - } - - @Override - public MsgEventConfig queryConfig() { - MsgEventConfig msgEventConfig = this.getOne(new LambdaQueryWrapper<>()); - msgEventConfig.setEventTypeList(Arrays.asList(msgEventConfig.getEventType().split(StrUtil.COMMA))); - return msgEventConfig; - } - - - @PostConstruct - public void init() { - System.out.println("------------------------------------------------------------------------------"); - MsgEventConfig config = this.getOne(new LambdaQueryWrapper<>()); - if(Objects.nonNull(config)){ - if (StrUtil.isNotBlank(config.getEventType())) { - eventType = Arrays.asList(config.getEventType().split(StrUtil.COMMA)); - } - if(Objects.nonNull(config.getEventValue())){ - eventValue = config.getEventValue(); - } - if(Objects.nonNull(config.getEventDuration())){ - eventDuration = config.getEventDuration(); - } - } - System.out.println(config); - } - - - @Override - public List getEventType() { - return eventType; - } - - @Override - public Float getEventValue() { - return eventValue; - } - - @Override - public Integer getEventDuration() { - return eventDuration; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java deleted file mode 100644 index 170b640b..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.MsgEventInfoMapper; -import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; -import com.njcn.gather.event.transientes.service.MsgEventInfoService; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-06-25 - * @Description: - */ -@Service -public class MsgEventInfoServiceImpl extends ServiceImpl implements MsgEventInfoService { - @Override - public List getMsgByIds(List ids) { - //通知 - List msgEventInfoList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(ids)){ - if(ids.size()>1000){ - List> listEven = CollUtil.split(ids,1000); - for(List pList: listEven){ - List temp = this.lambdaQuery().in(MsgEventInfo::getEventIndex,pList).list(); - msgEventInfoList.addAll(temp); - } - }else { - List temp = this.lambdaQuery().in(MsgEventInfo::getEventIndex,ids).list(); - msgEventInfoList.addAll(temp); - } - } - return msgEventInfoList; - } -} 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 deleted file mode 100644 index a8f10bb3..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqDevicedetailServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -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.mapper.PqDevicedetailMapper; -import com.njcn.gather.event.transientes.service.PqDevicedetailService; -/** - * - * Description: - * Date: 2025/06/19 下午 1:47【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqDevicedetailServiceImpl extends ServiceImpl implements PqDevicedetailService{ - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqUserLedgerServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqUserLedgerServiceImpl.java deleted file mode 100644 index bfc8720f..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqUserLedgerServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqUserLedgerMapper; -import com.njcn.gather.event.transientes.pojo.param.PqUserLedgerParam; -import com.njcn.gather.event.transientes.pojo.po.PqUserLedgerPO; -import com.njcn.gather.event.transientes.service.PqUserLedgerService; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.UUID; - -/** - * @Author: cdf - * @CreateTime: 2025-07-28 - * @Description: - */ -@Service -public class PqUserLedgerServiceImpl extends ServiceImpl implements PqUserLedgerService { - - @Autowired - private PqUserLedgerMapper ledgerMapper; - - @Override - public boolean addLedger(PqUserLedgerParam ledgerParam) { - PqUserLedgerPO ledger = new PqUserLedgerPO(); - BeanUtil.copyProperties(ledgerParam,ledger); - ledger.setId(UUID.randomUUID().toString()); - ledger.setCreateTime(LocalDateTime.now()); - ledger.setUpdateTime(LocalDateTime.now()); - return ledgerMapper.insert(ledger) > 0; - } - - @Override - public boolean updateLedger(PqUserLedgerParam ledgerParam) { - PqUserLedgerPO ledger = new PqUserLedgerPO(); - BeanUtil.copyProperties(ledgerParam,ledger); - ledger.setUpdateTime(LocalDateTime.now()); - return ledgerMapper.updateById(ledger) > 0; - } - - @Override - public boolean deleteLedger(List ids) { - // 物理删除(直接删除记录) - return ledgerMapper.deleteBatchIds(ids) > 0; - } - - @Override - public PqUserLedgerPO getLedgerById(String id) { - return ledgerMapper.selectById(id); - } - - @Override - public Page pageList(PqUserLedgerParam param) { - Page page = new Page<>(); - Page pageResult = ledgerMapper.selectPage(page,new LambdaQueryWrapper()); - return page; - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDeptsServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDeptsServiceImpl.java deleted file mode 100644 index 820fbfcd..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDeptsServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.njcn.gather.event.devcie.pojo.dto.PqsDeptDTO; -import org.springframework.stereotype.Service; - -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsDeptsMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsDepts; -import com.njcn.gather.event.transientes.service.PqsDeptsService; -/** - * - * Description: - * Date: 2025/06/19 下午 3:57【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsDeptsServiceImpl extends ServiceImpl implements PqsDeptsService{ - - @Override - public List findDeptAndChildren(String deptId) { - return this.getBaseMapper().findDeptAndChildren(deptId); - } - - @Override - public List getDeptList(List deptIds) { - return this.getBaseMapper().getDeptList(deptIds); - - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDicTreeServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDicTreeServiceImpl.java deleted file mode 100644 index 0e244ac8..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsDicTreeServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsDicTreeMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsDicTreePO; -import com.njcn.gather.event.transientes.pojo.vo.PqsDicTreeVO; -import com.njcn.gather.event.transientes.service.PqsDicTreeService; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: cdf - * @CreateTime: 2025-08-01 - * @Description: - */ -@Service -public class PqsDicTreeServiceImpl extends ServiceImpl implements PqsDicTreeService { - - - /** - * 获取字典树 - */ - - @Override - public List getDicTree(String code){ - List pqsDicTreePOList = this.getBaseMapper().selectChildrenByCode(code); - return pqsDicTreePOList; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsEventdetailServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsEventdetailServiceImpl.java deleted file mode 100644 index c43f4a79..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsEventdetailServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; -import com.njcn.gather.event.transientes.pojo.vo.EventDetailVO; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.mapper.PqsEventdetailMapper; -import com.njcn.gather.event.transientes.service.PqsEventdetailService; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * - * Description: - * Date: 2025/06/20 上午 10:06【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsEventdetailServiceImpl extends ServiceImpl implements PqsEventdetailService{ - - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsOnlinerateServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsOnlinerateServiceImpl.java deleted file mode 100644 index bd48b940..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsOnlinerateServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsOnlinerateMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsOnlinerate; -import com.njcn.gather.event.transientes.service.PqsOnlinerateService; -/** - * - * Description: - * Date: 2025/07/29 下午 6:40【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsOnlinerateServiceImpl extends ServiceImpl implements PqsOnlinerateService{ - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUserServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUserServiceImpl.java deleted file mode 100644 index 0e0946e4..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUserServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsEventdetailMapper; -import com.njcn.gather.event.transientes.mapper.PqsUserMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail; -import com.njcn.gather.event.transientes.pojo.po.PqsUser; -import com.njcn.gather.event.transientes.service.PqsUserService; -import org.springframework.stereotype.Service; - -import java.util.Collection; -import java.util.Map; -import java.util.function.Function; - -/** - * Description: - * Date: 2025/06/27 上午 9:46【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsUserServiceImpl extends ServiceImpl implements PqsUserService { - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java deleted file mode 100644 index 5a6fe3f9..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njcn.gather.event.transientes.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.gather.event.transientes.mapper.PqsUserSetMapper; -import com.njcn.gather.event.transientes.pojo.po.PqsUserSet; -import org.springframework.stereotype.Service; - - -import com.njcn.gather.event.transientes.service.PqsUsersetService; -/** - * - * Description: - * Date: 2025/06/26 下午 2:27【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -public class PqsUsersetServiceImpl extends ServiceImpl implements PqsUsersetService{ - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/utils/JwtUtil.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/utils/JwtUtil.java deleted file mode 100644 index 70805f73..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/utils/JwtUtil.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.njcn.gather.event.transientes.utils; - -import com.njcn.gather.event.transientes.security.MyUserDetails; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import io.jsonwebtoken.security.Keys; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.stereotype.Component; - -import java.security.Key; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; - -@Component -public class JwtUtil { - - private final String userId = "userId"; - private final String userName = "userName"; - private final String deptId = "deptId"; - - - private static final Key SECRET_KEY = Keys.secretKeyFor(SignatureAlgorithm.HS256); - private static final long EXPIRATION_TIME = 1000 * 60 * 60 * 1000000000L; // 100000小时 - - // 生成JWT令牌 - public String generateToken(MyUserDetails userDetails) { - Map claims = new HashMap<>(); - claims.put(userId,userDetails.getUserId()); - claims.put(userName,userDetails.getUsername()); - claims.put(deptId,userDetails.getDeptId()); - return createToken(claims, userDetails.getUsername()); - } - - private String createToken(Map claims, String subject) { - return Jwts.builder() - .setClaims(claims) - .setSubject(subject) - .setIssuedAt(new Date(System.currentTimeMillis())) - .setExpiration(new Date(System.currentTimeMillis() + EXPIRATION_TIME)) - .signWith(SECRET_KEY, SignatureAlgorithm.HS256) - .compact(); - } - - // 验证令牌 - public Boolean validateToken(String token, UserDetails userDetails) { - final String username = extractUsername(token); - return (username.equals(userDetails.getUsername()) && !isTokenExpired(token)); - } - - // 提取用户名 - public String extractUsername(String token) { - return extractClaim(token, it->it.get(userName).toString()); - } - - // 提取用户ID - public String extractUserId(String token) { - return extractClaim(token,it->it.get(userId).toString()); - } - - // 提取用户部门 - public String extractDepartment(String token) { - return extractClaim(token, it->it.get(deptId).toString()); - } - - // 提取过期时间 - public Date extractExpiration(String token) { - return extractClaim(token, Claims::getExpiration); - } - - private T extractClaim(String token, Function claimsResolver) { - final Claims claims = extractAllClaims(token); - return claimsResolver.apply(claims); - } - - private Claims extractAllClaims(String token) { - return Jwts.parser().setSigningKey(SECRET_KEY).parseClaimsJws(token).getBody(); - } - - private Boolean isTokenExpired(String token) { - return extractExpiration(token).before(new Date()); - } -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java deleted file mode 100644 index 5deddc88..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.njcn.gather.event.transientes.websocket; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; -import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; - -/** - * Description: - * Date: 2024/12/13 15:09【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Configuration -public class WebSocketConfig { - - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } - - /** - * 通信文本消息和二进制缓存区大小 - * 避免对接 第三方 报文过大时,Websocket 1009 错误 - * - * @return - */ - - @Bean - public ServletServerContainerFactoryBean createWebSocketContainer() { - ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean(); - // 在此处设置bufferSize - container.setMaxTextMessageBufferSize(10240000); - container.setMaxBinaryMessageBufferSize(10240000); - container.setMaxSessionIdleTimeout(15 * 60000L); - return container; - } - - -} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java deleted file mode 100644 index fc77f69e..00000000 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.njcn.gather.event.transientes.websocket; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * Description: - * Date: 2024/12/13 15:11【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Slf4j -@Component -@ServerEndpoint(value = "/ws/{userId}") -public class WebSocketServer { - - private static final ConcurrentHashMap sessions = new ConcurrentHashMap<>(); - private static final ConcurrentHashMap lastHeartbeatTime = new ConcurrentHashMap<>(); - private static final ConcurrentHashMap heartbeatExecutors = new ConcurrentHashMap<>(); - private static final long HEARTBEAT_TIMEOUT = 60; // 60秒超时 - - @OnOpen - public void onOpen(Session session, @PathParam("userId") String userId) { - if (StrUtil.isNotBlank(userId)) { - sessions.put(userId, session); - lastHeartbeatTime.put(userId, System.currentTimeMillis()); - sendMessage(session, "连接成功"); - System.out.println("用户 " + userId + " 已连接"); - - // 启动心跳检测 - startHeartbeat(session, userId); - } else { - try { - session.close(new CloseReason(CloseReason.CloseCodes.VIOLATED_POLICY, "用户ID不能为空")); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - @OnMessage - public void onMessage(String message, Session session, @PathParam("userId") String userId) { - if ("alive".equalsIgnoreCase(message)) { - // 更新最后心跳时间 - lastHeartbeatTime.put(userId, System.currentTimeMillis()); - sendMessage(session, "over"); - } else { - // 处理业务消息 - System.out.println("收到用户 " + userId + " 的消息: " + message); - // TODO: 处理业务逻辑 - } - } - - @OnClose - public void onClose(Session session, CloseReason closeReason, @PathParam("userId") String userId) { - // 移除用户并取消心跳检测 - sessions.remove(userId); - lastHeartbeatTime.remove(userId); - ScheduledExecutorService executor = heartbeatExecutors.remove(userId); - if (executor != null) { - executor.shutdownNow(); - } - System.out.println("用户 " + userId + " 已断开连接,状态码: " + closeReason.getCloseCode()); - } - - @OnError - public void onError(Session session, Throwable throwable, @PathParam("userId") String userId) { - System.out.println("用户 " + userId + " 发生错误: " + throwable.getMessage()); - try { - session.close(new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "发生错误")); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public void sendMessageToUser(String userId, String message) { - Session session = sessions.get(userId); - if (session != null && session.isOpen()) { - try { - session.getBasicRemote().sendText(message); - } catch (IOException e) { - System.out.println("发送消息给用户 " + userId + " 失败: " + e.getMessage()); - } - } else { - System.out.println("webSocket用户 " + userId + " 不在线或会话已关闭"); - } - } - - private final Object lock = new Object(); - - public void sendMessageToAll(String message) { - sessions.forEach((userId, session) -> { - System.out.println("给用户推送消息" + userId); - if (session.isOpen()) { - synchronized (lock) { - try { - session.getBasicRemote().sendText(message); - } catch (IOException e) { - System.out.println("发送消息给用户 " + userId + " 失败: " + e.getMessage()); - } - } - } - }); - } - - private void sendMessage(Session session, String message) { - try { - session.getBasicRemote().sendText(message); - } catch (IOException e) { - System.out.println("发送消息失败: " + e.getMessage()); - } - } - - private void startHeartbeat(Session session, String userId) { - ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); - heartbeatExecutors.put(userId, executor); - - // 定期检查心跳 - executor.scheduleAtFixedRate(() -> { - long lastTime = lastHeartbeatTime.getOrDefault(userId, 0L); - long currentTime = System.currentTimeMillis(); - - // 如果超过30秒没有收到心跳 - if (currentTime - lastTime > HEARTBEAT_TIMEOUT * 1000) { - try { - System.out.println("用户 " + userId + " 心跳超时,关闭连接"); - session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "心跳超时")); - } catch (IOException e) { - System.out.println("关闭用户 " + userId + " 连接时出错: " + e.getMessage()); - } - executor.shutdown(); - heartbeatExecutors.remove(userId); - } - }, 0, 5, TimeUnit.SECONDS); // 每5秒检查一次 - } -} \ No newline at end of file diff --git a/event_smart/src/main/resources/application-dev.yml b/event_smart/src/main/resources/application-dev.yml deleted file mode 100644 index 2c95ddb2..00000000 --- a/event_smart/src/main/resources/application-dev.yml +++ /dev/null @@ -1,53 +0,0 @@ -spring: - application: - name: event_smart - - datasource: - dynamic: - primary: master - strict: false # 是否严格匹配数据源,默认false - druid: # 如果使用Druid连接池 - validation-query: SELECT 1 FROM DUAL # 达梦专用校验SQL - initial-size: 10 - # 初始化大小,最小,最大 - min-idle: 20 - maxActive: 500 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - testWhileIdle: true - testOnBorrow: true - testOnReturn: false - # 打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - datasource: - master: - url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase - username: pqsadmin_bj - password: pqsadmin - driver-class-name: oracle.jdbc.OracleDriver -# salve: -# driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.1.21:5236/PQSADMIN?useUnicode=true&characterEncoding=utf-8 -# username: PQSADMINLN -# password: Pqsadmin123 - - - - redis: - database: 10 - host: localhost - port: 6379 - timeout: 5000 - lettuce: - pool: - max-active: 8 - max-wait: 8000 - max-idle: 8 - min-idle: 0 - - diff --git a/event_smart/src/main/resources/application-prod.yml b/event_smart/src/main/resources/application-prod.yml deleted file mode 100644 index 334d60d2..00000000 --- a/event_smart/src/main/resources/application-prod.yml +++ /dev/null @@ -1,55 +0,0 @@ -server: - port: 18093 -spring: - application: - name: event_smart - datasource: - dynamic: - primary: master - strict: false # 是否严格匹配数据源,默认false - druid: # 如果使用Druid连接池 - validation-query: SELECT 1 FROM DUAL # 达梦专用校验SQL - initial-size: 10 - # 初始化大小,最小,最大 - min-idle: 20 - maxActive: 500 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - testWhileIdle: true - testOnBorrow: true - testOnReturn: false - # 打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - datasource: - master: - url: jdbc:oracle:thin:@192.168.10.34:11521:pqsbase - username: pqsadmin - password: Pqsadmin_123 - driver-class-name: oracle.jdbc.OracleDriver -# salve: -# driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.1.21:5236/PQSADMIN?useUnicode=true&characterEncoding=utf-8 -# username: PQSADMINLN -# password: Pqsadmin123 - - - - redis: - database: 10 - host: localhost - port: 16379 - password: "Pqsadmin@#1qaz" - timeout: 5000 - lettuce: - pool: - max-active: 20 - max-wait: 8000 - max-idle: 8 - min-idle: 0 - - diff --git a/event_smart/src/main/resources/application.yml b/event_smart/src/main/resources/application.yml deleted file mode 100644 index da1c319f..00000000 --- a/event_smart/src/main/resources/application.yml +++ /dev/null @@ -1,72 +0,0 @@ -#当前服务的基本信息 -microservice: - ename: 12345 - name: 12345 -server: - port: 18093 -spring: - application: - name: event_smart - profiles: - active: prod - - -#mybatis配置信息 -mybatis-plus: - mapper-locations: classpath*:com/njcn/**/mapping/*.xml - #别名扫描 - type-aliases-package: com.njcn.gather.event.**.pojo - configuration: - #驼峰命名 - map-underscore-to-camel-case: true - #配置sql日志输出 - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - #关闭日志输出 - log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl - global-config: - db-config: - #指定主键生成策略 - id-type: assign_uuid - - -SYS_TYPE_ZT: 1cfcd6e2-c5fe-4b15-988a-32b90f1170c1 -SYS_TYPE_WT: 983f9dfe-4f9a-4c96-89d8-7d425a1f1d6c -db: - type: oracle - -#文件位置配置 -business: - #处理波形数据位置 - wavePath: D://Comtrade - #wavePath: /usr/local/comtrade - #处理临时数据 - tempPath: D://file - #tempPath: /usr/local/file - #文件存储的方式 3.本地存储 - file: - storage: 3 -#oss服务器配置 -min: - io: - endpoint: http://192.168.1.13:9009 - accessKey: minio - secretKey: minio@123 - bucket: excelreport - #华为obs服务器配置 -huawei: - access-key: J9GS9EA79PZ60OK23LWP - security-key: BirGrAFDSLxU8ow5fffyXgZRAmMRb1R1AdqCI60d - obs: - bucket: test-8601 - endpoint: https://obs.cn-east-3.myhuaweicloud.com - # 单位为秒 - expire: 3600 -#线程池配置信息 -threadPool: - corePoolSize: 10 - maxPoolSize: 20 - queueCapacity: 500 - keepAliveSeconds: 60 -WAVEPATH: D:/Comtrade - - diff --git a/event_smart/src/main/resources/logback.xml b/event_smart/src/main/resources/logback.xml deleted file mode 100644 index e972d91d..00000000 --- a/event_smart/src/main/resources/logback.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - UTF-8 - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n - - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - UTF-8 - - - - - - - - ${logHomeDir}/${log.projectName}/debug/debug.log - - - - - DEBUG - - ACCEPT - - DENY - - - - - - ${logHomeDir}/${log.projectName}/debug/debug.log.%d{yyyy-MM-dd}.%i.log - - 10MB - - ${log.maxHistory:-30} - - - - - - - - - - ${log.pattern} - - UTF-8 - - - - - - - INFO - ACCEPT - DENY - - - ${logHomeDir}/${log.projectName}/info/info.log - - - - ${logHomeDir}/${log.projectName}/info/info.log.%d{yyyy-MM-dd}.%i.log - - 10MB - ${log.maxHistory:-30} - - - - ${log.pattern} - - UTF-8 - - - - - - - - ${logHomeDir}/${log.projectName}/error/error.log - - - ERROR - ACCEPT - DENY - - - - ${logHomeDir}/${log.projectName}/error/error.log.%d{yyyy-MM-dd}.%i.log - - 10MB - ${log.maxHistory:-30} - - - - ${log.pattern} - - UTF-8 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/event_smart/src/test/java/com/njcn/gather/event/EventSmartApplicationTests.java b/event_smart/src/test/java/com/njcn/gather/event/EventSmartApplicationTests.java deleted file mode 100644 index fb9b0aae..00000000 --- a/event_smart/src/test/java/com/njcn/gather/event/EventSmartApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.gather.event; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class EventSmartApplicationTests { - - @Test - void contextLoads() { - } - -}