Przeglądaj źródła

物联总览bug修改

jingyuanchao 1 rok temu
rodzic
commit
084b43c64c

+ 1 - 1
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotAlarmSubsystem.java

@@ -68,7 +68,7 @@ public class IotAlarmSubsystem implements Serializable {
     @TableField("all_Hour")
     private Integer allHour;
 
-    @ApiModelProperty(value = "布撤防更新时间")
+    @ApiModelProperty(value = "布撤防更新时间",notes ="两点补登昨天7点的布防数据,那么statusUpdateTime=2点,statusChangeTime=七点")
     @TableField("status_update_time")
     private LocalDateTime statusUpdateTime;
 

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ProtectionServiceImpl.java

@@ -265,7 +265,7 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
 
         // 一个防区对应 布撤防历史(我知道这这个结构写的很烂,但是时间有限,先这样吧)
         List<Map<String, List<Map<String, Object>>>> resultList = new ArrayList<>();
-
+        //获取所有关联了登记簿的子系统
         List<IotAlarmSubsystem> list = getIotAlarmSubsystems(orgId);
         if (ObjectUtil.isEmpty(list)) {
             return resultList;

+ 1 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Sm4Util.java

@@ -185,7 +185,7 @@ public class Sm4Util {
 
 
     public static void main(String[] args) {
-        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "delete from core_message_send where id in (1731938932109217793,1735137019216719873) ");
+        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "update core_edu_training_task set status=2 where id=1787272874113736706;");
 
         System.out.println(s);