FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yanyizhou
2021-09-01 11:12:29 +08:00
parent 05a77b34a0 4204771472
commit e86f5cfbe7
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+12 -8
View File
@@ -54,8 +54,8 @@ public class ScheduledJob {
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?") @Scheduled(cron="*/5 * * * * ?")
@Async @Async
public void WarningSchedulingTasks() { public void WarningSchedulingTasks() {
@@ -82,44 +82,48 @@ public class ScheduledJob {
LinkedList<WarningEO> warningList = new LinkedList<>();//需预警的标准和条款列表集合 LinkedList<WarningEO> warningList = new LinkedList<>();//需预警的标准和条款列表集合
//分解单(条款) 新车型 mark=1 //分解单(条款) 新车型 mark=1
List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ", "APPLY_ARCTIC");
for (WarningEO warningEO : itemForXCXSSRQ) { for (WarningEO warningEO : itemForXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
.setMark("1") .setMark("1")
.setPutTime(warningEO.getXCXSSRQ()); .setPutTime(warningEO.getXCXSSRQ())
.setApplyType(warningEO.getApplyType());
} }
warningList.addAll(itemForXCXSSRQ); warningList.addAll(itemForXCXSSRQ);
//分解单(条款) 在产车型 mark=2 //分解单(条款) 在产车型 mark=2
List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ", "APPLY_ARCTIC");
for (WarningEO warningEO : itemForZCCSSRQ) { for (WarningEO warningEO : itemForZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
.setMark("2") .setMark("2")
.setPutTime(warningEO.getZCCSSRQ()); .setPutTime(warningEO.getZCCSSRQ())
.setApplyType(warningEO.getApplyType());
} }
warningList.addAll(itemForZCCSSRQ); warningList.addAll(itemForZCCSSRQ);
//标准 新车型 预警 mark=3 //标准 新车型 预警 mark=3
List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ", "CLLX");
for (WarningEO warningEO : standInfoXCXSSRQ) { for (WarningEO warningEO : standInfoXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
.setMark("3") .setMark("3")
.setPutTime(warningEO.getXCXSSRQ()) .setPutTime(warningEO.getXCXSSRQ())
.setApplyType(warningEO.getApplyType())
.setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
} }
warningList.addAll(standInfoXCXSSRQ); warningList.addAll(standInfoXCXSSRQ);
//标准 在产车型 mark=4 //标准 在产车型 mark=4
List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ", "CLLX");
for (WarningEO warningEO : standInfoZCCSSRQ) { for (WarningEO warningEO : standInfoZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
.setMark("4") .setMark("4")
.setPutTime(warningEO.getZCCSSRQ()) .setPutTime(warningEO.getZCCSSRQ())
.setApplyType(warningEO.getApplyType())
.setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
} }
warningList.addAll(standInfoZCCSSRQ); warningList.addAll(standInfoZCCSSRQ);
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.List;
@Repository @Repository
public interface SarStandardInfoDao{ public interface SarStandardInfoDao{
public List<WarningEO> selectWithinTerm(DataDTO date, String str); public List<WarningEO> selectWithinTerm(DataDTO date, String str, String CLLX);
public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus);
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
+1 -1
View File
@@ -11,6 +11,6 @@ import java.util.List;
@Repository @Repository
public interface SarStandardItemDao extends BaseMapper{ public interface SarStandardItemDao extends BaseMapper{
public List<WarningEO> selectWithinTerm(DataDTO date, String str); public List<WarningEO> selectWithinTerm(DataDTO date, String str, String applyType);
} }