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/IdxBizFanHealthLevelController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -109,6 +110,13 @@ public class IdxBizFanHealthLevelController extends BaseController {
 		return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.queryHealthLevel());
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "光伏子阵查询",   notes = "光伏子阵查询")
+	@GetMapping(value = "/queryPvSubArray")
+	public ResponseModel<JSONArray> queryPvSubArray() {
+		return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.queryPvSubArray());
+	}
+
 	/**
 	 * 列表全部数据查询
      *

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

@@ -34,4 +34,11 @@ public interface IdxBizFanHealthLevelMapper extends BaseMapper<IdxBizFanHealthLe
      * @return
      */
     List<Map<String, Object>> queryHealthLevel();
+
+    /**
+     * 查询子阵名称
+     * @return
+     */
+    List<Map<String, Object>> queryPvSubArray();
+
 }

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

@@ -98,4 +98,18 @@ public class IdxBizFanHealthLevelServiceImpl extends BaseService<IdxBizFanHealth
         result.add(xx);
         return result;
     }
+
+    public JSONArray queryPvSubArray() {
+        List<Map<String, Object>> maps = this.baseMapper.queryPvSubArray();
+        JSONArray result=new JSONArray();
+        if(CollectionUtil.isNotEmpty(maps)){
+            for (Map<String, Object> map : maps) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("text", map.get("SUBARRAY"));
+                jsonObject.put("value", map.get("SUBARRAY"));
+                result.add(jsonObject);
+            }
+        }
+        return result;
+    }
 }
\ No newline at end of file

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

@@ -31,4 +31,18 @@
     <select id="queryHealthLevel" resultType="java.util.Map">
         SELECT * FROM idx_biz_fan_health_level where ANALYSIS_OBJ_TYPE = '全域' ORDER BY GROUP_UPPER_LIMIT DESC
     </select>
+
+    <select id="queryPvSubArray" resultType="java.util.Map">
+        SELECT
+        STATION,
+        SUBARRAY
+        FROM
+        pv_health_index_latest_data
+        WHERE
+        EQUIPMENT_NAME != ''
+        GROUP BY
+        STATION,
+        SUBARRAY
+        ORDER BY SUBARRAY ASC
+    </select>
 </mapper>