解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -436,8 +436,8 @@ public class BigScreenAnalyseController extends BaseController {
             } else {
                 LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
                 query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "设备");
-                query.eq(IdxBizFanHealthLevel::getStatus, stationBasic.getStationName());
-                query.le(IdxBizFanHealthLevel::getGroupLowerLimit, equipmentHealthScore);
+                query.eq(IdxBizFanHealthLevel::getStatus, item.get("station"));
+                query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, equipmentHealthScore);
                 query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, equipmentHealthScore);
                 IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
                 item.put("warningName", idxBizFanHealthLevel.getHealthLevel());
@@ -708,7 +708,7 @@ public class BigScreenAnalyseController extends BaseController {
         String stationType = "风电站";
         List<IdxBizFanHealthLevel> collect = healthLevelInfoList.stream().filter(item -> item.getAnalysisObjType().contains(station)).collect(Collectors.toList());
         for (IdxBizFanHealthLevel item : collect) {
-            if (item.getAnalysisObjType().contains("子系统")) {
+            if (!item.getAnalysisObjType().contains("子系统")) {
                 stationType = "光伏站";
             }
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanPointProcessVariableClassificationController.java

@@ -15,6 +15,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -112,4 +113,19 @@ public class IdxBizFanPointProcessVariableClassificationController extends BaseC
 	public ResponseModel<List<IdxBizFanPointProcessVariableClassificationDto>> selectForList() {
 	    return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.queryForIdxBizFanPointProcessVariableClassificationList());
 	}
+
+
+
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/selectParams")
+	public ResponseModel<List<Map<String,Object>>> selectParams(String tableName,String column) {
+		return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.selectParams(column,tableName));
+	}
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointProcessVariableClassificationMapper.java

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -15,5 +17,8 @@ import java.util.List;
 public interface IdxBizFanPointProcessVariableClassificationMapper extends BaseMapper<IdxBizFanPointProcessVariableClassification> {
     List<IdxBizFanPointProcessVariableClassificationDto> getInfluxDBData();
 
+
+    List<Map<String,Object>> selectParams(String tableName,String column);
+
     List<String> gateWayIdListFan();
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IdxBizFanPointProcessVariableClassificationServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务实现类
@@ -31,4 +33,10 @@ public class IdxBizFanPointProcessVariableClassificationServiceImpl extends Base
     public List<IdxBizFanPointProcessVariableClassificationDto> queryForIdxBizFanPointProcessVariableClassificationList()   {
         return this.queryForList("" , false);
     }
+
+    public List<Map<String,Object>> selectParams(String column, String tableName)   {
+
+        return this.getBaseMapper(). selectParams(tableName,column);
+
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml

@@ -87,4 +87,10 @@
     <select id="gateWayIdListFan" resultType="java.lang.String">
         select GATEWAY_ID from idx_biz_fan_point_process_variable_classification group by GATEWAY_ID;
     </select>
+
+
+    <select id="selectParams" resultType="map">
+
+        select ${column} as text  from ${tableName} group by ${column};
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml

@@ -58,7 +58,7 @@
             AND a.recDate >= concat(#{startDate}, ' 00:00:00')
         </if>
         <if test="endDate != '' and endDate != null">
-            AND concat(#{startDate}, ' 59:59:59') >= a.recDate
+            AND concat(#{startDate}, ' 23:59:59') >= a.recDate
         </if>
     </where>
     order by warningName DESC, recDate DESC
@@ -119,7 +119,7 @@
             AND a.recDate >= concat(#{startDate}, ' 00:00:00')
         </if>
         <if test="endDate != '' and endDate != null">
-            AND concat(#{startDate}, ' 59:59:59') >= a.recDate
+            AND concat(#{startDate}, ' 23:59:59') >= a.recDate
         </if>
     </where>) b
     </select>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1015,7 +1015,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             result.setTotal(statusMaps.size());
             i += 1;
             try {
-                emqKeeper.getMqttClient().publish(stationId + "/fj/group1" + i, JSON.toJSONString(result).getBytes(), 1, true);
+                emqKeeper.getMqttClient().publish(stationId + "/fj/group" + i, JSON.toJSONString(result).getBytes(), 1, true);
             } catch (MqttException e) {
                 log.info("消息发送失败");
                 e.printStackTrace();
@@ -1598,7 +1598,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     queryCondtion.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
                     List<ESEquipments> list1 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
                     resultMap.put("status", AlarmDesc.getCode(list1.get(0).getEquipmentIndexName()));
-                    queryEquipNum = "#" + Integer.parseInt(equipNames[0]);
+//                    queryEquipNum = "#" + Integer.parseInt(equipNames[0]);
+                    queryEquipNum = equipNames[0] + equipNames[1]+1;
                 }
             } else {
                 queryEquipNum = "#" + Integer.parseInt(equipmentNumber) + "";