Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -50,7 +50,7 @@
             AND a.GATEWAY_ID = #{stationId}
         </if>
     </where>
-    order by REC_DATE DESC
+    order by recDate DESC
     limit #{current}, #{size}
 </select>
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -440,7 +440,13 @@ public class MonitorFanIdxController extends BaseController {
 
         return CommonResponseUtil.success();
     }
-
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "统一获取集电线与风机状态")
+    @GetMapping("/fanLineList")
+    public void getFanLineList() {
+        getStatusJDX();
+        getListByFJ();
+    }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取升压站信息 通过排序等")