From ea7136e0ad0019363a5a39b87fa792a6cc69f71e Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 15 Jun 2023 20:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/vo/CsEquipmentDeliveryVO.java | 14 +--- .../pojo/vo/DeviceManagerDetailVO.java | 24 ++++++ .../csdevice/pojo/vo/DeviceManagerVO.java | 53 ++++++++++++ .../equipment/CsDataArrayController.java | 43 ++++++---- .../equipment/DeviceManagerController.java | 45 ---------- .../equipment/DeviceMonitorController.java | 23 ----- .../EquipmentDeliveryController.java | 29 +++++-- .../csdevice/mapper/CsDataArrayMapper.java | 2 + .../mapper/CsEquipmentDeliveryMapper.java | 3 +- .../mapper/mapping/CsDataArrayMapper.xml | 11 ++- .../mapping/CsEquipmentDeliveryMapper.xml | 2 +- .../service/CsEquipmentDeliveryService.java | 18 +++- .../csdevice/service/ICsDataArrayService.java | 14 +++- .../csdevice/service/ICsLedgerService.java | 8 ++ .../service/impl/CsDataArrayServiceImpl.java | 42 ++++++++-- .../impl/CsEquipmentDeliveryServiceImpl.java | 83 +++++++++++++++---- .../service/impl/CsLedgerServiceImpl.java | 5 ++ .../controller/CsElementController.java | 9 +- .../csharmonic/service/ICsElementService.java | 5 +- .../service/impl/CsElementServiceImpl.java | 20 +++-- 20 files changed, 300 insertions(+), 153 deletions(-) create mode 100644 cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java create mode 100644 cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java delete mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceManagerController.java delete mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceMonitorController.java diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java index ce86abc..47b07b4 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java @@ -46,16 +46,10 @@ public class CsEquipmentDeliveryVO extends BaseEntity { private String mac; /** - * 装置用途(治理、监测...) + * 装置类型(直连设备、网关设备) */ - @ApiModelProperty(value="装置用途") - private String devUse; - -// /** -// * 装置类型(直连设备、网关设备) -// */ -// @ApiModelProperty(value="装置类型") -// private String devType; + @ApiModelProperty(value="装置类型") + private String devType; /** * 装置型号（pqs588、pqs680...） @@ -109,7 +103,7 @@ public class CsEquipmentDeliveryVO extends BaseEntity { private String salesManager; /** - * 状态(0:删除 1:正常) + * 状态(0:删除 1:未注册 2:注册 3:接入) */ @TableField(value = "status") private Integer status; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java new file mode 100644 index 0000000..1674bb0 --- /dev/null +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java @@ -0,0 +1,24 @@ +package com.njcn.csdevice.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/6/15 20:36 + */ +@Data +public class DeviceManagerDetailVO { + + @ApiModelProperty("指标名称") + private String name; + + @ApiModelProperty("数据类型") + private String type; + + @ApiModelProperty("单位") + private String unit; +} diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java new file mode 100644 index 0000000..b571e68 --- /dev/null +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java @@ -0,0 +1,53 @@ +package com.njcn.csdevice.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/6/15 15:23 + */ +@Data +public class DeviceManagerVO { + + @ApiModelProperty("识别码") + private String ndid; + + @ApiModelProperty("设备名称") + private String name; + + @ApiModelProperty(value = "装置类型(前端根据字典自己查询)") + private String devType; + + @ApiModelProperty(value = "设备型号(前端根据字典自己查询)") + private String devModel; + + @ApiModelProperty(value = "装置接入方式(cloud转为云前置)") + private String devAccessMethod; + + @ApiModelProperty(value = "装置接入时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDateTime time; + + @ApiModelProperty(value = "装置数据集集合") + private List dataSetList; + + @Data + public static class DataSetVO { + + @ApiModelProperty(value = "数据集Id") + private String id; + + @ApiModelProperty(value = "数据集名称") + private String name; + + } +} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java index 0da5a2c..b6bae12 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java @@ -7,8 +7,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.po.CsDataArray; -import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; import com.njcn.csdevice.pojo.vo.LineTargetVO; import com.njcn.csdevice.service.ICsDataArrayService; import com.njcn.web.controller.BaseController; @@ -42,10 +42,20 @@ public class CsDataArrayController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getArrayBySet") @ApiOperation("根据数据集获取详细数据") - @ApiImplicitParam(name = "dataSetList", value = "数据集集合", required = true) - public HttpResult> getArrayBySet(@RequestBody List dataSetList){ + @ApiImplicitParam(name = "dataSet", value = "数据集id", required = true) + public HttpResult> getArrayBySet(@RequestParam("dataSet") String dataSet){ String methodDescribe = getMethodDescribe("getArrayBySet"); - List list = csDataArrayService.getArrayBySet(dataSetList); + List list = csDataArrayService.getArrayBySet(dataSet); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getTargetById") + @ApiOperation("根据数据集获取指标数据") + @ApiImplicitParam(name = "id", value = "数据集Id", required = true) + public HttpResult> getTargetById(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("getTargetById"); + List list = csDataArrayService.getTargetById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } @@ -59,18 +69,19 @@ public class CsDataArrayController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getDataArrayById") - @ApiOperation("获取详细数据(id)") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pid", value = "数据集id", required = true), - @ApiImplicitParam(name = "name", value = "名称", required = true) - }) - public HttpResult> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name){ - String methodDescribe = getMethodDescribe("getDataArrayById"); - List list = csDataArrayService.getDataArrayById(pid, name); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @PostMapping("/getDataArrayById") +// @ApiOperation("获取详细数据(id)") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "pid", value = "数据集id", required = true), +// @ApiImplicitParam(name = "name", value = "名称", required = true) +// }) +// @Deprecated +// public HttpResult> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name){ +// String methodDescribe = getMethodDescribe("getDataArrayById"); +// List list = csDataArrayService.getDataArrayById(pid, name); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); +// } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceManagerController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceManagerController.java deleted file mode 100644 index 58f0a40..0000000 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceManagerController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.njcn.csdevice.controller.equipment; - -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.csdevice.pojo.param.CsEquipmentDeliveryAddParm; -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; - -/** - * 类的介绍： - * - * @author xuyang - * @version 1.0.0 - * @createTime 2023/6/13 15:44 - */ -@Slf4j -@RestController -@RequestMapping("/deviceManager") -@Api(tags = " 设备管理") -@AllArgsConstructor -public class DeviceManagerController extends BaseController { - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/deviceTree") - @ApiOperation("设备树") - public HttpResult getDeviceTree(){ - String methodDescribe = getMethodDescribe("getDeviceTree"); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - - -} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceMonitorController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceMonitorController.java deleted file mode 100644 index 0cf682c..0000000 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceMonitorController.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.csdevice.controller.equipment; - -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 类的介绍： - * - * @author xuyang - * @version 1.0.0 - * @createTime 2023/6/13 15:45 - */ -@Slf4j -@RestController -@RequestMapping("/deviceMonitor") -@Api(tags = " 设备监控") -@AllArgsConstructor -public class DeviceMonitorController extends BaseController { -} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index 40f4ac3..c3b6dbc 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -13,6 +13,8 @@ import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; +import com.njcn.csdevice.pojo.vo.CsLedgerVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; import com.njcn.csdevice.service.CsEquipmentDeliveryService; import com.njcn.web.controller.BaseController; @@ -123,17 +125,28 @@ public class EquipmentDeliveryController extends BaseController { @PostMapping("/list") @ApiOperation("出厂设备列表") @ApiImplicitParam(name = "param", value = "查询参数", required = true) - public HttpResult> list(@RequestBody CsEquipmentDeliveryQueryParm param){ + public HttpResult> list(@RequestBody CsEquipmentDeliveryQueryParm param){ String methodDescribe = getMethodDescribe("list"); - Page page = csEquipmentDeliveryService.list(param); + Page page = csEquipmentDeliveryService.list(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/deviceTree") + @ApiOperation("三层设备树") + public HttpResult> getDeviceTree(){ + String methodDescribe = getMethodDescribe("getDeviceTree"); + List list = csEquipmentDeliveryService.getDeviceTree(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } - - - - - - + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/deviceData") + @ApiOperation("装置基础数据和模板数据") + @ApiImplicitParam(name = "deviceId", value = "装置id", required = true) + public HttpResult getDeviceData(@RequestParam String deviceId){ + String methodDescribe = getMethodDescribe("getDeviceData"); + DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java index a4fd168..c5841aa 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java @@ -22,4 +22,6 @@ public interface CsDataArrayMapper extends BaseMapper { List getData(@Param("list") List list); + List getDictData(@Param("id") String id); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java index 34150e4..23690a9 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; +import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; import com.njcn.system.pojo.vo.EleEpdPqdVO; import org.apache.ibatis.annotations.Param; @@ -22,7 +23,7 @@ import org.apache.ibatis.annotations.Param; public interface CsEquipmentDeliveryMapper extends BaseMapper { Page queryProjectEquipmentVO(Page returnpage,@Param("projectEquipmentQueryParm")ProjectEquipmentQueryParm projectEquipmentQueryParm); - Page page(Page returnpage,@Param("ew") QueryWrapper queryWrapper); + Page page(Page returnpage, @Param("ew") QueryWrapper queryWrapper); } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml index 75bd49b..0f51d6b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml @@ -19,8 +19,6 @@ order by idx - - - + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml index 7630a7a..98e243a 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml @@ -60,7 +60,7 @@ - select * from diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index 8a9137e..467a065 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -9,6 +9,8 @@ import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; +import com.njcn.csdevice.pojo.vo.CsLedgerVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; import java.util.List; @@ -66,9 +68,21 @@ public interface CsEquipmentDeliveryService extends IService list(CsEquipmentDeliveryQueryParm param); + Page list(CsEquipmentDeliveryQueryParm param); + + /** + * 终端三层树 + * @return + */ + List getDeviceTree(); + + /** + * 获取装置基础数据和模板数据 + * @return + */ + DeviceManagerVO getDeviceData(String deviceId); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java index 57e760a..8b79874 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; import com.njcn.csdevice.pojo.vo.LineTargetVO; import org.springframework.web.bind.annotation.RequestParam; @@ -18,17 +19,22 @@ import java.util.List; * @since 2023-05-31 */ public interface ICsDataArrayService extends IService { - + /** + * 根据数据集获取指标数据 + * @param dataSet 数据集Id + * @return + */ + List getArrayBySet(String dataSet); /** * 根据数据集获取指标数据 - * @param list 数据集 + * @param id * @return */ - List getArrayBySet(List list); + List getTargetById(String id); List getDataArray(List list); - List getDataArrayById(String pid, String name); +// List getDataArrayById(String pid, String name); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java index 4a71d29..b9abcb5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java @@ -1,6 +1,7 @@ package com.njcn.csdevice.service; import com.njcn.csdevice.pojo.param.CsLedgerParam; +import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.vo.CsLedgerVO; import java.util.List; @@ -52,4 +53,11 @@ public interface ICsLedgerService { */ String findDevByLineId(String lineId); + /** + * 根据id查询数据 + * @param id + * @return + */ + CsLedger findDataById(String id); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java index 21c649b..0a24cf5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java @@ -5,15 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.pojo.dto.DataArrayDTO; import com.njcn.csdevice.pojo.po.CsDataArray; -import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; -import com.njcn.csdevice.pojo.vo.LineTargetVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; import com.njcn.csdevice.service.ICsDataArrayService; +import com.njcn.system.api.EpdFeignClient; +import com.njcn.system.pojo.po.EleEpdPqd; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; + /** *

* 详细数据表 服务实现类 @@ -23,12 +26,33 @@ import java.util.stream.Collectors; * @since 2023-05-31 */ @Service +@AllArgsConstructor public class CsDataArrayServiceImpl extends ServiceImpl implements ICsDataArrayService { + private final EpdFeignClient epdFeignClient; + @Override - public List getArrayBySet(List list) { - List setList = list.stream().map(CsDataSet::getId).collect(Collectors.toList()); - return this.lambdaQuery().in(CsDataArray::getPid,setList).list(); + public List getArrayBySet(String dataSet) { + return this.lambdaQuery().eq(CsDataArray::getPid,dataSet).orderByAsc(CsDataArray::getSort).list(); + } + + @Override + public List getTargetById(String id) { + List list = new ArrayList<>(); + List l = this.baseMapper.getDictData(id).stream().map(CsDataArray::getDataId).collect(Collectors.toList()); + List result = epdFeignClient.selectByIds(l).getData(); + result.forEach(item->{ + DeviceManagerDetailVO vo = new DeviceManagerDetailVO(); + if(Objects.equals(item.getPhase(),"M")) { + vo.setName(item.getShowName()); + } else { + vo.setName(item.getPhase() + "相" +item.getShowName()); + } + vo.setType(item.getType()); + vo.setUnit(item.getUnit()); + list.add(vo); + }); + return list; } @Override @@ -79,10 +103,10 @@ public class CsDataArrayServiceImpl extends ServiceImpl getDataArrayById(String pid, String name) { - return this.lambdaQuery().eq(CsDataArray::getPid,pid).eq(CsDataArray::getName,name).list(); - } +// @Override +// public List getDataArrayById(String pid, String name) { +// return this.lambdaQuery().eq(CsDataArray::getPid,pid).eq(CsDataArray::getName,name).list(); +// } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 820e71b..7c005ae 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -1,6 +1,5 @@ package com.njcn.csdevice.service.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,36 +9,32 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.enums.AlgorithmResponseEnum; +import com.njcn.csdevice.enums.LineBaseEnum; import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper; import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAddParm; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; +import com.njcn.csdevice.pojo.po.CsDataSet; +import com.njcn.csdevice.pojo.po.CsEngineeringPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; -import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; -import com.njcn.csdevice.service.CsEquipmentDeliveryService; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.system.enums.SystemResponseEnum; -import com.njcn.system.pojo.param.EleEpdPqdParam; -import com.njcn.system.pojo.po.EleEpdPqd; -import lombok.RequiredArgsConstructor; +import com.njcn.csdevice.pojo.vo.*; +import com.njcn.csdevice.service.*; import com.njcn.db.constant.DbConstant; -import com.njcn.system.pojo.vo.EleEpdPqdVO; import com.njcn.web.factory.PageFactory; +import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.lang.reflect.Array; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; /** * @@ -53,8 +48,17 @@ import java.util.Optional; @Service @RequiredArgsConstructor public class CsEquipmentDeliveryServiceImpl extends ServiceImpl implements CsEquipmentDeliveryService{ + private final CsLedgerMapper csLedgerMapper; + private final ICsEngineeringUserService csEngineeringUserService; + + private final CsDevModelRelationService csDevModelRelationService; + + private final ICsDataSetService csDataSetService; + + private final ICsLedgerService csLedgerService; + @Override @Transactional(rollbackFor = {Exception.class}) public Boolean save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) { @@ -129,7 +133,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl list(CsEquipmentDeliveryQueryParm queryParam) { + public Page list(CsEquipmentDeliveryQueryParm queryParam) { QueryWrapper queryWrapper = new QueryWrapper(); if (ObjectUtil.isNotNull(queryParam)) { //查询参数不为空，进行条件填充 @@ -145,7 +149,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); } + + @Override + public List getDeviceTree() { + List engineeringList = new ArrayList<>(); + List allList = csLedgerMapper.getAll(); + //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 + if (Objects.equals(RequestUtil.getUsername(),"root")){ + engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + } else { + List engineering = csEngineeringUserService.getEngineeringByUser(); + engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList()); + } + List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + List deviceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList))); + engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList))); + return engineeringList; + } + + @Override + public DeviceManagerVO getDeviceData(String deviceId) { + DeviceManagerVO deviceManagerVo = new DeviceManagerVO(); + List dataSetList = new ArrayList<>(); + CsEquipmentDeliveryPO csEquipmentDeliveryPo = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId,deviceId).one(); + String modelId = csDevModelRelationService.findModelByDevId(deviceId).getModelId(); + List dataSet = csDataSetService.findDataSetByModelId(modelId); + BeanUtils.copyProperties(csEquipmentDeliveryPo,deviceManagerVo); + dataSet.forEach(item->{ + DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO(); + dataSetVO.setId(item.getId()); + dataSetVO.setName(item.getAnotherName()); + dataSetList.add(dataSetVO); + }); + deviceManagerVo.setDataSetList(dataSetList); + CsLedger csLedger = csLedgerService.findDataById(deviceId); + deviceManagerVo.setTime(csLedger.getCreateTime()); + return deviceManagerVo; + } + + /** + * 获取子节点 + */ + public List getChildren(CsLedgerVO item, List all) { + return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList()); + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 43cdb7b..cc9d5a2 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -113,6 +113,11 @@ public class CsLedgerServiceImpl extends ServiceImpl i return deviceId; } + @Override + public CsLedger findDataById(String id) { + return this.lambdaQuery().eq(CsLedger::getId,id).one(); + } + /** * 获取子节点 */ diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java index 4c0a127..62eec84 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java @@ -22,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; /** *

@@ -42,10 +45,10 @@ public class CsElementController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/add") @ApiOperation("组态图元新增") - @ApiImplicitParam(name = "param", value = "组态图元", required = true) - public HttpResult add(@RequestBody @Validated CsPageParm param){ + @ApiImplicitParam(name = "multipartFile", value = "组态图元数据流", required = true) + public HttpResult add(@RequestBody @Validated MultipartFile multipartFile){ String methodDescribe = getMethodDescribe("add"); - csElementService.addElement(param.getJsonFile()); + csElementService.addElement(multipartFile); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, CommonResponseEnum.SUCCESS.getMessage(), methodDescribe); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java index 2955167..2e4dab0 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csharmonic.param.CsPageParm; import com.njcn.csharmonic.pojo.po.CsElement; import com.njcn.csharmonic.pojo.vo.ElementsVO; +import org.springframework.web.multipart.MultipartFile; /** *

@@ -17,9 +18,9 @@ public interface ICsElementService extends IService { /** * 新增组态图元 - * @param json 参数 + * @param multipartFile 文件 */ - void addElement(String json); + void addElement(MultipartFile multipartFile); /** * 组态图元数据查询 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsElementServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsElementServiceImpl.java index d0bb119..39e3245 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsElementServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsElementServiceImpl.java @@ -13,11 +13,9 @@ import com.njcn.oss.utils.FileStorageUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.stream.Collectors; @@ -38,9 +36,9 @@ public class CsElementServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper(); @@ -50,9 +48,13 @@ public class CsElementServiceImpl extends ServiceImpl