Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -211,6 +211,6 @@
             area_code = #{areaCode}
         and
             is_delete = 0
-
+        ORDER BY sequence_nbr ASC
     </select>
 </mapper>

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

@@ -845,11 +845,12 @@ public class MonitorFanIdxController extends BaseController {
         SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy");
         String monthy = myFmt2.format(new Date());
         QueryWrapper<StationPlan> wrapper = new QueryWrapper<>();
-        wrapper.select(" monthly ,sum(value) value ");
+        wrapper.select(" monthly ,sum(value) as data_value ");
         wrapper.eq("year", monthy);
         wrapper.eq("station_basic_id", stationBasic.getSequenceNbr());
+        wrapper.groupBy("monthly");
         List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper);
-        Double sumValue = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("value") : 0;
+        Double sumValue = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("data_value") : 0;
 
         columnMap.put("年发电量完成率(%)", String.format("%.2f", Double.parseDouble(columnMap.get("年发电量").toString()) / sumValue * 100));
 

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

@@ -1208,6 +1208,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 	}
 
 	public void getListByFJ(String gatewayId, String werks, String stationId) {
+		if(werks==null||StringUtils.isEmpty(werks))
+		{
+			return;
+		}
 		HashMap<String, String> fanstatutsHashMap = new HashMap<>();
 		StationBasic stationBasic = stationBasicMapper.selectById(stationId);
 		Map<String, List<String>> queryCondtion = new HashMap<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -61,7 +61,7 @@
             B.FSB
     </select>
 
-    <select id="getStationInfoMapByStationGFWerksNew" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz">
+    <select id="getStationInfoMapByStationGFWerksNew" resultType="map">
 
             SELECT
                 REPLACE(sjgl_zsj_zsbtz.SBMC, '光伏阵区系统', '') as  equipNum,