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/service/impl/TdengineTimeServiceImpl.java

@@ -122,7 +122,7 @@ public class TdengineTimeServiceImpl {
     /**
      * 风电 - 按天生成测点、子系统、设备、场站、区域 数据
      */
-    @Scheduled(cron = "0 0 0 1/1 * ? ")
+    @Scheduled(cron = "0 05 0 1/1 * ? ")
     public void insertDayData() throws ParseException {
         if (!openHealth) {
             return;
@@ -259,7 +259,7 @@ public class TdengineTimeServiceImpl {
     /**
      * 光伏  -  按天生成 测点、设备、子阵、场站和片区数据
      */
-    @Scheduled(cron = "0 0 0 1/1 * ? ")
+    @Scheduled(cron = "0 05 0 1/1 * ? ")
     public void insertDayDataPv() throws ParseException {
         if (!openHealth) {
             return;

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

@@ -24,7 +24,7 @@
                 <if test="gatewayIds.size() > 0">
                     AND ORG_CODE IN
                     <foreach collection="gatewayIds" item="item" open="(" separator="," close=")">
-                        ${item}
+                        #{item}
                     </foreach>
                 </if>
                 <if test="gatewayIds.size() == 0">

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

@@ -298,7 +298,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 		{
 			projectOrgCodes.add("NULL");
 		}
-		FeignClientResult<Object> result = mcbWarningFeign.getLampListList(questionRectificationStatus,projectOrgCodes,"in");
+		FeignClientResult<Object> result = mcbWarningFeign.getLampList(questionRectificationStatus,projectOrgCodes,"in");
 		return result.getResult();
 	}