海南暂降推送至Kafka

cn-advance/src/main/java/com/njcn/product/advance/responsility/service/impl/RespDataResultServiceImpl.java

@@ -49,11 +49,11 @@ public class RespDataResultServiceImpl extends ServiceImpl<RespDataResultMapper,
     @Override
     public List<ResponsibilityResult> displayHistoryData(String id, Integer time) {
         List<ResponsibilityResult> responsibilityResults = new ArrayList<>();
-        //if (Objects.isNull(time)) {
+        RespData respDataQuery = respDataService.getById(id);
-            RespData respDataQuery = respDataService.getById(id);
+        String[] split = respDataQuery.getDataTimes().split(StrPool.COMMA);
-            String[] split = respDataQuery.getDataTimes().split(StrPool.COMMA);
+        if (Objects.isNull(time)) {
             time = Integer.parseInt(split[0]);
-        //}
+        }
         LambdaQueryWrapper<RespDataResult> respDataResultLambdaQueryWrapper = new LambdaQueryWrapper<>();
         respDataResultLambdaQueryWrapper.eq(RespDataResult::getResDataId, id)
                 .eq(RespDataResult::getTime, time);

cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java

@@ -10,7 +10,7 @@ import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.diagram.LedgerScale.service.LedgerScaleService;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
@@ -94,12 +94,12 @@ public class LedgerScaleController extends BaseController {
 
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/clickImage")
+    @PostMapping("/clickImage")
     @ApiOperation("一次接线图点击事件")
     @ApiImplicitParam(name = "lineId", value = "查询参数", required = true)
-    public HttpResult<EventLedgerVO> clickImage(@RequestParam("lineId")String lineId) {
+    public HttpResult<EventLedgerVO> clickImage(@RequestBody LargeScreenCountParam param) {
         String methodDescribe = getMethodDescribe("clickImage");
-        EventLedgerVO result = ledgerScaleService.clickImage(lineId);
+        EventLedgerVO result = ledgerScaleService.clickImage(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -168,4 +168,16 @@ public class LedgerScaleController extends BaseController {
     }
 
 
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/stationMap")
+    @ApiOperation("获取变电站详情")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<List<PqStation>> stationMap(@RequestBody LargeScreenCountParam param) {
+        String methodDescribe = getMethodDescribe("stationMap");
+        List<PqStation> result = ledgerScaleService.stationMap(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+
 }

cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java

@@ -6,7 +6,7 @@ import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
 
@@ -30,8 +30,7 @@ public interface LedgerScaleService {
     List<EventLedgerVO> hasUpEventList(LargeScreenCountParam param);
 
 
-    EventLedgerVO clickImage(String lineId);
+    EventLedgerVO clickImage(LargeScreenCountParam param);
-
     Page<EventDetailVO> eventList(LargeScreenCountParam param);
 
     Page<EventDetailVO> eventListByLineId(LargeScreenCountParam param);
@@ -44,4 +43,6 @@ public interface LedgerScaleService {
 
 
     List<CustomerResponsibility> harmOneImage(String id, Integer time);
+
+    List<PqStation> stationMap(LargeScreenCountParam param);
 }

cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java

@@ -3,7 +3,6 @@ package com.njcn.product.diagram.LedgerScale.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
@@ -20,24 +19,25 @@ import com.njcn.product.advance.eventSource.pojo.po.RmpEventDetailAssPO;
 import com.njcn.product.advance.harmonicUp.mapper.UpHarmonicDetailMapper;
 import com.njcn.product.advance.harmonicUp.pojo.po.UpHarmonicDetail;
 import com.njcn.product.advance.responsility.mapper.RespDataResultMapper;
-import com.njcn.product.advance.responsility.pojo.dto.CustomerData;
 import com.njcn.product.advance.responsility.pojo.dto.CustomerResponsibility;
-import com.njcn.product.advance.responsility.pojo.dto.ResponsibilityResult;
 import com.njcn.product.advance.responsility.pojo.po.RespDataResult;
+import com.njcn.product.cnzutai.zutai.pojo.po.CsConfigurationPO;
+import com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss;
+import com.njcn.product.cnzutai.zutai.service.CsConfigurationService;
+import com.njcn.product.cnzutai.zutai.service.CsSubConfigurationAssService;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.mapper.LineMapper;
+import com.njcn.product.terminal.mysqlTerminal.mapper.*;
-import com.njcn.product.terminal.mysqlTerminal.mapper.UserReportPOMapper;
+import com.njcn.product.terminal.mysqlTerminal.pojo.enums.LineBaseEnum;
-import com.njcn.product.terminal.mysqlTerminal.pojo.po.UserReportPO;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.Line;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.diagram.LedgerScale.service.LedgerScaleService;
 import com.njcn.product.system.dict.mapper.DictDataMapper;
 import com.njcn.product.system.dict.pojo.enums.DicDataTypeEnum;
 import com.njcn.product.system.dict.pojo.po.DictData;
-import com.njcn.product.terminal.mysqlTerminal.mapper.LedgerScaleMapper;
-import com.njcn.product.terminal.mysqlTerminal.mapper.RmpEventDetailMapper;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
 import com.njcn.product.terminal.mysqlTerminal.pojo.enums.RunFlagEnum;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
@@ -51,7 +51,6 @@ import org.springframework.stereotype.Service;
 import java.io.InputStream;
 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;
@@ -80,9 +79,10 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     private final RespDataResultMapper respDataResultMapper;
 
     private final FileStorageUtil fileStorageUtil;
-    private final UserReportPOMapper userReportPOMapper;
     private final UpHarmonicDetailMapper upHarmonicDetailMapper;
-
+    private final PqStationMapper pqStationMapper;
+    private final CsSubConfigurationAssService csSubConfigurationAssService;
+    private final CsConfigurationService csConfigurationService;
 
     @Override
     public LedgerScaleDTO ledgerScaleStatistic(LargeScreenCountParam param) {
@@ -281,16 +281,18 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     }
 
     @Override
-    public EventLedgerVO clickImage(String lineId) {
+    public EventLedgerVO clickImage(LargeScreenCountParam param) {
-        List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(lineId).collect(Collectors.toList()));
+        List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(param.getLineId()).collect(Collectors.toList()));
         if (CollUtil.isEmpty(ledgerBaseInfoList)) {
             throw new BusinessException(CommonResponseEnum.FAIL, "当前节点未查询到测点信息");
         }
 
         EventLedgerVO eventLedgerVO = new EventLedgerVO();
         BeanUtil.copyProperties(ledgerBaseInfoList.get(0), eventLedgerVO);
+        DateTime start = DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()));
+        DateTime end = DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()));
         LambdaQueryWrapper<RmpEventDetailPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(RmpEventDetailPO::getLineId, lineId);
+        lambdaQueryWrapper.eq(RmpEventDetailPO::getLineId, param.getLineId()).between(RmpEventDetailPO::getStartTime, start, end).orderByDesc(RmpEventDetailPO::getStartTime);;
         List<RmpEventDetailPO> rmpEventDetailPOList = rmpEventDetailMapper.selectList(lambdaQueryWrapper);
 
         List<DictData> dictDataList = dictDataMapper.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode());
@@ -301,6 +303,7 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     }
 
 
+
     @Override
     public Page<EventDetailVO> eventList(LargeScreenCountParam param) {
         Page<EventDetailVO> result = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param));
@@ -489,5 +492,42 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<PqStation> stationMap(LargeScreenCountParam param) {
+        List<PqStation> result = new ArrayList<>();
+        List<String> runIds = commGeneralService.getRunLineIdsByDept(param.getDeptId());
+        if(CollUtil.isEmpty(runIds)){
+            return result;
+        }
+        List<Line> lineList = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,runIds));
+        List<String> stationIds = lineList.stream().map(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList());
+        List<Line> stationResult = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,stationIds));
+        List<String> ids = stationResult.stream().map(Line::getId).distinct().collect(Collectors.toList());
+        List<PqStation> pqStationList = pqStationMapper.selectList(new LambdaQueryWrapper<PqStation>().in(PqStation::getId,ids));
+        Map<String, PqStation> substationMap = pqStationList.stream().collect(Collectors.toMap(PqStation::getId, po->po));
+        stationResult.forEach(it->{
+            PqStation pqStation = new PqStation();
+            if(substationMap.containsKey(it.getId())){
+                PqStation tem = substationMap.get(it.getId());
+                pqStation.setLng(tem.getLng());
+                pqStation.setLat(tem.getLat());
+            }
+            pqStation.setId(it.getId());
+            pqStation.setName(it.getName());
+            CsSubConfigurationAss one = csSubConfigurationAssService.lambdaQuery().eq(CsSubConfigurationAss::getSubId, it.getId()).one();
+            if(Objects.isNull(one)){
+                pqStation.setBindFlag(false);
+
+            }else {
+                CsConfigurationPO csConfigurationPO = csConfigurationService.lambdaQuery().eq(CsConfigurationPO::getId, one.getConfigId()).one();
+                pqStation.setBindFlag(true);
+                pqStation.setConfigId(csConfigurationPO.getId());
+                pqStation.setConfigName(csConfigurationPO.getName());
+            }
+            result.add(pqStation);
+        });
+        return result;
+    }
+
 
 }

cn-terminal/src/main/java/com/njcn/product/terminal/device/service/LedgerTreeService.java

@@ -1,10 +0,0 @@
-package com.njcn.product.terminal.device.service;
-
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
-
-import java.util.List;
-
-public interface LedgerTreeService {
-
-    List<OracleLedgerTreeDTO> getTree();
-}

cn-terminal/src/main/java/com/njcn/product/terminal/event/service/impl/EventGateServiceImpl.java

@@ -54,17 +54,31 @@ public class EventGateServiceImpl implements EventGateService {
         String lineid = eventDetail.getLineId();
         LedgerBaseInfo pqLine = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(lineid).collect(Collectors.toList())).get(0);
         String waveName = eventDetail.getWavePath();
-        String cfgPath, datPath;
+        String cfgPath, datPath,cfgPath1,datPath1;
+        InputStream cfgStream,datStream;
         if (StrUtil.isBlank(waveName)) {
             throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
         }
-        cfgPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".CFG";
+        try {
-        datPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".DAT";
+            cfgPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".CFG";
-        log.info("本地磁盘波形文件路径----" + cfgPath);
+            datPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".DAT";
-        InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath);
+            cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath);
-        InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath);
+            datStream = waveFileComponent.getFileInputStreamByFilePath(datPath);
+            log.info("本地磁盘波形文件路径----" + cfgPath);
+
+        }catch (Exception e){
+            cfgPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".cfg";
+            datPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".dat";
+            cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath1);
+            datStream = waveFileComponent.getFileInputStreamByFilePath(datPath1);
+        }
+
+
+
         if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
-            throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
+
+          throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
+
         }
         waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
 

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LedgerTreeController.java

@@ -1,12 +1,10 @@
 package com.njcn.product.terminal.mysqlTerminal.controller;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.dto.SimpleDTO;
 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.product.terminal.device.service.LedgerTreeService;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.enums.StatisticsEnum;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.DeviceInfoParam;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LineController.java

@@ -5,7 +5,6 @@ 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.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.service.LineService;
 import com.njcn.web.controller.BaseController;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/PqStationMapper.java

@@ -0,0 +1,8 @@
+package com.njcn.product.terminal.mysqlTerminal.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
+
+public interface PqStationMapper extends BaseMapper<PqStation> {
+
+}

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml

@@ -93,7 +93,7 @@
             and (dev.name like CONCAT('%', #{searchValue}, '%')
             or a.name like CONCAT('%', #{searchValue}, '%'))
         </if>
-        order by c.name,a.name
+<!--        order by c.name,a.name-->
     </select>
 
     <select id="getLineList" resultType="TerminalShowVO">
@@ -131,7 +131,7 @@
             or a.name like CONCAT('%', #{searchValue}, '%')
             or c.name like CONCAT('%', #{searchValue}, '%'))
         </if>
-        order by c.name,a.name
+<!--        order by c.name,a.name-->
     </select>
 
     <select id="getMonitorDetail" resultType="com.njcn.product.terminal.mysqlTerminal.pojo.dto.LineDevGetDTO">

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/dto/LedgerTreeDTO.java

@@ -1,6 +1,5 @@
 package com.njcn.product.terminal.mysqlTerminal.pojo.dto;
 
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
 import lombok.Data;
 
 import java.util.ArrayList;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/po/PqStation.java

@@ -0,0 +1,58 @@
+package com.njcn.product.terminal.mysqlTerminal.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-01-04
+ */
+@Data
+@TableName("pq_substation")
+public class PqStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站序号
+     */
+    private String id;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 经度
+     */
+    private BigDecimal lng;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal lat;
+
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private boolean bindFlag;
+
+    @TableField(exist = false)
+    private String configId;
+
+    @TableField(exist = false)
+    private String configName;
+
+
+}

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceDetailMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqDeviceDetail;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDeviceDetail;
 
 /**
  * CN_Gather

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceMapper.java

@@ -1,11 +1,11 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqGdCompanyMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqGdCompany;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqGdCompany;
 
 /**
  *

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLineMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLinedetailMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqLinedetail;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLinedetail;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqSubstationMapper.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsDeptslineMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsStationMapMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.njcn.product.terminal.device.pojo.po.PqsStationMap;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsStationMap;
 
 /**
  *

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqDeviceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqDeviceMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqDevice">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice">
     <!--@mbg.generated-->
     <!--@Table PQ_DEVICE-->
     <id column="DEV_INDEX" jdbcType="DECIMAL" property="devIndex" />
@@ -28,7 +28,7 @@
     NODE_INDEX, PORTID, DEVFLAG, DEV_SERIES, DEV_KEY, IP, DEVMODEL, CALLFLAG, DATATYPE
   </sql>
 
-  <select id="queryListByIds" resultType="com.njcn.product.terminal.device.pojo.dto.DeviceDTO">
+  <select id="queryListByIds" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO">
     select
     pq_device.dev_index devId,
     pq_device.name devName,
@@ -52,7 +52,7 @@
     </foreach>
   </select>
 
-  <select id="selectDeviceDTOPage" resultType="com.njcn.product.terminal.device.pojo.dto.DeviceDTO">
+  <select id="selectDeviceDTOPage" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO">
 
     SELECT  DISTINCT
     pq_device.dev_index devId,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqLineMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqLineMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqLine">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqLine">
     <!--@mbg.generated-->
     <!--@Table PQ_LINE-->
     <id column="LINE_INDEX" jdbcType="DECIMAL" property="lineIndex" />
@@ -29,7 +29,7 @@
   </sql>
 
 
-  <select id="getBaseLineInfo" resultType="com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO">
+  <select id="getBaseLineInfo" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO">
 
       WITH temp AS(
       select PQ_USER_LINE_ASS.LINE_INDEX LINE_INDEX,listagg(PQ_USER_LEDGER.CUSTOMER_NAME,';')  within GROUP (order by PQ_USER_LEDGER.CUSTOMER_NAME) objName from PQ_USER_LINE_ASS  ,PQ_USER_LEDGER where PQ_USER_LINE_ASS.USER_INDEX=PQ_USER_LEDGER.ID group by PQ_USER_LINE_ASS.LINE_INDEX
@@ -62,7 +62,7 @@ where 1=1
   </select>
 
 
-    <select id="getBaseLedger" resultType="com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO">
+    <select id="getBaseLedger" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO">
         select
         PQ_GDINFORMATION.name gdName,
         pq_line.GD_INDEX gdIndex,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqSubstationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqSubstationMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqSubstation">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation">
     <!--@mbg.generated-->
     <!--@Table PQ_SUBSTATION-->
     <id column="SUB_INDEX" jdbcType="DECIMAL" property="subIndex" />
@@ -14,7 +14,7 @@
     SUB_INDEX, GD_INDEX, "NAME", "SCALE"
   </sql>
 
-  <select id="queryListByIds" resultType="com.njcn.product.terminal.device.pojo.dto.SubstationDTO">
+  <select id="queryListByIds" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO">
     select
     PQ_SUBSTATION.sub_index stationId,
     PQ_SUBSTATION.name stationName,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDeptDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/LedgerBaseInfoDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/OracleLedgerTreeDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/PqsDeptDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/SubstationDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDevice.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDeviceDetail.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqGdCompany.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLine.java

@@ -0,0 +1,132 @@
+package com.njcn.product.terminal.oracleDevice.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: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;
+}

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLinedetail.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 /**
  * @Author: cdf

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqSubstation.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsDeptsline.java

@@ -1,9 +1,8 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsStationMap.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/LedgerTreeService.java

@@ -0,0 +1,10 @@
+package com.njcn.product.terminal.oracleDevice.service;
+
+import com.njcn.product.terminal.oracleDevice.pojo.dto.OracleLedgerTreeDTO;
+
+import java.util.List;
+
+public interface LedgerTreeService {
+
+    List<OracleLedgerTreeDTO> getTree();
+}

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqDeviceService.java

@@ -1,11 +1,11 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
 
 import java.util.List;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqLineService.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqSubstationService.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
 
 import java.util.List;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqsDeptslineService.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/LedgerTreeServiceImpl.java

@@ -1,17 +1,17 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.product.terminal.device.mapper.PqDeviceMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqDeviceMapper;
-import com.njcn.product.terminal.device.mapper.PqGdCompanyMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqGdCompanyMapper;
-import com.njcn.product.terminal.device.mapper.PqLineMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqLineMapper;
-import com.njcn.product.terminal.device.mapper.PqSubstationMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqSubstationMapper;
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.OracleLedgerTreeDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
-import com.njcn.product.terminal.device.pojo.po.PqGdCompany;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqGdCompany;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
-import com.njcn.product.terminal.device.service.LedgerTreeService;
+import com.njcn.product.terminal.oracleDevice.service.LedgerTreeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqDeviceServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.njcn.product.terminal.device.mapper.PqDeviceMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqDeviceMapper;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
-import com.njcn.product.terminal.device.service.PqDeviceService;
+import com.njcn.product.terminal.oracleDevice.service.PqDeviceService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqLineServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.product.terminal.device.mapper.PqLineMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqLineMapper;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
-import com.njcn.product.terminal.device.service.PqLineService;
+import com.njcn.product.terminal.oracleDevice.service.PqLineService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqSubstationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
-import com.njcn.product.terminal.device.mapper.PqSubstationMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqSubstationMapper;
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
-import com.njcn.product.terminal.device.service.PqSubstationService;
+import com.njcn.product.terminal.oracleDevice.service.PqSubstationService;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqsDeptslineServiceImpl.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
-import com.njcn.product.terminal.device.mapper.PqsDeptslineMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqsDeptslineMapper;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
-import com.njcn.product.terminal.device.service.PqsDeptslineService;
+import com.njcn.product.terminal.oracleDevice.service.PqsDeptslineService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

cn-zutai/pom.xml

@@ -54,6 +54,12 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.njcn.product</groupId>
+            <artifactId>cn-terminal</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/mapper/CsSubConfigurationAssMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.product.cnzutai.zutai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss;
+
+/**
+ * 
+ * Description:
+ * Date: 2025/11/04  上午 11:07【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsSubConfigurationAssMapper extends BaseMapper<CsSubConfigurationAss> {
+}

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/mapper/mapping/CsSubConfigurationAssMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.product.cnzutai.zutai.mapper.CsSubConfigurationAssMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss">
+    <!--@mbg.generated-->
+    <!--@Table cs_sub_configuration_ass-->
+    <id column="sub_id" jdbcType="VARCHAR" property="subId" />
+    <result column="config_id" jdbcType="VARCHAR" property="configId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    sub_id, config_id
+  </sql>
+</mapper>

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/param/CsConfigurationParm.java

@@ -30,6 +30,8 @@ public class CsConfigurationParm  {
 
     private List<String> projectIds;
 
+    private List<String> substionIds;
+
 
     private Integer orderBy;
 

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/po/CsSubConfigurationAss.java

@@ -0,0 +1,33 @@
+package com.njcn.product.cnzutai.zutai.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;
+
+/**
+ * 
+ * Description:
+ * Date: 2025/11/04  上午 11:07【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@TableName(value = "cs_sub_configuration_ass")
+@Data
+public class CsSubConfigurationAss {
+    /**
+     * 变电站序号
+     */
+    @TableId(value = "sub_id", type = IdType.INPUT)
+    private String subId;
+
+    /**
+     * 组态id
+     */
+    @TableField(value = "config_id")
+    private String configId;
+
+
+}

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/vo/CsConfigurationVO.java

@@ -37,6 +37,9 @@ public class CsConfigurationVO extends BaseEntity {
 
     private List<String> projectIds;
 
+    private List<String> substionIds;
+
+    private List<String> substionName;
 
     @ApiModelProperty(value = "操作人")
     private String operater;

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/CsSubConfigurationAssService.java

@@ -0,0 +1,16 @@
+package com.njcn.product.cnzutai.zutai.service;
+
+import com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * Date: 2025/11/04  上午 11:07【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsSubConfigurationAssService extends IService<CsSubConfigurationAss>{
+
+
+}

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsConfigurationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.product.cnzutai.zutai.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,11 +12,16 @@ import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.product.cnzutai.zutai.mapper.CsPagePOMapper;
 import com.njcn.product.cnzutai.zutai.pojo.po.CsPagePO;
+import com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss;
 import com.njcn.product.cnzutai.zutai.service.CsConfigurationService;
 import com.njcn.product.cnzutai.zutai.mapper.CsConfigurationMapper;
 import com.njcn.product.cnzutai.zutai.pojo.param.CsConfigurationParm;
 import com.njcn.product.cnzutai.zutai.pojo.po.CsConfigurationPO;
 import com.njcn.product.cnzutai.zutai.pojo.vo.CsConfigurationVO;
+import com.njcn.product.cnzutai.zutai.service.CsSubConfigurationAssService;
+import com.njcn.product.terminal.mysqlTerminal.mapper.LineMapper;
+import com.njcn.product.terminal.mysqlTerminal.mapper.PqStationMapper;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.Line;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -46,6 +52,8 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
 
     private final FileStorageUtil fileStorageUtil;
     private final CsPagePOMapper csPagePOMapper;
+    private final CsSubConfigurationAssService csSubConfigurationAssService;
+    private final LineMapper lineMapper;
 
     //private final UserFeignClient userFeignClient;
 
@@ -72,21 +80,44 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
         csConfigurationPO.setStatus("1");
         boolean save = this.save(csConfigurationPO);
 
+
         String name = csConfigurationPO.getName();
         Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, name).eq(CsConfigurationPO::getStatus, "1").count();
         if(count>1){
             throw new BusinessException("存在相同的组态项目名称");
         }
+
+        //添加变电站绑定
+        if(!CollectionUtils.isEmpty(csConfigurationParm.getSubstionIds())){
+            List<CsSubConfigurationAss> list = csSubConfigurationAssService.lambdaQuery().in(CsSubConfigurationAss::getSubId, csConfigurationParm.getSubstionIds()).list();
+            if (!CollectionUtils.isEmpty(list)){
+                List<Line> stationResult = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,list));
+                String subNameList = stationResult.stream().map(Line::getName).collect(Collectors.joining(StrUtil.COMMA));
+
+                throw new BusinessException("变电站"+subNameList+"已绑定其他项目请修改");
+            }else {
+                List<CsSubConfigurationAss> csSubConfigurationAsses = csConfigurationParm.getSubstionIds().stream().map(temp -> {
+                    CsSubConfigurationAss csSubConfigurationAss = new CsSubConfigurationAss();
+                    csSubConfigurationAss.setSubId(temp);
+                    csSubConfigurationAss.setConfigId(csConfigurationPO.getId());
+                    return csSubConfigurationAss;
+                }).collect(Collectors.toList());
+
+                csSubConfigurationAssService.saveBatch(csSubConfigurationAsses);
+            }
+        }
         return save;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm) {
         CsConfigurationPO tem  = this.getById(auditParm.getId());
         if(Objects.isNull(tem)){
             throw new BusinessException(CommonResponseEnum.FAIL,"未查询到项目信息，无法操作！");
         }
-
+        //删除关联表信息
+        csSubConfigurationAssService.lambdaUpdate().eq(CsSubConfigurationAss::getConfigId,tem.getId()).remove();
 
         CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
         if(Objects.equals(auditParm.getStatus(),"0")){
@@ -126,6 +157,26 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
 
         boolean b = this.updateById(csConfigurationPO);
 
+        //添加变电站绑定
+        if(!CollectionUtils.isEmpty(auditParm.getSubstionIds())){
+            List<CsSubConfigurationAss> list = csSubConfigurationAssService.lambdaQuery().in(CsSubConfigurationAss::getSubId, auditParm.getSubstionIds()).list();
+            if (!CollectionUtils.isEmpty(list)){
+                List<Line> stationResult = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,list));
+                String subNameList = stationResult.stream().map(Line::getName).collect(Collectors.joining(StrUtil.COMMA));
+
+                throw new BusinessException("变电站"+subNameList+"已绑定其他项目请修改");
+            }else {
+                List<CsSubConfigurationAss> csSubConfigurationAsses = auditParm.getSubstionIds().stream().map(temp -> {
+                    CsSubConfigurationAss csSubConfigurationAss = new CsSubConfigurationAss();
+                    csSubConfigurationAss.setSubId(temp);
+                    csSubConfigurationAss.setConfigId(csConfigurationPO.getId());
+                    return csSubConfigurationAss;
+                }).collect(Collectors.toList());
+
+                csSubConfigurationAssService.saveBatch(csSubConfigurationAsses);
+            }
+        }
+
         return b;
     }
 
@@ -198,7 +249,14 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
                 }
 
             }
+            List<CsSubConfigurationAss> csSubConfigurationAssList = csSubConfigurationAssService.lambdaQuery().eq(CsSubConfigurationAss::getConfigId, page.getId()).list();
+            if(!CollectionUtils.isEmpty(csSubConfigurationAssList)){
+                List<String> subIds = csSubConfigurationAssList.stream().map(CsSubConfigurationAss::getSubId).collect(Collectors.toList());
 
+                csDevModelPageVO.setSubstionIds(subIds);
+//                List<Line> stationResult = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,subIds));
+//                csDevModelPageVO.setSubstionName();
+            }
 
             csDevModelPageVO.setOperater(collect2.get(csDevModelPageVO.getCreateBy()));
             return csDevModelPageVO;

cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsSubConfigurationAssServiceImpl.java

@@ -0,0 +1,21 @@
+package com.njcn.product.cnzutai.zutai.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.product.cnzutai.zutai.mapper.CsSubConfigurationAssMapper;
+import com.njcn.product.cnzutai.zutai.pojo.po.CsSubConfigurationAss;
+import com.njcn.product.cnzutai.zutai.service.CsSubConfigurationAssService;
+/**
+ * 
+ * Description:
+ * Date: 2025/11/04  上午 11:07【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class CsSubConfigurationAssServiceImpl extends ServiceImpl<CsSubConfigurationAssMapper, CsSubConfigurationAss> implements CsSubConfigurationAssService{
+
+}

event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.product.event.devcie.mapper.PqGdCompanyMapper;
+import com.njcn.product.event.devcie.mapper.PqLineMapper;
 import com.njcn.product.event.devcie.mapper.PqLinedetailMapper;
 import com.njcn.product.event.devcie.pojo.dto.LedgerBaseInfoDTO;
 import com.njcn.product.event.devcie.pojo.po.PqGdCompany;
@@ -23,6 +24,7 @@ import com.njcn.product.event.config.RedisUtil;
 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.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -41,6 +43,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -60,6 +63,7 @@ public class DataSynchronization {
 
     private final OssFileStorageUtils ossFileStorageUtils;
     private final PqLinedetailMapper pqLinedetailMapper;
+    private final PqLineMapper pqLineMapper;
 
     private final PqUserLineAssMapper pqUserLineAssMapper;
     private final PqUserLedgerMapper pqUserLedgerMapper;
@@ -159,8 +163,8 @@ public class DataSynchronization {
         String exportDirName = "/pq_user/pq_user.json";
         UpLoadUserDTO result = new UpLoadUserDTO();
         QueryWrapper<PqUserLedgerPO> pqUserLedgerPOQueryWrapper = new QueryWrapper<>();
-        pqUserLedgerPOQueryWrapper.lambda().eq(PqUserLedgerPO::getIsShow,1);
+//        pqUserLedgerPOQueryWrapper.lambda().eq(PqUserLedgerPO::getIsShow,1);
-        List<PqUserLedgerPO> pqUserLedgerPOS = pqUserLedgerMapper.selectList(pqUserLedgerPOQueryWrapper);
+        List<PqUserLedgerPO> pqUserLedgerPOS = pqUserLedgerMapper.selectList(null);
         if(!CollectionUtils.isEmpty(pqUserLedgerPOS)){
             List<String> showIds =new ArrayList<>();
             List<UserLegerDTO>  userLegerDTOList =new ArrayList<>();
@@ -178,11 +182,28 @@ public class DataSynchronization {
                 userLegerDTO.setBigObjType(pqsDicTreePOMap.get(temp.getBigObjType()).getName());
                 userLegerDTO.setSmallObjType(pqsDicTreePOMap.get(temp.getSmallObjType()).getName());
 
+                userLegerDTO.setCustomerNo("");
+                userLegerDTO.setIsShow(temp.getIsShow());
                 userLegerDTOList.add(userLegerDTO);
             });
 
             QueryWrapper<PqUserLineAssPO> userLineAssPOQueryWrapper = new QueryWrapper<>();
-            userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex,showIds);
+//            userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex,showIds);
+            if (showIds.size() > 1000) {
+                List<List<String>> splitList = CollUtil.split(showIds, 1000);
+                userLineAssPOQueryWrapper.lambda().and(ew -> {
+                    for (int i = 0; i < splitList.size(); i++) {
+                        List<String> batch = splitList.get(i);
+                        if (i == 0) {
+                            ew.in(PqUserLineAssPO::getUserIndex, batch); // 第一个条件不加 or
+                        } else {
+                            ew.or().in(PqUserLineAssPO::getUserIndex, batch); // 后续条件加 or
+                        }
+                    }
+                });
+            } else {
+                userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex, showIds);
+            }
             List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(userLineAssPOQueryWrapper);
             List<UserLineAssDTO> userLineAssDTOS = pqUserLineAssPOS.stream().map(temp -> {
                 UserLineAssDTO userLineAssDTO = new UserLineAssDTO();
@@ -215,19 +236,19 @@ public class DataSynchronization {
         String exportDirName = String.format("%s/%s/%s.json","/event", filePath,"bz_"+fileName);
         // 查询失败的暂降事件
         LambdaQueryWrapper<PqsEventDetailStatusPO> statusPOLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        statusPOLambdaQueryWrapper.between(PqsEventDetailStatusPO::getEventTime,start,end);
+        statusPOLambdaQueryWrapper.between(PqsEventDetailStatusPO::getSyncTime,start,end);
         List<PqsEventDetailStatusPO> hasList = pqsEventDetailStatusService.list(statusPOLambdaQueryWrapper);
         Map<String, PqsEventDetailStatusPO> pqsEventDetailStatusPOMap = hasList.stream().collect(Collectors.toMap(PqsEventDetailStatusPO::getEventDetailId, Function.identity()));
         // 查询事件
         LambdaQueryWrapper<PqsEventdetail> pqsEventdetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start,end);
+        pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start.minusMinutes(6*10),end);
         List<PqsEventdetail> unsyncedEvents = pqsEventdetailMapper.selectList(pqsEventdetailLambdaQueryWrapper);
         List<String> tempEvetIds = unsyncedEvents.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList());
         //查询日志
         List<String> allEventIds = hasList.stream().map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList());
         List<String> unSyncIds = tempEvetIds.stream().filter(temp -> !allEventIds.contains(temp)).collect(Collectors.toList());
 
-        List<String> failIds = hasList.stream().filter(temp -> temp.getRetryCount() <= 2 && temp.getSyncStatus() == 0).map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList());
+        List<String> failIds = hasList.stream().filter(temp -> temp.getRetryCount() <= 5 && temp.getSyncStatus() == 0).map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList());
         unSyncIds.addAll(failIds);
         List<UpLoadEvent> result = new ArrayList<>();
 
@@ -259,13 +280,13 @@ public class DataSynchronization {
             List<PqLinedetail> pqLinedetails = pqLinedetailMapper.selectList(null);
             Map<Integer, PqLinedetail> lineDetailMap = pqLinedetails.stream().collect(Collectors.toMap(PqLinedetail::getLineIndex, Function.identity()));
 
-            unSyncIds.forEach(temp->{
+            eventIds.forEach(temp->{
                 PqsEventdetail pqsEventdetail = pqsEventdetailMap.get(temp);
 
                 if(pqsEventDetailStatusPOMap.containsKey(temp)){
                     PqsEventDetailStatusPO pqsEventDetailStatusPO = pqsEventDetailStatusPOMap.get(temp);
                     pqsEventDetailStatusPO.setRetryCount(pqsEventDetailStatusPO.getRetryCount()+1);
-                    if(Objects.nonNull(pqsEventdetail.getWavename())||pqsEventDetailStatusPO.getRetryCount()>2){
+                    if(Objects.nonNull(pqsEventdetail.getWavename())||pqsEventDetailStatusPO.getRetryCount()>5){
                         pqsEventDetailStatusPO.setSyncStatus(1);
                         pqsEventDetailStatusPO.setWaveFlag(0);
                         UpLoadEvent upLoadEvent = new UpLoadEvent();
@@ -275,13 +296,18 @@ public class DataSynchronization {
                         upLoadEvent.setMs(pqsEventdetail.getMs());
                         upLoadEvent.setDescribe(pqsEventdetail.getDescribe());
                         upLoadEvent.setWavetype(pqsEventdetail.getWavetype());
-                        upLoadEvent.setPersisttime(pqsEventdetail.getPersisttime());
+                        upLoadEvent.setPersisttime( pqsEventdetail.getPersisttime()/ 1000);
                         upLoadEvent.setEventvalue(pqsEventdetail.getEventvalue());
                         upLoadEvent.setEventreason(pqsEventdetail.getEventreason());
                         upLoadEvent.setEventtype(pqsEventdetail.getEventtype());
                         LedgerBaseInfoDTO ledgerBaseInfoDTO = LedgerBaseInfoDTOMap.get(pqsEventdetail.getLineid());
+                        if(Objects.isNull(ledgerBaseInfoDTO)){
+                            List<LedgerBaseInfoDTO> baseLineInfo = pqLineMapper.getBaseLineInfo(Stream.of(pqsEventdetail.getLineid()).collect(Collectors.toList()));
+                            ledgerBaseInfoDTO = baseLineInfo.get(0);
+                        }
                         upLoadEvent.setGdname(ledgerBaseInfoDTO.getGdName());
-                        upLoadEvent.setBdname(ledgerBaseInfoDTO.getBusBarName());
+                        upLoadEvent.setBdname(ledgerBaseInfoDTO.getStationName());
+                        upLoadEvent.setBusname(ledgerBaseInfoDTO.getBusBarName());
                         upLoadEvent.setPointname(ledgerBaseInfoDTO.getLineName());
                         upLoadEvent.setIp(ledgerBaseInfoDTO.getIp());
                         upLoadEvent.setPt(ledgerBaseInfoDTO.getPt());
@@ -316,13 +342,18 @@ public class DataSynchronization {
                         upLoadEvent.setMs(pqsEventdetail.getMs());
                         upLoadEvent.setDescribe(pqsEventdetail.getDescribe());
                         upLoadEvent.setWavetype(pqsEventdetail.getWavetype());
-                        upLoadEvent.setPersisttime(pqsEventdetail.getPersisttime());
+                        upLoadEvent.setPersisttime(pqsEventdetail.getPersisttime()/ 1000);
                         upLoadEvent.setEventvalue(pqsEventdetail.getEventvalue());
                         upLoadEvent.setEventreason(pqsEventdetail.getEventreason());
                         upLoadEvent.setEventtype(pqsEventdetail.getEventtype());
                         LedgerBaseInfoDTO ledgerBaseInfoDTO = LedgerBaseInfoDTOMap.get(pqsEventdetail.getLineid());
+                        if(Objects.isNull(ledgerBaseInfoDTO)){
+                            List<LedgerBaseInfoDTO> baseLineInfo = pqLineMapper.getBaseLineInfo(Stream.of(pqsEventdetail.getLineid()).collect(Collectors.toList()));
+                            ledgerBaseInfoDTO = baseLineInfo.get(0);
+                        }
                         upLoadEvent.setGdname(ledgerBaseInfoDTO.getGdName());
-                        upLoadEvent.setBdname(ledgerBaseInfoDTO.getBusBarName());
+                        upLoadEvent.setBdname(ledgerBaseInfoDTO.getStationName());
+                        upLoadEvent.setBusname(ledgerBaseInfoDTO.getBusBarName());
                         upLoadEvent.setPointname(ledgerBaseInfoDTO.getLineName());
                         upLoadEvent.setIp(ledgerBaseInfoDTO.getIp());
                         upLoadEvent.setPt(ledgerBaseInfoDTO.getPt());
@@ -431,13 +462,18 @@ public class DataSynchronization {
                 upLoadEvent.setMs(unsyncedEvent.getMs());
                 upLoadEvent.setDescribe(unsyncedEvent.getDescribe());
                 upLoadEvent.setWavetype(unsyncedEvent.getWavetype());
-                upLoadEvent.setPersisttime(unsyncedEvent.getPersisttime());
+                upLoadEvent.setPersisttime(unsyncedEvent.getPersisttime()/ 1000);
                 upLoadEvent.setEventvalue(unsyncedEvent.getEventvalue());
                 upLoadEvent.setEventreason(unsyncedEvent.getEventreason());
                 upLoadEvent.setEventtype(unsyncedEvent.getEventtype());
                 LedgerBaseInfoDTO ledgerBaseInfoDTO = LedgerBaseInfoDTOMap.get(unsyncedEvent.getLineid());
+                if(Objects.isNull(ledgerBaseInfoDTO)){
+                    List<LedgerBaseInfoDTO> baseLineInfo = pqLineMapper.getBaseLineInfo(Stream.of(unsyncedEvent.getLineid()).collect(Collectors.toList()));
+                    ledgerBaseInfoDTO = baseLineInfo.get(0);
+                }
                 upLoadEvent.setGdname(ledgerBaseInfoDTO.getGdName());
-                upLoadEvent.setBdname(ledgerBaseInfoDTO.getBusBarName());
+                upLoadEvent.setBdname(ledgerBaseInfoDTO.getStationName());
+                upLoadEvent.setBusname(ledgerBaseInfoDTO.getBusBarName());
                 upLoadEvent.setPointname(ledgerBaseInfoDTO.getLineName());
                 upLoadEvent.setIp(ledgerBaseInfoDTO.getIp());
                 upLoadEvent.setPt(ledgerBaseInfoDTO.getPt());
@@ -504,6 +540,11 @@ public class DataSynchronization {
         }
     }
 
+    public static void main(String[] args) {
+        double a =3.00;
+        System.out.println(a/1000);
+    }
+
 
 
 }

event_smart/src/main/java/com/njcn/product/event/devcie/config/PqlineCache.java

@@ -45,7 +45,7 @@ public class PqlineCache {
     private String sysTypeZt;
     @PostConstruct
     public void init() {
-        log.info("系统启动中。。。加载pqline");
+        log.info("初始化刷新redis缓存----------------------");
         List<PqLine> pqLines = pqLineMapper.selectList(null);
         redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"pqLineList",pqLines);
         List<PqsDepts> list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState, 1).list();

event_smart/src/main/java/com/njcn/product/event/transientes/controller/EventGateController.java

@@ -1,6 +1,7 @@
 package com.njcn.product.event.transientes.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -14,6 +15,8 @@ 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.product.event.devcie.config.PqlineCache;
+import com.njcn.product.event.devcie.job.LineCacheJob;
 import com.njcn.product.event.devcie.mapper.PqLineMapper;
 import com.njcn.product.event.devcie.pojo.dto.LedgerBaseInfoDTO;
 import com.njcn.product.event.devcie.pojo.po.PqLine;
@@ -69,6 +72,8 @@ public class EventGateController extends BaseController {
     @Value("${SYS_TYPE_ZT}")
     private String sysTypeZt;
 
+    @Value("${business.RealTimeSMSSwitch:false}")
+    private boolean realTimeSMSSwitch;
 
     private final WebSocketServer webSocketServer;
 
@@ -93,7 +98,18 @@ public class EventGateController extends BaseController {
     private final SmsUtils smsUtils;
 
     private final ThreadPoolTaskExecutor smsTaskExecutor;
+    private final PqlineCache pqlineCache;
 
+    private final SendMessageService messageService;
+
+    @GetMapping("/testSendMessage")
+    @ApiOperation("接收远程推送的暂态事件")
+    public HttpResult<Object> SendMessage(@RequestParam("startTime") String startTime,@RequestParam("endtTime")  String endtTime) {
+        String methodDescribe = getMethodDescribe("SendMessage");
+        messageService.sendMessage(LocalDateTimeUtil.parse(startTime,DatePattern.NORM_DATETIME_PATTERN),LocalDateTimeUtil.parse(endtTime,DatePattern.NORM_DATETIME_PATTERN));
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+
+    }
 
     @OperateInfo
     @GetMapping("/eventMsg")
@@ -114,32 +130,60 @@ public class EventGateController extends BaseController {
                     && 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());
+                //F47过滤
-                List<PqUserLineAssPO> assList = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().eq(PqUserLineAssPO::getLineIndex, lineId));
+                float eventvalue = Float.parseFloat(jsonObject.get("eventvalue").toString());
+                float persisttime = Float.parseFloat(jsonObject.get("persisttime").toString()) * 1000;
+                if(shouldSendSMS(eventvalue,persisttime)){
+                    Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString());
+                    List<PqUserLineAssPO> assList = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().eq(PqUserLineAssPO::getLineIndex, lineId));
+
+                    String str ;
+                    if (CollUtil.isNotEmpty(assList)) {
+                        List<String> userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList());
+                        List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).in(PqUserLedgerPO::getId, userIds));
+                        List<PqUserLedgerPO> isShowUser = poList.stream().filter(temp -> temp.getIsShow() == 1).collect(Collectors.toList());
+                        List<PqUserLedgerPO> noShowUser = poList.stream().filter(temp -> temp.getIsShow() != 1).collect(Collectors.toList());
+                        String strUser="" ;
+
+                        if(CollectionUtil.isEmpty(isShowUser)){
+                            strUser =strUser+"影响集成电路敏感用户:无;";
+                        }else {
+                            String sensitiveUser = isShowUser.stream().map(PqUserLedgerPO::getCustomerName).collect(Collectors.joining(";"));
+                            strUser =strUser+"影响集成电路敏感用户:"+sensitiveUser+";";
+                        }
+                        if(CollectionUtil.isEmpty(noShowUser)){
+                            strUser =strUser+"影响其他用户:无;";
+                        }else {
+                            String sensitiveUser = noShowUser.stream().map(PqUserLedgerPO::getCustomerName).collect(Collectors.joining(";"));
+                            strUser =strUser+"影响其他用户:"+sensitiveUser+";";
+                        }
+                        str = strUser;
+                    } else {
+                        str = "/";
+                    }
+
+                    List<PqsDepts> deptsList = (List<PqsDepts>) redisUtil.getObjectByKey(REDIS_DEPT_INDEX + StrUtil.DASHED + "AllDept");
+                    Map<String, PqsDepts> deptsMap = deptsList.stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex, dept -> dept));
+
+                    List<PqsDeptsline> deptslineList = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).list();
+                    List<String> deptIds = deptslineList.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toList());
+                    Set<String> set = getAllParentIdsWithChildrenBatch(deptIds, deptsMap);
+                    jsonObject.putOpt("objName", str);
+                    jsonObject.putOpt("dept", String.join(StrUtil.COMMA, set));
+
+                    webSocketServer.sendMessageToAll(jsonObject.toString());
+
+                    //针对前置推送的暂降事件进行短信发送功能
+                    //开启实时短信功能默认关闭走批量
+                    if(realTimeSMSSwitch){
+                        smsTaskExecutor.execute(() -> {
+                            sendMessage(jsonObject, str);
+                        });
+                    }
+
 
-                String str;
-                if (CollUtil.isNotEmpty(assList)) {
-                    List<String> userIds = assList.stream().map(PqUserLineAssPO::getUserIndex).distinct().collect(Collectors.toList());
-                    List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName).in(PqUserLedgerPO::getId, userIds));
-                    str = poList.stream().map(PqUserLedgerPO::getCustomerName).collect(Collectors.joining(";"));
-                } else {
-                    str = "/";
                 }
 
-                List<PqsDepts> deptsList = (List<PqsDepts>) redisUtil.getObjectByKey(REDIS_DEPT_INDEX + StrUtil.DASHED + "AllDept");
-                Map<String, PqsDepts> deptsMap = deptsList.stream().collect(Collectors.toMap(PqsDepts::getDeptsIndex, dept -> dept));
-
-                List<PqsDeptsline> deptslineList = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).list();
-                List<String> deptIds = deptslineList.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toList());
-                Set<String> set = getAllParentIdsWithChildrenBatch(deptIds, deptsMap);
-                jsonObject.putOpt("objName", str);
-                jsonObject.putOpt("dept", String.join(StrUtil.COMMA, set));
-
-                webSocketServer.sendMessageToAll(jsonObject.toString());
-
-                smsTaskExecutor.execute(() -> {
-                    sendMessage(jsonObject, str);
-                });
             }
 
         } catch (Exception e) {
@@ -149,6 +193,27 @@ public class EventGateController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    private boolean shouldSendSMS( Float value , Float time ) {
+
+
+        // 条件1: 电压降至50%以下，持续时间超过20ms
+        if (value < 0.5 && time >= 20) {
+            return true;
+        }
+
+        // 条件2: 电压降至50%—70%，持续时间超过200ms
+        if (value >= 50 && value < 70 && time >= 200) {
+            return true;
+        }
+
+        // 条件3: 电压降至70%—80%，持续时间超过500ms
+        if (value >= 70 && value < 80 && time >= 500) {
+            return true;
+        }
+
+        return false;
+    }
+
     public Set<String> getAllParentIdsRecursive(String deptId, Map<String, PqsDepts> deptMap, Set<String> result) {
         if (deptId == null || result.contains(deptId)) {
             return result;
@@ -182,8 +247,12 @@ public class EventGateController extends BaseController {
         try {
             //下面一行代码正式环境需要放开
             jsonObject = test();
+            List<PqsDepts> deptsList = (List<PqsDepts>) redisUtil.getObjectByKey(REDIS_DEPT_INDEX + StrUtil.DASHED + "AllDept");
+            List<String> deptIds = deptsList.stream().map(PqsDepts::getDeptsIndex).distinct().collect(Collectors.toList());
+            jsonObject.putOpt("dept", String.join(StrUtil.COMMA,deptIds));
 
             if (msgEventConfigService.getEventType().contains(jsonObject.get("wavetype").toString()) && Float.parseFloat(jsonObject.get("eventvalue").toString()) <= msgEventConfigService.getEventValue()) {
+               log.info("122345678788999999----------测试发送数据成功: {}",jsonObject);
                 webSocketServer.sendMessageToAll(jsonObject.toString());
 
                 //开始发送短信
@@ -202,6 +271,8 @@ public class EventGateController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    private static final int MAX_RETRY_COUNT = 3; // 最大重试次数
+
 
     //测试模拟，正式环境删除
     private PqsEventdetail createEvent(JSONObject jsonObject, LocalDateTime now) {
@@ -225,8 +296,19 @@ public class EventGateController extends BaseController {
         //以下部分为测试数据后续删除
         List<PqLine> pqLineList = pqLineMapper.selectList(new LambdaQueryWrapper<>());
         List<Integer> lineList = pqLineList.stream().map(PqLine::getLineIndex).collect(Collectors.toList());
-        List<LedgerBaseInfoDTO> baseInfoDTOList = pqLineMapper.getBaseLineInfo(lineList);
+
-        Map<Integer, LedgerBaseInfoDTO> map = baseInfoDTOList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
+        List<LedgerBaseInfoDTO> ledgerBaseInfoDTOS = new ArrayList<>();
+        if(lineList.size()>1000){
+            List<List<Integer>> listIds = CollUtil.split(lineList,1000);
+            for(List<Integer> itemIds : listIds){
+                List<LedgerBaseInfoDTO> temp =pqLineMapper.getBaseLineInfo(itemIds);
+                ledgerBaseInfoDTOS.addAll(temp);
+            }
+        }else {
+            List<LedgerBaseInfoDTO> temp =pqLineMapper.getBaseLineInfo(lineList);
+            ledgerBaseInfoDTOS.addAll(temp);
+        }
+        Map<Integer, LedgerBaseInfoDTO> map = ledgerBaseInfoDTOS.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
 
         Random random = new Random();
         Integer lineId = lineList.get(random.nextInt(lineList.size()));
@@ -296,7 +378,7 @@ public class EventGateController extends BaseController {
         upLoadEvent.setMs(pqsEventdetail.getMs());
         upLoadEvent.setBdname("测试电站");
         upLoadEvent.setLineid(pqsEventdetail.getLineid());
-        upLoadEvent.setTimeid(LocalDateTimeUtil.format(pqsEventdetail.getTimeid(),DatePattern.NORM_DATETIME_PATTERN));
+        upLoadEvent.setTimeid(LocalDateTimeUtil.format(pqsEventdetail.getTimeid(), DatePattern.NORM_DATETIME_PATTERN));
         upLoadEvent.setWavetype(pqsEventdetail.getWavetype());
         upLoadEvent.setPersisttime(pqsEventdetail.getPersisttime());
         upLoadEvent.setEventvalue(pqsEventdetail.getEventvalue());
@@ -328,85 +410,77 @@ public class EventGateController extends BaseController {
 
 
     private void sendMessage(JSONObject jsonObject, String objStr) {
-
         try {
+            if (!"/".equals(objStr)) {
+                log.info("-------------------------开始执行短信发送逻辑{}", System.currentTimeMillis());
+                TimeInterval timeInterval = new TimeInterval();
+                Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString());
+                List<PqsDeptsline> pqLineDept = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).eq(PqsDeptsline::getSystype, sysTypeZt).list();
+                Set<String> deptIds = pqLineDept.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toSet());
+                Set<String> resultIds = getAllParentDeptIds(deptIds);
 
+                List<PqsUserSet> pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).in(PqsUserSet::getDeptsIndex, resultIds).list();
+                if (CollUtil.isEmpty(pqsUserSetList)) {
+                    //当前事件未找到用户信息，判断为不需要发送短信用户
+                    return;
+                }
+                List<PqsUser> pqsUserList = pqsUserService.lambdaQuery().select(PqsUser::getUserIndex, PqsUser::getPhone, PqsUser::getName).in(PqsUser::getUserIndex, pqsUserSetList.stream().map(PqsUserSet::getUserIndex).collect(Collectors.toList())).list();
+                List<String> userIds = pqsUserList.stream().map(PqsUser::getUserIndex).collect(Collectors.toList());
+                List<PqsUserSet> poList = pqsUserSetList.stream().filter(it -> userIds.contains(it.getUserIndex())).collect(Collectors.toList());
 
-            TimeInterval timeInterval = new TimeInterval();
+                if (CollUtil.isNotEmpty(poList)) {
-            log.info("-------------------------开始执行短信发送逻辑{}",System.currentTimeMillis());
+                    StringBuilder stringBuilder = new StringBuilder(jsonObject.get("timeid").toString());
-
+                    String busName = jsonObject.containsKey("busname")? "_"+jsonObject.get("busname").toString():"";
-            Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString());
+                    BigDecimal bigDecimal = new BigDecimal(jsonObject.get("eventvalue").toString()).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
-            List<PqsDeptsline> pqLineDept = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).eq(PqsDeptsline::getSystype, sysTypeZt).list();
+                    stringBuilder.append(".").append(jsonObject.get("ms").toString()).append(",").append(jsonObject.get("bdname").toString()).append(busName)
-            Set<String> deptIds = pqLineDept.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toSet());
+//                            .append("_").append(jsonObject.get("pointname").toString())
-            Set<String> resultIds = getAllParentDeptIds(deptIds);
+                            .append("发生电压暂降事件,事件残余电压").append(bigDecimal).append("%,持续时间:").append(String.format("%.3f", Double.parseDouble(jsonObject.get("persisttime").toString()))).append("S;");
-
-            List<PqsUserSet> pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).in(PqsUserSet::getDeptsIndex, resultIds).list();
-            if (CollUtil.isEmpty(pqsUserSetList)) {
-                //当前事件未找到用户信息，判断为不需要发送短信用户
-                return;
-            }
-            List<PqsUser> pqsUserList = pqsUserService.lambdaQuery().select(PqsUser::getUserIndex, PqsUser::getPhone, PqsUser::getName).in(PqsUser::getUserIndex, pqsUserSetList.stream().map(PqsUserSet::getUserIndex).collect(Collectors.toList())).list();
-            List<String> userIds = pqsUserList.stream().map(PqsUser::getUserIndex).collect(Collectors.toList());
-            List<PqsUserSet> 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<LedgerBaseInfoDTO> 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;影响用户:");
-
-
-                if ("/".equals(objStr)) {
-                    stringBuilder.append("/");
-                } else {
                     stringBuilder.append(objStr);
-                }
 
-                String message;
+                    String message;
-                if (stringBuilder.length() > 500) {
+                    if (stringBuilder.length() > 500) {
-                    message = stringBuilder.substring(0, 490).concat(";详情请登录电压暂降监测平台查看。");
+                        message = stringBuilder.substring(0, 490).concat(";详情请登录电压暂降监测平台查看。");
-                } else {
+                    } else {
-                    message = stringBuilder.toString();
+                        message = stringBuilder.toString();
-                }
-
-                List<MsgEventInfo> resultList = new ArrayList<>();
-                List<SmsSendDTO.ItemInner> msgDTOList = new ArrayList<>();
-                for (PqsUser user : pqsUserList) {
-                    String msgId = IdUtil.simpleUUID();
-
-                    SmsSendDTO.ItemInner dto = new SmsSendDTO.ItemInner();
-                    dto.setContent(message);
-                    dto.setTo(user.getPhone());
-                    dto.setCustomMsgID(msgId);
-                    msgDTOList.add(dto);
-
-                    MsgEventInfo msgEventInfo = new MsgEventInfo();
-                    msgEventInfo.setMsgIndex(msgId);
-                    msgEventInfo.setMsgContent(message);
-                    msgEventInfo.setPhone(user.getPhone());
-                    msgEventInfo.setUserId(user.getUserIndex());
-                    msgEventInfo.setUserName(user.getName());
-                    msgEventInfo.setIsHandle(0);
-                    msgEventInfo.setSendResult(0);
-                    msgEventInfo.setSendTime(LocalDateTime.now());
-                    msgEventInfo.setEventIndex(jsonObject.get("eventdetail_index").toString());
-                    resultList.add(msgEventInfo);
-                }
-
-                List<SmsResponseDTO.SmsItem> result = smsUtils.sendSmSToUser(msgDTOList);
-                Map<String, SmsResponseDTO.SmsItem> stringSmsItemMap = result.stream().collect(Collectors.toMap(SmsResponseDTO.SmsItem::getCustomMsgID, Function.identity()));
-
-                resultList.forEach(item -> {
-                    if (stringSmsItemMap.containsKey(item.getMsgIndex())) {
-                        SmsResponseDTO.SmsItem smsItem = stringSmsItemMap.get(item.getMsgIndex());
-                        item.setSendResult(Objects.equals(smsItem.getCode(), "0") ? 1 : 0);
                     }
-                });
-                msgEventInfoService.saveBatch(resultList);
-            }
 
-            log.info("{}-------------短信发送执行结束，执行时长{}s",System.currentTimeMillis(), timeInterval.intervalSecond());
+                    List<MsgEventInfo> resultList = new ArrayList<>();
+                    List<SmsSendDTO.ItemInner> msgDTOList = new ArrayList<>();
+                    for (PqsUser user : pqsUserList) {
+                        String msgId = IdUtil.simpleUUID();
+
+                        SmsSendDTO.ItemInner dto = new SmsSendDTO.ItemInner();
+                        dto.setContent(message);
+                        dto.setTo(user.getPhone());
+                        dto.setCustomMsgID(msgId);
+                        msgDTOList.add(dto);
+
+                        MsgEventInfo msgEventInfo = new MsgEventInfo();
+                        msgEventInfo.setMsgIndex(msgId);
+                        msgEventInfo.setMsgContent(message);
+                        msgEventInfo.setPhone(user.getPhone());
+                        msgEventInfo.setUserId(user.getUserIndex());
+                        msgEventInfo.setUserName(user.getName());
+                        msgEventInfo.setIsHandle(0);
+                        msgEventInfo.setSendResult(0);
+                        msgEventInfo.setSendTime(LocalDateTime.now());
+                        msgEventInfo.setEventIndex(jsonObject.get("eventdetail_index").toString());
+                        resultList.add(msgEventInfo);
+                    }
+
+                    List<SmsResponseDTO.SmsItem> result = smsUtils.sendSmSToUser(msgDTOList);
+                    Map<String, SmsResponseDTO.SmsItem> stringSmsItemMap = result.stream().collect(Collectors.toMap(SmsResponseDTO.SmsItem::getCustomMsgID, Function.identity()));
+
+                    resultList.forEach(item -> {
+                        if (stringSmsItemMap.containsKey(item.getMsgIndex())) {
+                            SmsResponseDTO.SmsItem smsItem = stringSmsItemMap.get(item.getMsgIndex());
+                            item.setSendResult(Objects.equals(smsItem.getCode(), "0") ? 1 : 0);
+                        }
+                    });
+                    msgEventInfoService.saveBatch(resultList);
+                }
+                log.info("{}-------------短信发送执行结束，执行时长{}s", System.currentTimeMillis(), timeInterval.intervalSecond());
+            }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("---------短信发送异常，异常信息", e);
@@ -458,6 +532,11 @@ public class EventGateController extends BaseController {
         }
         return result;
     }
-
+    @GetMapping("/refreshIdCache")
+    @ApiOperation("刷新缓存")
+    public Boolean refreshIdCache() {
+        pqlineCache.init();
+        return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步");
+    }
 
 }

event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java

@@ -2,7 +2,6 @@ package com.njcn.product.event.transientes.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.product.event.dataTransmit.DataSynchronization;
 import com.njcn.product.event.transientes.pojo.param.PqUserLedgerParam;
 import com.njcn.product.event.transientes.pojo.po.PqUserLedgerPO;
 import com.njcn.product.event.transientes.service.PqUserLedgerService;

event_smart/src/main/java/com/njcn/product/event/transientes/job/SendMessageJob.java

@@ -0,0 +1,35 @@
+package com.njcn.product.event.transientes.job;
+
+import com.njcn.product.event.transientes.service.SendMessageService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2026/05/29  上午 10:45【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Component
+@EnableScheduling
+@RequiredArgsConstructor
+@Slf4j
+public class SendMessageJob {
+    private final SendMessageService messageService;
+
+    @Scheduled(cron = "${business.sendMessageCronExpression}")
+    public void executeJob() {
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 减去一个小时
+        LocalDateTime threeHourAgo = now.minusHours(3);
+
+        messageService.sendMessage(threeHourAgo,now);
+    }
+}

event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UpLoadEvent.java

@@ -44,6 +44,7 @@ public class UpLoadEvent {
     private String eventtype;
     private String gdname;
     private String bdname;
+    private String busname;
     private String pointname;
     private String wavePath;
     private String ip;

event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java

@@ -19,6 +19,8 @@ public class UserLegerDTO {
 
     private String powerSupplyArea;
 
+    private String customerNo;
+
     private String customerName;
 
     private String electricityAddress;
@@ -27,4 +29,6 @@ public class UserLegerDTO {
 
     private String smallObjType;
 
+    private Integer isShow;
+
 }

event_smart/src/main/java/com/njcn/product/event/transientes/security/AuthController.java

@@ -47,6 +47,8 @@ public class AuthController extends BaseController {
             //针对系统推送的认证特殊处理
             if ("system_event".equals(authRequest.getUsername())) {
                 pass = authRequest.getPassword();
+            } else if ("cn_test_a".equals(authRequest.getUsername())) {
+                pass = authRequest.getPassword();
             } else {
                 hasFlag = redisUtil.hasKey(eventRedisKey + authRequest.getUsername());
                 if (hasFlag) {

event_smart/src/main/java/com/njcn/product/event/transientes/security/MyUserDetailsService.java

@@ -39,6 +39,13 @@ public class MyUserDetailsService implements UserDetailsService {
                     new ArrayList<>());
         }
 
+        if("cn_test_a".equals(username)){
+            PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+            String encodedPassword = passwordEncoder.encode("@#001njcnpqs");
+            return new MyUserDetails("12345678910","system_event",encodedPassword,"10001",
+                    new ArrayList<>());
+        }
+
 
         if(redisUtil.hasKey("event_smart_"+username)){
         String password = redisUtil.getRawValue("event_smart_"+username);

event_smart/src/main/java/com/njcn/product/event/transientes/security/SecurityConfig.java

@@ -34,8 +34,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http.csrf().disable()
                 .authorizeRequests()
-//                .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent","/accept/eventMsg").permitAll() // 允许访问认证接口
+                .antMatchers("/cn_authenticate","/ws/**","/accept/testEvent","/accept/eventMsg","/accept/simpleTest","/accept/phoneSend","/accept/refreshIdCache","/accept/testSendMessage","/largescreen/sycnUser").permitAll() // 允许访问认证接口
-                .antMatchers("/**").permitAll() // 允许访问认证接口
+//                .antMatchers("/**").permitAll() // 允许访问认证接口
                 .anyRequest().authenticated()
                 .and()
                 .sessionManagement()

event_smart/src/main/java/com/njcn/product/event/transientes/service/SendMessageService.java

@@ -0,0 +1,14 @@
+package com.njcn.product.event.transientes.service;
+
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2026/05/29  上午 11:30【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface SendMessageService {
+    void sendMessage(LocalDateTime threeHourAgo, LocalDateTime now);
+}

event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/LargeScreenCountServiceImpl.java

@@ -697,10 +697,14 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         DateTime start = DateUtil.beginOfDay(DateUtil.parse(largeScreenCountParam.getSearchBeginTime()));
         DateTime end = DateUtil.endOfDay(DateUtil.parse(largeScreenCountParam.getSearchEndTime()));
 
-        LambdaQueryWrapper<MsgEventInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<MsgEventInfo> queryWrapper = new QueryWrapper<>();
-        lambdaQueryWrapper.eq(!StringUtils.isEmpty(largeScreenCountParam.getSendResult()), MsgEventInfo::getSendResult, largeScreenCountParam.getSendResult());
+        queryWrapper.select("DISTINCT msg_index,user_id, user_name,send_time,msg_content,phone,send_result,is_handle ");
-        lambdaQueryWrapper.orderByDesc(MsgEventInfo::getSendTime).between(MsgEventInfo::getSendTime, start, end);
+        queryWrapper.lambda().eq(!StringUtils.isEmpty(largeScreenCountParam.getSendResult()), MsgEventInfo::getSendResult, largeScreenCountParam.getSendResult());
-        return msgEventInfoService.page(new Page<>(PageFactory.getPageNum(largeScreenCountParam), PageFactory.getPageSize(largeScreenCountParam)), lambdaQueryWrapper);
+        queryWrapper.lambda().orderByDesc(MsgEventInfo::getSendTime).between(MsgEventInfo::getSendTime, start, end);
+        if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){
+            queryWrapper.lambda().and(w->w.like(MsgEventInfo::getUserName,largeScreenCountParam.getSearchValue()).or().like(MsgEventInfo::getPhone,largeScreenCountParam.getSearchValue()));
+        }
+        return msgEventInfoService.page(new Page<>(PageFactory.getPageNum(largeScreenCountParam), PageFactory.getPageSize(largeScreenCountParam)), queryWrapper);
     }
 
     @Override

event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/SendMessageServiceImpl.java

@@ -0,0 +1,409 @@
+package com.njcn.product.event.transientes.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.product.event.config.RedisUtil;
+import com.njcn.product.event.devcie.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.event.devcie.pojo.po.PqsDeptsline;
+import com.njcn.product.event.devcie.service.PqsDeptslineService;
+import com.njcn.product.event.transientes.mapper.PqUserLedgerMapper;
+import com.njcn.product.event.transientes.mapper.PqUserLineAssMapper;
+import com.njcn.product.event.transientes.mapper.PqsEventdetailMapper;
+import com.njcn.product.event.transientes.pojo.dto.SmsResponseDTO;
+import com.njcn.product.event.transientes.pojo.dto.SmsSendDTO;
+import com.njcn.product.event.transientes.pojo.po.*;
+import com.njcn.product.event.transientes.service.*;
+import com.njcn.product.event.transientes.utils.SmsUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ * Date: 2026/05/29  上午 11:30【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class SendMessageServiceImpl implements SendMessageService {
+    private final PqUserLineAssMapper pqUserLineAssMapper;
+    private final PqUserLedgerMapper pqUserLedgerMapper;
+    private final PqsEventdetailMapper pqsEventdetailMapper;
+    private final MsgEventInfoService msgEventInfoService;
+    private final static String NAME_KEY = "LineCache:";
+    private final RedisUtil redisUtil;
+    private final ThreadPoolTaskExecutor smsTaskExecutor;
+    private final PqsUsersetService pqsUsersetService;
+    private final SmsUtils smsUtils;
+
+    private final PqsDeptslineService pqsDeptslineService;
+    @Value("${SYS_TYPE_ZT}")
+    private String sysTypeZt;
+
+    private final PqsDeptsService pqsDeptsService;
+
+    private final PqsUserService pqsUserService;
+    @Override
+    public void sendMessage(LocalDateTime threeHourAgo, LocalDateTime now) {
+        log.info("开始扫描暂态事件时间段："+threeHourAgo+"-"+now);
+        //查询重要敏感客户
+        List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1));
+        List<String> userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList());
+        List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().in(PqUserLineAssPO::getUserIndex, userIds));
+        List<Integer> lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList());
+        LambdaQueryWrapper<PqsEventdetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(PqsEventdetail::getLineid,lineIds).between(PqsEventdetail::getCreateTime,threeHourAgo,now);
+        List<PqsEventdetail> pqsEventdetails = pqsEventdetailMapper.selectList(lambdaQueryWrapper);
+        log.info("扫描到敏感客户暂态事件："+pqsEventdetails.size()+"条");
+
+        if(!CollectionUtils.isEmpty(pqsEventdetails)){
+            List<LedgerBaseInfoDTO> ledgerBaseInfoDTOS = (List<LedgerBaseInfoDTO>)redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED+"LedgerBaseInfoDTO");
+            Map<Integer, LedgerBaseInfoDTO> LedgerBaseInfoDTOMap = ledgerBaseInfoDTOS.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
+
+            List<MsgEventInfo> msgEventInfos = msgEventInfoService.lambdaQuery().between(MsgEventInfo::getSendTime, threeHourAgo, now).eq(MsgEventInfo::getSendResult, 1).list();
+            List<String> successSendEventIds = msgEventInfos.stream().map(MsgEventInfo::getEventIndex).distinct().collect(Collectors.toList());
+
+            pqsEventdetails = pqsEventdetails.stream()
+                    .filter(temp -> shouldSendSMS(temp.getEventvalue(), temp.getPersisttime()) && (!successSendEventIds.contains(temp.getEventdetailIndex())))
+                    .collect(Collectors.toList());
+            log.info("扫描到敏感客户暂态事件过滤后事件："+pqsEventdetails.size()+"条");
+
+            if(!CollectionUtils.isEmpty(pqsEventdetails)){
+                log.info("过滤后事件数："+pqsEventdetails.size());
+
+                List<PqsEventdetail> finalPqsEventdetails = pqsEventdetails;
+                poList.forEach(temp->{
+                    List<Integer> tempLineIds = pqUserLineAssPOS.stream()
+                            .filter(pqUserLineAssPO -> Objects.equals(pqUserLineAssPO.getUserIndex(), temp.getId()))
+                            .map(PqUserLineAssPO::getLineIndex).collect(Collectors.toList());
+                    if(CollectionUtils.isEmpty(tempLineIds)){
+                        return;
+                    }
+
+                    List<PqsEventdetail> result = finalPqsEventdetails.stream().filter(pqsEventdetail -> tempLineIds.contains(pqsEventdetail.getLineid())).collect(Collectors.toList());
+                    if(CollectionUtils.isEmpty(result)){
+                        return;
+                    }
+                    //组装台账信息
+                    List<LedgerBaseInfoDTO> tempLedger = ledgerBaseInfoDTOS.stream().filter(line -> tempLineIds.contains(line.getLineId())).collect(Collectors.toList());
+
+                    Map<String, List<String>> busNameMap = tempLedger.stream().map(LedgerBaseInfoDTO::getBusBarName).collect(Collectors.groupingBy(SendMessageServiceImpl::extractVoltage));
+                    String allBus = busNameMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).map(
+                            entry -> {
+                                return entry.getKey() + "母线" + entry.getValue().size() + "条";
+                            }
+                    ).collect(Collectors.joining("、"));
+                    Map<String, List<String>> subStaionMap = tempLedger.stream().map(LedgerBaseInfoDTO::getStationName).distinct().collect(Collectors.groupingBy(SendMessageServiceImpl::extractVoltage));
+
+                    String allsubStation = subStaionMap.entrySet().stream()
+                            .sorted(Map.Entry.comparingByKey()) // 按电压等级排序（110,220,500）
+                            .map(entry -> {
+                                String voltage = entry.getKey();      // 例如 "110kV"
+                                List<String> stations = entry.getValue();
+                                // 构建组内字符串：第一个保留全名，后续的去掉电压前缀
+                                StringBuilder sb = new StringBuilder();
+                                for (int i = 0; i < stations.size(); i++) {
+                                    String fullName = stations.get(i);
+                                    if (i == 0) {
+                                        sb.append(fullName); // 第一个保留完整名称（含电压）
+                                    } else {
+                                        // 去掉电压前缀（例如 "110kV标厂变" -> "标厂变"）
+                                        String pureName = fullName.startsWith(voltage)
+                                                ? fullName.substring(voltage.length())
+                                                : fullName;
+                                        sb.append("、").append(pureName);
+                                    }
+                                }
+                                return sb.toString();
+                            })
+                            .collect(Collectors.joining(","));
+                    result.forEach(event->{
+                        event.setBusBarName(LedgerBaseInfoDTOMap.get(event.getLineid()).getBusBarName());
+                        event.setStationName(LedgerBaseInfoDTOMap.get(event.getLineid()).getStationName());
+                    });
+
+
+                    Map<String, List<PqsEventdetail>> groupFilterNull = result.stream()
+                            .filter(e -> e.getStationName() != null)
+                            .collect(Collectors.groupingBy(PqsEventdetail::getStationName));
+                    //组装暂降信息
+                    StringBuilder stringBuilder = new StringBuilder(temp.getCustomerName());
+                    stringBuilder.append("上级直供变电站共有相关"+allBus+",");
+                    stringBuilder.append("涉及"+allsubStation+"。");
+                    AtomicInteger index = new AtomicInteger();
+
+                    String eventString = groupFilterNull.entrySet().stream().map(entry -> {
+                        String substationnName = entry.getKey();      // 例如 "110kV智芯变"
+                        List<PqsEventdetail> value = entry.getValue();
+                        StringBuilder sb = new StringBuilder();
+                        if (index.getAndIncrement() == 0) {
+                            sb.append(LocalDateTimeUtil.format(value.get(0).getTimeid(),DatePattern.NORM_DATETIME_MINUTE_PATTERN)).append(",");
+                        }else {
+                            sb.append(LocalDateTimeUtil.format(value.get(0).getTimeid(),"HH:mm")).append(",");
+
+                        }
+                        if (value.size() == 1) {
+
+                            BigDecimal eventvalue = new BigDecimal(value.get(0).getEventvalue()).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+                            BigDecimal persisttime = new BigDecimal(value.get(0).getPersisttime()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP);
+
+                            sb.append(substationnName).append(value.get(0).getBusBarName()).append("发生电压暂降,电压跌落至").append(eventvalue).append("%,持续时间:").append(persisttime).append("S");
+                        } else {
+//                            String minTime = LocalDateTimeUtil.format(value.stream()
+//                                    .map(PqsEventdetail::getTimeid)
+//                                    .min(LocalDateTime::compareTo).get(), DatePattern.NORM_DATETIME_MINUTE_PATTERN);
+//                            String maxTime = LocalDateTimeUtil.format(value.stream()
+//                                    .map(eventdetail -> {
+//                                        return eventdetail.getTimeid().plus(Duration.ofMillis(eventdetail.getMs().longValue()));
+//                                    })
+//                                    .max(LocalDateTime::compareTo).get(), DatePattern.NORM_DATETIME_MS_FORMATTER);
+//                            String BusNameList = value.stream().map(PqsEventdetail::getBusBarName).collect(Collectors.joining("、"));
+                            Map<String, List<String>> BusNameMap = value.stream().map(PqsEventdetail::getBusBarName).distinct().collect(Collectors.groupingBy(SendMessageServiceImpl::extractVoltage));
+                            String allBusName = BusNameMap.entrySet().stream()
+                                    .sorted(Map.Entry.comparingByKey()) // 按电压等级排序（110,220,500）
+                                    .map(tempEntry -> {
+                                        String voltage = tempEntry.getKey();      // 例如 "110kV"
+                                        List<String> busNameList = tempEntry.getValue();
+                                        // 构建组内字符串：第一个保留全名，后续的去掉电压前缀
+                                        StringBuilder busName = new StringBuilder();
+                                        for (int i = 0; i < busNameList.size(); i++) {
+                                            String fullName = busNameList.get(i).replace("母线","");
+                                            if (i == 0) {
+                                                busName.append(fullName); // 第一个保留完整名称（含电压）
+                                            } else {
+                                                // 去掉电压前缀（例如 "10kV3B#母线" -> "3B#"）
+                                                String pureName = fullName.startsWith(voltage)
+                                                        ? fullName.substring(voltage.length())
+                                                        : fullName;
+                                                busName.append("、").append(pureName.replace("母线",""));
+                                            }
+                                        }
+                                        return busName.toString();
+                                    })
+                                    .collect(Collectors.joining(","));
+                            BigDecimal eventvalueMin = new BigDecimal(value.stream().mapToDouble(PqsEventdetail::getEventvalue).min().getAsDouble())
+                                    .multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+                            BigDecimal eventvalueMax = new BigDecimal(value.stream().mapToDouble(PqsEventdetail::getEventvalue).max().getAsDouble())
+                                    .multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+
+                            BigDecimal persisttimeMin = new BigDecimal(value.stream().mapToDouble(PqsEventdetail::getPersisttime).min().getAsDouble())
+                                    .divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP);
+                            BigDecimal persisttimeMax = new BigDecimal(value.stream().mapToDouble(PqsEventdetail::getPersisttime).max().getAsDouble())
+                                    .divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP);
+                            sb.append(substationnName).append(allBusName)
+                                    .append("母线发生电压暂降,电压跌落至").append(eventvalueMin).append("%—").append(eventvalueMax).append("%,持续时间:")
+                                    .append(persisttimeMin).append("S—").append(persisttimeMax).append("S");
+                        }
+
+                        return sb.toString();
+                    }).collect(Collectors.joining(";"));
+
+                    stringBuilder.append(eventString).append("。");
+                    List<Integer> eventLineIds = result.stream().map(PqsEventdetail::getLineid).collect(Collectors.toList());
+                    List<String> eventdetailIndexs = result.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList());
+
+                    List<PqsDeptsline> pqLineDept = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getLineIndex, eventLineIds).eq(PqsDeptsline::getSystype, sysTypeZt).list();
+                    if(CollectionUtils.isEmpty(pqLineDept)){
+                        return;
+                    }
+                    Set<String> deptIds = pqLineDept.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toSet());
+                    Set<String> resultIds = getAllParentDeptIds(deptIds);
+
+                    List<PqsUserSet> pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).in(PqsUserSet::getDeptsIndex, resultIds).list();
+                    if (CollUtil.isEmpty(pqsUserSetList)) {
+                        //当前事件未找到用户信息，判断为不需要发送短信用户
+                        return;
+                    }
+                    List<PqsUser> pqsUserList = pqsUserService.lambdaQuery().select(PqsUser::getUserIndex, PqsUser::getPhone, PqsUser::getName).in(PqsUser::getUserIndex, pqsUserSetList.stream().map(PqsUserSet::getUserIndex).collect(Collectors.toList())).list();
+                    if(!CollectionUtils.isEmpty(pqsUserList)){
+                        //开始发送短信
+                        smsTaskExecutor.execute(() -> {
+                            sendMessageforUser(stringBuilder.toString(), pqsUserList,eventdetailIndexs);
+                        });
+                    }
+
+
+                });
+
+
+            }
+
+        }
+
+
+    }
+
+    private void sendMessageforUser(String content, List<PqsUser> pqsUserList, List<String> eventdetailIndexs) {
+
+        //发送短信
+        List<MsgEventInfo> resultList = new ArrayList<>();
+        List<SmsSendDTO.ItemInner> msgDTOList = new ArrayList<>();
+        String message;
+        if (content.length() > 500) {
+            message = content.substring(0, 490).concat(";详情请登录电压暂降监测平台查看。");
+        } else {
+            message = content.toString();
+        }
+        for (PqsUser user : pqsUserList) {
+            String msgId = IdUtil.simpleUUID();
+
+            SmsSendDTO.ItemInner dto = new SmsSendDTO.ItemInner();
+            dto.setContent(message);
+            dto.setTo(user.getPhone());
+            dto.setCustomMsgID(msgId);
+            msgDTOList.add(dto);
+            for (String eventdetailIndex : eventdetailIndexs) {
+                MsgEventInfo msgEventInfo = new MsgEventInfo();
+                msgEventInfo.setMsgIndex(msgId);
+                msgEventInfo.setMsgContent(message);
+                msgEventInfo.setPhone(user.getPhone());
+                msgEventInfo.setUserId(user.getUserIndex());
+                msgEventInfo.setUserName(user.getName());
+                msgEventInfo.setIsHandle(0);
+                msgEventInfo.setSendResult(0);
+                msgEventInfo.setSendTime(LocalDateTime.now());
+                msgEventInfo.setEventIndex(eventdetailIndex);
+                resultList.add(msgEventInfo);
+            }
+
+        }
+
+        List<SmsResponseDTO.SmsItem> result = smsUtils.sendSmSToUser(msgDTOList);
+        Map<String, SmsResponseDTO.SmsItem> stringSmsItemMap = result.stream().collect(Collectors.toMap(SmsResponseDTO.SmsItem::getCustomMsgID, Function.identity()));
+
+        resultList.forEach(item -> {
+            if (stringSmsItemMap.containsKey(item.getMsgIndex())) {
+                SmsResponseDTO.SmsItem smsItem = stringSmsItemMap.get(item.getMsgIndex());
+                item.setSendResult(Objects.equals(smsItem.getCode(), "0") ? 1 : 0);
+            }
+        });
+        msgEventInfoService.saveBatch(resultList);
+    }
+
+    public Set<String> getAllParentDeptIds(Set<String> deptIds) {
+        // 首次获取直接父级
+        List<PqsDepts> allDeptList = pqsDeptsService.lambdaQuery().list();
+        // 递归获取所有父级
+        Set<String> result = recursivelyGetParentIds(deptIds, allDeptList);
+        return result;
+    }
+    /**
+     * 递归获取所有父级ID
+     *
+     * @param currentParentIds 当前层级的父级ID集合
+     * @return 所有层级的父级ID集合
+     */
+    private Set<String> recursivelyGetParentIds(Set<String> currentParentIds, List<PqsDepts> allDeptList) {
+        Set<String> result = new HashSet<>(currentParentIds);
+        Set<String> nextLevelParentIds = new HashSet<>();
+        List<PqsDepts> 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<String> deeperParentIds = recursivelyGetParentIds(nextLevelParentIds, allDeptList);
+            result.addAll(deeperParentIds);
+        }
+        return result;
+    }
+
+
+    private boolean shouldSendSMS( Double value , Double time ) {
+
+
+        // 条件1: 电压降至50%以下，持续时间超过20ms
+        if (value < 0.5 && time >= 20) {
+            return true;
+        }
+
+        // 条件2: 电压降至50%—70%，持续时间超过200ms
+        if (value >= 50 && value < 70 && time >= 200) {
+            return true;
+        }
+
+        // 条件3: 电压降至70%—80%，持续时间超过500ms
+        if (value >= 70 && value < 80 && time >= 500) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static String extractVoltage(String name) {
+        int kVIndex = name.indexOf("kV");
+        if (kVIndex == -1) {
+            log.info("存在台账"+name+"不符合命名规范");
+            throw new IllegalArgumentException("无法解析电压等级: " + name);
+        }
+        // 返回从开头到 "kV" 结束的部分（包含 "kV"）
+        return name.substring(0, kVIndex + 2);
+    }
+
+    public static void main(String[] args) {
+//        Stream.of(1,2,3).collect(Collectors.toList()).forEach(
+//                temp->{
+//                    if(temp==2){
+//                        return;
+//                    }
+//                    System.out.println(temp);
+//                }
+//        );
+        List<String> substations = Arrays.asList(
+                "110kV智芯变",
+                "110kV标厂变",
+                "110kV科创变",
+                "220kV开发区变",
+                "220kV高新变",
+                "500kV枢纽换流站"
+        );
+
+        // 按电压等级字符串（含kV）分组
+        Map<String, List<String>> grouped = substations.stream()
+                .collect(Collectors.groupingBy(SendMessageServiceImpl::extractVoltage));
+        String collect = grouped.entrySet().stream()
+                .sorted(Map.Entry.comparingByKey()) // 按电压等级排序（110,220,500）
+                .map(entry -> {
+                    String voltage = entry.getKey();      // 例如 "110kV"
+                    List<String> stations = entry.getValue();
+                    // 构建组内字符串：第一个保留全名，后续的去掉电压前缀
+                    StringBuilder sb = new StringBuilder();
+                    for (int i = 0; i < stations.size(); i++) {
+                        String fullName = stations.get(i);
+                        if (i == 0) {
+                            sb.append(fullName); // 第一个保留完整名称（含电压）
+                        } else {
+                            // 去掉电压前缀（例如 "110kV标厂变" -> "标厂变"）
+                            String pureName = fullName.startsWith(voltage)
+                                    ? fullName.substring(voltage.length())
+                                    : fullName;
+                            sb.append("、").append(pureName);
+                        }
+                    }
+                    return sb.toString();
+                })
+                .collect(Collectors.joining(";"));
+        System.out.println(collect);
+    }
+}

event_smart/src/main/java/com/njcn/product/event/transientes/utils/SmsUtils.java

@@ -1,7 +1,9 @@
 package com.njcn.product.event.transientes.utils;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.SM3;
 import cn.hutool.json.JSONObject;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -20,8 +22,8 @@ import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author: cdf
@@ -33,8 +35,13 @@ import java.util.List;
 @RequiredArgsConstructor
 public class SmsUtils {
 
-
     private final RestTemplate restTemplate;
+    // 最大重试次数
+    private static final int MAX_RETRY_COUNT = 2;
+    //短信平台成功返回码
+    private static final String SUCCESS_CODE = "0";
+    //短信平台业务码
+    private static final String SERVICE_CODE = "01001101";
 
     @Value("${smsServer.info}")
     private String smsServer;
@@ -46,7 +53,223 @@ public class SmsUtils {
     private String password;
 
 
-    public List<SmsResponseDTO.SmsItem> sendSmSToUser(List<SmsSendDTO.ItemInner> temList) {
+    /**
+     * 发送短信给用户
+     *
+     * @param itemList 短信内容列表
+     * @return 发送结果列表
+     */
+    public List<SmsResponseDTO.SmsItem> sendSmSToUser(List<SmsSendDTO.ItemInner> itemList) {
+        if (CollUtil.isEmpty(itemList)) {
+            log.info("短信发送列表为空");
+            return Collections.emptyList();
+        }
+        return sendSmSToUserWithRetry(itemList, MAX_RETRY_COUNT);
+    }
+
+
+    /**
+     * 带重试机制的短信发送
+     *
+     * @param itemList  短信内容列表
+     * @param retryCount 剩余重试次数
+     * @return 发送结果列表
+     */
+    private List<SmsResponseDTO.SmsItem> sendSmSToUserWithRetry(List<SmsSendDTO.ItemInner> itemList, int retryCount) {
+        if (retryCount <= 0) {
+            log.error("短信发送重试次数耗尽，剩余{}条短信发送失败", itemList.size());
+            return buildFailedResponse(itemList);
+        }
+
+        try {
+            SmsSendDTO smsSendDTO = buildSmsRequest(itemList);
+            ResponseEntity<SmsResponseDTO> response = executeSmsRequest(smsSendDTO);
+            return processSmsResponse(response, itemList, retryCount);
+
+        } catch (RestClientException e) {
+            log.error("第{}次短信发送网络异常，剩余重试次数: {}",
+                    MAX_RETRY_COUNT - retryCount + 1, retryCount - 1, e);
+            return sendSmSToUserWithRetry(itemList, retryCount - 1);
+        } catch (Exception e) {
+            log.error("第{}次短信发送系统异常，剩余重试次数: {}",
+                    MAX_RETRY_COUNT - retryCount + 1, retryCount - 1, e);
+            return sendSmSToUserWithRetry(itemList, retryCount - 1);
+        }
+    }
+
+    /**
+     * 构建短信请求参数
+     */
+    private SmsSendDTO buildSmsRequest(List<SmsSendDTO.ItemInner> itemList) {
+        String nowTime = LocalDateTime.now().format(
+                DateTimeFormatter.ofPattern(DatePattern.PURE_DATETIME_PATTERN));
+        String sm3Hash = new SM3().digestHex(account + password + nowTime);
+
+        SmsSendDTO smsSendDTO = new SmsSendDTO();
+        smsSendDTO.setServiceCode(SERVICE_CODE);
+        smsSendDTO.setAccount(account);
+        smsSendDTO.setToken(sm3Hash);
+        smsSendDTO.setTs(nowTime);
+        smsSendDTO.setItems(itemList);
+        log.info("短信请求实体{}", smsSendDTO);
+
+        return smsSendDTO;
+    }
+
+    /**
+     * 执行短信请求
+     */
+    private ResponseEntity<SmsResponseDTO> executeSmsRequest(SmsSendDTO smsSendDTO) {
+        String url = smsServer + "/sms/msg";
+        log.info("调用短信接口: {}", url);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+
+        String requestBody = new JSONObject(smsSendDTO).toString();
+        HttpEntity<String> requestEntity = new HttpEntity<>(requestBody, headers);
+        return restTemplate.exchange(url, HttpMethod.POST, requestEntity, SmsResponseDTO.class);
+    }
+
+
+    /**
+     * 处理短信响应
+     */
+    private List<SmsResponseDTO.SmsItem> processSmsResponse(
+            ResponseEntity<SmsResponseDTO> response,
+            List<SmsSendDTO.ItemInner> originalList,
+            int retryCount) {
+
+        // 检查HTTP状态码
+        if (response.getStatusCode() != HttpStatus.OK) {
+            log.error("短信接口HTTP状态码异常: {}", response.getStatusCode());
+            return sendSmSToUserWithRetry(originalList, retryCount - 1);
+        }
+
+        // 检查响应体
+        SmsResponseDTO smsResponse = response.getBody();
+        if (smsResponse == null) {
+            log.error("短信接口返回体为空");
+            return sendSmSToUserWithRetry(originalList, retryCount - 1);
+        }
+
+        // 检查业务状态码
+        if (!SUCCESS_CODE.equals(smsResponse.getCode())) {
+            log.error("短信发送业务失败: {} - {}", smsResponse.getCode(), smsResponse.getMessage());
+            return sendSmSToUserWithRetry(originalList, retryCount - 1);
+        }
+
+        log.info("短信发送接口调用成功，batchId: {}, 发送条数: {}",
+                smsResponse.getBatchId(), smsResponse.getItems().size());
+
+        // 处理部分失败的情况
+        return handlePartialFailures(smsResponse, originalList);
+    }
+
+    /**
+     * 处理部分短信发送失败的情况
+     */
+    private List<SmsResponseDTO.SmsItem> handlePartialFailures(
+            SmsResponseDTO smsResponse,
+            List<SmsSendDTO.ItemInner> originalList) {
+
+        List<SmsResponseDTO.SmsItem> allItems = smsResponse.getItems();
+
+        // 找出发送失败的短信ID
+        List<String> failedIds = allItems.stream()
+                .filter(item -> !SUCCESS_CODE.equals(item.getCode()))
+                .map(SmsResponseDTO.SmsItem::getCustomMsgID)
+                .filter(StrUtil::isNotBlank)
+                .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(failedIds)) {
+            log.info("所有短信发送成功！");
+            return allItems;
+        }
+
+        log.info("发现{}条短信发送失败，尝试重新发送", failedIds.size());
+
+        // 找出需要重发的短信内容
+        List<SmsSendDTO.ItemInner> failedItems = originalList.stream()
+                .filter(item -> failedIds.contains(item.getCustomMsgID()))
+                .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(failedItems)) {
+            log.info("未找到对应的失败短信内容，直接返回原始结果");
+            return allItems;
+        }
+
+        // 对失败的消息重新发送
+        List<SmsResponseDTO.SmsItem> retryResults = sendSmSToUserWithRetry(failedItems, MAX_RETRY_COUNT);
+
+        // 合并结果：用重试结果替换原有的失败结果
+        return mergeSmsResults(allItems, retryResults, failedIds);
+    }
+
+    /**
+     * 合并短信发送结果
+     */
+    private List<SmsResponseDTO.SmsItem> mergeSmsResults(
+            List<SmsResponseDTO.SmsItem> originalResults,
+            List<SmsResponseDTO.SmsItem> retryResults,
+            List<String> originalFailedIds) {
+
+        // 创建结果副本
+        List<SmsResponseDTO.SmsItem> mergedResults = new ArrayList<>(originalResults);
+
+        // 构建重试结果的映射，便于查找
+        Map<String, SmsResponseDTO.SmsItem> retryResultMap = retryResults.stream()
+                .collect(Collectors.toMap(
+                        SmsResponseDTO.SmsItem::getCustomMsgID,
+                        item -> item,
+                        (existing, replacement) -> replacement
+                ));
+
+        // 用重试结果替换原有的失败结果
+        for (int i = 0; i < mergedResults.size(); i++) {
+            SmsResponseDTO.SmsItem originalItem = mergedResults.get(i);
+            String msgId = originalItem.getCustomMsgID();
+
+            if (originalFailedIds.contains(msgId)) {
+                SmsResponseDTO.SmsItem retryItem = retryResultMap.get(msgId);
+                if (retryItem != null) {
+                    mergedResults.set(i, retryItem);
+                }
+                // 如果重试结果中没有找到对应的消息，保持原失败结果
+            }
+        }
+
+        log.info("结果合并完成，原始结果数: {}, 重试结果数: {}, 合并后结果数: {}",
+                originalResults.size(), retryResults.size(), mergedResults.size());
+
+        return mergedResults;
+    }
+
+    /**
+     * 构建失败响应
+     */
+    private List<SmsResponseDTO.SmsItem> buildFailedResponse(List<SmsSendDTO.ItemInner> itemList) {
+        return itemList.stream()
+                .map(item -> {
+                    SmsResponseDTO.SmsItem failedItem = new SmsResponseDTO.SmsItem();
+                    failedItem.setCustomMsgID(item.getCustomMsgID());
+                    failedItem.setCode("-1");
+                    failedItem.setMsg("短信发送失败，重试次数耗尽");
+                    return failedItem;
+                })
+                .collect(Collectors.toList());
+    }
+
+
+
+
+   /* public List<SmsResponseDTO.SmsItem> sendSmSToUser(List<SmsSendDTO.ItemInner> temList,Boolean failFlag) {
+        if (CollUtil.isEmpty(temList)) {
+            log.error("短信发送列表为空");
+            return Collections.emptyList();
+        }
+
         SmsSendDTO smsSendDTO = new SmsSendDTO();
         smsSendDTO.setServiceCode("01001101");
         smsSendDTO.setAccount(account);
@@ -60,6 +283,7 @@ public class SmsUtils {
         log.info("短信请求实体{}", smsSendDTO);
 
         String url = smsServer + "/sms/msg";
+        System.out.println(url);
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
@@ -72,27 +296,46 @@ public class SmsUtils {
                     SmsResponseDTO.class
             );
             // 处理响应
-            return handleSmsResponse(response);
+            return handleSmsResponse(response,failFlag,temList);
         } catch (Exception e) {
             log.error("短信接口调用失败", e);
             return new ArrayList<>();
         }
     }
 
-    private List<SmsResponseDTO.SmsItem> handleSmsResponse(ResponseEntity<SmsResponseDTO> response) {
+    private List<SmsResponseDTO.SmsItem> handleSmsResponse(ResponseEntity<SmsResponseDTO> response,Boolean failFlag,List<SmsSendDTO.ItemInner> msgList) {
         if (response.getStatusCode() == HttpStatus.OK) {
             SmsResponseDTO smsResponse = response.getBody();
+            List<SmsSendDTO.ItemInner> failList = new ArrayList<>();
             if (smsResponse != null && "0".equals(smsResponse.getCode())) {
                 log.info("短信发送成功，batchId: {},发送条数{}", smsResponse.getBatchId(),smsResponse.getItems().size());
+                List<String> ids = smsResponse.getItems().stream().filter(it->!"0".equals(it.getCode())).map(SmsResponseDTO.SmsItem::getCustomMsgID).collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(ids)){
+                    //调用成功的情况下，依然会存在个别短信发送失败
+                    List<SmsSendDTO.ItemInner> faliList = msgList.stream().filter(it->ids.contains(it.getCustomMsgID())).collect(Collectors.toList());
+                    sendSmSToUser(faliList,false);
+                }
                 return smsResponse.getItems();
             } else {
                 log.error("短信发送失败: {}", (smsResponse != null ? smsResponse.getMessage() : "API 返回异常"));
+                //全部失败重新发送一次
+                if(failFlag){
+                    //失败重新发送
+                    sendSmSToUser(msgList,false);
+                }
+
                 return new ArrayList<>();
             }
         } else {
             log.error("HTTP 请求失败，状态码: {}", response.getStatusCode());
+            if(failFlag){
+                //全部失败重新发送一次
+                sendSmSToUser(msgList,false);
+            }
             return new ArrayList<>();
         }
     }
+*/
+
 
 }

event_smart/src/main/resources/application-prod.yml

@@ -57,10 +57,10 @@ spring:
 
 
 smsServer:
-  info: http://22.33.194.50:18096
+  info: http://22.33.194.49:18095
-  netInfo: http://22.33.191.206:18096
+  netInfo: http://20.33.234.143:18095
   account: xbjbpt
-  password: WLv8w071
+  password: ihS2b73v
 
 aliyun:
   oss:

event_smart/src/main/resources/application.yml

@@ -40,11 +40,14 @@ business:
   wavePath: D://Comtrade
   targetPath: /pqmonitor
   exportBaseDir: D://exportComtrade
-  eventCronExpression: 0 9 0/1 * * ?
+  eventCronExpression: 0 0/2 * * * ?
-  failCronExpression: 0 16 0/1 * * ?
+  failCronExpression: 0 5/10 * * * ?
-  userCronExpression: 0 5 0/1 * * ?
+  userCronExpression: 0 5 1 * * ?
-  syncinterval: 60
+  sendMessageCronExpression : 0 */3 * * * ?
+  syncinterval: 2
   failsyncinterval: 1440
+  #实时短信功能
+  RealTimeSMSSwitch: false
   #wavePath: /usr/local/comtrade
   #处理临时数据
   tempPath: D://file

kafka-event-data/.gitignore

@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

kafka-event-data/pom.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.njcn</groupId>
+    <artifactId>kafka-event-data</artifactId>
+
+
+    <parent>
+        <groupId>com.njcn.product</groupId>
+        <artifactId>CN_Product</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>njcn-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <!--        <dependency>-->
+        <!--            <groupId>com.njcn</groupId>-->
+        <!--            <artifactId>common-redis</artifactId>-->
+        <!--            <version>1.0.0</version>-->
+        <!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <version>2.7.12</version>
+        </dependency>
+
+        <!-- 多数据源切换，当数据源为oracle时需要使用 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>spingboot2.3.12</artifactId>
+            <version>2.3.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>mybatis-plus</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <!--oracle驱动-->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>21.6.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>21.1.0.0</version> <!-- 版本号需要与你的ojdbc版本匹配 -->
+        </dependency>
+
+        <!-- Spring Security -->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>2.5.14.RELEASE</version> <!-- 与Spring Boot 2.3.x兼容 -->
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.3-jre</version> <!-- 使用最新稳定版 -->
+        </dependency>
+
+
+
+    </dependencies>
+
+
+    <build>
+        <finalName>kafka-event-data</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+
+    </build>
+
+</project>

kafka-event-data/src/main/java/com/njcn/kafka/event/KafkaEventtApplication.java

@@ -0,0 +1,17 @@
+package com.njcn.kafka.event;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@Slf4j
+@SpringBootApplication(scanBasePackages = "com.njcn")
+@MapperScan("com.njcn.**.mapper")
+public class KafkaEventtApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(KafkaEventtApplication.class, args);
+    }
+
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/controller/EventDataController.java

@@ -0,0 +1,29 @@
+package com.njcn.kafka.event.controller;
+
+import com.njcn.kafka.event.pojo.param.PushParam;
+import com.njcn.kafka.event.service.EventDataService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Description:
+ * Date: 2025/05/27  下午 2:56【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/eventdata")
+@AllArgsConstructor
+public class EventDataController {
+    private final EventDataService eventDataService;
+    @PostMapping("/push")
+    public void push(@RequestBody PushParam pushParam) throws Exception {
+        eventDataService.push(pushParam);
+    }
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/controller/KafkaTestController.java

@@ -0,0 +1,31 @@
+package com.njcn.kafka.event.controller;
+
+import com.njcn.kafka.event.service.KafkaProducerService;
+import lombok.AllArgsConstructor;
+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;
+
+/**
+ * Description:
+ * Date: 2025/05/27  下午 2:06【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/test")
+@AllArgsConstructor
+public class KafkaTestController {
+    private final KafkaProducerService kafkaProducerService;
+
+    @GetMapping("/testkafka")
+
+    public void test(@RequestParam("context") String context) {
+        kafkaProducerService.sendMessageWithCallback("eventdata",context);
+    }
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/mapper/OracleRmpEventDetailPOMapper.java

@@ -0,0 +1,20 @@
+package com.njcn.kafka.event.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.kafka.event.pojo.po.OracleRmpEventDetailPO;
+
+import java.util.List;
+
+/**
+ * data-migration
+ *
+ * @author cdf
+ * @date 2024/2/19
+ */
+public interface OracleRmpEventDetailPOMapper extends BaseMapper<OracleRmpEventDetailPO> {
+
+
+
+
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/mapper/PqLineMapper.java

@@ -0,0 +1,27 @@
+package com.njcn.kafka.event.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.njcn.kafka.event.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.kafka.event.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<PqLine> {
+
+
+
+    List<LedgerBaseInfoDTO> getBaseLedger(@Param("ids")List<Integer> ids, @Param("searchValue")String searchValue);
+
+
+
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/mapper/mapping/PqLineMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.kafka.event.mapper.PqLineMapper">
+
+
+
+
+
+
+    <select id="getBaseLedger" resultType="com.njcn.kafka.event.pojo.dto.LedgerBaseInfoDTO">
+        select
+        PQ_GDINFORMATION.name gdName,
+        pq_line.GD_INDEX gdIndex,
+        pq_line.line_index lineId,
+        pq_line.name lineName,
+        PQ_SUBVOLTAGE.SUBV_INDEX busBarId,
+        PQ_SUBVOLTAGE.name busBarName,
+        PQ_SUBVOLTAGE.SCALE,
+        pq_device.dev_index devId,
+        pq_device.name devName,
+        pq_device.ip ip,
+        pq_line.pt1/pq_line.pt2 pt,
+        pq_line.ct1/pq_line.ct2 ct,
+        pq_device.Status runFlag,
+        PQ_SUBSTATION.sub_index stationId,
+        PQ_SUBSTATION.name stationName
+        from
+        pq_line inner JOIN PQ_SUBVOLTAGE on pq_line.SUBV_INDEX = PQ_SUBVOLTAGE.SUBV_INDEX
+        inner JOIN pq_device on PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX
+        inner JOIN PQ_SUBSTATION on pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
+        inner JOIN PQ_GDINFORMATION on pq_line.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
+        <where>
+        and pq_line.line_index in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+            <if test="searchValue!=null and searchValue!=''">
+                and (
+                PQ_GDINFORMATION.name  LIKE '%' || #{searchValue} || '%'
+                or PQ_SUBSTATION.name  LIKE '%' || #{searchValue} || '%'
+                or pq_line.name  LIKE '%' || #{searchValue} || '%'
+                )
+            </if>
+        </where>
+    </select>
+
+
+
+
+</mapper>

kafka-event-data/src/main/java/com/njcn/kafka/event/pojo/dto/EventPushDTO.java

@@ -0,0 +1,68 @@
+package com.njcn.kafka.event.pojo.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2026/06/04  上午 9:14【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class EventPushDTO {
+    /**
+     * type :
+     * time : 2025-10-09 13:25:14
+     * body : [{"eventdetail_index":"d4963f8f-201f-443f-b293-dda8ef870ee6","lineid":"1591","timeid":"2025-10-09 13:25:14","ms":"509","describe":"","wavetype":"1","persisttime":"23.000","eventvalue":"0.6","eventreason":"","eventtype":"","gdname":"","bdname":"110kV皇后店变","busname":"XX名称","phasicType":"A","pointname":"232待用","wavePath":"192.168.1.102/3_20240515_163022_349"}]
+     */
+
+    private String type;
+    private LocalDateTime time;
+    private List<EventDTO> body;
+
+    @Data
+    public static class EventDTO {
+        /**
+         * eventdetail_index : d4963f8f-201f-443f-b293-dda8ef870ee6
+         * lineid : 1591
+         * timeid : 2025-10-09 13:25:14
+         * ms : 509
+         * describe :
+         * wavetype : 1
+         * persisttime : 23.000
+         * eventvalue : 0.6
+         * eventreason :
+         * eventtype :
+         * gdname :
+         * bdname : 110kV皇后店变
+         * busname : XX名称
+         * phasicType : A
+         * pointname : 232待用
+         * wavePath : 192.168.1.102/3_20240515_163022_349
+         */
+
+        private String eventdetail_index;
+        private Integer lineid;
+        private LocalDateTime timeid;
+        private Integer ms;
+        private String describe;
+        private String wavetype;
+        private BigDecimal persisttime;
+        private BigDecimal eventvalue;
+        private String eventreason;
+        private String eventtype;
+        private String gdname;
+        private String bdname;
+        private String busname;
+        private String phasicType;
+        private String pointname;
+        private String wavePath;
+
+
+    }
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/pojo/dto/LedgerBaseInfoDTO.java

@@ -0,0 +1,43 @@
+package com.njcn.kafka.event.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * @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 String scale;
+
+    private Integer devId;
+
+    private String devName;
+
+    private String objName;
+
+    private Integer stationId;
+
+    private String stationName;
+    //通讯状态
+    private Integer runFlag=0;
+
+    private Integer eventCount;
+    private String ip;
+
+    private int pt;
+    private int ct;
+
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/pojo/param/PushParam.java

@@ -0,0 +1,34 @@
+package com.njcn.kafka.event.pojo.param;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2025/05/28  上午 8:47【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class PushParam {
+
+    //补招起始日期_yyyy-MM-dd(按小时跑的任务可加时分秒
+    private LocalDateTime beginTime;
+
+    //补招截止日期_yyyy-MM-dd(按小时跑的任务可加时分秒)
+    private LocalDateTime endTime;
+
+    //时间日期_yyyy-MM-dd(按小时跑的任务可加时分秒)
+    private String dataDate;
+
+
+
+    /**
+     * 待计算的对象索引集合，监测点、设备、母线、变电站、单位等等
+     */
+    private List<String> idList;
+
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/pojo/po/OracleRmpEventDetailPO.java

@@ -0,0 +1,174 @@
+package com.njcn.kafka.event.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.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * data-migration
+ *
+ * @author cdf
+ * @date 2024/2/19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("PQS_EVENTDETAIL")
+public class OracleRmpEventDetailPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 暂时事件ID
+     */
+    @TableId(value = "EVENTDETAIL_INDEX",type = IdType.ASSIGN_ID)
+    private String eventdetailIndex;
+
+    /**
+     * 监测点ID
+     */
+    @TableField(value = "LINEID")
+    private Integer lineid;
+
+    /**
+     * 统计指标类型
+     */
+    @TableField(value = "MS")
+    private Integer ms;
+    /**
+     * 统计指标类型
+     */
+    @TableField(value = "WAVETYPE")
+    private String wavetype;
+
+    /**
+     * 暂降原因（字典表PQS_Dicdata）
+     */
+    @TableField(value = "EVENTREASON")
+    private String eventreason;
+
+    /**
+     * 暂降类型（字典表PQS_Dicdata）
+     */
+    @TableField(value = "EVENTTYPE")
+    private String eventtype;
+
+    /**
+     * 事件关联分析表Guid
+     */
+    @TableField(value = "EVENTASS_INDEX")
+    private String eventassIndex;
+
+    @TableField(value = "DQTIME")
+    private Double dqTime;
+
+    /**
+     * 特征值计算更新时间（外键PQS_Relevance的Time字段）
+     */
+    @TableField(value = "DEALTIME")
+    private Date dealTime;
+
+    /**
+     * 默认事件个数为0
+     */
+    @TableField(value = "NUM")
+    private Integer num;
+
+    /**
+     * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0
+     */
+    @TableField(value = "FILEFLAG")
+    private Integer fileFlag;
+
+    /**
+     * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0
+     */
+    @TableField(value = "DEALFLAG")
+    private Integer dealFlag;
+
+    /**
+     * 处理结果第一条事件发生时间(读comtra文件获取)
+     */
+    @TableField(value = "FIRSTTIME")
+    private LocalDateTime firstTime;
+
+    /**
+     * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）
+     */
+    @TableField(value = "FIRSTTYPE")
+    private String firstType;
+
+    /**
+     * 处理结果第一条事件发生时间毫秒(读comtra文件获取)
+     */
+    @TableField(value = "FIRSTMS")
+    private BigDecimal firstMs;
+
+    /**
+     * 暂降能量
+     */
+    @TableField(value = "ENERGY")
+    private Double energy;
+
+    /**
+     * 暂降严重度
+     */
+    @TableField(value = "SEVERITY")
+    private Double severity;
+
+    /**
+     * 暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算
+     */
+    @TableField(value = "SAGSOURCE")
+    private String sagsource;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "TIMEID")
+    private LocalDateTime timeid;
+
+    /**
+     * 持续时间，单位秒
+     */
+    @TableField(value = "PERSISTTIME")
+    private BigDecimal persisttime;
+
+    /**
+     * 特征幅值
+     */
+    @TableField(value = "EVENTVALUE")
+    private BigDecimal eventvalue;
+
+    /**
+     * 相别
+     */
+    @TableField(value = "PHASIC_TYPE")
+    private String phasicType;
+
+    /**
+     * 事件描述
+     */
+    @TableField(value = "DESCRIBE")
+    private String describe;
+
+    /**
+     * 波形路径
+     */
+    @TableField(value = "WAVENAME")
+    private String wavePath;
+
+
+
+    @TableField(value = "TRANSIENTVALUE")
+    private Double transientValue;
+
+    @TableField(value = "CREATE_TIME")
+    private LocalDateTime createTime;
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/pojo/po/PqLine.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.kafka.event.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,6 +15,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
  * 靠靠?
  */

kafka-event-data/src/main/java/com/njcn/kafka/event/service/EventDataService.java

@@ -0,0 +1,15 @@
+package com.njcn.kafka.event.service;
+
+
+import com.njcn.kafka.event.pojo.param.PushParam;
+
+/**
+ * Description:
+ * Date: 2025/05/28  上午 8:38【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface EventDataService {
+    void push(PushParam pushParam) throws Exception;
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/service/KafkaProducerService.java

@@ -0,0 +1,15 @@
+package com.njcn.kafka.event.service;
+
+/**
+ * Description:
+ * Date: 2025/05/27  下午 1:57【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface KafkaProducerService {
+    void sendMessage(String topic, String message);
+
+    // 带回调的发送
+    void sendMessageWithCallback(String topic, String message);
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/service/impl/EventDataServiceImpl.java

@@ -0,0 +1,74 @@
+package com.njcn.kafka.event.service.impl;
+
+
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.kafka.event.mapper.OracleRmpEventDetailPOMapper;
+import com.njcn.kafka.event.mapper.PqLineMapper;
+import com.njcn.kafka.event.pojo.dto.EventPushDTO;
+import com.njcn.kafka.event.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.kafka.event.pojo.param.PushParam;
+import com.njcn.kafka.event.pojo.po.OracleRmpEventDetailPO;
+import com.njcn.kafka.event.service.EventDataService;
+import com.njcn.kafka.event.service.KafkaProducerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+/**
+ * Description:
+ * Date: 2025/05/28  上午 8:38【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class EventDataServiceImpl implements EventDataService {
+
+
+    private final KafkaProducerService kafkaProducerService;
+    private final OracleRmpEventDetailPOMapper oracleRmpEventDetailPOMapper;
+    private final PqLineMapper pqLineMapper;
+
+
+    @Override
+    public void push(PushParam pushParam) throws Exception {
+        LocalDateTime beginTime = pushParam.getBeginTime();
+        LocalDateTime endTime = pushParam.getEndTime();
+        List<OracleRmpEventDetailPO> oracleRmpEventDetailPOList = oracleRmpEventDetailPOMapper.selectList(
+                new LambdaQueryWrapper<OracleRmpEventDetailPO>()
+                        .between(OracleRmpEventDetailPO::getCreateTime,beginTime,endTime));
+        if(!CollectionUtils.isEmpty(oracleRmpEventDetailPOList)){
+            List<Integer> lineIds = oracleRmpEventDetailPOList.stream().map(OracleRmpEventDetailPO::getLineid).collect(Collectors.toList());
+            List<LedgerBaseInfoDTO> baseLedger = pqLineMapper.getBaseLedger(lineIds, null);
+            Map<Integer, LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = baseLedger.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
+            EventPushDTO eventPushDTO = new EventPushDTO();
+            eventPushDTO.setTime(LocalDateTime.now());
+            List<EventPushDTO.EventDTO> collect = oracleRmpEventDetailPOList.stream().map(temp -> {
+                EventPushDTO.EventDTO eventDTO = new EventPushDTO.EventDTO();
+                BeanUtils.copyProperties(temp,eventDTO);
+                eventDTO.setEventdetail_index(temp.getEventdetailIndex());
+                eventDTO.setBusname(ledgerBaseInfoDTOMap.get(temp.getLineid()).getBusBarName());
+                eventDTO.setBdname(ledgerBaseInfoDTOMap.get(temp.getLineid()).getStationName());
+                eventDTO.setPointname(ledgerBaseInfoDTOMap.get(temp.getLineid()).getLineName());
+                eventDTO.setGdname(ledgerBaseInfoDTOMap.get(temp.getLineid()).getGdName());
+                return eventDTO;
+            }).collect(Collectors.toList());
+            eventPushDTO.setBody(collect);
+            String jsonStr = JSONUtil.toJsonStr(collect);
+
+            kafkaProducerService.sendMessage("eventdata",jsonStr);
+        }
+
+
+    }
+}

kafka-event-data/src/main/java/com/njcn/kafka/event/service/impl/KafkaProducerServiceImpl.java

@@ -0,0 +1,50 @@
+package com.njcn.kafka.event.service.impl;
+
+import com.njcn.kafka.event.service.KafkaProducerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.support.SendResult;
+import org.springframework.stereotype.Service;
+import org.springframework.util.concurrent.ListenableFuture;
+import org.springframework.util.concurrent.ListenableFutureCallback;
+
+/**
+ * Description:
+ * Date: 2025/05/27  下午 2:00【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class KafkaProducerServiceImpl implements KafkaProducerService {
+
+    private final KafkaTemplate<String, String> kafkaTemplate;
+
+
+    @Override
+    public void sendMessage(String topic, String message) {
+        kafkaTemplate.send(topic, message);
+    }
+    @Override
+    // 带回调的发送
+    public void sendMessageWithCallback(String topic, String message) {
+        ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send(topic, message);
+
+        future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
+
+
+            @Override
+            public void onSuccess(SendResult<String, String> result) {
+                System.out.println("Sent message=[" + message +
+                        "] with offset=[" + result.getRecordMetadata().offset() + "]");
+            }
+
+            @Override
+            public void onFailure(Throwable ex) {
+                System.out.println("Unable to send message=[" +
+                        message + "] due to : " + ex.getMessage());
+            }
+        });
+    }
+}

kafka-event-data/src/main/resources/application-dev.yml

@@ -0,0 +1,88 @@
+spring:
+  application:
+    name: kafka-event-data
+  kafka:
+    # Kafka 服务器地址
+    bootstrap-servers: 192.168.2.130:9092
+
+    # 生产者配置
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+      # 可选配置
+      acks: all
+      retries: 3
+      batch-size: 16384
+      buffer-memory: 33554432
+
+    # 消费者配置
+    consumer:
+      group-id: my-group
+      auto-offset-reset: earliest
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      # 可选配置
+      enable-auto-commit: false
+      max-poll-records: 500
+  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_hn
+          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
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: 8000
+        max-idle: 8
+        min-idle: 2
+        test-on-borrow: true  # 借出连接时验证
+        test-on-return: true  # 归还连接时验证
+        test-while-idle: true # 空闲时验证
+
+smsServer:
+  info: http://22.33.194.50:18096
+  netInfo: http://22.33.191.206:18096
+  account: xbjbpt
+  password: WLv8w071
+aliyun:
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKeyId: LTAI5tQYuyu1PpiCdeM74PT6
+    accessKeySecret: vTGHcQOCF9u7w9FL3HAHJO1oufVWru
+    bucketName: cn-comtrade

kafka-event-data/src/main/resources/application.yml

@@ -0,0 +1,83 @@
+#当前服务的基本信息
+microservice:
+  ename: 12345
+  name: 12345
+server:
+  port: 18094
+spring:
+  application:
+    name: kafka-event-data
+  profiles:
+    active: dev
+
+
+#mybatis配置信息
+mybatis-plus:
+  mapper-locations: classpath*:com/njcn/**/mapping/*.xml
+  #别名扫描
+  type-aliases-package: com.njcn.product.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
+  targetPath: /pqmonitor
+  exportBaseDir: D://exportComtrade
+  eventCronExpression: 0 0/2 * * * ?
+  failCronExpression: 0 5/10 * * * ?
+  userCronExpression: 0 5 1 * * ?
+  sendMessageCronExpression : 0 */3 * * * ?
+  syncinterval: 2
+  failsyncinterval: 1440
+  #实时短信功能
+  RealTimeSMSSwitch: false
+  #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
+
+
+
+

kafka-event-data/src/main/resources/logback.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="20 seconds" debug="false">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+
+    <springProperty scope="context" name="log.projectName" source="spring.application.name" defaultValue="event_msg"/>
+    <springProperty scope="context" name="logCommonLevel" source="log.commonLevel" defaultValue="info"/>
+    <springProperty scope="context" name="logHomeDir" source="log.homeDir" defaultValue="D:\logs"/>
+
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="ec"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+
+
+    <!--日志输出格式-->
+    <property name="log.pattern" value="|-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%level} ${log.projectName} -- %t %logger{100}.%M ==> %m%n${Log_EXCEPTION_CONVERSION_WORD:-%ec}}"/>
+    <property name="log.maxHistory" value="30"/>
+    <!-- 控制台输出（可选） -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <charset>UTF-8</charset> <!-- 控制台也建议指定 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!--客户端输出日志-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--系统中常规的debug日志-->
+    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 RollingFileAppender -->
+    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>
+            ${logHomeDir}/${log.projectName}/debug/debug.log
+        </file>
+        <!-- 如果日志级别等于配置级别，过滤器会根据onMath 和 onMismatch接收或拒绝日志。 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 设置过滤级别 -->
+            <level>DEBUG</level>
+            <!-- 用于配置符合过滤条件的操作 -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 用于配置不符合过滤条件的操作 -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <!-- 最常用的滚动策略，它根据时间来制定滚动策略.既负责滚动也负责触发滚动  SizeAndTimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志输出位置 可相对、和绝对路径 -->
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/debug/debug.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <!-- 可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件,假设设置每个月滚动，且<maxHistory>是6，
+            则只保存最近6个月的文件，删除之前的旧文件。注意，删除旧文件是，那些为了归档而创建的目录也会被删除 -->
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+            <!--重启清理日志文件-->
+            <!--            <cleanHistoryOnStart>true</cleanHistoryOnStart>-->
+            <!--每个文件最多100MB，保留N天的历史记录，但最多20GB-->
+            <!--<totalSizeCap>20GB</totalSizeCap>-->
+            <!--日志文件最大的大小-->
+            <!--<MaxFileSize>${log.maxSize}</MaxFileSize>-->
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--系统中常规的info日志-->
+    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>
+            ${logHomeDir}/${log.projectName}/info/info.log
+        </file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/info/info.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+
+    <!--系统中常规的error日志-->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>
+            ${logHomeDir}/${log.projectName}/error/error.log
+        </file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/error/error.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <logger name="org.apache.catalina.startup.DigesterFactory"  level="ERROR"/>
+    <logger name="org.apache.catalina.util.LifecycleBase"  level="ERROR"/>
+    <logger name="org.apache.coyote.http11.Http11NioProtocol"  level="WARN"/>
+
+
+
+    <logger name="com.njcn" level="INFO" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="ERROR"/>
+    </logger>
+
+    <root level="${logCommonLevel}">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="ERROR"/>
+    </root>
+</configuration>

kafka-event-data/src/main/resources/templates/hello.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8" />
+    <title></title>
+</head>
+<body>
+<p>
+    <span th:text="${hello}">Hello!</span>
+</p>
+</body>
+</html>