Merge remote-tracking branch 'origin/developer' into developer

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

@@ -724,7 +724,7 @@ private FanHealthIndexDayMapper fanHealthIndexDayMapper;
                                                                    @RequestParam(value = "stationId", required = true) String stationId,
                                                                    @RequestParam(value = "tableName2", required = false) String tableName2) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-        String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName, stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
+        String nameByIndexAddress = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(indexAddress, tableName, stationBasic.getFanGatewayId());
 
         int num = idxBizFanHealthIndexMapper.getIsWarningByPointId(indexAddress, stationBasic.getFanGatewayId(), tableName2,stationBasic.getBoosterGatewayId());
 
@@ -742,7 +742,7 @@ private FanHealthIndexDayMapper fanHealthIndexDayMapper;
                                                                      @RequestParam(value = "stationId") String stationId) {
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-        varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName, stationBasic.getFanGatewayId(),stationBasic.getBoosterGatewayId());
+        varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName, stationBasic.getFanGatewayId());
         FeignClientResult<List<String>> sevenEntityMcb = null;
         try {
             sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);

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

@@ -101,7 +101,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 			@Param("equipmentName") String equipmentName,@Param("syzGatewayId") String syzGatewayId);
 
 	String getPointNameByIndexAddress(@Param("varDesc") String varDesc, @Param("tableName") String tableName,
-			@Param("gatewayId") String gatewayId,@Param("syzGatewayId") String syzGatewayId);
+			@Param("gatewayId") String gatewayId);
 
 	List<FullViewRecallDataDTO> getFullViewRecall(@Param("gatewayIds") List<String> gatewayIds);
 
@@ -152,7 +152,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 	Map<String, Object> getPvEquipStatusByStation(String station);
 
 	String getRecDateByIndexAddress(@Param("fanGatewayId") String fanGatewayId,
-			@Param("indexAddress") String indexAddress, @Param("tableName") String tableName,@Param("syzGatewayId") String syzGatewayId);
+			@Param("indexAddress") String indexAddress, @Param("tableName") String tableName);
 
 	List<Map<String, Object>> getInfoListByTableName(@Param("fanGatewayId") String fanGatewayId,
 			@Param("indexAddress") String indexAddress, @Param("tableName") String tableName,
@@ -164,7 +164,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 	List<Map<String, Object>> queryIndexByArae(String ARAE, String ANALYSISTYPE, String startTimeTop,
 			String endTimeTop);
 
-	Map<String, Object> getHealthIndexByIndexAddress(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress,@Param("syzGatewayId") String syzGatewayId);
+	Map<String, Object> getHealthIndexByIndexAddress(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress);
 
-	Map<String, Object> getHealthIndexByIndexAddressPv(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress,@Param("syzGatewayId") String syzGatewayId);
+	Map<String, Object> getHealthIndexByIndexAddressPv(@Param("gatewayId") String gatewayId, @Param("indexAddress") String indexAddress);
 }

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

@@ -757,7 +757,7 @@ FROM (
     select POINT_NAME
     from ${tableName}
     where INDEX_ADDRESS = #{varDesc}
-          AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
+          AND GATEWAY_ID = #{gatewayId}
         limit 1
 
 
@@ -1354,7 +1354,7 @@ FROM (
                 WHERE
                     INDEX_ADDRESS = #{indexAddress}
                   AND DISPOSOTION_STATE = '待确认'
-                    AND (GATEWAY_ID = #{fanGatewayId} or GATEWAY_ID = #{syzGatewayId})
+                    AND GATEWAY_ID = #{fanGatewayId}
                 ORDER BY
                     sort DESC,
                     REC_DATE DESC
@@ -1770,7 +1770,7 @@ TIMESTAMPDIFF( MINUTE,  #{startTime} , #{endTime})/10 >= @s-1
         from fan_health_index_latest_data
         where
         INDEX_ADDRESS = #{indexAddress}
-          AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
+          AND GATEWAY_ID = #{gatewayId}
         and ANALYSIS_OBJ_TYPE = '测点'
         and ANALYSIS_TYPE = '按天'
         limit 1
@@ -1782,7 +1782,7 @@ TIMESTAMPDIFF( MINUTE,  #{startTime} , #{endTime})/10 >= @s-1
         from pv_health_index_latest_data
         where
         INDEX_ADDRESS = #{indexAddress}
-          AND (GATEWAY_ID = #{gatewayId} or GATEWAY_ID = #{syzGatewayId})
+          AND GATEWAY_ID = #{gatewayId}
         and ANALYSIS_OBJ_TYPE = '测点'
         and ANALYSIS_TYPE = '按天'
         limit 1