From bb378b56a75bee2a7f0378228f8183bbba097af2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 31 Aug 2021 14:01:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandFileEOController.java | 9 +++++ .../standardSplit/entity/SarStandFileEO.java | 33 +++++++++++++++++-- .../service/SarStandFileEOService.java | 3 ++ .../impl/SarStandFileEOServiceImpl.java | 9 +++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index 825a91d6..7ab8d9ff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -135,4 +135,13 @@ public class SarStandFileEOController extends BaseController { return Result.success(getPageInfo(page.getPager(), rows)); } + + @ApiOperation(value = "查询文本信息") + @GetMapping("/queryFileInfo") + public ResponseMessage> queryFileInfo(String standId){ + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId); + return Result.success(sarStandFileEOS); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java index 6e8ef33a..3cf3ed1d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -1,6 +1,11 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.ArrayList; import java.util.Date; @@ -12,14 +17,22 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data +@TableName("sar_stand_file") public class SarStandFileEO extends BaseEntity { + @TableField(exist = false) @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modifyTime; + @TableField(exist = false) @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date creationTime; + @TableLogic(value = "0",delval = "1") private String validFlag; + + @TableField("USE_MODEL") private String useModel; + @TableField("ATT_ID") private String attId; public String getAttId1() { @@ -29,23 +42,39 @@ public class SarStandFileEO extends BaseEntity { public void setAttId1(String attId1) { this.attId1 = attId1; } - + @TableField(exist = false) private String attId1; + @TableField(exist = false) private String resId; + @TableField("STAND_ID") private String standId; + @TableId("id") private String id; + @TableField(exist = false) private Integer pageCount; + @TableField(exist = false) private String fileOldName; + @TableField(exist = false) private List idlist = new ArrayList<>(); + @TableField("STAND_FILE_CLASSIFY") private String standFileClassify; + @TableField(exist = false) private String standFileClassifyShow; + @TableField(exist = false) private String fileSuffix; + @TableField("FILE_NAME") private String fileName; + @TableField(exist = false) private String password; + @TableField(exist = false) private String creationUser; + @TableField(exist = false) private String standNumber; + @TableField(exist = false) private String standName; + @TableField(exist = false) private String sarType; + @TableField("ORI_ATT_ID") private String oriAttId; /** @@ -103,7 +132,7 @@ public class SarStandFileEO extends BaseEntity { default: return null; } } - + /** **/ public Date getModifyTime() { return this.modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index daee26b8..4d876d41 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -22,4 +22,7 @@ public interface SarStandFileEOService { int deleteByPrimaryKey(String id) throws Exception; List selectFileByAttId(String attId) throws Exception; + + List selectFileByStandId(String standId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index d4457165..ee9578a2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandFileEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -63,4 +64,12 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEODao.selectFileByAttId(attId); } + @Override + public List selectFileByStandId(String standId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID",standId).groupBy("ORI_ATT_ID"); + return sarStandFileEODao.selectList(queryWrapper); +// return sarStandFileEODao.selectFileByStandId(standId);r + } + } From 02dc65167e336fd3ad6d5a02cf0d2e1de5d6628b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 31 Aug 2021 14:04:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=B9=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=BF=9B=E8=A1=8C=E9=A2=84=E8=AD=A6.=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AF=B9=E6=9D=A1=E6=AC=BE=E7=9A=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?,=E5=8A=A0=E5=85=A5=E4=BD=BF=E7=94=A8=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=92=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 20 ++++++++++++++---- .../scheduled/dao/SarStandardWarningDao.java | 4 +++- .../com/adc/da/scheduled/entity/DataDTO.java | 21 +++++++++++++++++++ .../adc/da/scheduled/entity/WarningEO.java | 3 +++ .../entity/EarlyWarningEO.java | 1 + .../Impl/EarlyWarningEOServiceImpl.java | 4 +--- .../sarStandWarning/SarStandardInfo.xml | 8 +++++-- .../sarStandWarning/SarStandardItem.xml | 19 +++++++++-------- 8 files changed, 61 insertions(+), 19 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 8f4cb872..1dd441c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -7,6 +7,7 @@ import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.scheduled.entity.WarningEO; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; @@ -54,8 +55,8 @@ public class ScheduledJob { - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron="*/5 * * * * ?") @Async public void WarningSchedulingTasks() { @@ -76,6 +77,14 @@ public class ScheduledJob { 1：新车条款预警 2：在产车条款预警 */ + + //删除不在预警范围的标准 + QueryWrapper earlyWarningEOQW = new QueryWrapper<>(); + earlyWarningEOQW.lt("PUT_TIME",LocalDate.now()); + int remove = sarStandardWarningDao.delete(earlyWarningEOQW); + System.out.println(remove); + + System.out.println("开始执行预警!!!"); DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) @@ -98,6 +107,7 @@ public class ScheduledJob { .setPower("1") .setMark("2") .setPutTime(warningEO.getZCCSSRQ()); + } warningList.addAll(itemForZCCSSRQ); @@ -109,6 +119,8 @@ public class ScheduledJob { .setMark("3") .setPutTime(warningEO.getXCXSSRQ()) .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); + + } warningList.addAll(standInfoXCXSSRQ); @@ -143,8 +155,8 @@ public class ScheduledJob { -// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 - @Scheduled(cron="*/5 * * * * ?") + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index 76b2394b..9e326220 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -1,6 +1,8 @@ package com.adc.da.scheduled.dao; import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; @@ -9,7 +11,7 @@ import org.springframework.stereotype.Repository; import java.util.LinkedList; @Repository -public interface SarStandardWarningDao extends IService { +public interface SarStandardWarningDao extends BaseMapper { public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java index 042d54c3..17416712 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java @@ -1,10 +1,16 @@ package com.adc.da.scheduled.entity; +import com.alibaba.druid.sql.visitor.functions.Char; +import com.sun.org.apache.bcel.internal.generic.NEW; import lombok.Data; import lombok.experimental.Accessors; +import org.apache.poi.ss.formula.functions.T; import org.springframework.format.annotation.DateTimeFormat; +import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; @Data @Accessors(chain = true) @@ -30,4 +36,19 @@ public class DataDTO { this.endDate=endDate; } +// +// public boolean isTerm(T date){ +// +// if (date.getClass().equals(Date.class)){ +// +// } +// +// +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//线程不安全 +// +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dataStr= dtf.format(LocalDate.now()); +// LocalDate localDateTime = LocalDate.parse(dataStr, dtf); +// return +// } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java index 4f101c9a..20868a38 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java @@ -22,6 +22,9 @@ public class WarningEO extends EarlyWarningEO { @DateTimeFormat(pattern = "YYYY-MM-dd") private Date ZCCSSRQ; + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date SSRQ; + private String standNum; private String standSort; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index e33134a9..aebda782 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.time.LocalDate; import java.util.Date; @Data diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 0b67b072..9ed5c7d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -108,9 +108,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { - DataDTO dataDTO = new DataDTO(); - wrapper.eq("power",1) - .between("PUT_TIME",dataDTO.getStartDate(),dataDTO.getEndDate()); + wrapper.eq("power",1); Page page = new Page<>(current, pageSize); IPage userIPage = earlyWarningEODao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml index 87d27fdf..905fe1e1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml @@ -11,6 +11,7 @@ + @@ -27,6 +28,7 @@ info.STAND_TYPE, attrInfo.CLLX, attrInfo.ZRGCS, + attrInfo.SSRQ, attrInfo.${str} FROM sar_standards_info AS info @@ -35,9 +37,11 @@ 1=1 and + attrInfo.SSRQ + BETWEEN #{date.startDate} and #{date.endDate} + or attrInfo.${str} - BETWEEN DATE_FORMAT( #{date.startDate},'%Y-%m-%d %H:%i:%s') - and DATE_FORMAT( #{date.endDate},'%Y-%m-%d %H:%i:%s') + BETWEEN #{date.startDate} and #{date.endDate} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index d05e821b..d0e0434b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -20,22 +20,23 @@ From a8433547942b28abf32eaa7fcf58704943d1f737 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 31 Aug 2021 14:47:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=97=B6=E8=AE=BEitemsId=E4=B8=BA'-1'=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7=E7=BA=A6=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 12 +++++++++++- .../mapper/sarStandWarning/SarStandardItem.xml | 1 + .../mapper/sarStandWarning/SarStandardWarningDao.xml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 1dd441c5..7d844e8e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -115,6 +115,12 @@ public class ScheduledJob { List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); for (WarningEO warningEO : standInfoXCXSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) + /** + * //如果插入的值均为NULL，则根据索引的原理， + * 全NULL值不被记录在索引上，所以插入全NULL值时，可以有重复的 + * 则此处设为 '-1' + */ + .setItemsId("-1") .setPower("1") .setMark("3") .setPutTime(warningEO.getXCXSSRQ()) @@ -129,6 +135,10 @@ public class ScheduledJob { List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); for (WarningEO warningEO : standInfoZCCSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) + /** + * 同上 + */ + .setItemsId("-1") .setPower("1") .setMark("4") .setPutTime(warningEO.getZCCSSRQ()) @@ -138,7 +148,7 @@ public class ScheduledJob { //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ - //此表的STAND_ID和MARK字段以及ITEMS_ID和MARK字段需两个建立唯一性约束 + //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); System.out.println("已预警 " + count + " 条标准或条款!!"); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index d0e0434b..fde09804 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -25,6 +25,7 @@ items.TERMS_CONDITIONS, items.DUTY_ENGINEER, items.STAND_ID, + info.STAND_NAME, info.STAND_TYPE, info.STAND_NUMBER, attrInfo.CLLX, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 12daa750..ab43a5b0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -4,7 +4,7 @@ - INSERT IGNORE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER) + REPLACE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER) VALUES From f48869a1d5584e28e2858d12b9a86d6c86e12193 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 31 Aug 2021 21:39:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6,?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=A0=87=E5=87=86=E5=9C=A8=E4=BA=A7=E8=BD=A6?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=92=8C=E6=96=B0=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=9C=A8=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 14 ++-- .../com/adc/da/scheduled/entity/DataDTO.java | 68 ++++++++++++------- 2 files changed, 55 insertions(+), 27 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 7d844e8e..b13dd512 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -55,8 +55,8 @@ public class ScheduledJob { -// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 - @Scheduled(cron="*/5 * * * * ?") + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron="*/5 * * * * ?") @Async public void WarningSchedulingTasks() { @@ -123,9 +123,12 @@ public class ScheduledJob { .setItemsId("-1") .setPower("1") .setMark("3") - .setPutTime(warningEO.getXCXSSRQ()) .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); + //实施日期达到预警时间,但新车型实施日期不在时间内 + if (term.isTerm(warningEO.getXCXSSRQ())){ + warningEO.setPutTime(warningEO.getXCXSSRQ()); + } } warningList.addAll(standInfoXCXSSRQ); @@ -141,8 +144,11 @@ public class ScheduledJob { .setItemsId("-1") .setPower("1") .setMark("4") - .setPutTime(warningEO.getZCCSSRQ()) .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); + //实施日期达到预警时间,但在产车实施日期不在时间内 + if (term.isTerm(warningEO.getZCCSSRQ())){ + warningEO.setPutTime(warningEO.getZCCSSRQ()); + } } warningList.addAll(standInfoZCCSSRQ); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java index 17416712..7effccb0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java @@ -9,6 +9,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; @@ -19,36 +21,56 @@ public class DataDTO { * 预警的期限为系统日期的次日至3个月后 */ - @DateTimeFormat(pattern="yyyy-MM-dd") - private LocalDate startDate; - @DateTimeFormat(pattern="yyyy-MM-dd") - private LocalDate endDate; + + private String startDate; + + private String endDate; // private String str; public DataDTO() { - this.startDate =LocalDate.now().plusDays(1); //系统当前日期 - this.endDate = LocalDate.now().plusMonths(3);//系统当前日期3个月后 + LocalDate starDate = LocalDate.now();//系统当前日期 + LocalDate endDate = LocalDate.now().plusMonths(3);//系统当前日期3个月后 + + convertToStr(starDate,endDate); } public DataDTO(LocalDate startDate,LocalDate endDate){ - this.startDate=startDate; - this.endDate=endDate; + convertToStr(startDate,endDate); } -// -// public boolean isTerm(T date){ -// -// if (date.getClass().equals(Date.class)){ -// -// } -// -// -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//线程不安全 -// -// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); -// String dataStr= dtf.format(LocalDate.now()); -// LocalDate localDateTime = LocalDate.parse(dataStr, dtf); -// return -// } + //判断日期是否在期限内 + public boolean isTerm(Date date) { + + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + String dateString = formatter.format(date); + int compareStart = dateString.compareTo(startDate); + int compareEnd = dateString.compareTo(startDate); + if (compareStart >= 0 && compareEnd <=0) { + return true; + } else return false; + + } + + + + + /** + * 此时的mybatis-plus对localDate类型没有完全支持,则转换为字符串使用 + * @param startDate + * @param endDate + */ + public void convertToStr(LocalDate startDate,LocalDate endDate){ + + /** + * 使用DateTimeFormatter线程安全,但不晓得怎么支持Date类型转换为字符串 ¯\_(ツ)_/¯ + */ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + +// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//线程不安全且不支持LocalDate + + this.startDate =formatter.format(startDate); + this.endDate=formatter.format(endDate); + } }