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

@@ -105,7 +105,6 @@ public class BigScreenAnalyseController extends BaseController {
         return ResponseHelper.buildResponse(stringBigDecimalHashMap);
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "场站设备健康状态指数与趋势 - 折线图", notes = "场站设备健康状态指数与趋势 - 折线图")
     @GetMapping(value = "/getHealthListInfo")

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

@@ -130,6 +130,23 @@ public class TDBigScreenAnalyseController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "场站设备健康状态指数与趋势 - 仪表盘-10分钟", notes = "场站设备健康状态指数与趋势 - 仪表盘-10分钟")
+    @GetMapping(value = "/getHealthScoreInfoByMinute")
+    public ResponseModel<Map<String, Object>> getHealthScoreInfoByMinute(@RequestParam(required = false) String areaCode,
+                                                                          @RequestParam(required = false) String stationCode,
+                                                                          @RequestParam (required = false) String tableName) {
+        HashMap<String, Object> stringBigDecimalHashMap = new HashMap<>();
+        if (CharSequenceUtil.isNotEmpty(stationCode)) {
+            StationBasic stationBasic = stationBasicMapper.selectById(stationCode);
+            stationCode = stationBasic.getFanGatewayId();
+            stringBigDecimalHashMap.put("value", idxBizFanHealthIndexMapper.getHealthScoreInfoByStationByMinute(stationCode, tableName));
+            return ResponseHelper.buildResponse(stringBigDecimalHashMap);
+        }
+        stringBigDecimalHashMap.put("value",
+                idxBizFanHealthIndexMapper.getHealthScoreInfoByLatest(areaCode, stationCode));
+        return ResponseHelper.buildResponse(stringBigDecimalHashMap);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "场站设备健康状态指数与趋势 - 折线图", notes = "场站设备健康状态指数与趋势 - 折线图")
     @GetMapping(value = "/getHealthListInfo")
     public ResponseModel<Map<String, Object>> getHealthListInfo(@RequestParam(required = false) String areaCode,

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

@@ -22,12 +22,13 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
 public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIndex> {
 
 	BigDecimal getHealthScoreInfo(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode);
-
 	BigDecimal getHealthScoreInfoByLatest(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode);
 
 	BigDecimal getHealthScoreInfoByStation(@Param("stationCode") String stationCode,
 			@Param("tableName") String tableName);
 
+	BigDecimal getHealthScoreInfoByStationByMinute(@Param("stationCode") String stationCode,
+										   @Param("tableName") String tableName);
 	BigDecimal getHealthScoreInfoByParam(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode,
 			@Param("analysisType") String analysisType);
 

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

@@ -131,7 +131,7 @@
 		<where>
 			ANALYSIS_TYPE = '按天'
            <!-- AND DATE_ADD(DATE_FORMAT( REC_DATE, '%Y-%m-%d' ),INTERVAL 1 DAY) = CURRENT_DATE-->
-            AND CURRENT_DATE = get_time_add(1,'DAY')
+           AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
 			<if test="stationCode != null and stationCode != ''">
                 AND GATEWAY_ID = #{stationCode}
                 AND ANALYSIS_OBJ_TYPE = '场站'
@@ -139,6 +139,21 @@
 		</where>
 		limit 1
 	</select>
+    <select id="getHealthScoreInfoByStationByMinute" resultType="java.math.BigDecimal">
+        SELECT
+        round(IFNULL( HEALTH_INDEX , 100 ), 1) AS healthIndex
+        FROM
+        ${tableName}
+        <where>
+            ANALYSIS_TYPE = '按10分钟'
+            <if test="stationCode != null and stationCode != ''">
+                AND GATEWAY_ID = #{stationCode}
+                AND ANALYSIS_OBJ_TYPE = '场站'
+            </if>
+        </where>
+        order by REC_DATE DESC
+        limit 1
+    </select>
 	<select id="getHealthListInfo" resultType="java.util.Map">
 		SELECT
         CEILING(IFNULL( AVG( HEALTH_INDEX ), 100 )) AS avgHealthIndex,