From 3f0c3df93946e6c7db9da821f6109d43e5cc257e Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Mon, 10 Apr 2023 17:54:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?zbj//1.=E6=95=B0=E6=8D=AE=E8=A7=84=E6=A8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../njcn/device/pq/pojo/vo/DataScaleVO.java | 30 +++++ .../controller/LargeScreenController.java | 52 ++++++++ .../njcn/system/mapper/LargeScreenMapper.java | 19 +++ .../mapper/mapping/LargeScreenMapper.xml | 34 +++++ .../system/service/LargeScreenService.java | 18 +++ .../service/impl/LargeScreenServiceImpl.java | 126 ++++++++++++++++++ 7 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/LargeScreenService.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/LargeScreenServiceImpl.java diff --git a/pom.xml b/pom.xml index 4afc1017a..284836f68 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 192.168.1.18 - 192.168.1.114 + 192.168.1.166 192.168.1.13 @@ -54,7 +54,7 @@ - fe40a052-d787-48f4-940f-688cabdff26a + 012fcc94-a4d4-4dff-a75a-396a1b997f25 ${middle.server.url}:8080 diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java new file mode 100644 index 000000000..eba1b12f2 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.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/10 + */ +@Data +public class DataScaleVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 月份 + */ + @ApiModelProperty("月份") + private String timeId; + + /** + * 数据 + */ + @ApiModelProperty("数据") + private Float dataStatis; + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java new file mode 100644 index 000000000..f7a5322e9 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java @@ -0,0 +1,52 @@ +package com.njcn.system.controller; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.DataScaleVO; +import com.njcn.system.service.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/10 + */ +@Slf4j +@Api(tags = "大屏") +@RestController +@RequestMapping("/largeScreen") +@RequiredArgsConstructor +public class LargeScreenController extends BaseController { + + private final LargeScreenService largeScreenService; + + /** + * 数据规模 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getDataScale") + @ApiOperation("数据规模") + @ApiImplicitParam(name = "largeScreenParam", value = "数据规模", required = true) + public HttpResult> getDataScale(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getDataScale"); + List result = largeScreenService.getDataScale(largeScreenParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java new file mode 100644 index 000000000..c3838ac04 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java @@ -0,0 +1,19 @@ +package com.njcn.system.mapper; + + +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.DataScaleVO; +import com.njcn.device.pq.pojo.vo.UserScaleVO; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/10 + */ +public interface LargeScreenMapper { + + List getDataScale (LargeScreenParam largeScreenParam); + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml new file mode 100644 index 000000000..0668d1e48 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/LargeScreenService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/LargeScreenService.java new file mode 100644 index 000000000..625b51b32 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/LargeScreenService.java @@ -0,0 +1,18 @@ +package com.njcn.system.service; + +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.DataScaleVO; + +import java.util.List; + + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/10 + */ +public interface LargeScreenService { + + List getDataScale(LargeScreenParam largeScreenParam); + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/LargeScreenServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/LargeScreenServiceImpl.java new file mode 100644 index 000000000..117fa4a7b --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/LargeScreenServiceImpl.java @@ -0,0 +1,126 @@ +package com.njcn.system.service.impl; + +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.DataScaleVO; +import com.njcn.system.mapper.LargeScreenMapper; +import com.njcn.system.service.LargeScreenService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/10 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class LargeScreenServiceImpl implements LargeScreenService { + + private final LargeScreenMapper largeScreenMapper; + + /** + * 数据规模 + */ + @Override + public List getDataScale(LargeScreenParam largeScreenParam) { + //创建返回VO + List result = new ArrayList<>(); + //创建模板 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + //获取当前日期 + LocalDate today = LocalDate.now(); + String endTime = today.format(formatter); + String startTime = ""; + //获取30天前的日期 + try { + startTime = getDate(endTime); + } catch (Exception e) { + e.printStackTrace(); + } + largeScreenParam.setSearchBeginTime(startTime); + largeScreenParam.setSearchEndTime(endTime); + List list = largeScreenMapper.getDataScale(largeScreenParam); + //获取区间中所有日期 + List days = null; + try { + days = selectDate(startTime, endTime); + } catch (Exception e) { + e.printStackTrace(); + } + //加上今天 + days.add(endTime); + for (String s : days) { + DataScaleVO vo = new DataScaleVO(); + vo.setTimeId(s); + result.add(vo); + } + //集合不为空 + if (list.size() > 0) { + for (DataScaleVO dataScaleVO : result) { + for (DataScaleVO scaleVO : list) { + if (Objects.equals(scaleVO.getTimeId(), dataScaleVO.getTimeId())) { + dataScaleVO.setDataStatis(scaleVO.getDataStatis()); + } + } + } + for (DataScaleVO vo : result) { + if (vo.getDataStatis() == null) { + vo.setDataStatis(0.0f); + } + } + return result; + } else { + return result; + } + } + + /** + * 传入字符串日期获取当前日期30天日期 + * + * @param stringDate + * @throws Exception + */ + public static String getDate(String stringDate) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date date = sdf.parse(stringDate); // 将字符串日期转换为Date对象 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, -30); // 计算30天前的日期 + Date newDate = calendar.getTime(); // 获取新日期 + String newDateStr = sdf.format(newDate); // 将新日期转换为字符串日期 + return newDateStr; + } + + /** + * 获取传入起始月结束月中所有天 + * + * @param startTime + * @param endTime + * @return + */ + public List selectDate(String startTime, String endTime) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Date startDate = sdf.parse(startTime); + Date endDate = sdf.parse(endTime); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startDate); + + List dates = new ArrayList<>(); + while (calendar.getTime().before(endDate)) { + Date date = calendar.getTime(); + String dateStr = sdf.format(date); + dates.add(dateStr); + calendar.add(Calendar.DATE, 1); + } + return dates; + } +} From 35f7f1315477584a43d83d5552ad12f9fe0021a0 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Mon, 10 Apr 2023 19:30:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=A8=B3=E6=80=81=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-system/system-boot/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml index d927436d1..c589f0315 100644 --- a/pqs-system/system-boot/pom.xml +++ b/pqs-system/system-boot/pom.xml @@ -46,6 +46,12 @@ common-swagger ${project.version} + + com.njcn + pq-device-api + 1.0.0 + compile + From 9199a7c7632b01ac7c5f2ed20dc56c288f80344b Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Mon, 10 Apr 2023 20:31:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=AF=8F=E6=9C=88=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/param/PqsParam.java | 2 ++ .../controller/OperationContrController.java | 15 +++++++++++---- .../com/njcn/device/pq/mapper/LineMapper.java | 6 ++++-- .../device/pq/mapper/mapping/DeviceMapper.xml | 4 ++-- .../device/pq/mapper/mapping/LineMapper.xml | 18 ++++++++++++++++++ .../njcn/device/pq/service/LineService.java | 2 ++ .../pq/service/impl/LineServiceImpl.java | 6 ++++++ 7 files changed, 45 insertions(+), 8 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java index 59180de88..0e397d9a6 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java @@ -12,6 +12,8 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class PqsParam extends DeviceInfoParam.BusinessParam { + @ApiModelProperty("装置id") + private String devId; @ApiModelProperty("当前页码") private Integer pageNum; @ApiModelProperty("当前页条数") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 292e198cb..d15c77864 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -22,10 +22,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; 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 org.springframework.web.bind.annotation.*; import java.util.List; @@ -118,6 +115,16 @@ public class OperationContrController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getMonthFlow") + @ApiOperation("获取每月流量") + @ApiImplicitParam(name = "deviceInfoParam", value = "实体", required = true) + public HttpResult> getMonthFlow (@RequestBody PqsParam deviceInfoParam){ + String methodDescribe = getMethodDescribe("getMonthFlow"); + LogUtil.njcnDebug(log, "{}，参数集合：{}", methodDescribe, deviceInfoParam); + List result = lineService.getMonthFlow(deviceInfoParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java index 649f45d25..981eb08c0 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java @@ -420,6 +420,8 @@ public interface LineMapper extends BaseMapper { List getDeviceRunStatistics(@Param("list") List list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); - Page getNewDeviceRunStatistics(Page page,@Param("devs") List list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); - Page getNewDeviceFlowStatistics(Page page,@Param("devs") List list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + Page getNewDeviceRunStatistics (Page page,@Param("devs") List list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + Page getNewDeviceFlowStatistics (Page page,@Param("devs") List list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + + List getMonthFlow (@Param("devId") String devId,@Param("startTime") DateTime beginOfDay, @Param("endTime") DateTime endOfDay); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml index c2bfe7fcc..043a32d6c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml @@ -118,7 +118,7 @@ + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java index 6453fa6de..53ba61443 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java @@ -208,4 +208,6 @@ public interface LineService { Page dailyDeviceAbnormalStatistics(PqsParam param); List dailyDeviceAbnormal(DeviceInfoParam.BusinessParam conditionBusinessParam); + + List getMonthFlow (PqsParam deviceInfoParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index aee95534a..ca87f9a39 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -403,6 +403,12 @@ public class LineServiceImpl extends ServiceImpl implements Li return topMsgDetails; } + @Override + public List getMonthFlow(PqsParam deviceInfoParam) { + List list = lineMapper.getMonthFlow(deviceInfoParam.getDevId(),DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime()))); + return list; + } + @Override public List getDeviceRunStatistics(DeviceInfoParam.BusinessParam deviceInfoParam) { ArrayList lineFlowMealDetailList = new ArrayList<>(); From b2646a080dfe86594297f2f7b2e18eba8d69179b Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 11 Apr 2023 08:58:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/AppBaseInformationAddParm.java | 4 +- .../param/AppLineTopologyDiagramAddParm.java | 4 +- .../AppLineTopologyDiagramAuditParm.java | 4 +- .../pojo/param/AppPersonSetAddParm.java | 4 +- .../pojo/param/AppTopologyDiagramAddParm.java | 4 +- .../param/AppTopologyDiagramAuditParm.java | 3 - .../pojo/param/CsDevModelAddParm.java | 4 +- .../pojo/param/CsDevModelAuditParm.java | 4 +- .../pojo/param/CsDevModelQueryListParm.java | 4 +- .../pojo/param/CsDevModelQueryParm.java | 4 +- .../algorithm/pojo/param/CsDictAddParm.java | 4 +- .../algorithm/pojo/param/CsEdDataAddParm.java | 4 +- .../pojo/param/CsEdDataAuditParm.java | 4 +- .../pojo/param/CsEdDataQueryParm.java | 4 +- .../pojo/param/CsEngineeringAddParm.java | 58 ++++++++++++++ .../pojo/param/CsEngineeringAuditParm.java | 59 ++++++++++++++ .../pojo/param/CsEngineeringQueryParm.java | 38 +++++++++ .../param/CsEquipmentDeliveryAddParm.java | 3 - .../param/CsEquipmentDeliveryQueryParm.java | 3 - .../pojo/param/CsFeedbackQueryParm.java | 4 +- .../pojo/po/AppLineTopologyDiagramPO.java | 4 +- .../njcn/algorithm/pojo/po/AppProjectPO.java | 5 +- .../pojo/po/AppTopologyDiagramPO.java | 5 +- .../algorithm/pojo/po/CsEngineeringPO.java | 2 +- .../pojo/vo/AppBaseInformationVO.java | 4 +- .../pojo/vo/AppTopologyDiagramVO.java | 4 +- .../algorithm/pojo/vo/CsDevModelPageVO.java | 4 +- .../com/njcn/algorithm/pojo/vo/CsDictVO.java | 4 +- .../njcn/algorithm/pojo/vo/CsEdDataVO.java | 4 +- .../algorithm/pojo/vo/CsEngineeringVO.java | 67 ++++++++++++++++ .../pojo/vo/CsEquipmentDeliveryVO.java | 4 +- .../algorithm/pojo/vo/CsFeedbackDetailVO.java | 4 +- .../njcn/algorithm/pojo/vo/CsFeedbackVO.java | 4 +- .../project/EngineeringController.java | 77 +++++++++++++++++++ .../mapper/mapping/CsDevModelMapper.xml | 4 +- .../mapper/mapping/CsEdDataMapper.xml | 2 +- .../service/CsEngineeringService.java | 28 ++++++- .../impl/CsEngineeringServiceImpl.java | 50 ++++++++++++ .../impl/CsEquipmentDeliveryServiceImpl.java | 3 + .../impl/CsFeedbackChatServiceImpl.java | 1 + .../service/impl/CsFeedbackServiceImpl.java | 4 +- 41 files changed, 416 insertions(+), 88 deletions(-) create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAuditParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringQueryParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEngineeringVO.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/EngineeringController.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 index c1a03eb0b..5adc03959 100644 --- 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 @@ -15,9 +15,7 @@ import javax.validation.constraints.NotBlank; * @version V1.0.0 */ -/** - * app基础信息表 - */ + @Data public class AppBaseInformationAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java index 1915881c9..11eb0f39e 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java @@ -15,9 +15,7 @@ import javax.validation.constraints.NotBlank; * @version V1.0.0 */ -/** - * 项目拓扑图关系表 - */ + @Data public class AppLineTopologyDiagramAddParm { /** diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java index 7704d7c1a..b46aaceb4 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java @@ -15,9 +15,7 @@ import javax.validation.constraints.NotBlank; * @version V1.0.0 */ -/** - * 项目拓扑图关系表 - */ + @Data public class AppLineTopologyDiagramAuditParm { /** 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 index 3f880c7bc..6f8c8c6c5 100644 --- 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 @@ -15,9 +15,7 @@ import javax.validation.constraints.NotBlank; * @version V1.0.0 */ -/** - * app个人中心-设置信息 - */ + @Data public class AppPersonSetAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java index d8e853320..13bcc3979 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java @@ -17,9 +17,7 @@ import javax.validation.constraints.NotNull; * @version V1.0.0 */ -/** - * 项目拓扑图关系表 - */ + @Data public class AppTopologyDiagramAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java index d663ba333..4ca8a3125 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java @@ -16,9 +16,6 @@ import javax.validation.constraints.NotBlank; * @version V1.0.0 */ -/** - * 项目拓扑图关系表 - */ @Data public class AppTopologyDiagramAuditParm { @ApiModelProperty(value = "拓扑图id") diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java index 597a6cbf1..ecb2bcf46 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java @@ -17,9 +17,7 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 装置数据模板表 - */ + @Data public class CsDevModelAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java index c233c874c..e7a83e28d 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java @@ -18,9 +18,7 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 装置数据模板表 - */ + @Data public class CsDevModelAuditParm { @NotNull(message="版本id不能为空！") diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java index 8fd79fad6..a61300a9e 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java @@ -15,9 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsDevModelQueryListParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java index 246d6ba70..cc535e912 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java @@ -18,9 +18,7 @@ import javax.validation.constraints.NotNull; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsDevModelQueryParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java index 72929a530..1207b04b7 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java @@ -13,9 +13,7 @@ import lombok.Data; * @version V1.0.0 */ -/** - * 数据字典表 - */ + @Data public class CsDictAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAddParm.java index 29ec01194..46f01eecb 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAddParm.java @@ -20,9 +20,7 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsEdDataAddParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAuditParm.java index f1ee20530..4a722abe3 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAuditParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAuditParm.java @@ -19,9 +19,7 @@ import java.time.LocalDate; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsEdDataAuditParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataQueryParm.java index 729c09cbd..739b19580 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataQueryParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataQueryParm.java @@ -18,9 +18,7 @@ import javax.validation.constraints.NotNull; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsEdDataQueryParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAddParm.java new file mode 100644 index 000000000..59b5cd7d2 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAddParm.java @@ -0,0 +1,58 @@ +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/7 11:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + + +@Data +public class CsEngineeringAddParm { + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + @NotBlank(message="工程名称不能为空！") + private String name; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + @NotBlank(message="用户id不能为空！") + private String userId; + + /** + * 省 + */ + @ApiModelProperty(value = "省") + @NotBlank(message="省不能为空！") + private String province; + + /** + * 市 + */ + @ApiModelProperty(value = "市") + @NotBlank(message="市不能为空！") + private String city; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAuditParm.java new file mode 100644 index 000000000..afc44f009 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringAuditParm.java @@ -0,0 +1,59 @@ +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/7 11:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + + +@Data +public class CsEngineeringAuditParm { + + @NotNull(message="版本id不能为空！") + private String id; + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + private String name; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private String userId; + + /** + * 省 + */ + @ApiModelProperty(value = "省") + private String province; + + /** + * 市 + */ + @ApiModelProperty(value = "市") + private String city; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + @ApiModelProperty(value="0：删除 1：正常") + private String status; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringQueryParm.java new file mode 100644 index 000000000..c58091ac6 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEngineeringQueryParm.java @@ -0,0 +1,38 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/10 19:47【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class CsEngineeringQueryParm { + + @ApiModelProperty(value = "工程名称") + private String name; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private String userId; + + /** + * 省 + */ + @ApiModelProperty(value = "省") + private String province; + + /** + * 市 + */ + @ApiModelProperty(value = "市") + private String city; + +} diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java index 4bdd596a3..0a7c46037 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java @@ -18,9 +18,6 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 设备出厂表 - */ @Data public class CsEquipmentDeliveryAddParm{ diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java index d5e6eff52..054f2dc8e 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java @@ -16,9 +16,6 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 设备出厂表 - */ @Data public class CsEquipmentDeliveryQueryParm { 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 index 67e3946e0..856bec504 100644 --- 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 @@ -16,9 +16,7 @@ import javax.validation.constraints.NotNull; * @version V1.0.0 */ -/** - * 信息反馈表 - */ + @Data public class CsFeedbackQueryParm { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java index 37a4dce0a..9ec3e63e6 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java @@ -1,6 +1,8 @@ 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.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; @@ -24,7 +26,7 @@ public class AppLineTopologyDiagramPO extends BaseEntity { /** * 拓扑图Id */ - @MppMultiId(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; /** 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 31d5066bf..af7152cee 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 @@ -1,8 +1,9 @@ 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.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import lombok.Data; @@ -24,7 +25,7 @@ public class AppProjectPO extends BaseEntity { /** * 项目Id */ - @MppMultiId(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; 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 16de33ae4..288f6e327 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 @@ -1,8 +1,9 @@ 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.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import lombok.Data; @@ -24,7 +25,7 @@ public class AppTopologyDiagramPO extends BaseEntity { /** * 拓扑图Id */ - @MppMultiId(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; /** diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEngineeringPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEngineeringPO.java index 90f41828c..38f658451 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEngineeringPO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEngineeringPO.java @@ -62,7 +62,7 @@ public class CsEngineeringPO extends BaseEntity { * 状态(0：删除 1：正常) */ @TableField(value = "status") - private Boolean 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 index f5ac07de3..a61e226b1 100644 --- 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 @@ -14,9 +14,7 @@ import lombok.Data; * @version V1.0.0 */ -/** - * app基础信息表 - */ + @Data public class AppBaseInformationVO extends BaseEntity { /** 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 581323679..b673ddadc 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 @@ -14,9 +14,7 @@ import lombok.Data; * @version V1.0.0 */ -/** - * 项目拓扑图关系表 - */ + @Data public class AppTopologyDiagramVO extends BaseEntity { /** diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java index a71f0b27b..36af3db85 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java @@ -17,9 +17,7 @@ import java.time.LocalDate; * @version V1.0.0 */ -/** - * 装置数据模板表 - */ + @Data public class CsDevModelPageVO extends BaseEntity { /** diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java index bc22e9030..48fd6f951 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java @@ -14,9 +14,7 @@ import lombok.Data; * @version V1.0.0 */ -/** - * 数据字典表 - */ + @Data public class CsDictVO extends BaseEntity { /** diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java index c53dfa1ff..4fa7af5f4 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java @@ -16,9 +16,7 @@ import java.time.LocalDate; * @version V1.0.0 */ -/** - * 程序版本表 - */ + @Data public class CsEdDataVO extends BaseEntity { diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEngineeringVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEngineeringVO.java new file mode 100644 index 000000000..21925d84f --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEngineeringVO.java @@ -0,0 +1,67 @@ +package com.njcn.algorithm.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/4/7 11:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 工程信息表 + */ +@Data +@TableName(value = "cs_engineering") +public class CsEngineeringVO extends BaseEntity { + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + private String name; + + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private String userId; + + /** + * 省 + */ + @ApiModelProperty(value = "省") + private String province; + + /** + * 市 + */ + @ApiModelProperty(value = "市") + private String city; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + /** + * 状态(0：删除 1：正常) + */ + @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/vo/CsEquipmentDeliveryVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java index 40b83ea8a..a9f7480e3 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java @@ -18,9 +18,7 @@ import java.util.Date; * @version V1.0.0 */ -/** - * 设备出厂表 - */ + @Data public class CsEquipmentDeliveryVO extends BaseEntity { /** 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 index 9dbb4ab0a..cbda577a4 100644 --- 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 @@ -18,9 +18,7 @@ import java.util.List; * @version V1.0.0 */ -/** - * 信息反馈列表 - */ + @Data public class CsFeedbackDetailVO { /** 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 index 233c4ccc6..880e06383 100644 --- 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 @@ -16,9 +16,7 @@ import java.time.LocalDateTime; * @version V1.0.0 */ -/** - * 信息反馈列表 - */ + @Data public class CsFeedbackVO { /** diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/EngineeringController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/EngineeringController.java new file mode 100644 index 000000000..2aac52f41 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/EngineeringController.java @@ -0,0 +1,77 @@ +package com.njcn.algorithm.controller.project; + +import com.njcn.algorithm.pojo.param.CsEngineeringAddParm; +import com.njcn.algorithm.pojo.param.CsEngineeringAuditParm; +import com.njcn.algorithm.pojo.param.CsEngineeringQueryParm; +import com.njcn.algorithm.pojo.vo.CsEngineeringVO; +import com.njcn.algorithm.service.CsEngineeringService; +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; + +import java.util.List; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/3/27 10:54【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/engineering") +@Api(tags = " 工程管理") +@AllArgsConstructor +public class EngineeringController extends BaseController { + + + private final CsEngineeringService csEngineeringService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addEngineering") + @ApiOperation("新增工程") + @ApiImplicitParam(name = "csEngineeringAddParm", value = "新增工程参数", required = true) + public HttpResult addEngineering(@Validated @RequestBody CsEngineeringAddParm csEngineeringAddParm){ + String methodDescribe = getMethodDescribe("addEngineering"); + + Boolean flag = csEngineeringService.addEngineering(csEngineeringAddParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/auditEngineering") + @ApiOperation("修改/删除工程") + @ApiImplicitParam(name = "csEngineeringAuditParm", value = "修改项目参数", required = true) + public HttpResult auditAppProject(@Validated @RequestBody CsEngineeringAuditParm csEngineeringAuditParm){ + String methodDescribe = getMethodDescribe("auditEngineering"); + + Boolean flag = csEngineeringService.auditEngineering(csEngineeringAuditParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryEngineering") + @ApiOperation("查询工程列表") + @ApiImplicitParam(name = "csEngineeringQueryParm", value = "修改项目参数", required = true) + public HttpResult> queryEngineering(@Validated @RequestBody CsEngineeringQueryParm csEngineeringQueryParm){ + String methodDescribe = getMethodDescribe("queryEngineering"); + + List csEngineeringVOList = csEngineeringService.queryEngineering(csEngineeringQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEngineeringVOList, methodDescribe); + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml index 13be37d25..61a53632b 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml @@ -25,7 +25,7 @@ FROM cs_dev_model a LEFT JOIN sys_dict_data b ON a.dev_type = b.id WHERE - 1 = 1 + 1 = 1 And a.`status`='1' AND a.version_date >= #{csDevModelQueryParm.versionStartDate } @@ -45,7 +45,7 @@ FROM cs_dev_model a LEFT JOIN sys_dict_data b ON a.dev_type = b.id WHERE - 1 = 1 + 1 = 1 And a.`status`='1' AND a.version_date >= #{csDevModelQueryListParm.versionStartDate } 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 index a65dc135d..1368c0646 100644 --- 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 @@ -29,7 +29,7 @@ FROM cs_ed_data a LEFT JOIN sys_dict_data b ON a.dev_type = b.id WHERE - 1 = 1 + 1 = 1 And a.`status`='1' AND a.version_date >= #{csEdDataQueryParm.versionStartDate } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEngineeringService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEngineeringService.java index 6c09eaceb..fde2ee8f4 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEngineeringService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEngineeringService.java @@ -1,8 +1,15 @@ package com.njcn.algorithm.service; +import com.njcn.algorithm.pojo.param.CsEngineeringAddParm; +import com.njcn.algorithm.pojo.param.CsEngineeringAuditParm; +import com.njcn.algorithm.pojo.param.CsEngineeringQueryParm; import com.njcn.algorithm.pojo.po.CsEngineeringPO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.algorithm.pojo.vo.CsEngineeringVO; + +import java.util.List; + +/** * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html @@ -13,5 +20,22 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface CsEngineeringService extends IService{ + /** + * @Description: 新增工程 + * @Param: [csEngineeringAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/4/10 + */ + Boolean addEngineering(CsEngineeringAddParm csEngineeringAddParm); -} + Boolean auditEngineering(CsEngineeringAuditParm csEngineeringAuditParm); + /** + * @Description: 查询工程 + * @Param: [csEngineeringQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2023/4/10 + */ + List queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm); + } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEngineeringServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEngineeringServiceImpl.java index 42d594b79..c8bc81ae7 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEngineeringServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEngineeringServiceImpl.java @@ -1,10 +1,23 @@ package com.njcn.algorithm.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.algorithm.mapper.CsEngineeringMapper; +import com.njcn.algorithm.pojo.param.CsEngineeringAddParm; +import com.njcn.algorithm.pojo.param.CsEngineeringAuditParm; +import com.njcn.algorithm.pojo.param.CsEngineeringQueryParm; import com.njcn.algorithm.pojo.po.CsEngineeringPO; +import com.njcn.algorithm.pojo.vo.CsEngineeringVO; import com.njcn.algorithm.service.CsEngineeringService; +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: @@ -17,4 +30,41 @@ import org.springframework.stereotype.Service; @Service public class CsEngineeringServiceImpl extends ServiceImpl implements CsEngineeringService{ + @Override + @Transactional(rollbackFor = {Exception.class}) + public Boolean addEngineering(CsEngineeringAddParm csEngineeringAddParm) { + CsEngineeringPO csEngineeringPO = new CsEngineeringPO (); + BeanUtils.copyProperties (csEngineeringAddParm, csEngineeringPO); + csEngineeringPO.setStatus ("1"); + boolean save = this.save (csEngineeringPO); + return save; + } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public Boolean auditEngineering(CsEngineeringAuditParm csEngineeringAuditParm) { + + CsEngineeringPO csEngineeringPO = new CsEngineeringPO (); + BeanUtils.copyProperties (csEngineeringAuditParm, csEngineeringPO); + boolean b = this.updateById (csEngineeringPO); + return b; + } + + @Override + public List queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm) { + List csEngineeringVOList = new ArrayList<> (); + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryParm.getUserId ()),"user_id",csEngineeringQueryParm.getUserId ()). + eq (StringUtils.isNotBlank (csEngineeringQueryParm.getProvince ()),"province",csEngineeringQueryParm.getProvince ()). + eq (StringUtils.isNotBlank (csEngineeringQueryParm.getCity ()),"city",csEngineeringQueryParm.getCity ()). + eq ("status","1" ). + like (StringUtils.isNotBlank (csEngineeringQueryParm.getName ()),"name",csEngineeringQueryParm.getName ()); + List csEngineeringPOS = this.getBaseMapper ( ).selectList (queryWrapper); + csEngineeringVOList = csEngineeringPOS.stream ().map (temp->{ + CsEngineeringVO vo = new CsEngineeringVO(); + BeanUtils.copyProperties (temp, vo); + return vo; + }).collect(Collectors.toList()); + return csEngineeringVOList; + } } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java index 7fbeba7ac..fa64df23c 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -16,6 +16,7 @@ import com.njcn.algorithm.service.CsEquipmentDeliveryService; import com.njcn.common.pojo.exception.BusinessException; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Objects; @@ -32,6 +33,7 @@ import java.util.Objects; public class CsEquipmentDeliveryServiceImpl extends ServiceImpl implements CsEquipmentDeliveryService{ @Override + @Transactional(rollbackFor = {Exception.class}) public Boolean save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) { CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (csEquipmentDeliveryAddParm.getNdid ( )); if(!Objects.isNull (po)){ @@ -46,6 +48,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl wrapper = new UpdateWrapper(); wrapper.eq ("id", id); 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 index 240830dae..a0b680d6f 100644 --- 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 @@ -35,6 +35,7 @@ public class CsFeedbackChatServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<> (); 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 index 446deead9..533722f59 100644 --- 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 @@ -52,7 +52,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl csFilePathPOS= new ArrayList<> (); for (int i = 0; i < csFeedbackAddParm.getFiles ( ).length; i++) { @@ -90,7 +90,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl