From 779fa3faa3ea1e4536ea7229ed9e929f728e2e7e Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 7 Apr 2023 09:51:02 +0800 Subject: [PATCH 01/14] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=A8=B3=E6=80=81?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/vo/AllDataVO.java | 6 +++++ .../majornetwork/LargeScreenMapper.java | 3 +++ .../mapping/LargeScreenMapper.xml | 20 ++++++++++++++- .../Impl/LargeScreenServiceImpl.java | 25 +++++++++++++++---- .../majornetwork/LargeScreenMapper.java | 3 --- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java index fc181c760..054580d6f 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java @@ -21,6 +21,12 @@ public class AllDataVO implements Serializable { @ApiModelProperty("部门名称") private String areaName; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private String index; + /** * 暂降事件次数 */ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java index 193090015..9c4a6c2be 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java @@ -32,4 +32,7 @@ public interface LargeScreenMapper { List> getMiddleTerminal (@Param("deviceIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); List getMiddleLimitRate (@Param("lineIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + + List> getHomeostasisArea (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml index 3e353e547..45b4d5a5c 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -195,5 +195,23 @@ left join pq_line pl3 on pl2.Pid = pl3.Id - + diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index 7ff900fc9..5b3f1e596 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -12,6 +12,7 @@ import com.njcn.system.pojo.enums.StatisticsEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import com.njcn.device.pq.api.GeneralDeviceInfoClient; @@ -19,10 +20,7 @@ import java.math.RoundingMode; import java.text.NumberFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -274,6 +272,8 @@ public class LargeScreenServiceImpl implements LargeScreenService { if (generalDeviceDTO.getDeviceIndexes().size() > 0) { AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes()); allDataVO.setAreaName(generalDeviceDTO.getName()); + allDataVO.setIndex(generalDeviceDTO.getIndex()); + allDataVO.setSteadyLoad("0.0"); if (generalDeviceDTO.getLineIndexes().size() > 0) { Map map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); allDataVO.setEventCounts(map.get("count").toString()); @@ -284,11 +284,13 @@ public class LargeScreenServiceImpl implements LargeScreenService { } else { AllDataVO allDataVO = new AllDataVO(); allDataVO.setAreaName(generalDeviceDTO.getName()); + allDataVO.setIndex(generalDeviceDTO.getIndex()); allDataVO.setRunning("0"); allDataVO.setHotSpare("0"); allDataVO.setShutdown("0"); allDataVO.setNormal("0"); allDataVO.setBreakdown("0"); + allDataVO.setSteadyLoad("0.0"); if (generalDeviceDTO.getLineIndexes().size() > 0) { Map map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); allDataVO.setEventCounts(map.get("count").toString()); @@ -298,7 +300,20 @@ public class LargeScreenServiceImpl implements LargeScreenService { result.add(allDataVO); } } - //todo 该接口部分功能未完成 1.稳态符合性 2.综合评估 + //部门id集合 + List indexIds = generalDeviceDTOList.stream().map(GeneralDeviceDTO::getIndex).collect(Collectors.toList()); + List> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + float f = 0.0f; + for (AllDataVO allDataVO : result) { + for (Map map : homeostasisArea) { + if (Objects.equals(map.get("id"),allDataVO.getIndex())){ + f=Float.parseFloat(map.get("avg").toString()); + allDataVO.setSteadyLoad(String.valueOf((1-f)*100)); + } + } + } + + //todo 该接口部分功能未完成 1.综合评估 return result; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java index 8eb99865a..53ee2108c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java @@ -1,8 +1,5 @@ package com.njcn.harmonic.mapper.majornetwork; -import com.njcn.device.pq.pojo.vo.AllDataVO; -import com.njcn.device.pq.pojo.vo.EventVO; -import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO; import org.apache.ibatis.annotations.Param; import java.util.List; From a4363bf37bb7cfcbccb81d0d63d9d8d7028263ee Mon Sep 17 00:00:00 2001 From: wurui Date: Fri, 7 Apr 2023 10:03:46 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=94=B5=E5=8E=8B=E6=9A=82=E9=99=8D:?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=9B=91=E6=B5=8B=E7=82=B9=E7=BD=91=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/device/pq/api/LineFeignClient.java | 2 +- .../main/java/com/njcn/device/pq/controller/LineController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java index 797656c22..da4e05c91 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java @@ -92,7 +92,7 @@ public interface LineFeignClient { * @return 结果 */ @PostMapping("getSubstationData") - HttpResult> getSubstationData(@RequestParam("id") List id); + HttpResult> getSubstationData(@RequestBody List id); /** * 根据变电站id获取子节数据 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java index 78319a7fe..bc06f6ae1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java @@ -81,7 +81,7 @@ public class LineController extends BaseController { @PostMapping("/getSubstationData") @ApiOperation("根据变电站id获取变电站详情") @ApiImplicitParam(name = "id", value = "监测点id", required = true) - public HttpResult> getSubstationData(@RequestParam("id") List id) { + public HttpResult> getSubstationData(@RequestBody List id) { String methodDescribe = getMethodDescribe("getSubstationData"); List result = lineService.getSubstationData(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); From b06916b5ea4e72a4d25a0502d810ee7ef3bdd2ba Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 7 Apr 2023 10:11:53 +0800 Subject: [PATCH 03/14] =?UTF-8?q?sql=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/api/GeneralDeviceInfoClient.java | 6 ++++- .../njcn/device/pq/api/LineFeignClient.java | 9 ++++++- .../LineFeignClientFallbackFactory.java | 7 +++-- .../pq/pojo/param/LineBaseQueryParam.java | 6 +++++ .../GeneralDeviceInfoController.java | 14 ++++++++++ .../device/pq/controller/LineController.java | 15 ++++++++--- .../pq/mapper/RStatIntegrityDMapper.java | 3 +++ .../mapper/mapping/RStatIntegrityDMapper.xml | 27 ++++++++++++++++++- .../mapper/mapping/RStatOnlinerateDMapper.xml | 2 +- .../service/impl/IntegrityServiceImpl.java | 14 +++++----- 10 files changed, 87 insertions(+), 16 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java index 80ebf47fa..d5f168066 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java @@ -24,7 +24,11 @@ import java.util.List; * @version 1.0.0 * @date 2022年02月14日 14:02 */ -@FeignClient(value = ServerInfo.DEVICE, path = "/deviceInfo", fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class, contextId = "deviceInfo") +@FeignClient( + value = ServerInfo.DEVICE, + path = "/deviceInfo", + fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class, + contextId = "deviceInfo") public interface GeneralDeviceInfoClient { diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java index da4e05c91..c2e9e1e77 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java @@ -22,7 +22,11 @@ import java.util.Map; * @author denghuajun * @date 2022/2/28 */ -@FeignClient(value = ServerInfo.DEVICE, path = "/line", fallbackFactory = LineFeignClientFallbackFactory.class, contextId = "line") +@FeignClient( + value = ServerInfo.DEVICE, + path = "/line", + fallbackFactory = LineFeignClientFallbackFactory.class, + contextId = "line") public interface LineFeignClient { /** @@ -304,4 +308,7 @@ public interface LineFeignClient { */ @PostMapping("/getOnIntegrityByIds") HttpResult> getOnIntegrityByIds(@RequestBody OnlineRateParam param); + + @PostMapping("getOnIntegrityByIdsAndTime") + HttpResult> getOnIntegrityByIdsAndTime(@RequestBody LineBaseQueryParam param); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java index 824df775b..c5632cb20 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java @@ -224,10 +224,13 @@ public class LineFeignClientFallbackFactory implements FallbackFactory> getOnIntegrityByIds(OnlineRateParam param) { log.error("{}异常，降级处理，异常为：{}", "获取监测点数据完整率（谐波专用）: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); - } - + @Override + public HttpResult> getOnIntegrityByIdsAndTime(LineBaseQueryParam param) { + log.error("{}异常，降级处理，异常为：{}", "获取监测点数据完整率: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineBaseQueryParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineBaseQueryParam.java index 10b3acfb4..b00883e01 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineBaseQueryParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineBaseQueryParam.java @@ -25,4 +25,10 @@ public class LineBaseQueryParam { @ApiModelProperty(name = "searchValue",value = "关键字搜索值") private String searchValue; + + @ApiModelProperty(name = "startTime", value = "开始时间") + private String startTime; + + @ApiModelProperty(name = "endTime", value = "结束时间") + private String endTime; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java index 189e8debb..0b0db98ae 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java @@ -6,12 +6,15 @@ 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.HttpResultUtil; +import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO; import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO; import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO; +import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO; import com.njcn.device.pq.service.TerminalBaseService; import com.njcn.device.pq.service.impl.GeneralDeviceService; import com.njcn.web.controller.BaseController; @@ -48,6 +51,7 @@ public class GeneralDeviceInfoController extends BaseController { private final TerminalBaseService terminalBaseService; + private final RStatOnlinerateDMapper onlineRateMapper; /** * 获取按部门分类的实际运行终端综合信息 */ @@ -266,4 +270,14 @@ public class GeneralDeviceInfoController extends BaseController { } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getOnlineRateByDevIds") + @ApiOperation("终端在线率（谐波专用）") + @ApiImplicitParam(name = "param", value = "参数实体", required = true) + public HttpResult> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) { + String methodDescribe = getMethodDescribe("getOnlineRateByDevIds"); + List onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe); + } + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java index bc06f6ae1..3e9a1f5bf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java @@ -45,18 +45,15 @@ public class LineController extends BaseController { private final LineService lineService; - private final GeneralDeviceService generalDeviceService; - private final DeviceMapper deviceMapper; private final LineMapper lineMapper; private final LineDetailMapper lineDetailMapper; - private final DeptFeignClient deptFeignClient; - private final RStatIntegrityDMapper integrityDMapper; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLineDetailData") @ApiOperation("根据监测点id获取监测点详情") @@ -421,4 +418,14 @@ public class LineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onIntegrityByIds,methodDescribe); } + + @PostMapping("/getOnIntegrityByIdsAndTime") + @ApiOperation("监测点数据完整率") + @ApiImplicitParam(name = "param", value = "参数实体", required = true) + public HttpResult> getOnIntegrityByIdsAndTime(@RequestBody LineBaseQueryParam param) { + String methodDescribe = getMethodDescribe("getOnIntegrityByIdsAndTime"); + List onIntegrityByIds = integrityDMapper.getOnIntegrityByIdsAndTime (param.getLineIds(),param.getStartTime(),param.getEndTime()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onIntegrityByIds,methodDescribe); + } + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java index 06144b71a..6431f465e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.po.LineDataIntegrity; import com.njcn.device.pq.pojo.po.RStatIntegrityD; @@ -36,4 +37,6 @@ public interface RStatIntegrityDMapper extends BaseMapper { * @return List */ List getOnIntegrityByIds(@Param("param") OnlineRateParam param); + + List getOnIntegrityByIdsAndTime (@Param("list")List lineIds,@Param("startTime")String startTime,@Param("endTime")String endTime); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml index 34eb0ff93..59d7dff60 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml @@ -24,7 +24,7 @@ r_stat_integrity_d - AND Dev_Id IN + AND line_index IN #{item} @@ -38,4 +38,29 @@ group by line_index ; + + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml index 56e6b7456..c5bc476ec 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml @@ -8,7 +8,7 @@ from r_stat_onlinerate_d - AND Dev_Id IN + AND dev_index IN #{item} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java index 11f2e43e5..a86d7dd5e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java @@ -11,7 +11,9 @@ import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; +import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; import com.njcn.device.pq.pojo.vo.RStatIntegrityVO; import com.njcn.harmonic.mapper.IntegrityMapper; import com.njcn.harmonic.pojo.dto.PublicDTO; @@ -346,11 +348,6 @@ public class IntegrityServiceImpl implements IntegrityService { } - /** - * influxDB相关操作 - * 查询监测点的数据完整性 - * 前端要求: 返回百分比数据 - */ private List getCondition(List lineList, String startTime, String endTime) { List integrityList = new ArrayList<>(); OnlineRateParam param = new OnlineRateParam(); @@ -358,7 +355,12 @@ public class IntegrityServiceImpl implements IntegrityService { param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); param.setEndTime(DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); List data = lineFeignClient.getOnIntegrityByIds(param).getData(); - +// LineBaseQueryParam param = new LineBaseQueryParam(); +// param.setLineIds(lineList); +// param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); +// param.setEndTime(DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); +// List data = lineFeignClient.getOnIntegrityByIdsAndTime(param).getData(); +// List data = lineFeignClient.getOnOrUnLine(param).getData() if (!CollectionUtils.isEmpty(data)) { data.forEach(po -> { PublicDTO publicDTO = new PublicDTO(); From 613a8a85059fbe2b45582dc2d58caa2b48ca6b7a Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 7 Apr 2023 10:48:03 +0800 Subject: [PATCH 04/14] =?UTF-8?q?app=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/AppBaseInformationAddParm.java | 39 ++++++ .../pojo/param/AppPersonSetAddParm.java | 69 +++++++++++ .../pojo/param/AppProjectAddParm.java | 11 +- .../pojo/param/AppProjectAuditParm.java | 19 +-- .../pojo/param/CsFeedbackAddParm.java | 55 +++++++++ .../pojo/param/CsFeedbackChatAddParm.java | 34 ++++++ .../pojo/param/CsFeedbackChatCheckParm.java | 32 +++++ .../pojo/param/CsFeedbackQueryParm.java | 51 ++++++++ .../pojo/po/AppBaseInformationPO.java | 44 +++++++ .../algorithm/pojo/po/AppPersonSetPO.java | 72 +++++++++++ .../njcn/algorithm/pojo/po/AppProjectPO.java | 27 +---- .../pojo/po/AppTopologyDiagramPO.java | 5 - .../njcn/algorithm/pojo/po/CsEdDataPO.java | 80 +++++++++++++ .../algorithm/pojo/po/CsFeedbackChatPO.java | 43 +++++++ .../njcn/algorithm/pojo/po/CsFeedbackPO.java | 60 ++++++++++ .../njcn/algorithm/pojo/po/CsFilePathPO.java | 43 +++++++ .../pojo/vo/AppBaseInformationVO.java | 41 +++++++ .../njcn/algorithm/pojo/vo/AppProjectVO.java | 9 +- .../pojo/vo/AppTopologyDiagramVO.java | 6 +- .../algorithm/pojo/vo/CsFeedbackDetailVO.java | 74 ++++++++++++ .../njcn/algorithm/pojo/vo/CsFeedbackVO.java | 68 +++++++++++ .../feedback/FeedBackChatController.java | 65 ++++++++++ .../feedback/FeedBackController.java | 73 ++++++++++++ .../controller/project/AppInfoController.java | 92 ++++++++++++++ .../mapper/AppBaseInformationMapper.java | 16 +++ .../algorithm/mapper/AppPersonSetMapper.java | 16 +++ .../algorithm/mapper/AppProjectMapper.java | 8 +- .../njcn/algorithm/mapper/CsEdDataMapper.java | 16 +++ .../mapper/CsFeedbackChatMapper.java | 16 +++ .../algorithm/mapper/CsFeedbackMapper.java | 16 +++ .../algorithm/mapper/CsFilePathMapper.java | 16 +++ .../mapping/AppBaseInformationMapper.xml | 19 +++ .../mapper/mapping/AppPersonSetMapper.xml | 25 ++++ .../mapper/mapping/CsEdDataMapper.xml | 26 ++++ .../mapping/CsEquipmentDeliveryMapper.xml | 1 - .../mapper/mapping/CsFeedbackChatMapper.xml | 19 +++ .../mapper/mapping/CsFeedbackMapper.xml | 23 ++++ .../mapper/mapping/CsFilePathMapper.xml | 15 +++ .../service/AppBaseInformationService.java | 17 +++ .../service/AppPersonSetService.java | 17 +++ .../algorithm/service/CsEdDataService.java | 17 +++ .../service/CsFeedbackChatService.java | 28 +++++ .../algorithm/service/CsFeedbackService.java | 46 +++++++ .../algorithm/service/CsFilePathService.java | 17 +++ .../impl/AppBaseInformationServiceImpl.java | 22 ++++ .../service/impl/AppPersonSetServiceImpl.java | 22 ++++ .../service/impl/AppProjectServiceImpl.java | 32 +++-- .../impl/AppTopologyDiagramServiceImpl.java | 3 - .../service/impl/CsEdDataServiceImpl.java | 20 ++++ .../impl/CsFeedbackChatServiceImpl.java | 50 ++++++++ .../service/impl/CsFeedbackServiceImpl.java | 112 ++++++++++++++++++ .../service/impl/CsFilePathServiceImpl.java | 20 ++++ 52 files changed, 1679 insertions(+), 88 deletions(-) create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java new file mode 100644 index 000000000..c1a03eb0b --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java @@ -0,0 +1,39 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * app基础信息表 + */ +@Data +public class AppBaseInformationAddParm { + + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + @NotBlank(message="内容不能为空！") + private String content; + + /** + * 类型(字典数据) + */ + @ApiModelProperty(value = "类型") + @NotBlank(message="类型不能为空！") + private String type; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java new file mode 100644 index 000000000..3f880c7bc --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java @@ -0,0 +1,69 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * app个人中心-设置信息 + */ +@Data +public class AppPersonSetAddParm { + + + /** + * 用户协议(基础信息id) + */ + @ApiModelProperty(value = "用户协议(基础信息id)") + @NotBlank(message="用户协议不能为空！") + private String userAgreement; + + /** + * 系统介绍(基础信息id) + */ + @ApiModelProperty(value = "系统介绍(基础信息id)") + @NotBlank(message="系统介绍不能为空！") + private String systemIntroduction; + + /** + * 使用手册(基础信息id) + */ + @ApiModelProperty(value = "使用手册(基础信息id)") + @NotBlank(message="使用手册不能为空！") + private String userManual; + + /** + * 资料库(基础信息id) + */ + @ApiModelProperty(value = "资料库(基础信息id)") + @NotBlank(message="资料库不能为空！") + private String dataBase; + + /** + * 公司介绍(基础信息id) + */ + @ApiModelProperty(value = "公司介绍(基础信息id)") + @NotBlank(message="公司介绍不能为空！") + private String companyProfile; + + /** + * 关于我们(基础信息id) + */ + @ApiModelProperty(value = "关于我们(基础信息id)") + @NotBlank(message="关于我们id不能为空！") + private String aboutUs; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java index 079a83d61..013a74069 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java @@ -26,14 +26,9 @@ public class AppProjectAddParm { @NotBlank(message="项目名称不能为空！") private String name; - @NotBlank(message="项目类型不能为空！") - private String projectType; - /** - * 关联用户Id - */ - @ApiModelProperty(value="关联用户Id") - @NotBlank(message="关联用户Id不能为空！") - private String userId; + @NotBlank(message="工程id不能为空！") + private String engineeringId; + /** * 地市Id diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java index 574af0de4..9686c770b 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; /** * Description: @@ -23,11 +22,7 @@ public class AppProjectAuditParm { @ApiModelProperty(value="项目名称") private String name; - /** - * 关联用户Id - */ - @ApiModelProperty(value="关联用户Id") - private String userId; + /** * 地市Id @@ -35,18 +30,6 @@ public class AppProjectAuditParm { @ApiModelProperty(value="地市") private String area; - /** - * 中心点经度 - */ - @ApiModelProperty(value="中心点经度") - private BigDecimal lng; - - /** - * 中心点纬度 - */ - @ApiModelProperty(value="中心点纬度") - private BigDecimal lat; - @ApiModelProperty(value="0：删除 1：正常") private String status; diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java new file mode 100644 index 000000000..91d9f474a --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java @@ -0,0 +1,55 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotNull; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + + +@Data +public class CsFeedbackAddParm { + + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + @NotNull(message="标题不能为空！") + private String title; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + @NotNull(message="描述不能为空！") + private String description; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + @NotNull(message="用户id不能为空！") + private String userId; + + /** + * 问题类型(字典数据) + */ + @ApiModelProperty(value = "问题类型") + @NotNull(message="问题类型不能为空！") + private String type; + + @ApiModelProperty(value = "拓扑图文件") + @NotNull(message="拓扑图文件不能为空！") + private MultipartFile[] files; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java new file mode 100644 index 000000000..dc82209f2 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java @@ -0,0 +1,34 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class CsFeedbackChatAddParm { + @ApiModelProperty(value = "反馈id") + @NotNull(message="反馈id不能为空！") + private String id; + + @ApiModelProperty(value = "用户id") + @NotNull(message="用户id不能为空！") + private String userId; + /** + * 消息内容 + */ + @ApiModelProperty(value = "消息内容") + @NotNull(message="消息内容不能为空！") + private String chatContent; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java new file mode 100644 index 000000000..049ea94cd --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java @@ -0,0 +1,32 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class CsFeedbackChatCheckParm { + + + + @ApiModelProperty(value = "反馈") + @NotNull(message="反馈不能为空！") + private String id; + + @ApiModelProperty(value = "用户id") + @NotNull(message="用户id不能为空！") + private String userId; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java new file mode 100644 index 000000000..67e3946e0 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java @@ -0,0 +1,51 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 信息反馈表 + */ +@Data +public class CsFeedbackQueryParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer currentPage; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + @NotNull(message="用户id不能为空！") + private String userId; + + /** + * 问题类型(字典数据) + */ + @ApiModelProperty(value = "问题类型") + private String type; + + /** + * 问题状态(字典数据) + */ + @ApiModelProperty(value = "问题状态") + private String status; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java new file mode 100644 index 000000000..8c9c66e3b --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java @@ -0,0 +1,44 @@ +package com.njcn.algorithm.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 com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * app基础信息表 + */ +@Data +@TableName(value = "app_base_information") +public class AppBaseInformationPO extends BaseEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + /** + * 内容 + */ + @TableField(value = "content") + private String content; + + /** + * 类型(字典数据) + */ + @TableField(value = "type") + private String type; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java new file mode 100644 index 000000000..71fe15075 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java @@ -0,0 +1,72 @@ +package com.njcn.algorithm.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * app个人中心-设置信息 + */ +@Data +@TableName(value = "app_person_set") +public class AppPersonSetPO extends BaseEntity { + /** + * id + */ + @TableField(value = "id") + private String id; + + /** + * 用户协议(基础信息id) + */ + @TableField(value = "user_agreement") + private String userAgreement; + + /** + * 系统介绍(基础信息id) + */ + @TableField(value = "system_introduction") + private String systemIntroduction; + + /** + * 使用手册(基础信息id) + */ + @TableField(value = "user_manual") + private String userManual; + + /** + * 资料库(基础信息id) + */ + @TableField(value = "data_base") + private String dataBase; + + /** + * 公司介绍(基础信息id) + */ + @TableField(value = "company_profile") + private String companyProfile; + + /** + * 关于我们(基础信息id) + */ + @TableField(value = "about_us") + private String aboutUs; + + /** + * 状态(0：删除 1：正常) + */ + @TableField(value = "status") + private String status; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java index b95ba6148..31d5066bf 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java @@ -6,8 +6,6 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import lombok.Data; -import java.math.BigDecimal; - /** * * Description: @@ -28,11 +26,7 @@ public class AppProjectPO extends BaseEntity { */ @MppMultiId(value = "id") private String id; - /** - * 项目类型 - */ - @TableField(value = "project_type") - private String projectType; + /** * 项目名称 @@ -40,11 +34,10 @@ public class AppProjectPO extends BaseEntity { @TableField(value = "name") private String name; - /** - * 关联用户Id - */ - @TableField(value = "user_id") - private String userId; + @TableField(value = "engineering_id") + private String engineeringId; + + /** * 地市Id @@ -52,17 +45,7 @@ public class AppProjectPO extends BaseEntity { @TableField(value = "area") private String area; - /** - * 中心点经度 - */ - @TableField(value = "lng") - private BigDecimal lng; - /** - * 中心点纬度 - */ - @TableField(value = "lat") - private BigDecimal lat; /** * 0：删除 1：正常 diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java index f15fbd57b..16de33ae4 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java @@ -33,11 +33,6 @@ public class AppTopologyDiagramPO extends BaseEntity { @TableField(value = "name") private String name; - /** - * 文件大小(kb) - */ - @TableField(value = "file_size") - private Integer fileSize; /** * 项目Id diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java new file mode 100644 index 000000000..9141ec48e --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java @@ -0,0 +1,80 @@ +package com.njcn.algorithm.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:12【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 程序版本表 + */ +@Data +@TableName(value = "cs_ed_data") +public class CsEdDataPO extends BaseEntity { + /** + * id + */ + @TableField(value = "id") + private String id; + + /** + * 装置型号(字典数据) + */ + @TableField(value = "dev_type") + private String devType; + + /** + * 版本号 + */ + @TableField(value = "version_no") + private String versionNo; + + /** + * 版本协议 + */ + @TableField(value = "version_agree") + private String versionAgree; + + /** + * 版本日期 + */ + @TableField(value = "version_date") + private Date versionDate; + + /** + * 描述 + */ + @TableField(value = "describe") + private String describe; + + /** + * 版本类型(字典数据) + */ + @TableField(value = "version_type") + private String versionType; + + /** + * 状态(0：删除 1：正常) + */ + @TableField(value = "status") + private String status; + + /** + * 程序版本文件路径 + */ + @TableField(value = "file_path") + private String filePath; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java new file mode 100644 index 000000000..f54889a58 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java @@ -0,0 +1,43 @@ +package com.njcn.algorithm.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 com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "cs_feedback_chat") +public class CsFeedbackChatPO extends BaseEntity { + @TableId(value = "id", type = IdType.INPUT) + private String id; + + @TableField(value = "user_id") + private String userId; + /** + * 消息内容 + */ + @TableField(value = "chat_content") + private String chatContent; + /** + * 消息状态消息状态（0-未读，1-已读) + */ + @TableField(value = "chat_status") + private String chatStatus; + + /** + * 状态(0：删除 1：正常) + */ + @TableField(value = "status") + private String status; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java new file mode 100644 index 000000000..6f2386dc9 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java @@ -0,0 +1,60 @@ +package com.njcn.algorithm.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 com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 信息反馈表 + */ +@Data +@TableName(value = "cs_feedback") +public class CsFeedbackPO extends BaseEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + /** + * 标题 + */ + @TableField(value = "title") + private String title; + + /** + * 描述 + */ + @TableField(value = "description") + private String description; + + /** + * 用户id + */ + @TableField(value = "user_id") + private String userId; + + /** + * 问题类型(字典数据) + */ + @TableField(value = "type") + private String type; + + /** + * 问题状态(字典数据) + */ + @TableField(value = "status") + private String status; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java new file mode 100644 index 000000000..63f582ec6 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java @@ -0,0 +1,43 @@ +package com.njcn.algorithm.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:40【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 文件路径表 + */ +@Data +@TableName(value = "cs_file_path") +public class CsFilePathPO { + /** + * 关联数据id + */ + @TableField(value = "id") + private String id; + /** + * 文件名 + */ + @TableField(value = "file_name") + private String fileName; + /** + * 文件路径 + */ + @TableField(value = "file_path") + private String filePath; + + /** + * 状态(0：删除 1：正常) + */ + @TableField(value = "status") + private String status; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java new file mode 100644 index 000000000..f5ac07de3 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java @@ -0,0 +1,41 @@ +package com.njcn.algorithm.pojo.vo; + +import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * app基础信息表 + */ +@Data +public class AppBaseInformationVO extends BaseEntity { + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + + /** + * 类型(字典数据) + */ + @ApiModelProperty(value = "类型") + private String type; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java index 31a4e5a16..825f41808 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java @@ -23,16 +23,15 @@ public class AppProjectVO { * 项目Id */ private String id; - private String projectType; /** * 项目名称 */ private String name; - /** - * 关联用户Id - */ - private String userId; + private String engineeringId; + + private String engineeringName; + /** * 用户名称 */ diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java index 1bd78898f..581323679 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java @@ -31,11 +31,7 @@ public class AppTopologyDiagramVO extends BaseEntity { @ApiModelProperty(value = "拓扑图名称") private String name; - /** - * 文件大小(kb) - */ - @ApiModelProperty(value = "文件大小") - private Integer fileSize; + /** * 项目Id diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java new file mode 100644 index 000000000..9dbb4ab0a --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java @@ -0,0 +1,74 @@ +package com.njcn.algorithm.pojo.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.njcn.algorithm.pojo.po.CsFeedbackChatPO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 信息反馈列表 + */ +@Data +public class CsFeedbackDetailVO { + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private String userId; + + /** + * 问题类型(字典数据) + */ + @ApiModelProperty(value = "问题类型") + private String type; + + /** + * 问题状态(字典数据) + */ + @ApiModelProperty(value = "问题状态") + private String status; + + + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + private List imageUrls; + + private List csFeedbackChatPOList; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java new file mode 100644 index 000000000..233c4ccc6 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java @@ -0,0 +1,68 @@ +package com.njcn.algorithm.pojo.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 信息反馈列表 + */ +@Data +public class CsFeedbackVO { + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private String userId; + + /** + * 问题类型(字典数据) + */ + @ApiModelProperty(value = "问题类型") + private String type; + + /** + * 问题状态(字典数据) + */ + @ApiModelProperty(value = "问题状态") + private String status; + + + @ApiModelProperty(value = "未读消息条数") + private int chatCount; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java new file mode 100644 index 000000000..673f6bcaa --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java @@ -0,0 +1,65 @@ +package com.njcn.algorithm.controller.feedback; + +import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.algorithm.service.CsFeedbackChatService; +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.HttpResultUtil; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/3/27 10:54【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/feedbackChat") +@Api(tags = "问题反馈聊天") +@AllArgsConstructor +public class FeedBackChatController extends BaseController { + + + private final CsFeedbackChatService csFeedbackChatService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/AddFeedbackChat") + @ApiOperation("新增反馈聊天") + @ApiImplicitParam(name = "csFeedbackAddParm", value = "新增反馈聊天参数", required = true) + public HttpResult AddFeedbackChat(@RequestBody @Validated CsFeedbackChatAddParm csFeedbackAddParm){ + String methodDescribe = getMethodDescribe("AddFeedbackChat"); + + Boolean flag = csFeedbackChatService.AddFeedbackChat(csFeedbackAddParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/updateChatStatus") + @ApiOperation("更新反馈聊天状态") + @ApiImplicitParam(name = "CsFeedbackChatCheckParm", value = "新增反馈聊天参数", required = true) + public HttpResult updateChatStatus(@RequestBody@Validated CsFeedbackChatCheckParm CsFeedbackChatCheckParm){ + String methodDescribe = getMethodDescribe("updateChatStatus"); + + Boolean flag = csFeedbackChatService.updateChatStatus(CsFeedbackChatCheckParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + + } + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java new file mode 100644 index 000000000..2995eaa99 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java @@ -0,0 +1,73 @@ +package com.njcn.algorithm.controller.feedback; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.njcn.algorithm.pojo.param.CsFeedbackAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm; +import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO; +import com.njcn.algorithm.pojo.vo.CsFeedbackVO; +import com.njcn.algorithm.service.CsFeedbackService; +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.HttpResultUtil; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/3/27 10:54【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/feedback") +@Api(tags = "问题反馈") +@AllArgsConstructor +public class FeedBackController extends BaseController { + + + private final CsFeedbackService csFeedbackService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addFeedBack") + @ApiOperation("新增反馈") + public HttpResult addFeedBack(@Validated CsFeedbackAddParm csFeedbackAddParm){ + String methodDescribe = getMethodDescribe("addFeedBack"); + + Boolean flag = csFeedbackService.addFeedBack(csFeedbackAddParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryFeedBackPage") + @ApiOperation("查询反馈列表") + @ApiImplicitParam(name = "csFeedbackQueryParm", value = "新增反馈聊天参数", required = true) + public HttpResult> queryFeedBackPage(@Validated @RequestBody CsFeedbackQueryParm csFeedbackQueryParm){ + String methodDescribe = getMethodDescribe("queryFeedBackPage"); + + IPage csFeedbackVOIPage = csFeedbackService.queryFeedBackPage(csFeedbackQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackVOIPage, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryFeedBackDetail") + @ApiOperation("查询反馈详情") + public HttpResult queryFeedBackDetail(@RequestParam("id")String id){ + String methodDescribe = getMethodDescribe("queryFeedBackDetail"); + + CsFeedbackDetailVO csFeedbackDetailVO = csFeedbackService.queryFeedBackDetail(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackDetailVO, methodDescribe); + } + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java new file mode 100644 index 000000000..8db24954d --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java @@ -0,0 +1,92 @@ +package com.njcn.algorithm.controller.project; + +import com.njcn.algorithm.pojo.param.AppBaseInformationAddParm; +import com.njcn.algorithm.pojo.param.AppPersonSetAddParm; +import com.njcn.algorithm.pojo.po.AppBaseInformationPO; +import com.njcn.algorithm.pojo.po.AppPersonSetPO; +import com.njcn.algorithm.pojo.vo.AppBaseInformationVO; +import com.njcn.algorithm.service.AppBaseInformationService; +import com.njcn.algorithm.service.AppPersonSetService; +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.HttpResultUtil; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/4 9:02【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/appinfo") +@Api(tags = "app信息") +@AllArgsConstructor +public class AppInfoController extends BaseController { + + private final AppBaseInformationService appBaseInformationService; + private final AppPersonSetService appPersonSetService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addAppInfo") + @ApiOperation("新增app基础信息") + @ApiImplicitParam(name = "AppBaseInformationAddParm", value = "新增app基础信息参数", required = true) + public HttpResult addAppInfo(@RequestBody @Validated AppBaseInformationAddParm AppBaseInformationAddParm){ + String methodDescribe = getMethodDescribe("addAppInfo"); + AppBaseInformationPO appBaseInformationPO = new AppBaseInformationPO (); + BeanUtils.copyProperties (AppBaseInformationAddParm, appBaseInformationPO); + boolean save = appBaseInformationService.save (appBaseInformationPO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addPersonSet") + @ApiOperation("新增app个人中心信息") + @ApiImplicitParam(name = "appPersonSetAddParm", value = "新增apppp个人中心信参数", required = true) + public HttpResult addPersonSet(@RequestBody @Validated AppPersonSetAddParm appPersonSetAddParm){ + String methodDescribe = getMethodDescribe("addPersonSet"); + AppPersonSetPO appPersonSetPO = new AppPersonSetPO (); + BeanUtils.copyProperties (appPersonSetAddParm, appPersonSetPO); + appPersonSetPO.setStatus ("1"); + boolean save = appPersonSetService.save (appPersonSetPO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPersonSet") + @ApiOperation("查询app个人中心信息") + public HttpResult queryPersonSet(){ + String methodDescribe = getMethodDescribe("queryPersonSet"); + + List list = appPersonSetService.list ( ); + AppPersonSetPO appPersonSetPO = list.stream ( ).filter (temp -> Objects.equals ("1", temp.getStatus ( ))).collect (Collectors.toList ( )).get (0); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appPersonSetPO, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryAppInfo") + @ApiOperation("查询app个人中心信息详情") + public HttpResult queryPersonSet(@RequestParam("id")String id ){ + String methodDescribe = getMethodDescribe("queryPersonSet"); + AppBaseInformationVO appBaseInformationVO = new AppBaseInformationVO(); + AppBaseInformationPO byId = appBaseInformationService.getById (id); + BeanUtils.copyProperties (byId,appBaseInformationVO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appBaseInformationVO, methodDescribe); + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java new file mode 100644 index 000000000..cbff15a29 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.AppBaseInformationPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface AppBaseInformationMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java new file mode 100644 index 000000000..b765d817a --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.AppPersonSetPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface AppPersonSetMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java index 815515ab0..be54c6397 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java @@ -23,12 +23,12 @@ public interface AppProjectMapper extends MppBaseMapper { "SELECT\n" + "\ta.id id,\n" + "\ta.`name` name,\n" + - "\ta.user_id user_id,\n" + - "\t\"username\" user_name,\n" + +// "\ta.user_id user_id,\n" + +// "\t\"username\" user_name,\n" + "\ta.area area,\n" + // "\tb.file_path topologyDiagramPath,\n" + - "\ta.lng lng,\n" + - "\ta.lat lat,\n" + +// "\ta.lng lng,\n" + +// "\ta.lat lat,\n" + "\ta.`status` STATUS,\n" + "\ta.create_by create_by,\n" + "\ta.create_time create_time,\n" + diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java new file mode 100644 index 000000000..7ca6b4a94 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.CsEdDataPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:12【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsEdDataMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java new file mode 100644 index 000000000..bebf5d05c --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.CsFeedbackChatPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFeedbackChatMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java new file mode 100644 index 000000000..d45bd7de7 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.CsFeedbackPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFeedbackMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java new file mode 100644 index 000000000..c358d001e --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java @@ -0,0 +1,16 @@ +package com.njcn.algorithm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.algorithm.pojo.po.CsFilePathPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:40【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFilePathMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml new file mode 100644 index 000000000..511422916 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + id, content, `type`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml new file mode 100644 index 000000000..7f433e500 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, user_agreement, system_introduction, user_manual, data_base, company_profile, + about_us, `status`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml new file mode 100644 index 000000000..920dea6b6 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + id, dev_type, version_no, version_agree, version_date, `describe`, version_type, + `status`, file_path, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml index 4649f5c03..ad4ba21eb 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml @@ -34,7 +34,6 @@ SELECT a.id projectId, a.name projectName, - a.project_type projectType, b.id equipmentId, b.name equipmentName FROM cs_project a, diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml new file mode 100644 index 000000000..99bd7c3d8 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + id, user_id, chat_content, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml new file mode 100644 index 000000000..6409560aa --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + id, title, `describe`, user_id, create_by, create_time, update_by, update_time, `type`, + `status` + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml new file mode 100644 index 000000000..4f478bcf4 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + id, file_path, `status` + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java new file mode 100644 index 000000000..66fb50487 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java @@ -0,0 +1,17 @@ +package com.njcn.algorithm.service; + +import com.njcn.algorithm.pojo.po.AppBaseInformationPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface AppBaseInformationService extends IService{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java new file mode 100644 index 000000000..d31341cbe --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java @@ -0,0 +1,17 @@ +package com.njcn.algorithm.service; + +import com.njcn.algorithm.pojo.po.AppPersonSetPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface AppPersonSetService extends IService{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java new file mode 100644 index 000000000..6c75bf149 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java @@ -0,0 +1,17 @@ +package com.njcn.algorithm.service; + +import com.njcn.algorithm.pojo.po.CsEdDataPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:12【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsEdDataService extends IService{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java new file mode 100644 index 000000000..1e4c36bca --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java @@ -0,0 +1,28 @@ +package com.njcn.algorithm.service; + +import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.algorithm.pojo.po.CsFeedbackChatPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFeedbackChatService extends IService{ + + /** + * @Description: AddFeedbackChat + * @Param: [csFeedbackAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/4/6 + */ + Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm); + + Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm); + } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java new file mode 100644 index 000000000..2abb2286c --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java @@ -0,0 +1,46 @@ +package com.njcn.algorithm.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.njcn.algorithm.pojo.param.CsFeedbackAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm; +import com.njcn.algorithm.pojo.po.CsFeedbackPO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO; +import com.njcn.algorithm.pojo.vo.CsFeedbackVO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFeedbackService extends IService{ + + /** + * @Description: 新增反馈 + * @Param: [csFeedbackAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/4/6 + */ + Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm); + /** + * @Description: queryFeedBackPage + * @Param: [csFeedbackQueryParm] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @Author: clam + * @Date: 2023/4/6 + */ + IPage queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm); + /** + * @Description: queryFeedBackDetail + * @Param: [id] + * @return: com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO + * @Author: clam + * @Date: 2023/4/7 + */ + CsFeedbackDetailVO queryFeedBackDetail(String id); +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java new file mode 100644 index 000000000..5fd34d65a --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java @@ -0,0 +1,17 @@ +package com.njcn.algorithm.service; + +import com.njcn.algorithm.pojo.po.CsFilePathPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:40【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface CsFilePathService extends IService{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java new file mode 100644 index 000000000..e90c656ee --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java @@ -0,0 +1,22 @@ +package com.njcn.algorithm.service.impl; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.algorithm.pojo.po.AppBaseInformationPO; +import com.njcn.algorithm.mapper.AppBaseInformationMapper; +import com.njcn.algorithm.service.AppBaseInformationService; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class AppBaseInformationServiceImpl extends ServiceImpl implements AppBaseInformationService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java new file mode 100644 index 000000000..5966b29fe --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java @@ -0,0 +1,22 @@ +package com.njcn.algorithm.service.impl; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.algorithm.mapper.AppPersonSetMapper; +import com.njcn.algorithm.pojo.po.AppPersonSetPO; +import com.njcn.algorithm.service.AppPersonSetService; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/3 19:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class AppPersonSetServiceImpl extends ServiceImpl implements AppPersonSetService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java index f8b53898e..c313d1201 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.algorithm.enums.AlgorithmResponseEnum; import com.njcn.algorithm.mapper.AppProjectMapper; import com.njcn.algorithm.pojo.param.*; import com.njcn.algorithm.pojo.po.AppProjectPO; @@ -13,7 +12,6 @@ import com.njcn.algorithm.pojo.vo.AppProjectVO; import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; import com.njcn.algorithm.service.AppProjectService; import com.njcn.algorithm.service.AppTopologyDiagramService; -import com.njcn.common.pojo.exception.BusinessException; import com.njcn.oss.utils.FileStorageUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; @@ -45,10 +43,10 @@ public class AppProjectServiceImpl extends MppServiceImpl queryWrapper = new QueryWrapper ( ); queryWrapper.eq ("id", appProjectAuditParm.getId ( )); AppProjectPO appProjectPO1 = appProjectMapper.selectOne (queryWrapper); - if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) { - Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ), - appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( )); - if (result) { - throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); - } - } +// if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) { +// Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ), +// appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( )); +// if (result) { +// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); +// } +// } BeanUtils.copyProperties (appProjectAuditParm, appProjectPO); UpdateWrapper updateWrapper = new UpdateWrapper ( ); updateWrapper.eq ("id", appProjectAuditParm.getId ( )); int i = appProjectMapper.update (appProjectPO, updateWrapper); - Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( )); - if (result) { - throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); - } +// Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( )); +// if (result) { +// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); +// } return i == 1 ? true : false; } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java index bc83df7cc..d00b94012 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java @@ -49,12 +49,10 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl implements CsEdDataService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java new file mode 100644 index 000000000..240830dae --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java @@ -0,0 +1,50 @@ +package com.njcn.algorithm.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.algorithm.mapper.CsFeedbackChatMapper; +import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.algorithm.pojo.po.CsFeedbackChatPO; +import com.njcn.algorithm.service.CsFeedbackChatService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 15:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class CsFeedbackChatServiceImpl extends ServiceImpl implements CsFeedbackChatService{ + + @Override + @Transactional(rollbackFor = {Exception.class}) + public Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm) { + CsFeedbackChatPO csFeedbackChatPO = new CsFeedbackChatPO (); + BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackChatPO); + csFeedbackChatPO.setChatStatus ("0"); + csFeedbackChatPO.setStatus ("1"); + boolean save = this.save (csFeedbackChatPO); + return save; + } + + @Override + public Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm) { + UpdateWrapper updateWrapper = new UpdateWrapper<> (); + + + updateWrapper.clear (); + updateWrapper.eq ("id",csFeedbackChatCheckParm.getId ()). + ne ("user_id",csFeedbackChatCheckParm.getUserId ()). + set ("chat_status","1"). + eq ("status", "1"); + boolean update = this.update (updateWrapper); + return update; + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java new file mode 100644 index 000000000..ca17f763e --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java @@ -0,0 +1,112 @@ +package com.njcn.algorithm.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.algorithm.mapper.CsFeedbackMapper; +import com.njcn.algorithm.pojo.param.CsFeedbackAddParm; +import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm; +import com.njcn.algorithm.pojo.po.CsFeedbackChatPO; +import com.njcn.algorithm.pojo.po.CsFeedbackPO; +import com.njcn.algorithm.pojo.po.CsFilePathPO; +import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO; +import com.njcn.algorithm.pojo.vo.CsFeedbackVO; +import com.njcn.algorithm.service.CsFeedbackChatService; +import com.njcn.algorithm.service.CsFeedbackService; +import com.njcn.algorithm.service.CsFilePathService; +import com.njcn.oss.constant.OssPath; +import com.njcn.oss.utils.FileStorageUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +public class CsFeedbackServiceImpl extends ServiceImpl implements CsFeedbackService{ + + private final FileStorageUtil fileStorageUtil; + private final CsFilePathService csFilePathService; + private final CsFeedbackChatService csFeedbackChatService; + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm) { + CsFeedbackPO csFeedbackPO = new CsFeedbackPO (); + BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackPO); + csFeedbackPO.setStatus ("1"); + boolean save = this.save (csFeedbackPO); + List csFilePathPOS= new ArrayList<> (); + for (int i = 0; i < csFeedbackAddParm.getFiles ( ).length; i++) { + + CsFilePathPO csFilePathPO = new CsFilePathPO ( ); + csFilePathPO.setId (csFeedbackPO.getId ()); + String filePath = fileStorageUtil.uploadMultipart (csFeedbackAddParm.getFiles ( )[i], OssPath.FEEDBACK); + csFilePathPO.setFileName (csFeedbackAddParm.getFiles ( )[i].getOriginalFilename ( )); + csFilePathPO.setFilePath (filePath); + csFilePathPO.setStatus ("1"); + csFilePathPOS.add (csFilePathPO); + } + boolean b = csFilePathService.saveBatch (csFilePathPOS); + + return save&&b; + } + + @Override + public IPage queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) { + Page page = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); + Page returnpage = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); + + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()). + eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()). + eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()); + Page csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper); + QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper<> (); + List collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> { + CsFeedbackVO csFeedbackVO = new CsFeedbackVO ( ); + BeanUtils.copyProperties (temp, csFeedbackVO); + csFeedbackChatPOQueryWrapper.clear (); + csFeedbackChatPOQueryWrapper.eq ("id",temp.getId ()). + ne ("user_id",temp.getUserId ()). + eq ("chat_status","0"). + eq ("status", "1"); + int count = csFeedbackChatService.count ( ); + csFeedbackVO.setChatCount (count); + return csFeedbackVO; + }).collect (Collectors.toList ( )); + returnpage.setRecords (collect); + return returnpage; + } + + @Override + public CsFeedbackDetailVO queryFeedBackDetail(String id) { + CsFeedbackDetailVO csFeedbackDetailVO = new CsFeedbackDetailVO(); + CsFeedbackPO byId = this.getById (id); + BeanUtils.copyProperties (byId, csFeedbackDetailVO); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq ("id", id).eq ("status", "1"); + List list = csFilePathService.list (queryWrapper); + List collect = list.stream ( ).map (CsFilePathPO::getFilePath).collect (Collectors.toList ( )); + csFeedbackDetailVO.setImageUrls (collect); + QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper(); + csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByAsc ("create_time"); + List list1 = csFeedbackChatService.list (csFeedbackChatPOQueryWrapper); + csFeedbackDetailVO.setCsFeedbackChatPOList (list1); + return csFeedbackDetailVO; + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java new file mode 100644 index 000000000..a3ab8a6ef --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.algorithm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.algorithm.mapper.CsFilePathMapper; +import com.njcn.algorithm.pojo.po.CsFilePathPO; +import com.njcn.algorithm.service.CsFilePathService; +import org.springframework.stereotype.Service; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/6 11:40【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class CsFilePathServiceImpl extends ServiceImpl implements CsFilePathService{ + +} From 97e9a266c87e3d21edf15ea352cded8eda87427a Mon Sep 17 00:00:00 2001 From: Lee <1976536221@qq.com> Date: Fri, 7 Apr 2023 11:08:18 +0800 Subject: [PATCH 05/14] =?UTF-8?q?Feign=E8=BF=9C=E7=A8=8B=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/src/main/resources/bootstrap.yml | 1 + pqs-event/event-boot/src/main/resources/bootstrap.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/pqs-device/device-boot/src/main/resources/bootstrap.yml b/pqs-device/device-boot/src/main/resources/bootstrap.yml index 3b4528be0..0b6f730ee 100644 --- a/pqs-device/device-boot/src/main/resources/bootstrap.yml +++ b/pqs-device/device-boot/src/main/resources/bootstrap.yml @@ -9,6 +9,7 @@ microservice: url: @gateway.url@ server: port: 10202 + max-http-header-size: 1048576 #feign接口开启服务熔断降级处理 feign: sentinel: diff --git a/pqs-event/event-boot/src/main/resources/bootstrap.yml b/pqs-event/event-boot/src/main/resources/bootstrap.yml index 185a07259..2e789522f 100644 --- a/pqs-event/event-boot/src/main/resources/bootstrap.yml +++ b/pqs-event/event-boot/src/main/resources/bootstrap.yml @@ -9,6 +9,7 @@ microservice: url: @gateway.url@ server: port: 10203 + max-http-header-size: 1048576 #feign接口开启服务熔断降级处理 feign: sentinel: From 0eb101dc70a0d5dc3ffd4cb807901618bac01da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 7 Apr 2023 13:36:14 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/biz/utils/COverlimit.java | 5 +- ...peratingY.java => RDnOperatingIndexY.java} | 4 +- .../distribution/RDnOperatingYMapper.java | 6 +- .../mapping/PwROperatingIndexMapper.xml | 12 +-- .../mapping/RDnOperatingYMapper.xml | 8 +- .../distribution/RDnOperatingYService.java | 6 +- .../impl/RDnOperatingYServiceImpl.java | 7 +- .../pq/controller/DeviceController.java | 28 +++++++ .../device/pq/mapper/mapping/LineMapper.xml | 1 - .../pq/service/impl/RunManageServiceImpl.java | 2 +- .../service/impl/TerminalBaseServiceImpl.java | 2 +- .../com/njcn/event/pojo/vo/WaveTypeVO.java | 3 +- .../Impl/AreaInfoServiceImpl.java | 2 +- .../Impl/AreaStatisticalServiceImpl.java | 2 +- .../Impl/EventAnalysisServiceImpl.java | 4 +- .../majornetwork/Impl/ReportServiceImpl.java | 34 ++++---- .../Impl/TransientServiceImpl.java | 82 +++---------------- .../com/njcn/system/enums/DicDataEnum.java | 1 + 18 files changed, 90 insertions(+), 119 deletions(-) rename pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/{RDnOperatingY.java => RDnOperatingIndexY.java} (93%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index 85fed9f05..8cf1050c0 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -342,8 +342,9 @@ public class COverlimit { //处理基准容量 public static float getStandShortCap(String voltageLevel){ - - if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ + if(DicDataEnum.KV01.getCode().equalsIgnoreCase(voltageLevel)){ + return 10; + } else if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ return 10; }else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){ return 10; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java similarity index 93% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java index bcab6f65e..40e51b6fe 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java @@ -7,10 +7,10 @@ import java.util.Date; /** * 配网运行指标统计-年表,配网监测指标数据质量统计-年表 - * @TableName r_dn_operating_y + * @TableName r_dn_operating_index_y */ @Data -public class RDnOperatingY implements Serializable { +public class RDnOperatingIndexY implements Serializable { /** * 单位ID */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java index 76c98e203..80839461e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java @@ -1,7 +1,7 @@ package com.njcn.device.pms.mapper.distribution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; import java.util.List; @@ -9,11 +9,11 @@ import java.util.Map; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper * @createDate 2022-11-10 10:21:46 * @Entity com.njcn.device.pms.pojo.po.RDnOperatingY */ -public interface RDnOperatingYMapper extends BaseMapper { +public interface RDnOperatingYMapper extends BaseMapper { List getOperatingList(Map condMap); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml index ba7b8a371..38b16939c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml @@ -35,7 +35,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -61,7 +61,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -90,7 +90,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -153,7 +153,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN @@ -179,7 +179,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN @@ -208,7 +208,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml index 2d446b568..26acfe505 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -55,11 +55,11 @@ -- 数据准确率 truncate((rdim1.data_right_rate + rdim2.data_right_rate + rdim3.data_right_rate) / 3, 2) as dataRightRate - from r_dn_operating_y rdim1 + from r_dn_operating_index_y rdim1 - left join r_dn_operating_y rdim2 + left join r_dn_operating_index_y rdim2 on rdim1.org_no = rdim2.org_no - left join r_dn_operating_y rdim3 + left join r_dn_operating_index_y rdim3 on rdim1.org_no = rdim3.org_no where 1 = 1 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java index dedb2fc4e..3965b4f2e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java @@ -1,7 +1,7 @@ package com.njcn.device.pms.service.distribution; import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; @@ -9,10 +9,10 @@ import java.util.List; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service * @createDate 2022-11-10 10:21:46 */ -public interface RDnOperatingYService extends IService { +public interface RDnOperatingYService extends IService { List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java index b6a8dbd84..faf869964 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; import com.njcn.device.pms.service.distribution.RDnOperatingYService; import com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper; @@ -13,7 +13,6 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -24,12 +23,12 @@ import java.util.stream.Collectors; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现 +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现 * @createDate 2022-11-10 10:21:46 */ @Service @RequiredArgsConstructor -public class RDnOperatingYServiceImpl extends ServiceImpl +public class RDnOperatingYServiceImpl extends ServiceImpl implements RDnOperatingYService{ private final DicDataFeignClient dicDataFeignClient; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java new file mode 100644 index 000000000..f5f9f25e6 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java @@ -0,0 +1,28 @@ +package com.njcn.device.pq.controller; + +import com.njcn.device.pq.service.IDeviceService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * pqs + * 设备相关 + * @author cdf + * @date 2023/4/4 + */ +@Slf4j +@Api(tags = "台账-设备相关") +@RestController +@RequestMapping("/dev") +@RequiredArgsConstructor +public class DeviceController extends BaseController { + + private final IDeviceService iDeviceService; + + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 110885d46..4a5863374 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -486,7 +486,6 @@ substation.`Name` subName, subscale.name subScale, pqdevice.IP ip, - pqdevice.Com_Flag comFlag, factory.`Name` manufacturer, voltage.`Name` voltageName, scale.`Name` voltageScale, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java index fd334d267..d85058e10 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java @@ -147,7 +147,7 @@ public class RunManageServiceImpl implements RunManageService { */ private TerminalLedgerVO.TemData filterScale(GeneralDeviceDTO generalDeviceDTO, List scales) { TerminalLedgerVO.TemData temData = new TerminalLedgerVO.TemData(); - temData.setName(DicDataTypeEnum.DEV_VOLTAGE.getName()); + temData.setName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()); //如果电压等级集合为空，则查询所有的电压等级 if (CollectionUtil.isEmpty(scales)) { List scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index e028510fc..6cd96ac49 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1416,7 +1416,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple List manufacturerList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName()).getData(); List devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData(); List frontList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.FRONT_TYPE.getName()).getData(); - List scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData(); + List scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData(); List nodeList = nodeService.nodeAllList(); diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java index 76b1cc49c..7e09d724e 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java @@ -14,7 +14,6 @@ import java.math.BigDecimal; */ @Data -@Measurement(name = "pqs_eventdetail") public class WaveTypeVO{ @@ -124,7 +123,7 @@ public class WaveTypeVO{ private String lineId; @Column(name = "time") - private String timeId; + private String startTime; @Column(name = "event_describe") private String eventDescribe; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index 5c067901d..023dbfa29 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -116,7 +116,7 @@ public class AreaInfoServiceImpl implements AreaInfoService { //查询监测点未处理暂态事件 List eventDetails = eventDetailService.list(new LambdaQueryWrapper() - .in(RmpEventDetailPO::getMeasurementPointId, lineIds)); + .in(RmpEventDetailPO::getMeasurementPointId, lineIds).orderByDesc(RmpEventDetailPO::getStartTime)); EventDetailNew eventDetailNew; for (RmpEventDetailPO eventDetail : eventDetails) { eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java index 497c4a99a..670d8bd4d 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java @@ -88,7 +88,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService { List info = eventDetailService.list(new LambdaQueryWrapper() .in(RmpEventDetailPO::getMeasurementPointId, lineIds) //todo 是否缺少录波 - .eq(RmpEventDetailPO::getEventType, data.getId()) + .ne(RmpEventDetailPO::getEventType, data.getId()) .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))) .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime()))) ); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index 0cc6413a5..ee23d2ec1 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -999,7 +999,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { ); Map> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())) - .collect(Collectors.groupingBy(s -> s.getStartTime().substring(0, 10))); + .collect(Collectors.groupingBy(s -> s.getStartTime().toString())); Set keySet = map.keySet(); LocalDate parse1 = LocalDate.parse(startTime); @@ -1072,7 +1072,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { HashMap reasonMap = new HashMap<>(); HashMap typeMap = new HashMap<>(); - + //添加detail for (RmpEventDetailPO detail : info) { EventDetail details = null; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 49ad27b76..60fa04b42 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -377,28 +377,30 @@ public class ReportServiceImpl implements ReportService { @Override public List getSeverity(DeviceInfoParam.BusinessParam businessParam) { List result = new ArrayList<>(); - List info = getED2(businessParam); + List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData(); + List lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); + List info = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(lineIds)){ + //数据暂降查询 + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, lineIds) + .ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime()))) + .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime()))) + .orderByDesc(RmpEventDetailPO::getSeverity).last(" limit 20") + ); + info = BeanUtil.copyToList(eventDetails, EventDetailNew.class); + }else{ + throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); + } if (CollectionUtil.isNotEmpty(info)) { - List idlist = new ArrayList<>(); - //根据严重度进行排序并取前二十个数据 - info.sort(((o1, o2) -> o1.getSeverity().compareTo(o2.getSeverity()))); - Collections.reverse(info); - List details=new ArrayList<>(); - if(info.size()>20){ - details = info.subList(0, 20); - }else{ - details=info; - } - //遍历集合得到id集合 - for (EventDetailNew detail : details) { - idlist.add(detail.getLineId()); - } + List idlist = info.stream().map(EventDetailNew::getLineId).distinct().collect(Collectors.toList()); + //得到对应的监测点信息 HttpResult> AreaInfo = lineFeignClient.getBaseLineAreaInfo(idlist); List data = AreaInfo.getData(); //遍历集合比较id得到最终数据 - for (EventDetailNew detail : details) { + for (EventDetailNew detail : info) { WaveTypeVO waveTypeVO = new WaveTypeVO(); for (AreaLineInfoVO vo : data) { if (detail.getLineId().equals(vo.getLineId())) { diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index e0ea6e897..91426a3ac 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -349,17 +349,21 @@ public class TransientServiceImpl implements TransientService { } } - for (DictData dictData : reasonList) { - if (eventDetail.getAdvanceReason().equals(dictData.getId())) { - eventDetail.setAdvanceReason(dictData.getName()); - break; + if(StrUtil.isNotBlank(eventDetail.getAdvanceReason())) { + for (DictData dictData : reasonList) { + if (eventDetail.getAdvanceReason().equals(dictData.getId())) { + eventDetail.setAdvanceReason(dictData.getName()); + break; + } } } - for (DictData dictData : typeList) { - if (eventDetail.getAdvanceType().equals(dictData.getId())) { - eventDetail.setAdvanceType(dictData.getName()); - break; + if(StrUtil.isNotBlank(eventDetail.getAdvanceType())) { + for (DictData dictData : typeList) { + if (eventDetail.getAdvanceType().equals(dictData.getId())) { + eventDetail.setAdvanceType(dictData.getName()); + break; + } } } } @@ -371,68 +375,6 @@ public class TransientServiceImpl implements TransientService { } - - - - - - -// if (!CollectionUtils.isEmpty(lineList)) { -// StringBuilder stringBuilder = InfluxDBCommUtils.assToInfluxParam(lineList); -// //influxDB查询待分页数据总量 -// Long total = getTransientDetail(stringBuilder, transientParam); -// page.setTotal(total); -// //分页总页数 -// int pages = (int) Math.ceil(transientParam.getPageNum() * 1.0 / transientParam.getPageSize()); -// page.setPages(pages); -// //influxDB分页查询 -// List eventDetailData = getTransientDetailLimit(lineList, transientParam); -// -// if (CollUtil.isNotEmpty(eventDetailData)) { -// List lineIds = eventDetailData.stream().map(EventDetailNew::getLineId).collect(Collectors.toList()); -// lineIds = lineIds.stream().distinct().collect(Collectors.toList()); -// -// List r = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); -// List reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData(); -// List typeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData(); -// -// -// for (EventDetailNew eventDetail : eventDetailData) { -// for (AreaLineInfoVO areaLineInfoVO : r) { -// if (eventDetail.getLineId().equals(areaLineInfoVO.getLineId())) { -// eventDetail.setLineId(areaLineInfoVO.getLineId()); -// eventDetail.setLineName(areaLineInfoVO.getLineName()); -// eventDetail.setGdName(areaLineInfoVO.getGdName()); -// eventDetail.setSubName(areaLineInfoVO.getSubName()); -// eventDetail.setIp(areaLineInfoVO.getIp()); -// eventDetail.setScale(areaLineInfoVO.getVoltageScale()); -// eventDetail.setIp(areaLineInfoVO.getIp()); -// break; -// } -// } -// -// for (DictData dictData : reasonList) { -// if (eventDetail.getEventReason().equals(dictData.getId())) { -// eventDetail.setEventReason(dictData.getName()); -// break; -// } -// } -// -// for (DictData dictData : typeList) { -// if (eventDetail.getEventType().equals(dictData.getId())) { -// eventDetail.setEventType(dictData.getName()); -// break; -// } -// } -// } -// -// -// //当前页数据 -// page.setRecords(eventDetailData); -// } -// -// } - } return page; } 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 1664f6220..2174b2917 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 @@ -179,6 +179,7 @@ public enum DicDataEnum { * @date 2023/3/24 */ + KV01("0.1kV","0.1"), V022("0.22kV","0.22"), KV038("0.38kV","0.38"), V380("380V","0.38"), From 2a6bc359edeb58dbd221c3b01ee8b168819f1652 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 7 Apr 2023 13:40:20 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/pojo/po/Version.java | 2 ++ .../java/com/njcn/device/pq/pojo/vo/VersionVO.java | 3 ++- .../pq/controller/ProgramVersionController.java | 6 ++++-- .../pq/mapper/mapping/ProgramVersionMapper.xml | 3 ++- .../device/pq/service/ProgramVersionService.java | 4 ++-- .../pq/service/impl/ProgramVersionServiceImpl.java | 8 ++++---- .../handler/DeviceAbnormalStatisticsJob.java | 13 +++++-------- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java index 4d89d879a..401df5cbc 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java @@ -57,6 +57,8 @@ public class Version extends BaseEntity { */ private byte[] file; + private String fileName; + /** * 终端程序版本状态（0-停用 1-启用） */ diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java index 8b53b1140..b1a5db9ce 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java @@ -77,6 +77,7 @@ public class VersionVO implements Serializable { @ApiModelProperty("终端程序版本状态（0-停用 1-启用）") private Integer versionFlag; - + @ApiModelProperty("文件名称") + private String fileName; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java index ff8373ce2..d36ffee6b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java @@ -57,9 +57,10 @@ public class ProgramVersionController extends BaseController { @RequestParam("devType") String devType, @RequestParam("remark") String remark, @RequestParam(value = "versionType",required = false) String versionType, + @RequestParam("filename") String fileName, @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) { String methodDescribe = getMethodDescribe("addProgramVersion"); - boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,file); + boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,fileName,file); if (res) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } else { @@ -91,9 +92,10 @@ public class ProgramVersionController extends BaseController { @RequestParam("devType") String devType, @RequestParam("remark") String remark, @RequestParam(value = "versionType",required = false) String versionType, + @RequestParam("filename") String fileName, @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) { String methodDescribe = getMethodDescribe("updateProgramVersion"); - boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,file); + boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,fileName,file); if (res) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } else { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml index 7594671d5..c1297d66c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml @@ -14,7 +14,8 @@ A.`Update_Time` updateTime, A.`Remark` remark, A.`Version_Type` versionType, - A.`Version_Flag` versionFlag + A.`Version_Flag` versionFlag, + A.`File_Name` fileName FROM cld_version A, sys_dict_data B, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java index e2ae45d88..4b151bad2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java @@ -22,7 +22,7 @@ public interface ProgramVersionService { * 新增程序版本管理信息 * @return */ - boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file); + boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file); /** * 版本文件是否存在 * @return @@ -32,7 +32,7 @@ public interface ProgramVersionService { * 修改程序版本管理信息 * @return */ - boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file); + boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file); /** * 修改程序版本状态 * @return diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java index fee8cd1f9..f52bf4fd5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java @@ -66,7 +66,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl"+format); + String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + log.info("执行日期deviceAbnormalStatisticsJob===============>"+time); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); - param.setTime(formatter.format(Calendar.getInstance().getTime())); + param.setTime(time); deviceAbnormalFeignClient.dailyDeviceAbnormaStatistics(param); } } From 26b19bbb0a955883e97d55dc1b6ec35d29bfdf41 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 7 Apr 2023 14:03:41 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=B7=AF=EF=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/oss/constant/OssPath.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java index 9d88a0f61..7516e46f9 100644 --- a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java +++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java @@ -52,4 +52,9 @@ public interface OssPath { * app拓扑图文件 */ String TOPOLOGY = "topology/"; + + /*** + * app反馈图片 + */ + String FEEDBACK = "feedBack/"; } From 24a12ec54f9e80474343b478042f804cca966716 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 7 Apr 2023 14:17:51 +0800 Subject: [PATCH 09/14] =?UTF-8?q?zbj//1.=E7=A8=B3=E6=80=81=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E8=B6=85=E6=A0=87=E5=8D=A0=E6=AF=94(=E8=B4=9F?= =?UTF-8?q?=E8=8D=B7=E7=B1=BB=E5=9E=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/vo/AllDataVO.java | 6 ++ .../Impl/LargeScreenServiceImpl.java | 7 +- .../majornetwork/LargeScreenController.java | 13 ++++ .../majornetwork/LargeScreenMapper.java | 3 + .../mapping/LargeScreenMapper.xml | 21 ++++- .../majornetwork/LargeScreenService.java | 3 + .../impl/LargeScreenServiceImpl.java | 76 ++++++++++++++++--- 7 files changed, 116 insertions(+), 13 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java index 054580d6f..57d344089 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java @@ -27,6 +27,12 @@ public class AllDataVO implements Serializable { @ApiModelProperty("部门id") private String index; + /** + * 监测点数量 + */ + @ApiModelProperty("监测点数量") + private Integer num; + /** * 暂降事件次数 */ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index 5b3f1e596..ac2a59d5d 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -273,6 +273,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes()); allDataVO.setAreaName(generalDeviceDTO.getName()); allDataVO.setIndex(generalDeviceDTO.getIndex()); + allDataVO.setNum(generalDeviceDTO.getLineIndexes().size()); allDataVO.setSteadyLoad("0.0"); if (generalDeviceDTO.getLineIndexes().size() > 0) { Map map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); @@ -285,6 +286,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { AllDataVO allDataVO = new AllDataVO(); allDataVO.setAreaName(generalDeviceDTO.getName()); allDataVO.setIndex(generalDeviceDTO.getIndex()); + allDataVO.setNum(generalDeviceDTO.getLineIndexes().size()); allDataVO.setRunning("0"); allDataVO.setHotSpare("0"); allDataVO.setShutdown("0"); @@ -382,7 +384,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { vo.setIp(stringObjectMap.get("ip").toString()); vo.setPort(stringObjectMap.get("port").toString()); vo.setComFlag(stringObjectMap.get("comFlag").toString()); - vo.setProportion(s + "%"); + vo.setProportion(s); result.add(vo); } return result; @@ -392,7 +394,8 @@ public class LargeScreenServiceImpl implements LargeScreenService { NumberFormat nf = NumberFormat.getNumberInstance(); nf.setMaximumFractionDigits(2);//保留两位小数，即四舍五入到小数点后两位 nf.setRoundingMode(RoundingMode.HALF_UP);//设置四舍五入模式为四舍五入 - return nf.format(value); + float v = Float.parseFloat(nf.format(value)); + return String.valueOf(v*100); } /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java index 7c23d3789..85655816b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java @@ -49,4 +49,17 @@ public class LargeScreenController extends BaseController { List result = largeScreenService.getHomeostasisArea(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + /** + * 稳态指标超标占比(负荷类型) + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getHomeostasisLoad") + @ApiOperation("稳态指标超标占比(负荷类型)") + @ApiImplicitParam(name = "largeScreenParam", value = "稳态指标超标占比(负荷类型)", required = true) + public HttpResult> getHomeostasisLoad(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getHomeostasisLoad"); + List result = largeScreenService.getHomeostasisLoad(largeScreenParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java index 53ee2108c..da298fc48 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java @@ -13,4 +13,7 @@ import java.util.Map; public interface LargeScreenMapper { List> getHomeostasisArea (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + + List> getHomeostasisLoad (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml index ab38313dd..ed1e33a9e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -2,7 +2,6 @@ - + + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java index 08221993c..fc6c8df37 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java @@ -14,4 +14,7 @@ import java.util.List; public interface LargeScreenService { List getHomeostasisArea(LargeScreenParam largeScreenParam); + + List getHomeostasisLoad(LargeScreenParam largeScreenParam); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java index cc2622394..f5c8f9981 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java @@ -62,21 +62,77 @@ public class LargeScreenServiceImpl implements LargeScreenService { List> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); - for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + float f = 0.0f; + for (int i = 0; i < generalDeviceDTOList.size(); i++) { for (Map map : homeostasisArea) { - if (Objects.equals(generalDeviceDTO.getIndex(), map.get("id"))) { + if (Objects.equals(generalDeviceDTOList.get(i).getIndex(), map.get("id"))) { HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); - homeostasisAreaVO.setName(generalDeviceDTO.getName()); - homeostasisAreaVO.setAvg(map.get("avg").toString()); + homeostasisAreaVO.setName(generalDeviceDTOList.get(i).getName()); + f = Float.parseFloat(map.get("avg").toString()) * 100; + homeostasisAreaVO.setAvg(String.valueOf(f)); result.add(homeostasisAreaVO); - } else { - HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); - homeostasisAreaVO.setName(generalDeviceDTO.getName()); - homeostasisAreaVO.setAvg("0"); - result.add(homeostasisAreaVO); - } } } + } + List collect = result.stream().map(HomeostasisAreaVO::getName).collect(Collectors.toList()); + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + if (!collect.contains(generalDeviceDTO.getName())) { + HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); + homeostasisAreaVO.setName(generalDeviceDTO.getName()); + homeostasisAreaVO.setAvg("0"); + result.add(homeostasisAreaVO); + } + } return result; } + + /** + * 稳态指标超标占比(负荷类型) + */ + @Override + public List getHomeostasisLoad(LargeScreenParam largeScreenParam) { + //创建返回VO + List result = new ArrayList<>(); + + DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam(); + //部门索引 + deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex()); + //统计类型 + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setCode(String.valueOf(StatisticsEnum.LOAD_TYPE)); + deviceInfoParam.setStatisticalType(simpleDTO); + //添加时间 + deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime()); + deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime()); + + // 获取所有数据 + List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); + //部门id集合 + List indexIds = generalDeviceDTOList.stream().map(GeneralDeviceDTO::getIndex).collect(Collectors.toList()); + + List> homeostasisArea = largeScreenMapper.getHomeostasisLoad(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + float f = 0.0f; + for (int i = 0; i < generalDeviceDTOList.size(); i++) { + for (Map map : homeostasisArea) { + if (Objects.equals(generalDeviceDTOList.get(i).getIndex(), map.get("id"))) { + HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); + homeostasisAreaVO.setName(generalDeviceDTOList.get(i).getName()); + f = Float.parseFloat(map.get("avg").toString()) * 100; + homeostasisAreaVO.setAvg(String.valueOf(f)); + result.add(homeostasisAreaVO); + } + } + } + List collect = result.stream().map(HomeostasisAreaVO::getName).collect(Collectors.toList()); + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + if (!collect.contains(generalDeviceDTO.getName())) { + HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); + homeostasisAreaVO.setName(generalDeviceDTO.getName()); + homeostasisAreaVO.setAvg("0"); + result.add(homeostasisAreaVO); + } + } + return result; + } + } From 76b999a1cb7ebc5fa30ca8206efbafb64906470c Mon Sep 17 00:00:00 2001 From: wurui Date: Fri, 7 Apr 2023 15:11:41 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=94=B5=E5=8E=8B=E6=9A=82=E9=99=8D?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/event/pojo/vo/DetailVO.java | 13 +++++++------ .../java/com/njcn/event/pojo/vo/WaveTypeVO.java | 17 ++++++++++------- .../majornetwork/Impl/ReportServiceImpl.java | 16 ++++++++-------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java index 0701a26a4..3e15230d9 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.influxdb.annotation.Column; import java.io.Serializable; @@ -19,16 +20,16 @@ import java.io.Serializable; public class DetailVO extends AreaLineInfoVO implements Serializable { @ApiModelProperty(name = "persistTime",value = "持续时间") - private Double persistTime; + private Double duration; - @ApiModelProperty(name = "eventType",value = "暂态类型") - private String eventType; + @ApiModelProperty(value = "暂降类型（Event_Type）") + private String advanceType; @ApiModelProperty(name = "eventValue",value = "特征幅值") - private Double eventValue; + private Double featureAmplitude; - @ApiModelProperty(name = "time",value = "发生时间") - private String timeId; + @ApiModelProperty(name = "startTime",value = "发生时间") + private String startTime; @ApiModelProperty(name = "times",value = "次数") private Integer times; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java index 7e09d724e..114b751d2 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java @@ -129,19 +129,22 @@ public class WaveTypeVO{ private String eventDescribe; @Column(name = "wave_type") - private String waveType; + @ApiModelProperty(value = "统计类型") + private String eventType; - @Column(name = "persist_time") - private Double persistTime; + @ApiModelProperty(value = "持续时间，单位秒") + private Double duration; - @Column(name = "event_value") - private Double eventValue; + @ApiModelProperty(value = "特征幅值") + private Double featureAmplitude; @Column(name = "event_reason") - private String eventReason; + @ApiModelProperty(value = "暂降原因（Event_Reason）") + private String advanceReason; @Column(name = "event_type") - private String eventType; + @ApiModelProperty(value = "暂降类型（Event_Type）") + private String advanceType; @Column(name = "eventass_index") private String eventassIndex; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 60fa04b42..d1fdb9a79 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -510,8 +510,8 @@ public class ReportServiceImpl implements ReportService { List type = reason.getData(); for (DetailVO detailVO : result) { for (DictData dictData : type) { - if (dictData.getId().equals(detailVO.getEventType())) { - detailVO.setEventType(dictData.getName()); + if (dictData.getId().equals(detailVO.getAdvanceType())) { + detailVO.setAdvanceType(dictData.getName()); } } } @@ -2011,11 +2011,11 @@ public class ReportServiceImpl implements ReportService { List eventTypeList = type.getData(); for (WaveTypeVO waveTypeVO : eventDetailList) { - if (waveTypeVO.getEventReason() != null) { + if (waveTypeVO.getAdvanceReason() != null) { for (DictData dictData : eventReasonList) { //将字典数据id与VO中属性eventReason对应的字符串进行比较 - if (waveTypeVO.getEventReason().equals(dictData.getId())) { - waveTypeVO.setEventReason(dictData.getName()); + if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) { + waveTypeVO.setAdvanceReason(dictData.getName()); } } } else { @@ -2025,11 +2025,11 @@ public class ReportServiceImpl implements ReportService { } for (WaveTypeVO waveTypeVO : eventDetailList) { - if (waveTypeVO.getEventType() != null) { + if (waveTypeVO.getAdvanceType() != null) { for (DictData dictData : eventTypeList) { //将字典数据id与VO中属性eventType对应的字符串进行比较 - if (waveTypeVO.getEventType().equals(dictData.getId())) { - waveTypeVO.setEventType(dictData.getName()); + if (waveTypeVO.getAdvanceType().equals(dictData.getId())) { + waveTypeVO.setAdvanceType(dictData.getName()); } } } else { From 5d6bc4678f0e590f45b2e472b80335370e3687ea Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 7 Apr 2023 15:28:59 +0800 Subject: [PATCH 11/14] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/vo/AllDataVO.java | 6 + pqs-event/event-boot/pom.xml | 6 + .../majornetwork/LargeScreenMapper.java | 11 ++ .../mapping/LargeScreenMapper.xml | 53 +++++++ .../Impl/LargeScreenServiceImpl.java | 130 ++++++++++++++++-- 5 files changed, 198 insertions(+), 8 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java index 57d344089..0c4e01ca0 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java @@ -74,4 +74,10 @@ public class AllDataVO implements Serializable { */ @ApiModelProperty("中断") private String breakdown; + + /** + * 综合评估 + */ + @ApiModelProperty("综合评估") + private String data; } diff --git a/pqs-event/event-boot/pom.xml b/pqs-event/event-boot/pom.xml index 9d26a9187..969be891f 100644 --- a/pqs-event/event-boot/pom.xml +++ b/pqs-event/event-boot/pom.xml @@ -83,6 +83,12 @@ okio 2.8.0 + + com.njcn + harmonic-api + 1.0.0 + compile + diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java index 9c4a6c2be..273fc18be 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java @@ -3,6 +3,7 @@ package com.njcn.event.mapper.majornetwork; import com.njcn.device.pq.pojo.vo.AllDataVO; import com.njcn.device.pq.pojo.vo.EventVO; import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO; +import com.njcn.harmonic.pojo.po.PQSComAssesPO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -35,4 +36,14 @@ public interface LargeScreenMapper { List> getHomeostasisArea (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + /** + * 统计综合评估平均值 + * @param lineIndexes + * @param searchBeginTime + * @param searchEndTime + * @return + */ + List getAvgCount(@Param("ids") List lineIndexes, + @Param("statTime") String searchBeginTime, + @Param("endTime") String searchEndTime); } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml index 45b4d5a5c..96defa9ba 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -214,4 +214,57 @@ group by rshom.org_no + + diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index ac2a59d5d..a4a325027 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -1,5 +1,7 @@ package com.njcn.event.service.majornetwork.Impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; @@ -8,6 +10,9 @@ import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam; import com.njcn.device.pq.pojo.vo.*; import com.njcn.event.mapper.majornetwork.LargeScreenMapper; import com.njcn.event.service.majornetwork.LargeScreenService; +import com.njcn.harmonic.pojo.dto.ComAssessDTO; +import com.njcn.harmonic.pojo.po.PQSComAssesPO; +import com.njcn.harmonic.utils.HarmonicComAssesUtil; import com.njcn.system.pojo.enums.StatisticsEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,7 +20,9 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import com.njcn.device.pq.api.GeneralDeviceInfoClient; +import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.math.RoundingMode; import java.text.NumberFormat; import java.time.LocalDate; @@ -37,6 +44,8 @@ public class LargeScreenServiceImpl implements LargeScreenService { private final LargeScreenMapper largeScreenMapper; + private final HarmonicComAssesUtil comAssesUtil; + /** * 暂降事件区域 */ @@ -308,14 +317,33 @@ public class LargeScreenServiceImpl implements LargeScreenService { float f = 0.0f; for (AllDataVO allDataVO : result) { for (Map map : homeostasisArea) { - if (Objects.equals(map.get("id"),allDataVO.getIndex())){ - f=Float.parseFloat(map.get("avg").toString()); - allDataVO.setSteadyLoad(String.valueOf((1-f)*100)); - } + if (Objects.equals(map.get("id"), allDataVO.getIndex())) { + f = Float.parseFloat(map.get("avg").toString()); + allDataVO.setSteadyLoad(String.valueOf((1 - f) * 100)); + } + } + } + List comAssessDTOS = new ArrayList<>(); + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) { + List pqsComAssesPOS = getComAccessData(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + setResults(pqsComAssesPOS, comAssessDTOS); + float allComAss = comAssesUtil.getAllComAss(comAssessDTOS); + /*String lv = getLevel(allComAss);*/ + /*comAssessVO.setData(allComAss);*/ + for (AllDataVO allDataVO : result) { + if (Objects.equals(generalDeviceDTO.getIndex(), allDataVO.getIndex())) { + allDataVO.setData(String.valueOf(allComAss)); + } + } + } + /*comAssessVO.setLevel(lv);*/ + } + for (AllDataVO allDataVO : result) { + if (Objects.isNull(allDataVO.getData())){ + allDataVO.setData("-1"); } } - - //todo 该接口部分功能未完成 1.综合评估 return result; } @@ -395,7 +423,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { nf.setMaximumFractionDigits(2);//保留两位小数，即四舍五入到小数点后两位 nf.setRoundingMode(RoundingMode.HALF_UP);//设置四舍五入模式为四舍五入 float v = Float.parseFloat(nf.format(value)); - return String.valueOf(v*100); + return String.valueOf(v * 100); } /** @@ -421,4 +449,90 @@ public class LargeScreenServiceImpl implements LargeScreenService { return largeScreenMapper.getMiddleLimitRate(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); } -} + + //设置保留四位小数 + private void setResults(List pqsComAssesPOS, List comAssessDTOS) { + for (int i = 0; i < pqsComAssesPOS.size(); i++) { + float v1 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + ComAssessDTO comAssessDTO = new ComAssessDTO(); + comAssessDTO.setVuDev1(v1); + float v2 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVuDev2(v2); + float v3 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVuDev3(v3); + float v4 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVuDev4(v4); + float v5 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVuDev5(v5); + float f1 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setFreqDev1(f1); + float f2 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setFreqDev2(f2); + float f3 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setFreqDev3(f3); + float f4 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setFreqDev4(f4); + float f5 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setFreqDev5(f5); + float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT1(d1); + float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT2(d2); + float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT3(d3); + float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT4(d4); + float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT5(d5); + float vu1 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVUnbalance1(vu1); + float vu2 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVUnbalance2(vu2); + float vu3 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVUnbalance3(vu3); + float vu4 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVUnbalance4(vu4); + float vu5 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVUnbalance5(vu5); + float vt1 = new BigDecimal(pqsComAssesPOS.get(i).getVThd1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVTHD1(vt1); + float vt2 = new BigDecimal(pqsComAssesPOS.get(i).getVThd2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVTHD2(vt2); + float vt3 = new BigDecimal(pqsComAssesPOS.get(i).getVThd3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVTHD3(vt3); + float vt4 = new BigDecimal(pqsComAssesPOS.get(i).getVThd4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVTHD4(vt4); + float vt5 = new BigDecimal(pqsComAssesPOS.get(i).getVThd5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setVTHD5(vt5); + float e1 = new BigDecimal(pqsComAssesPOS.get(i).getEvent1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setEvent1(e1); + float e2 = new BigDecimal(pqsComAssesPOS.get(i).getEvent2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setEvent2(e2); + float e3 = new BigDecimal(pqsComAssesPOS.get(i).getEvent3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setEvent3(e3); + float e4 = new BigDecimal(pqsComAssesPOS.get(i).getEvent4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setEvent4(e4); + float e5 = new BigDecimal(pqsComAssesPOS.get(i).getEvent5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setEvent5(e5); + comAssessDTOS.add(comAssessDTO); + } + } + + /** + * influxDB查询综合评估相关信息 + * 返回每个监测点在时间段的各指标平均数 + * + * @param lineIndexes + * @param searchBeginTime + * @param searchEndTime + */ + private List getComAccessData(List lineIndexes, String searchBeginTime, String searchEndTime) { + List avgCount = largeScreenMapper.getAvgCount(lineIndexes, + DateUtil.beginOfDay(DateUtil.parse(searchBeginTime)).toString(), + DateUtil.beginOfDay(DateUtil.parse(searchEndTime)).toString()); + if (CollUtil.isNotEmpty(avgCount)) { + return avgCount; + } + return new ArrayList<>(); + } +} \ No newline at end of file From cdeb64b6693d91a1054b95e1f30fbb45ec2bdba5 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 7 Apr 2023 15:33:20 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9&&=E6=8E=A5=E5=8F=A3=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/controller/ProgramVersionController.java | 4 ++-- .../com/njcn/device/pq/mapper/ProgramVersionMapper.java | 3 ++- .../java/com/njcn/device/pq/mapper/mapping/LineMapper.xml | 6 +++--- .../device/pq/mapper/mapping/ProgramVersionMapper.xml | 2 +- .../device/pq/mapper/mapping/TerminalMaintainMapper.xml | 2 +- .../com/njcn/device/pq/service/ProgramVersionService.java | 2 +- .../device/pq/service/impl/ProgramVersionServiceImpl.java | 7 +++++-- .../executor/handler/DeviceAbnormalStatisticsJob.java | 1 - .../device/mapping/DeviceAbnormaStatisticsMapper.xml | 8 ++++---- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java index d36ffee6b..016da84f7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java @@ -107,9 +107,9 @@ public class ProgramVersionController extends BaseController { @PostMapping("/updateVersionFlag") @ApiOperation("修改程序版本状态") @ApiImplicitParam(name = "id", value = "终端版本id", required = true) - public HttpResult updateVersionFlag(@RequestParam("id") String id) { + public HttpResult updateVersionFlag(@RequestParam("id") String id, @RequestParam("versionFlag") Integer flag) { String methodDescribe = getMethodDescribe("updateVersionFlag"); - boolean res = programService.updateVersionFlag(id); + boolean res = programService.updateVersionFlag(id,flag); if (res) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } else { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java index a46d71801..5cd92cd18 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper; import com.njcn.device.pq.pojo.vo.ShowVersionVO; import com.njcn.device.pq.pojo.vo.VersionVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,7 +24,7 @@ public interface ProgramVersionMapper { /** * 修改程序版本状态 */ - void updateVersionFlag(String id); + void updateVersionFlag(Integer flag,String id); /** * 修改程序版本状态 */ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 4a5863374..fc3b8cbca 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -787,7 +787,7 @@ INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line elc ON sub.pid = elc.id - LEFT JOIN cld_month_flow m ON b.id = m.Line_Id + LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id @@ -825,7 +825,7 @@ INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line elc ON sub.pid = elc.id - LEFT JOIN cld_month_flow m ON b.id = m.Line_Id + LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id @@ -854,7 +854,7 @@ ifnull(m.Actual_Value,0) statisValue FROM pq_line a INNER JOIN pq_device b ON a.id = b.id - LEFT JOIN cld_month_flow m ON b.id = m.Line_Id + LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml index c1297d66c..cbdcf8bf1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml @@ -41,7 +41,7 @@ UPDATE cld_version SET - Version_Flag = 0 + Version_Flag = #{flag} WHERE Id = #{id} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index a3947618b..d8b6dc3ce 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -25,7 +25,7 @@ FROM LEFT JOIN cld_dev_version f on a.id = f.line_id and f.flag = 1 and f.state = 1 LEFT JOIN cld_version g on f.version_id = g.id LEFT JOIN - (select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.line_id + (select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.Dev_Id where a.id in #{item} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java index 4b151bad2..8c7f5a1d7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java @@ -37,7 +37,7 @@ public interface ProgramVersionService { * 修改程序版本状态 * @return */ - boolean updateVersionFlag(String id); + boolean updateVersionFlag(String id, Integer flag); /** * 删除版本 * @return diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java index f52bf4fd5..0f2bb0fbb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java @@ -138,8 +138,11 @@ public class ProgramVersionServiceImpl extends ServiceImpl"+time); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml index c7f193626..30cad716b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml @@ -101,16 +101,16 @@ FROM ( SELECT - cmf.Line_Id deviceId, + cmf.Dev_Id deviceId, IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + IFNULL(d1.flow, 0) flowMeal, IFNULL(cmf.Actual_Value,0) actualValue, rsod.online_min/1440 onlineRate FROM cld_month_flow cmf - LEFT JOIN cld_dev_meal c ON cmf.Line_Id = c.Line_Id + LEFT JOIN cld_dev_meal c ON cmf.Dev_Id = c.Line_Id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id - LEFT JOIN r_stat_onlinerate_d rsod ON rsod.dev_index = cmf.Line_Id - WHERE cmf.Line_Id IN + LEFT JOIN r_stat_onlinerate_d rsod ON rsod.dev_index = cmf.Dev_Id + WHERE cmf.Dev_Id IN #{item} From d38fc933d8492c3f789bf15828c144aa4439dd6e Mon Sep 17 00:00:00 2001 From: wurui Date: Fri, 7 Apr 2023 15:39:37 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E7=94=B5=E5=8E=8B=E6=9A=82=E9=99=8D:?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=8B=E4=BB=B6=E5=88=86=E6=9E=90=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/event/pojo/vo/DetailVO.java | 7 ++--- .../Impl/EventAnalysisServiceImpl.java | 28 ++++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java index 3e15230d9..796ff8271 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.influxdb.annotation.Column; import java.io.Serializable; @@ -19,13 +18,13 @@ import java.io.Serializable; @NoArgsConstructor public class DetailVO extends AreaLineInfoVO implements Serializable { - @ApiModelProperty(name = "persistTime",value = "持续时间") + @ApiModelProperty(name = "duration",value = "持续时间") private Double duration; - @ApiModelProperty(value = "暂降类型（Event_Type）") + @ApiModelProperty(name = "advanceType",value = "暂降类型（Event_Type）") private String advanceType; - @ApiModelProperty(name = "eventValue",value = "特征幅值") + @ApiModelProperty(name = "featureAmplitude",value = "特征幅值") private Double featureAmplitude; @ApiModelProperty(name = "startTime",value = "发生时间") diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index ee23d2ec1..229938873 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -1488,6 +1488,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { */ @Override public Page getMonitorEventAnalyseQuery(EventBaseParam eventBaseParam) { + List eventReasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData(); + List eventTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData(); //数据暂降查询 Page pageInfo = eventDetailService.page(new Page<>(eventBaseParam.getPageNum(), eventBaseParam.getPageSize()), new LambdaQueryWrapper() @@ -1498,7 +1500,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { ); //获取关于监测点发电站相关信息 List areaLineList = lineFeignClient.getBaseLineAreaInfo(Arrays.asList(eventBaseParam.getLineId())).getData(); - if(CollectionUtil.isNotEmpty(areaLineList)){ + if(CollectionUtil.isEmpty(areaLineList)){ throw new BusinessException(EventResponseEnum.NOT_FOUND); } List waveTypeVOS = new ArrayList<>(); @@ -1529,6 +1531,30 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { waveTypeVO.setLng(lineInfoVO.getLng()); waveTypeVO.setManufacturer(lineInfoVO.getManufacturer()); waveTypeVO.setVoltageScale(lineInfoVO.getVoltageScale()); + //查询字典表替换事件原因与事件类型的字符串 + if (waveTypeVO.getAdvanceReason() != null) { + for (DictData dictData : eventReasonList) { + //将字典数据id与VO中属性eventReason对应的字符串进行比较 + if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) { + waveTypeVO.setAdvanceReason(dictData.getName()); + } + } + } else { + //抛出异常,当前暂态原因为空 + throw new BusinessException(EventResponseEnum.EVENT_REASON_NOT_FOUND); + } + + if (waveTypeVO.getAdvanceType() != null) { + for (DictData dictData : eventTypeList) { + //将字典数据id与VO中属性eventType对应的字符串进行比较 + if (waveTypeVO.getAdvanceType().equals(dictData.getId())) { + waveTypeVO.setAdvanceType(dictData.getName()); + } + } + } else { + //抛出异常,当前暂态类型为空 + throw new BusinessException(EventResponseEnum.EVENT_TYPE_NOT_FOUND); + } waveTypeVOS.add(waveTypeVO); } } From 766d824f54bad6e7d0bc311854267f78da31638e Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 7 Apr 2023 16:34:19 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/pojo/po/DevVersion.java | 3 +++ .../njcn/device/pq/mapper/TerminalVersionMapper.java | 6 ++---- .../device/pq/mapper/mapping/TerminalVersionMapper.xml | 10 ++++++++++ .../njcn/device/pq/service/TerminalVersionService.java | 1 + .../pq/service/impl/TerminalVersionServiceImpl.java | 4 +--- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java index 948e1c467..f444d6dbc 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java @@ -67,5 +67,8 @@ public class DevVersion extends BaseEntity { */ private LocalDateTime updateTime; + private String devType; + private String devTypeName; + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java index 28051cbd2..6b570a209 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.mapper; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; +import com.njcn.device.pq.pojo.po.DevVersion; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import com.njcn.device.pq.pojo.vo.TerminalVersionVO; import org.apache.ibatis.annotations.Param; @@ -51,8 +52,5 @@ public interface TerminalVersionMapper { List getPqLineGdAndSubList(@Param("ids") List ids); - - - - + List selectListById(String id); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml index 68481436c..28218d545 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml @@ -69,5 +69,15 @@ order by a.sort + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java index 8f6b12d7c..522218478 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java @@ -26,6 +26,7 @@ public interface TerminalVersionService { * 查询装置升级日志 * @author cdf * @date 2022/5/17 + * @return */ List getTerminalUpLog(String id); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java index 866ddc737..d0aa69c53 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java @@ -64,9 +64,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService { @Override public List getTerminalUpLog(String id) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DevVersion::getLineId,id); - return devVersionMapper.selectList(lambdaQueryWrapper); + return terminalVersionMapper.selectListById(id); }