From 1d6b39609ba2b1b39265b7c2275349cc0eba5a3f Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 6 Sep 2023 14:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=80=81=E4=BA=8B=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/influx/imapper/EvtDataMapper.java | 3 +++ .../pojo/constant/InfluxDBTableConstant.java | 2 +- .../njcn/influx/pojo/dto/EventDataSetDTO.java | 23 +++++++++++++++++++ .../njcn/influx/pojo/dto/EventQueryDTO.java | 1 + .../com/njcn/influx/pojo/po/cs/EntData.java | 1 + .../njcn/influx/service/EvtDataService.java | 4 ++++ .../service/impl/EvtDataServiceImpl.java | 12 ++++++++++ .../njcn/system/api/EleEvtFeignClient.java | 5 ++++ .../EleEvtFeignClientFallbackFactory.java | 7 ++++++ .../com/njcn/system/enums/DicDataEnum.java | 7 +++++- .../njcn/system/enums/DicDataTypeEnum.java | 1 + .../controller/EleEvtParmController.java | 14 +++++++++++ .../controller/ImageToStreamController.java | 16 +++---------- .../system/service/IEleEvtParmService.java | 3 +++ .../service/impl/EleEvtParmServiceImpl.java | 7 ++++++ 15 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java index 35ee9b1a8..b771613d3 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java @@ -3,6 +3,7 @@ package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.pojo.dto.EventDataSetDTO; import com.njcn.influx.pojo.po.cs.EntData; import com.njcn.influx.query.InfluxQueryWrapper; @@ -20,4 +21,6 @@ public interface EvtDataMapper extends InfluxDbBaseMapper { List getEventData(InfluxQueryWrapper influxQueryWrapper); + + EventDataSetDTO getEventDataSet(InfluxQueryWrapper influxQueryWrapper); } diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java index 042457481..a9bec1323 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java @@ -162,7 +162,7 @@ public interface InfluxDBTableConstant { String CL_DID = "cl_did"; /** - * 逻辑子设备id + * 逻辑子设备id/暂态事件号 */ String UUID = "uuid"; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java new file mode 100644 index 000000000..70de0e450 --- /dev/null +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java @@ -0,0 +1,23 @@ +package com.njcn.influx.pojo.dto; + +import lombok.Data; + +import java.util.List; + +/** + * Description: + * Date: 2023/9/6 9:52【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class EventDataSetDTO { + private String name; + private String value; + private String type; + + private String unit; + + private String showName; +} diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java index a5f831a42..adfbc2fff 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java @@ -12,6 +12,7 @@ import java.util.List; * @version V1.0.0 */ @Data +@Deprecated public class EventQueryDTO { private String devId; private List lineIds; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java index cd3b753ec..cd53957e6 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java @@ -17,6 +17,7 @@ import java.time.Instant; */ @Data @Measurement(name = "evt_data") +@Deprecated public class EntData { @Column(name = "time") diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java b/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java index 222f12866..75ac5b605 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java @@ -1,5 +1,6 @@ package com.njcn.influx.service; +import com.njcn.influx.pojo.dto.EventDataSetDTO; import com.njcn.influx.pojo.dto.EventQueryDTO; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.pojo.po.cs.EntData; @@ -24,5 +25,8 @@ public interface EvtDataService { * @Author: clam * @Date: 2023/8/30 */ + @Deprecated List getEventData(EventQueryDTO eventQueryDTO); + + EventDataSetDTO getEventDataSet(String tableName,String uuid,String columnName ); } diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/EvtDataServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/EvtDataServiceImpl.java index 5a99c1454..dd0080cc2 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/EvtDataServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/EvtDataServiceImpl.java @@ -3,6 +3,7 @@ package com.njcn.influx.service.impl; import com.njcn.influx.imapper.CommonMapper; import com.njcn.influx.imapper.EvtDataMapper; import com.njcn.influx.pojo.constant.InfluxDBTableConstant; +import com.njcn.influx.pojo.dto.EventDataSetDTO; import com.njcn.influx.pojo.dto.EventQueryDTO; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.pojo.po.cs.EntData; @@ -26,6 +27,7 @@ import java.util.List; public class EvtDataServiceImpl implements EvtDataService { private final EvtDataMapper commonMapper; @Override + @Deprecated public List getEventData(EventQueryDTO eventQueryDTO) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper("evt_data", EntData.class); influxQueryWrapper.select(EntData::getLineId,EntData::getTarget,EntData::getTime,EntData::getTime, @@ -38,4 +40,14 @@ public class EvtDataServiceImpl implements EvtDataService { return commonMapper.getEventData(influxQueryWrapper); } + + @Override + public EventDataSetDTO getEventDataSet(String tableName, String uuid, String columnName) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName, EventDataSetDTO.class); + influxQueryWrapper.select(columnName,InfluxDBTableConstant.VALUE) + .eq(InfluxDBTableConstant.UUID,uuid); + + + return commonMapper.getEventDataSet(influxQueryWrapper); + } } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/EleEvtFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/EleEvtFeignClient.java index e84614a90..fdb22600c 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/EleEvtFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/EleEvtFeignClient.java @@ -5,12 +5,15 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.system.api.fallback.EleEvtFeignClientFallbackFactory; import com.njcn.system.pojo.param.EleEvtParam; import com.njcn.system.pojo.po.EleEpdPqd; +import com.njcn.system.pojo.po.EleEvtParm; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @author xuyang * @version 1.0.0 @@ -24,5 +27,7 @@ public interface EleEvtFeignClient { @PostMapping("/delete") HttpResult delete(@RequestParam("id") String id); + @PostMapping("/queryByPid") + HttpResult> queryByPid(@RequestParam("pid") String pid); } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EleEvtFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EleEvtFeignClientFallbackFactory.java index 4b68d7621..5697973d6 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EleEvtFeignClientFallbackFactory.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EleEvtFeignClientFallbackFactory.java @@ -8,6 +8,7 @@ import com.njcn.system.api.EpdFeignClient; import com.njcn.system.pojo.param.EleEpdPqdParam; import com.njcn.system.pojo.param.EleEvtParam; import com.njcn.system.pojo.po.EleEpdPqd; +import com.njcn.system.pojo.po.EleEvtParm; import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -47,6 +48,12 @@ public class EleEvtFeignClientFallbackFactory implements FallbackFactory> queryByPid(String pid) { + log.error("{}异常，降级处理，异常为：{}","查询事件拓展数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 10c2177ce..e9a3ccf51 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -285,7 +285,12 @@ public enum DicDataEnum { SCOTT_TRANS("SCOTT牵引变压器", "SCOTT_Trans"), YN_V_TRANS("YN v联结平衡牵引变压器", "YN_V_Trans"), YN_A_TRANS("YN A联结平衡牵引变压器", "YN_A_Trans"), - + /** + * APP暂态事件类型 + */ + EVT_DIPSTR("电压暂降事件启动","Evt_DipStr"), + EVT_INTRSTR("电压中断事件启动","Evt_IntrStr"), + EVT_SWLSTR("电压暂升事件启动","Evt_SwlStr"), diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index 6fb0d3317..604ff1aa2 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -108,6 +108,7 @@ public enum DicDataTypeEnum { DEVICE_UNIT("数据单位类型","Device_Unit"), //国网上送 PLAN_STATUS("计划状态","plan_status"), + APP_EVENT("APP暂态事件类型","app_event") ; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java index be37cc13a..ee94ea815 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java @@ -10,6 +10,7 @@ import com.njcn.common.utils.LogUtil; import com.njcn.system.pojo.param.EleEpdPqdParam; import com.njcn.system.pojo.param.EleEvtParam; import com.njcn.system.pojo.po.EleEpdPqd; +import com.njcn.system.pojo.po.EleEvtParm; import com.njcn.system.service.IEleEvtParmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,6 +22,8 @@ import org.springframework.web.bind.annotation.*; import com.njcn.web.controller.BaseController; +import java.util.List; + /** *

* 事件拓展表 前端控制器 @@ -62,6 +65,17 @@ public class EleEvtParmController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @PostMapping("/queryByPid") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("删除事件拓展数据") + @ApiImplicitParam(name = "pid", value = "pid", required = true) + public HttpResult> queryByPid(@RequestParam String pid){ + String methodDescribe = getMethodDescribe("queryByPid"); + LogUtil.njcnDebug(log, "{}，传递的id为:{}", methodDescribe,pid); + List list = eleEvtParmService.queryByPid(pid); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java index 5c297eec2..90789f327 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java @@ -1,13 +1,6 @@ package com.njcn.system.controller; -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.common.utils.FileUtil; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pq.pojo.param.LargeScreenParam; -import com.njcn.device.pq.pojo.vo.DataScaleVO; + import com.njcn.oss.utils.FileStorageUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -15,15 +8,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.io.InputStreamResource; -import org.springframework.validation.annotation.Validated; + import org.springframework.web.bind.annotation.*; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.util.List; -import java.util.Objects; + /** * Description: diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEvtParmService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEvtParmService.java index 522b865d4..a06038106 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEvtParmService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEvtParmService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.system.pojo.param.EleEvtParam; import com.njcn.system.pojo.po.EleEvtParm; +import java.util.List; + /** *

* 事件拓展表 服务类 @@ -18,4 +20,5 @@ public interface IEleEvtParmService extends IService { void delete(String id); + List queryByPid(String pid); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEvtParmServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEvtParmServiceImpl.java index 3dbc0757d..ce367dfb2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEvtParmServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEvtParmServiceImpl.java @@ -9,6 +9,8 @@ import com.njcn.system.service.IEleEvtParmService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 事件拓展表 服务实现类 @@ -33,4 +35,9 @@ public class EleEvtParmServiceImpl extends ServiceImpl queryByPid(String pid) { + return this.lambdaQuery().eq(EleEvtParm::getPid,pid).list(); + } }