From 6f8ecd9e86fc1149c48add1022869abb0305b25b Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Thu, 6 Apr 2023 19:20:55 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 894b1c2ff..7594671d5 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 @@ -23,7 +23,7 @@ AND A.Dev_Type = B.Id AND A.Update_By = C.Id - AND A.Dev_Type = ${devType} + AND A.Dev_Type = #{devType} From 836565c1cfc65b0978eb6319750acdb4ee11afa3 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Thu, 6 Apr 2023 19:33:21 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8E=87=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/pojo/vo/OnlineRateCensusVO.java | 29 ++++++++ .../TerminalOnlineRateDataController.java | 13 ++++ .../TerminalOnlineRateDataService.java | 3 + .../impl/TerminalMaintainServiceImpl.java | 6 +- .../TerminalOnlineRateDataServiceImpl.java | 66 ++++++++++++++++++- .../impl/OnlineRateDataServiceImpl.java | 10 +-- 6 files changed, 113 insertions(+), 14 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OnlineRateCensusVO.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OnlineRateCensusVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OnlineRateCensusVO.java new file mode 100644 index 000000000..2f717610a --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OnlineRateCensusVO.java @@ -0,0 +1,29 @@ +package com.njcn.device.pq.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class OnlineRateCensusVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * x轴 统计类型 + */ + private List type; + + /** + * y轴 数据 + */ + private List single; + + /** + * y轴 同比环比数据 + */ + private List ratio; + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java index b464df06f..b36265ca2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java @@ -7,10 +7,12 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.mapper.OnlineRateMapper; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; import com.njcn.device.pq.pojo.po.OnlineRate; import com.njcn.device.pq.pojo.po.RStatOnlinerateD; +import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO; import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; import com.njcn.device.pq.service.TerminalOnlineRateDataService; @@ -20,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -57,6 +60,16 @@ public class TerminalOnlineRateDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateData,methodDescribe); } + @OperateInfo + @PostMapping("/getOnlineRateDataCensus") + @ApiOperation("终端在线率图表") + @ApiImplicitParam(name = "onlineRateCensusParam", value = "终端在线率参数", required = true) + public HttpResult getOnlineRateDataCensus(@RequestBody @Validated DeviceInfoParam.CompareBusinessParam onlineRateCensusParam){ + String methodDescribe = getMethodDescribe("getOnlineRateDataCensus"); + OnlineRateCensusVO onlineRateCensusVO = terminalOnlineRateDataService.getOnlineRateDataCensus(onlineRateCensusParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateCensusVO,methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getOnlineRateByDevIds") @ApiOperation("终端在线率（谐波专用）") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java index c3a2b81a3..a80f36562 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; +import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; import java.util.List; @@ -20,4 +21,6 @@ public interface TerminalOnlineRateDataService { * @return */ List getOnlineRateData(TerminalOnlineRateDataParam terminalOnlineRateDataParam); + + OnlineRateCensusVO getOnlineRateDataCensus(DeviceInfoParam.CompareBusinessParam onlineRateCensusParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index 591700799..6e2b307af 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -126,7 +126,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { } @Override - public boolean updateRunFlagManage(TerminalParam terminalParam){ + public boolean updateRunFlagManage(TerminalParam terminalParam) { //终端状态管理 List tem = new ArrayList<>(); terminalParam.getIds().forEach(item-> { @@ -191,10 +191,6 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); List deviceDayFlow = influxDBResultMapper.toPOJO(result, DeviceDayFlow.class); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); -// Instant time = deviceDayFlow.get(0).getTime(); -// System.out.println(time); -// Date from = Date.from(time); -// System.out.println(from); deviceDayFlow.forEach(t-> t.setDate(formatter.format(Date.from(t.getTime())))); Map> dayFlowMap = deviceDayFlow.stream().collect(Collectors.groupingBy(DeviceDayFlow::getDate)); List list = new ArrayList<>(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java index d3f8cb404..67f42b944 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java @@ -1,21 +1,29 @@ package com.njcn.device.pq.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.graphbuilder.math.func.AvgFunction; +import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.api.AlarmClient; import com.njcn.device.pq.enums.DeviceResponseEnum; import com.njcn.device.pq.enums.LineBaseEnum; +import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.mapper.TerminalOnlineRateDataMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.dto.PublicDTO; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; import com.njcn.device.pq.pojo.po.TerminalOnlineRateData; import com.njcn.device.pq.pojo.vo.AlarmStrategyVO; +import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO; +import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; import com.njcn.device.pq.service.IRStatOnlinerateDService; import com.njcn.device.pq.service.TerminalOnlineRateDataService; @@ -35,6 +43,7 @@ import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -55,7 +64,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData private final TerminalOnlineRateDataMapper terminalOnlineRateDataMapper; - private final InfluxDbUtils influxDbUtils; + private final GeneralInfo generalInfo; private final GeneralDeviceService generalDeviceService; @@ -63,6 +72,9 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData private final DicDataFeignClient dicDataFeignClient; + private final RStatOnlinerateDMapper onlineRateMapper; + + /** @@ -157,6 +169,58 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData } + @Override + public OnlineRateCensusVO getOnlineRateDataCensus(DeviceInfoParam.CompareBusinessParam onlineRateCensusParam) { + OnlineRateCensusVO onlineRateCensusVO = new OnlineRateCensusVO(); + onlineRateCensusParam.setServerName(generalInfo.getMicroServiceName()); + List generalDeviceDTOList = generalDeviceService.getDeviceInfo(onlineRateCensusParam,Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); + List type = new ArrayList<>(); + List single = new ArrayList<>(), ratio = new ArrayList<>(); + if (!CollectionUtils.isEmpty(generalDeviceDTOList)) { + for (GeneralDeviceDTO generalDeviceDTO: generalDeviceDTOList){ + List deviceIndexes = generalDeviceDTO.getDeviceIndexes(); + if (CollectionUtils.isEmpty(deviceIndexes)) { + continue; + } + type.add(generalDeviceDTO.getName()); + //根据终端索引集查询在线率 + List onlineRateList = getCondition(deviceIndexes, onlineRateCensusParam.getSearchBeginTime(), onlineRateCensusParam.getSearchEndTime()); + single.add(onlineRateList.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); + //如果存在需要比较的时间，再获取对应数据 + if(StrUtil.isNotBlank(onlineRateCensusParam.getPeriodBeginTime()) && StrUtil.isNotBlank(onlineRateCensusParam.getPeriodEndTime())){ + List compareData = getCondition(deviceIndexes, onlineRateCensusParam.getPeriodBeginTime(), onlineRateCensusParam.getPeriodEndTime()); + ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); + } + } + } + onlineRateCensusVO.setType(type); + onlineRateCensusVO.setSingle(single); + onlineRateCensusVO.setRatio(ratio); + + + return onlineRateCensusVO; + } + + private List getCondition(List deviceIndexes, String searchBeginTime, String searchEndTime) { + List publicDTOList = new ArrayList<>(); + OnlineRateParam param=new OnlineRateParam(); + param.setIds(deviceIndexes); + param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(searchBeginTime)).toString()); + param.setEndTime( DateUtil.endOfDay(DateUtil.parse(searchEndTime)).toString()); + List data = onlineRateMapper.getOnlineRateByDevIds(param); + if (CollUtil.isNotEmpty(data)) { + data.forEach(po -> { + PublicDTO publicDTO = new PublicDTO(); + //终端在线率 保留两位小数 + Double onlineRate = po.getOnlineRate() == null ? null : BigDecimal.valueOf(Double.parseDouble(po.getOnlineRate().toString())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + publicDTO.setId(po.getDevIndex()); + publicDTO.setData(onlineRate); + publicDTOList.add(publicDTO); + }); + } + return publicDTOList; + } + /** * 处理变电站 * diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OnlineRateDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OnlineRateDataServiceImpl.java index 4cbf1689a..2b33aacfe 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OnlineRateDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OnlineRateDataServiceImpl.java @@ -42,8 +42,6 @@ public class OnlineRateDataServiceImpl implements OnlineRateDataService { private final OnlineRateDataMapper onlineRateDataMapper; - private final InfluxDbUtils influxDbUtils; - private final GeneralDeviceInfoClient generalDeviceInfoClient; private final GeneralInfo generalInfo; @@ -142,16 +140,12 @@ public class OnlineRateDataServiceImpl implements OnlineRateDataService { return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList()); } - /** - * influxDB相关操作 - * 查询终端的在线率 - * 前端要求: 返回百分比数据 - */ + private List getCondition(List deviceIndexes, String startTime, String endTime) { List publicDTOList = new ArrayList<>(); OnlineRateParam param=new OnlineRateParam(); param.setIds(deviceIndexes); - param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); + param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); List data = generalDeviceInfoClient.getOnlineRateByDevIds(param).getData(); if (CollUtil.isNotEmpty(data)) { From 989eb31a10ab79d61b3766cf5663cda96d46fb6a Mon Sep 17 00:00:00 2001 From: wurui Date: Thu, 6 Apr 2023 20:02:05 +0800 Subject: [PATCH 03/12] ... --- .../harmonic/service/impl/THDistortionServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java index d20df5665..51866a459 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java @@ -77,12 +77,10 @@ public class THDistortionServiceImpl implements THDistortionService { //查找畸变率 List condition = getCondition(lineIndexes, thDistortionParam.getSearchBeginTime(), thDistortionParam.getSearchEndTime()); - if(CollUtil.isNotEmpty(condition)){ - thDistortionVO.setDistortion(condition.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); - //组装父级数据树 - List treeList = getTreeData(lineIndexes, thDistortionParam); - thDistortionVO.setChildren(treeList); - } + thDistortionVO.setDistortion(condition.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); + //组装父级数据树 + List treeList = getTreeData(lineIndexes, thDistortionParam); + thDistortionVO.setChildren(treeList); } thDistortionVOS.add(thDistortionVO); From 2f9fe8c64c7f5adfb1a5ae1eb98cf9daf5952dc2 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Thu, 6 Apr 2023 20:20:36 +0800 Subject: [PATCH 04/12] =?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(=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/pojo/vo/HomeostasisAreaVO.java | 30 +++++++ .../majornetwork/LargeScreenController.java | 52 ++++++++++++ .../majornetwork/LargeScreenMapper.java | 19 +++++ .../mapping/LargeScreenMapper.xml | 25 ++++++ .../majornetwork/LargeScreenService.java | 17 ++++ .../impl/LargeScreenServiceImpl.java | 82 +++++++++++++++++++ 6 files changed, 225 insertions(+) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HomeostasisAreaVO.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HomeostasisAreaVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HomeostasisAreaVO.java new file mode 100644 index 000000000..8d57174ed --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HomeostasisAreaVO.java @@ -0,0 +1,30 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/06 + */ +@Data +public class HomeostasisAreaVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 稳态超标占比 + */ + @ApiModelProperty("稳态超标占比") + private String avg; + +} 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 new file mode 100644 index 000000000..7c23d3789 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java @@ -0,0 +1,52 @@ +package com.njcn.harmonic.controller.majornetwork; + +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.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.*; + +import com.njcn.harmonic.service.majornetwork.LargeScreenService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/06 + */ +@Slf4j +@Api(tags = "大屏") +@RestController +@RequestMapping("/largeScreen") +@RequiredArgsConstructor +public class LargeScreenController extends BaseController { + + private final LargeScreenService largeScreenService; + + /** + * 稳态指标超标占比(区域) + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getHomeostasisArea") + @ApiOperation("稳态指标超标占比(区域)") + @ApiImplicitParam(name = "largeScreenParam", value = "稳态指标超标占比(区域)", required = true) + public HttpResult> getHomeostasisArea(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getHomeostasisArea"); + List result = largeScreenService.getHomeostasisArea(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 new file mode 100644 index 000000000..8eb99865a --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java @@ -0,0 +1,19 @@ +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; +import java.util.Map; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/31 + */ +public interface LargeScreenMapper { + + List> getHomeostasisArea (@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 new file mode 100644 index 000000000..ab38313dd --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -0,0 +1,25 @@ + + + + + + + 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 new file mode 100644 index 000000000..08221993c --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java @@ -0,0 +1,17 @@ +package com.njcn.harmonic.service.majornetwork; + +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.*; + +import java.util.List; + + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/31 + */ +public interface LargeScreenService { + + List getHomeostasisArea(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 new file mode 100644 index 000000000..cc2622394 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java @@ -0,0 +1,82 @@ +package com.njcn.harmonic.service.majornetwork.impl; + +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.pq.api.GeneralDeviceInfoClient; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam; +import com.njcn.device.pq.pojo.vo.*; +import com.njcn.harmonic.mapper.majornetwork.LargeScreenMapper; +import com.njcn.harmonic.service.majornetwork.LargeScreenService; +import com.njcn.system.pojo.enums.StatisticsEnum; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; +import org.springframework.stereotype.Service; + +import java.math.RoundingMode; +import java.text.NumberFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/31 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class LargeScreenServiceImpl implements LargeScreenService { + + private final GeneralDeviceInfoClient generalDeviceInfoClient; + + private final LargeScreenMapper largeScreenMapper; + + /** + * 稳态指标超标占比(区域) + */ + @Override + public List getHomeostasisArea(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.POWER_NETWORK)); + 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.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + for (Map map : homeostasisArea) { + if (Objects.equals(generalDeviceDTO.getIndex(), map.get("id"))) { + HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); + homeostasisAreaVO.setName(generalDeviceDTO.getName()); + homeostasisAreaVO.setAvg(map.get("avg").toString()); + result.add(homeostasisAreaVO); + } else { + HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO(); + homeostasisAreaVO.setName(generalDeviceDTO.getName()); + homeostasisAreaVO.setAvg("0"); + result.add(homeostasisAreaVO); + } + } + } + return result; + } +} From 4dec79da8fbbb5a91aa62d6e4262035d8869750a Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 6 Apr 2023 21:48:15 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-user/user-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pqs-user/user-api/pom.xml b/pqs-user/user-api/pom.xml index 48168aa36..2e7cc342a 100644 --- a/pqs-user/user-api/pom.xml +++ b/pqs-user/user-api/pom.xml @@ -29,7 +29,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} From 5d0a682053b0c7dd7778867b35b0d42ee7caae4f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 7 Apr 2023 09:02:13 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java | 0 .../algorithm/pojo/param/AppLineTopologyDiagramAddParm.java | 0 .../algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java | 0 .../algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java | 0 .../main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java | 0 .../njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java | 0 .../njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java | 0 .../njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java | 0 .../com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java | 0 .../main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java | 0 .../java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java | 0 .../main/java/com/njcn/algorithm/pojo/po/CsDictPO.java | 0 .../java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java | 0 .../java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java | 0 .../main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java | 0 .../main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java | 0 pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java | 2 ++ 26 files changed, 2 insertions(+) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java (100%) diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java diff --git a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java index 5ce750bc0..f01039dbe 100644 --- a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java +++ b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java @@ -50,6 +50,8 @@ public class IpUtils { log.error("X-Real-IP:"+ipAddress); ipAddress = headers.getFirst("Proxy-Client-IP"); log.error("Proxy-Client-IP:"+ipAddress); + ipAddress = headers.getFirst("REMOTE-HOST"); + log.error("REMOTE-HOST:"+ipAddress); if (StrUtil.isBlankIfStr(ipAddress) || UNKNOWN.equalsIgnoreCase(ipAddress)) { ipAddress = headers.getFirst(HEADER_PROXY_CLIENT_IP); } From 9a7571a997ed3a5eccf9775d8a33d91a30e6f86c Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 7 Apr 2023 09:12:59 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-auth/pom.xml | 2 +- .../java/com/njcn/common/pojo/constant/BizParamConstant.java | 2 +- pqs-common/common-echarts/pom.xml | 2 +- pqs-common/common-web/pom.xml | 2 +- pqs-device/common-device-biz/pom.xml | 2 +- pqs-energy/energy-api/pom.xml | 2 +- pqs-event/event-api/pom.xml | 2 +- pqs-gateway/pom.xml | 2 +- pqs-harmonic/harmonic-api/pom.xml | 2 +- pqs-job/job-executor/pom.xml | 2 +- pqs-prepare/prepare-boot/pom.xml | 2 +- pqs-process/process-api/pom.xml | 2 +- pqs-system/system-api/pom.xml | 2 +- .../main/java/com/njcn/user/pojo/constant/ComponentState.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pqs-auth/pom.xml b/pqs-auth/pom.xml index a3e48eea5..78b6e2a15 100644 --- a/pqs-auth/pom.xml +++ b/pqs-auth/pom.xml @@ -29,7 +29,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java index 66f3b2013..39ffd88dc 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java @@ -8,7 +8,7 @@ package com.njcn.common.pojo.constant; public interface BizParamConstant { /** - * 前端查询时间类型 + * 前端查询时间类型 测试jenkins打包 * 1年 2季度 3月份 4周 5日 */ String STAT_BIZ_YEAR = "1"; diff --git a/pqs-common/common-echarts/pom.xml b/pqs-common/common-echarts/pom.xml index cc049f778..39bdeba13 100644 --- a/pqs-common/common-echarts/pom.xml +++ b/pqs-common/common-echarts/pom.xml @@ -24,7 +24,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-common/common-web/pom.xml b/pqs-common/common-web/pom.xml index 39e5d70f9..269cd2967 100644 --- a/pqs-common/common-web/pom.xml +++ b/pqs-common/common-web/pom.xml @@ -24,7 +24,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml index 191b423a8..526b99636 100644 --- a/pqs-device/common-device-biz/pom.xml +++ b/pqs-device/common-device-biz/pom.xml @@ -31,7 +31,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-energy/energy-api/pom.xml b/pqs-energy/energy-api/pom.xml index d110beb1b..5558d940d 100644 --- a/pqs-energy/energy-api/pom.xml +++ b/pqs-energy/energy-api/pom.xml @@ -32,7 +32,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-event/event-api/pom.xml b/pqs-event/event-api/pom.xml index 67e68a01b..bdd2fa9dd 100644 --- a/pqs-event/event-api/pom.xml +++ b/pqs-event/event-api/pom.xml @@ -29,7 +29,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml index a0772a625..68071219a 100644 --- a/pqs-gateway/pom.xml +++ b/pqs-gateway/pom.xml @@ -29,7 +29,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-harmonic/harmonic-api/pom.xml b/pqs-harmonic/harmonic-api/pom.xml index 2ffbf72ed..246ddc258 100644 --- a/pqs-harmonic/harmonic-api/pom.xml +++ b/pqs-harmonic/harmonic-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml index c7ff9446f..6a39aaa1e 100644 --- a/pqs-job/job-executor/pom.xml +++ b/pqs-job/job-executor/pom.xml @@ -35,7 +35,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index 144e9a60f..493710416 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -64,7 +64,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-process/process-api/pom.xml b/pqs-process/process-api/pom.xml index 23cec6eb1..402e5c50c 100644 --- a/pqs-process/process-api/pom.xml +++ b/pqs-process/process-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-system/system-api/pom.xml b/pqs-system/system-api/pom.xml index e1779dd6e..d6086d6f9 100644 --- a/pqs-system/system-api/pom.xml +++ b/pqs-system/system-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - ${micro.sdk} + common-microservice ${project.version} diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java index 930abdbe5..fc9cd75a4 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java @@ -6,7 +6,7 @@ package com.njcn.user.pojo.constant; public interface ComponentState { /** - * 状态 0-删除；1-正常；默认正常 + * 状态 0-删除；1-正常；默认正常 测试jenkins打包 */ int DELETE = 0; From 50d2e2637a5dc9394241353cef05ee274f7d5420 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 7 Apr 2023 09:17:47 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/common/pojo/constant/BizParamConstant.java | 3 ++- .../main/java/com/njcn/user/pojo/constant/ComponentState.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java index 39ffd88dc..013225fb8 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java @@ -8,9 +8,10 @@ package com.njcn.common.pojo.constant; public interface BizParamConstant { /** - * 前端查询时间类型 测试jenkins打包 + * 前端查询时间类型 * 1年 2季度 3月份 4周 5日 */ + String s = "测试jenkins打包"; String STAT_BIZ_YEAR = "1"; String STAT_BIZ_QUARTER = "2"; String STAT_BIZ_MONTH = "3"; diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java index fc9cd75a4..35063b0eb 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/ComponentState.java @@ -6,8 +6,9 @@ package com.njcn.user.pojo.constant; public interface ComponentState { /** - * 状态 0-删除；1-正常；默认正常 测试jenkins打包 + * 状态 0-删除；1-正常；默认正常 */ + String s = "测试jenkins打包"; int DELETE = 0; int ENABLE = 1; 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 09/12] =?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 10/12] =?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 11/12] =?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 12/12] =?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{ + +}