代码调整

2023-06-20 08:55:46 +08:00
parent a8df0efa9c
commit 6dc27f2eda
14 changed files with 239 additions and 17 deletions
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupTemplateVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupTemplateVO.java
@@ -0,0 +1,27 @@
+package com.njcn.csdevice.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * @author xuyang
+ * @date 2023/6/19
+ */
+@Data
+public class DataGroupTemplateVO {
+
+    private String id;
+
+    private String pid;
+
+    @ApiModelProperty("组名称")
+    private String name;
+
+    private Integer sort;
+
+    @ApiModelProperty("指标数据")
+    private List<EnergyTemplateVO> children;
+}
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
@@ -0,0 +1,46 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.njcn.common.utils.serializer.InstantDateSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.Instant;
+
+/**
+ *
+ * @author xuyang
+ * @date 2023/6/19
+ */
+@Data
+public class EnergyTemplateVO {
+
+    private String id;
+
+    private String pid;
+
+    @ApiModelProperty("字典id")
+    private String dataId;
+
+    @ApiModelProperty("别名")
+    private String anotherName;
+
+    @ApiModelProperty("指标名称")
+    private String name;
+
+    @ApiModelProperty("数据类型")
+    private String statMethod;
+
+    @ApiModelProperty("相别")
+    private String phase;
+
+    @ApiModelProperty("数据查询表名")
+    private String classId;
+
+    @ApiModelProperty("数据时间")
+    @JsonSerialize(using = InstantDateSerializer.class)
+    private Instant time;
+
+    @ApiModelProperty("数据")
+    private Double dataValue;
+}
--- a/cs-device/cs-device-boot/pom.xml
+++ b/cs-device/cs-device-boot/pom.xml
@@ -58,6 +58,21 @@
      <artifactId>system-api</artifactId>
      <version>${project.version}</version>
    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>pqs-influx</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>4.9.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>logging-interceptor</artifactId>
+      <version>4.9.0</version>
+    </dependency>
  </dependencies>

  <build>
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/CsDeviceBootApplication.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/CsDeviceBootApplication.java
@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;


 /**
@@ -16,6 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@MapperScan("com.njcn.**.mapper")
@EnableFeignClients(basePackages = "com.njcn")
@SpringBootApplication(scanBasePackages = "com.njcn")
+@DependsOn("proxyMapperRegister")
 public class CsDeviceBootApplication {

    public static void main(String[] args)  {
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java
@@ -1,16 +1,19 @@
 package com.njcn.csdevice.controller.equipment;


+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.vo.CsGroupVO;
+import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.service.ICsGroupService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -48,5 +51,20 @@ public class CsGroupController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deviceRtData")
+    @ApiOperation("装置分组实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "tab选项id", required = true),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true),
+            @ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
+    })
+    public HttpResult<IPage<DataGroupTemplateVO>> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId){
+        String methodDescribe = getMethodDescribe("getDeviceData");
+        IPage<DataGroupTemplateVO> list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

--- 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
@@ -12,10 +12,7 @@ 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.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.pojo.vo.*;
 import com.njcn.csdevice.service.CsEquipmentDeliveryService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -140,4 +137,5 @@ public class EquipmentDeliveryController extends BaseController {
        DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
    }
+
 }
--- 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
@@ -3,6 +3,7 @@ package com.njcn.csdevice.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.csdevice.pojo.dto.DataArrayDTO;
 import com.njcn.csdevice.pojo.po.CsDataArray;
+import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
 import com.njcn.csdevice.pojo.vo.LineTargetVO;
 import org.apache.ibatis.annotations.Param;

@@ -26,4 +27,5 @@ public interface CsDataArrayMapper extends BaseMapper<CsDataArray> {

    List<CsDataArray> getGroupData(@Param("id") String id);

+    List<EnergyTemplateVO> getArrayByGroup(@Param("list") List<String> list);
 }
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java
@@ -1,8 +1,11 @@
 package com.njcn.csdevice.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.csdevice.pojo.po.CsGroup;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
+import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
@@ -24,4 +27,6 @@ public interface CsGroupMapper extends BaseMapper<CsGroup> {
    List<CsGroupVO> getArrayData(@Param("list") List<String> list);

    void insertList(@Param("list") List<CsGroup> list);
+
+    Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id);
 }
--- 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
@@ -65,4 +65,28 @@
            phase
        order by min(sort)
    </select>
+
+    <select id="getArrayByGroup" resultType="EnergyTemplateVO">
+        select
+            t1.id,
+            t0.group_id pid,
+            t1.data_id dataId,
+            t1.name,
+            case when t1.phase in ('A', 'B', 'C') then concat(t1.phase, "相", t1.another_name)
+            when t1.phase in ('M', 'T') then t1.another_name
+            else concat(t1.phase, t1.another_name)
+            end anotherName,
+            t1.stat_method statMethod,
+            t1.phase
+        from
+            cs_gro_arr t0
+        left join cs_data_array t1 on
+            t0.array_id = t1.id
+        where
+            t0.group_id in
+            <foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
+                #{item}
+            </foreach>
+        order by t1.sort
+    </select>
 </mapper>
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
@@ -71,4 +71,19 @@
        </foreach>
    </insert>

+
+    <select id="getGroupDataList" resultType="DataGroupTemplateVO">
+        select
+            id,
+            data_set_id pid,
+            group_name name,
+            sort
+        from
+            cs_group
+        where
+            data_set_id = #{id} and is_show = 1
+        order by
+            sort
+    </select>
+
 </mapper>
--- 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
@@ -8,10 +8,7 @@ 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.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.pojo.vo.*;

 import java.util.List;

--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java
@@ -1,8 +1,10 @@
 package com.njcn.csdevice.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.csdevice.pojo.po.CsGroup;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
+import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;

 import java.util.List;

@@ -22,4 +24,10 @@ public interface ICsGroupService extends IService<CsGroup> {
     */
    List<CsGroupVO> getGroupData(String dataSet);

+    /**
+     * 获取装置分组后的实时数据
+     * @return
+     */
+    IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId);
+
 }
--- 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,5 +1,6 @@
 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;
@@ -12,19 +13,22 @@ 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.CsDataArrayMapper;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
+import com.njcn.csdevice.mapper.CsGroupMapper;
 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.po.*;
 import com.njcn.csdevice.pojo.vo.*;
 import com.njcn.csdevice.service.*;
 import com.njcn.db.constant.DbConstant;
+import com.njcn.influx.pojo.dto.StatisticalDataDTO;
+import com.njcn.influx.service.CommonService;
+import com.njcn.system.api.EpdFeignClient;
+import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
@@ -189,10 +193,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
        return deviceManagerVo;
    }

-    /**
-     * 获取子节点
-     */
-    public List<CsLedgerVO> getChildren(CsLedgerVO item, List<CsLedgerVO> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+    private List<EnergyTemplateVO> getChildren(String tabId, List<EnergyTemplateVO> all) {
+        return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
    }
 }
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -2,16 +2,26 @@ package com.njcn.csdevice.service.impl;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+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.csdevice.mapper.CsDataArrayMapper;
 import com.njcn.csdevice.mapper.CsGroupMapper;
 import com.njcn.csdevice.pojo.po.CsDataArray;
 import com.njcn.csdevice.pojo.po.CsGroArr;
 import com.njcn.csdevice.pojo.po.CsGroup;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
+import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
+import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroArrService;
 import com.njcn.csdevice.service.ICsGroupService;
+import com.njcn.influx.pojo.dto.StatisticalDataDTO;
+import com.njcn.influx.service.CommonService;
+import com.njcn.system.api.EpdFeignClient;
+import com.njcn.system.pojo.po.EleEpdPqd;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -35,6 +45,14 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl

    private final ICsGroArrService csGroArrService;

+    private final CsGroupMapper csGroupMapper;
+
+    private final CsDataArrayMapper csDataArrayMapper;
+
+    private final CommonService commonService;
+
+    private final EpdFeignClient epdFeignClient;
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<CsGroupVO> getGroupData(String dataSet) {
@@ -53,6 +71,52 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
        return result;
    }

+    @Override
+    public IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId) {
+        IPage<DataGroupTemplateVO> pageTurn = new Page<>();
+        List<EnergyTemplateVO> arrayList = new ArrayList<>();
+        IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize), id);
+        if (pageRes.getTotal() != 0) {
+            List<DataGroupTemplateVO> groupList = pageRes.getRecords();
+            List<String> group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());
+            //获取当前组的所有指标项
+            List<EnergyTemplateVO> list = csDataArrayMapper.getArrayByGroup(group);
+            list.forEach(item->{
+                EnergyTemplateVO vo = new EnergyTemplateVO();
+                BeanUtils.copyProperties(item,vo);
+                EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
+                vo.setClassId(eleEpdPqd.getClassId());
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,eleEpdPqd.getClassId(),item.getName(),item.getPhase(),item.getStatMethod());
+                if (!Objects.isNull(statisticalDataDTO)){
+                    vo.setTime(statisticalDataDTO.getTime());
+                    vo.setDataValue(statisticalDataDTO.getValue());
+                } else {
+                    vo.setDataValue(3.1415926);
+                }
+                arrayList.add(vo);
+            });
+            if (CollectionUtil.isNotEmpty(arrayList)){
+                List<DataGroupTemplateVO> grList = groupList.stream().peek((item) -> {item.setChildren(getChildren(item.getId(), arrayList));}).collect(Collectors.toList());
+                pageTurn.setRecords(grList);
+                pageTurn.setTotal(pageRes.getTotal());
+                pageTurn.setSize(pageRes.getSize());
+                pageTurn.setCurrent(pageRes.getCurrent());
+                pageTurn.setPages(pageRes.getPages());
+            }
+        } else {
+            pageTurn.setRecords(new ArrayList<>());
+            pageTurn.setTotal(pageRes.getTotal());
+            pageTurn.setSize(pageRes.getSize());
+            pageTurn.setCurrent(pageRes.getCurrent());
+            pageTurn.setPages(pageRes.getPages());
+        }
+        return pageTurn;
+    }
+
+    private List<EnergyTemplateVO> getChildren(String tabId, List<EnergyTemplateVO> all) {
+        return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
+    }
+
    private List<CsGroupVO> getChildrenes(String tabId, List<CsGroupVO> all) {
        return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
    }