Merge remote-tracking branch 'origin/develop_1' into develop_master

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

@@ -5,6 +5,7 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
 import com.adc.da.scheduled.dao.SarStandardWarningDao;
 import com.adc.da.scheduled.entity.DataDTO;
 import com.adc.da.scheduled.entity.WarningEO;
+import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
 import com.adc.da.util.UUIDUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +56,7 @@ public class ScheduledJob {
     @Autowired
     private SarStandardInfoDao sarStandardInfoDao;
 
-
+    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-     @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
 //    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void schedulingTasks() {
@@ -109,7 +109,8 @@ public class ScheduledJob {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("3")
-                    .setPutTime(warningEO.getXCXSSRQ());
+                    .setPutTime(warningEO.getXCXSSRQ())
+                    .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
         }
         warningList.addAll(standInfoXCXSSRQ);
 
@@ -120,7 +121,8 @@ public class ScheduledJob {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("4")
-                    .setPutTime(warningEO.getZCCSSRQ());
+                    .setPutTime(warningEO.getZCCSSRQ())
+                    .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
         }
         warningList.addAll(standInfoZCCSSRQ);
 

adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java

@@ -19,4 +19,9 @@ public class WarningEO extends EarlyWarningEO {
 
     private Date ZCCSSRQ;
 
+    private String standNum;
+
+    private String standSort;
+
+    private String standYear;
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml

@@ -5,8 +5,10 @@
     <!-- Result Map-->
     <resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO" >
         <id column="ID" property="standId" />
-        <result column="STAND_NUMBER" property="standCode" />
+        <result column="STAND_NUMBER" property="standNum" />
         <result column="STAND_NAME" property="standName" />
+        <result column="STAND_SORT" property="standSort"/>
+        <result column="STAND_YEAR" property="standYear"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
         <result column="ZCCSSRQ" property="ZCCSSRQ"/>
         <result column="CLLX" property="applyType" />
@@ -18,6 +20,8 @@
     <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
         info.ID,
+        info.STAND_SORT,
+        info.STAND_YEAR,
         info.STAND_NUMBER,
         info.STAND_NAME,
         info.STAND_TYPE,