Merge branch 'develop_master' into develop_1

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -56,8 +56,8 @@ public class ScheduledJob {
     private SarStandardInfoDao sarStandardInfoDao;
 
 
-     @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-//    @Scheduled(cron="*/5 * * * * ?")
+//     @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void schedulingTasks() {
 
@@ -126,6 +126,7 @@ public class ScheduledJob {
 
         //持久化至预警表 忽略标准id和标志位都一样的数据
         if (warningList.size()!=0){
+            //此表的STAND_CODE和MARK字段需建立唯一性约束
             int count = sarStandardWarningDao.ignoreInsert(warningList);
             System.out.println("已预警 " + count + " 条标准或条款!!");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -24,6 +24,9 @@ public class EarlyWarningEO extends BaseEntity {
     @TableId("ID")
     private String id;
 
+    @TableField("STAND_ID")
+    private String standId;
+
     @TableField("STAND_TYPE")
     private String standType;
 
@@ -45,6 +48,9 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField("ITEMS_ID")
     private String itemsId;
 
+    @TableField("ITEMS_NUM")
+    private String itemsNum;
+
     @TableField("ITEMS_NAME")
     private String itemsName;