qhiot-api/qhiot-api-wechat/src/main/java/com/qhiot/api/wechat/controller/StationWechatController.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import com.qhiot.api.wechat.model.*;
 import com.qhiot.api.wechat.response.*;
@@ -748,11 +749,33 @@ public class StationWechatController<stationTypeDashboardService> extends Abstra
         example.orderBy("rating");
         List<AdvStationTree> list = advStationTreeService.selectByExample(example);
         List<MonitoringGroup> monitoringGroupList=new ArrayList<MonitoringGroup>();
-        for(int a=0;a<list.size();a++){
+
+        //农饮水部分没有正确配置工艺分组解决方法
+        List<AdvStationTree> list0 = list.stream().filter(item-> item.getConnectTree() == 0).collect(Collectors.toList());
+        //如果工艺段类型为0时有数据,说明下方工艺段未配置，则直接取下方配置的指标为菜单分组
+        if(list0.size()>0){
+            List<AdvStationEquipmentDTO> listEQ = advDeviceEquipments.stream().filter(item-> item.getAdvGroupId().equals(list0.get(0).getAdvGroupId())).collect(Collectors.toList());
+            //连接设备工艺段默认一直都有
+            List<AdvStationTree> list1 = list.stream().filter(item-> item.getConnectTree() == 1).collect(Collectors.toList());
             MonitoringGroup monitoringGroup=new MonitoringGroup();
-            monitoringGroup.setGroupId(list.get(a).getAdvGroupId());
-            monitoringGroup.setGroupName(list.get(a).getAdvGroupName());
-            monitoringGroupList.add(a,monitoringGroup);
+            monitoringGroup.setGroupId(list1.get(0).getAdvGroupId());
+            monitoringGroup.setGroupName(list1.get(0).getAdvGroupName());
+            monitoringGroupList.add(monitoringGroup);
+            //将指标加入
+            for(AdvStationEquipmentDTO dto:listEQ){
+                MonitoringGroup monitoringGroupDto=new MonitoringGroup();
+                monitoringGroupDto.setGroupId(dto.getAdvStationEquipmentId());
+                monitoringGroupDto.setGroupName(dto.getEquipmentName());
+                monitoringGroupList.add(monitoringGroupDto);
+            }
+/**/
+        }else {
+            for (int a = 0; a < list.size(); a++) {
+                MonitoringGroup monitoringGroup = new MonitoringGroup();
+                monitoringGroup.setGroupId(list.get(a).getAdvGroupId());
+                monitoringGroup.setGroupName(list.get(a).getAdvGroupName());
+                monitoringGroupList.add(a, monitoringGroup);
+            }
         }
         response.setGroup(monitoringGroupList);
         return response;

qhiot-cm/src/main/java/com/qhiot/cm/basic/mapper/sql/StationMonitoringDTOMapper.xml

@@ -340,12 +340,13 @@
             </if>
             <if test="groupsId != null" >
                 and f.adv_group_id =#{groupsId}
+                or ae.adv_station_equipment_id =#{groupsId}
             </if>
 
         </where>
         order by f.rating asc, m.rating desc, m.monitoring_id
     </select>
-
+<!---->
     <select id="selectStationMonitoringDataForcontrol" resultMap="BaseResultMap"
             parameterType="java.util.Map">
         SELECT a.sm_id,a.index_id, a.monitoring_id, a.monitoring_name, m.monitoring_name as

qhiot-cm/src/main/java/com/qhiot/cm/basic/service/StationMonitoringDTOService.java

@@ -111,12 +111,14 @@ public class StationMonitoringDTOService {
      * @param stationId,groupId
      * @return
      * @throws ServiceException
+     *
      */
     public List<StationMonitoringDTO> selectStationMonitoringDataForNew(Long stationId,Long groupId) throws ServiceException {
         try {
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("stationId", stationId);
             map.put("groupsId", groupId);
+            map.put("advStationEquipmentId", groupId);
             return stationMonitoringDTOMapper.selectStationMonitoringDataForNew(map);
         } catch (Exception e) {
             throw new ServiceException(e.getMessage(), e);