From a5ad8077d47089114c3510beb2b1902550f005e6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 25 Aug 2021 14:24:42 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java | 1 + 1 file changed, 1 insertion(+) 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 81ee5c0f..3261df90 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 @@ -126,6 +126,7 @@ public class ScheduledJob { //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ + //此表的STAND_CODE和MARK字段需建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); System.out.println("已预警 " + count + " 条标准或条款!!"); } From a828f41d20fd77e29a9707780d9cc4822fb16c6e Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 25 Aug 2021 15:16:14 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 75 ++++++++++++------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ad240f40..2229e53e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -30,43 +30,68 @@ public class TableToExcel { Set keys=columnMap.keySet(); //第一行（标题行）合并并设置标题 - - - //创建表头行 - Row headRow=sheet.createRow(0); + //创建表头行(合并单元格) + Row headRow = sheet.createRow(0); + Row neckRow = sheet.createRow(1); + sheet.addMergedRegion(new CellRangeAddress(0,1,0,0)); + sheet.addMergedRegion(new CellRangeAddress(0,1,1,1)); + sheet.addMergedRegion(new CellRangeAddress(0,0,2,4)); + sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); + sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); + sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); //生成表头行 int j=0; + for(String key:keys) { Cell hCell=headRow.createCell(j++); - hCell.setCellValue(columnMap.get(key)); + if (j<3) + hCell.setCellValue(columnMap.get(key)); } - //从第二行开始填充数据 - int c=1; + Cell hCellh = headRow.createCell(2); + hCellh.setCellValue("修改意见内容"); + Cell hCell = headRow.createCell(5); + hCell.setCellValue("提出部门"); + Cell hCell1 = headRow.createCell(6); + hCell1.setCellValue("提出人"); + Cell hCell2 = headRow.createCell(7); + hCell2.setCellValue("处理意见"); + Cell nCell = neckRow.createCell(2); + nCell.setCellValue("修改前"); + Cell nCell1 = neckRow.createCell(3); + nCell1.setCellValue("修改后"); + Cell nCell2 = neckRow.createCell(4); + nCell2.setCellValue("修改理由"); + + + //从第三行开始填充数据 + int c=2; for(int k=i*sheetRow;k Date: Wed, 25 Aug 2021 15:17:55 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 97b368c2..3528e41d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -1398,7 +1398,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 25 Aug 2021 17:02:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=A1=B9=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=8A=A0standType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandUnqualifiedDao.java | 5 ++ .../entity/SarStandUnqualified.java | 4 ++ .../impl/SarStandUnqualifiedServiceImpl.java | 54 ++++++++++--------- .../impl/SarFileSplitItemsEOServiceImpl.java | 13 +++++ .../SarStandUnqualifiedMapper.xml | 46 ++++++++++++++++ 5 files changed, 96 insertions(+), 26 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index 5d7791d0..c456d737 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *

* Mapper 接口 @@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper; public interface SarStandUnqualifiedDao extends BaseMapper { IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + List getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + + Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index d6e29253..9f5e772e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity { @TableField(exist=false) private String dutyEngineerName; + @ApiModelProperty(value = "国内OR海外") + @TableField(exist=false) + private String standType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 599e5517..aaaff4f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR"); + wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE"); wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'"); Page page1 = new Page<>(); IPage userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1); @@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); - } - //仅查询未关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - //根据 项目名称 进行查询 - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); - } - //根据 责任部门 进行查询 - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - //根据 标准号/标准名称 进行查询 - if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ -// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); - sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + - "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); - } +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); +// } +// //仅查询未关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// //根据 项目名称 进行查询 +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); +// } +// //根据 责任部门 进行查询 +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// //根据 标准号/标准名称 进行查询 +// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ +//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); +// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + +// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); +// } Page standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null - && sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); + standUnqualifiedPage.setRecords(sarStandUnqualifieds); + standUnqualifiedPage.setTotal(total); + standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent()); + standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize()); + return standUnqualifiedPage; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 06d92dfa..8080938d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -74,23 +74,36 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic @Override public Map getByPage(SarFileSplitItemsEOPage page) { + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId TreeNode treeNode = tree.getTreeNode(page.getMenuId()); List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 menuIds.add(treeNode.getNodeId()); for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 menuIds.add(node.getNodeId()); } + //把它放到MenuIdList里 page.setMenuIdList(menuIds); } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） int count = dao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 List rows = dao.queryByPage(page); + //如果查询出来的结果不为空 if (rows != null && !rows.isEmpty()) { + //遍历rows for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { //查询svpps String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index da1eb9a9..117b6e2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -29,4 +29,50 @@ and a.stand_id = #{standId} + + + + + From 6e0091f8755ee734af67d949a7bf749302879ed0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 26 Aug 2021 10:23:02 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 6 ++++++ .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 2 +- .../mybatis/mapper/sarStandWarning/SarStandardItem.xml | 8 +++++++- .../mapper/sarStandWarning/SarStandardWarningDao.xml | 4 +++- 5 files changed, 19 insertions(+), 5 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 3261df90..815574da 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 @@ -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() { 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 e7cffdeb..e33134a9 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 @@ -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; 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 3d82bdd6..518aa911 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 @@ -4,7 +4,7 @@ - + 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 58a4b8eb..01a5167a 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 @@ -4,7 +4,10 @@ - + + + + @@ -16,12 +19,15 @@ select @@ -386,7 +419,7 @@ select SAR_FILE_SPLIT_ITEMS.id,SAR_FILE_SPLIT_ITEMS.items_num,SAR_FILE_SPLIT_ITEMS.items_name, newcar_put_time,product_put_time,svpps,apply_arctic,reference_stand,SAR_FILE_SPLIT_ITEMS.remarks, From 05994c6014c1d372a167d8f68d1a4a60220b0156 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 11:24:27 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E4=B8=8E=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B7=B3=E9=A1=B5~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 11 +++++++---- .../java/com/adc/da/scheduled/entity/WarningEO.java | 5 +++++ 2 files changed, 12 insertions(+), 4 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 3261df90..80feeba5 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 @@ -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; @@ -56,8 +57,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() { @@ -109,7 +110,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 +122,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); 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 dcfa2df3..cf8f1a4d 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 @@ -19,4 +19,9 @@ public class WarningEO extends EarlyWarningEO { private Date ZCCSSRQ; + private String standNum; + + private String standSort; + + private String standYear; } From 8cf4fec559c19238469ece0f445a35a3ad8a6412 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 11:25:17 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E4=B8=8E=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B7=B3=E9=A1=B5~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 518aa911..d90455ed 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 @@ -5,8 +5,10 @@ - + + + @@ -18,6 +20,8 @@