问题单修复

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java

@@ -331,7 +331,7 @@ public class GeneralDeviceService {
                     deviceInfoParam));
         } else {
             for (DeptDTO directDeptDTO : directDeptInfos) {
-                //筛选上级部门pids包含该id的所有部门 直接子部门下属所有部门
+                //筛选pids包含该id的所有部门 直接子部门下属所有部门
                 List<DeptDTO> descendantDeptDTO = deptInfos.stream()
                         .filter(d -> d.getPids().contains(directDeptDTO.getId()))
                         .collect(Collectors.toList());
@@ -348,7 +348,7 @@ public class GeneralDeviceService {
 
 
         //判断统计类型
-        if (deviceInfoParam.getStatisticalType()==null) {
+        if (deviceInfoParam.getStatisticalType() == null) {
             deviceInfoParam.setStatisticalType(new SimpleDTO());
         }
         StatisticsEnum statisticsEnum = StatisticsEnum.getStatisticsEnumByCode(deviceInfoParam.getStatisticalType().getCode());
@@ -377,8 +377,7 @@ public class GeneralDeviceService {
     private GeneralDeviceDTO getGeneralDeviceInfo(DeptDTO directDeptDTO,
                                                   DeviceType deviceType,
                                                   List<String> ids,
-                                                  DeviceInfoParam deviceInfoParam)
+                                                  DeviceInfoParam deviceInfoParam) {
-    {
         GeneralDeviceDTO generalDeviceDTO = new GeneralDeviceDTO();
         generalDeviceDTO.setIndex(directDeptDTO.getId());
         // type:部门类型 0-非自定义；1-web自定义；2-App自定义；3-web测试

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java

@@ -301,7 +301,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                             List<TerminalOnlineRateDataVO> devs = subItem.getChildren();
                             if (CollectionUtil.isNotEmpty(devs)) {
                                 for (TerminalOnlineRateDataVO devItem : devs) {
-                                    if (Objects.isNull(devItem.getChildren())) {
+                                    if (devItem.getChildren().size()==0) {
                                         if (mapAlarm.containsKey(devItem.getAlgoDescribe())) {
                                             if (devItem.getOnlineRate() != 3.14159  && devItem.getOnlineRate() > mapAlarm.get(devItem.getAlgoDescribe())) {
                                                 devItem.setValueOver(1);

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java

@@ -31,6 +31,9 @@ public class EventTemplateParam {
     @ApiModelProperty("类型")
     private Integer type;
 
+    @ApiModelProperty("字典树")
+    private List<String> ids;
+
     /**
      * 更新操作实体
      */

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/TemplateRel.java

@@ -12,10 +12,10 @@ public class TemplateRel {
     /**
      * 模板Id
      */
-    private String RtId;
+    private String rtId;
 
     /**
      * 字典Id
      */
-    private String RdId;
+    private String rdId;
 }

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java

@@ -3,6 +3,7 @@ package com.njcn.system.pojo.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author hany
@@ -39,5 +40,10 @@ public class EventTemplateVO implements Serializable {
      */
     private Integer state;
 
+    /**
+     * 关联字典表id
+     */
+    private List<String> rdIds;
+
 
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java

@@ -2,7 +2,8 @@ package com.njcn.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.system.pojo.po.TemplateRel;
-import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.ibatis.annotations.Param;
+
 
 import java.util.List;
 
@@ -18,5 +19,7 @@ public interface TemplateRelMapper extends BaseMapper<TemplateRel> {
      * @param ids
      * @return
      */
-    List<TemplateRel> selectRelevance(@Param("ids")List<String> ids);
+    List<TemplateRel> selectRelevance(@Param("ids") List<String> ids);
+
+    boolean batchInsert(@Param("list") List<TemplateRel> list);
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml

@@ -3,13 +3,21 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.system.mapper.TemplateRelMapper">
+    <insert id="batchInsert">
+        INSERT INTO report_relevancy
+        (Rt_Id,Rd_Id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+        (#{item.rtId},
+        #{item.rdId})
+        </foreach>
+    </insert>
 
     <select id="selectRelevance" resultType="TemplateRel">
         select report_relevancy.*
         from report_relevancy report_relevancy
         where report_relevancy.Rt_id in
-        <foreach item="item" index="index" collection="ids" open="("
+        <foreach collection="ids" item="item" index="index"  open="(" separator="," close=")">
-                 separator="," close=")">
             #{item}
         </foreach>
     </select>

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java

@@ -44,7 +44,7 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
      * @return
      */
     @Override
-    public boolean addDict (EventDictParam eventDictParam){
+    public boolean addDict (EventDictParam eventDictParam) {
         checkName(eventDictParam,false);
         ReportDict rptDict = new ReportDict();
         BeanUtils.copyProperties(eventDictParam,rptDict);
@@ -115,7 +115,7 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
             if (ObjectUtil.isAllNotEmpty(dictQueryParam.getSortBy(), dictQueryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, dictQueryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(dictQueryParam.getSortBy()));
             }else{
-                queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
+                //queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "report_dict.update_time");
             }

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.system.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;
@@ -22,7 +23,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author: hany
@@ -58,7 +60,21 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
             queryWrapper.eq("report_template.type",1);
         }
         //初始化分页数据
-        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+        Page<EventTemplateVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+        List<String> list = page.getRecords().stream().map(EventTemplateVO::getId).collect(Collectors.toList());
+        List<TemplateRel> templateRels = templateRelMapper.selectRelevance(list);
+        if (CollectionUtil.isNotEmpty(templateRels)) {
+            // Map<String, String> map = templateRels.stream().collect(Collectors.toMap(TemplateRel::getRdId, TemplateRel::getRtId));
+            Map<String, List<TemplateRel>> temMap = templateRels.stream().collect(Collectors.groupingBy(TemplateRel::getRtId));
+            for (EventTemplateVO record : page.getRecords()) {
+                if (Objects.nonNull(temMap.get(record.getId()))) {
+                    record.setRdIds(temMap.get(record.getId()).stream().map(TemplateRel::getRtId).collect(Collectors.toList()));
+                }
+
+            }
+        }
+
+        return page;
     }
 
     /**
@@ -83,7 +99,20 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         BeanUtils.copyProperties(eventTemplateParam,eventTemplate);
         //设为正常状态
         eventTemplate.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(eventTemplate);
+        boolean flag= this.save(eventTemplate);
+        String id = eventTemplate.getId();
+        TemplateRel relevancy = new TemplateRel();
+        List<TemplateRel> list = new ArrayList<>();
+        relevancy.setRdId(id);
+        eventTemplateParam.getIds().forEach(rtId -> {
+            // 字典表id
+            relevancy.setRdId(rtId);
+            // 模版id
+            relevancy.setRtId(id);
+            list.add(relevancy);
+        });
+        flag = templateRelMapper.batchInsert(list);
+        return flag;
     }
     /**
      * 修改模板