From 29f63744744500a7c5a77e61d5358cbf81322c2a Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 23 Jun 2022 14:27:53 +0800 Subject: [PATCH 01/14] =?UTF-8?q?fix:=20=E6=94=B9=E9=80=A0=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9D=97=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/Timer/ProcessTimer.java | 78 +++++++++---------- .../da/scheduled/WarningSchedulingTasks.java | 29 +++++++ ...0220623_定时任务执行管理表添加预警信息.sql | 1 + 3 files changed, 69 insertions(+), 39 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java create mode 100644 doc/sql/20220623_定时任务执行管理表添加预警信息.sql diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index 9846d4f2..67312aae 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -69,45 +69,45 @@ public class ProcessTimer { public void urging() { if(isNotScheduled){ log.info("=================================自动催办定时任务启动====================================="); - List busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null); - if (null != busProcessNames && 0 < busProcessNames.size()) { - for (BusProcessName busProcessName : busProcessNames) { - String type = busProcessName.getPrcType(); - Integer typeInt = 99; - if (StringUtils.isNotEmpty(type)) { - typeInt = Integer.valueOf(type); - } - type = chooseType(typeInt, type); - - UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName()); - String[] array = userEO.getEmail().split(","); - String overTime = busProcessName.getOverTime(); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date dateTime = null; - Integer num = 3; - try { - dateTime = simpleDateFormat.parse(overTime); - Date now = new Date(); - long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); - num = Integer.valueOf(String.valueOf(daysBetween)); - } catch (ParseException e) { - SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'"); - try { - dateTime = simpleDateFormat1.parse(overTime); - Date now = new Date(); - long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); - num = Integer.valueOf(String.valueOf(daysBetween)); - } catch (ParseException e1) { - e.getMessage(); - } - } - - String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" + - " ——来自 全球标准法规管理系统"; - String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务"; - mailUtil.sendMsgFeign(array, title, msg); - } - } +// List busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null); +// if (null != busProcessNames && 0 < busProcessNames.size()) { +// for (BusProcessName busProcessName : busProcessNames) { +// String type = busProcessName.getPrcType(); +// Integer typeInt = 99; +// if (StringUtils.isNotEmpty(type)) { +// typeInt = Integer.valueOf(type); +// } +// type = chooseType(typeInt, type); +// +// UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName()); +// String[] array = userEO.getEmail().split(","); +// String overTime = busProcessName.getOverTime(); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// Date dateTime = null; +// Integer num = 3; +// try { +// dateTime = simpleDateFormat.parse(overTime); +// Date now = new Date(); +// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); +// num = Integer.valueOf(String.valueOf(daysBetween)); +// } catch (ParseException e) { +// SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'"); +// try { +// dateTime = simpleDateFormat1.parse(overTime); +// Date now = new Date(); +// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); +// num = Integer.valueOf(String.valueOf(daysBetween)); +// } catch (ParseException e1) { +// e.getMessage(); +// } +// } +// +// String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" + +// " ——来自 全球标准法规管理系统"; +// String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务"; +// mailUtil.sendMsgFeign(array, title, msg); +// } +// } log.info("=================================自动催办定时任务结束====================================="); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java new file mode 100644 index 00000000..4d16ec86 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java @@ -0,0 +1,29 @@ +package com.adc.da.scheduled; + +import com.adc.da.common.GetBeanUtil; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Slf4j +public class WarningSchedulingTasks implements Runnable{ + + + Logger logger = LoggerFactory.getLogger(WarningSchedulingTasks.class); + + private ScheduledJob scheduledJob; + + public WarningSchedulingTasks() { + scheduledJob= GetBeanUtil.getApplicationContext().getBean(ScheduledJob.class); + } + + @Override + public void run() { + try{ + Thread.sleep(2000); + scheduledJob.warningSchedulingTasks(); + }catch(Exception e){ + logger.info(e.getMessage()); + } + } +} diff --git a/doc/sql/20220623_定时任务执行管理表添加预警信息.sql b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql new file mode 100644 index 00000000..48e83a89 --- /dev/null +++ b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql @@ -0,0 +1 @@ +INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '*/5 * * * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32'); From 03b4ba0d1ef7af01a89beee77a98defc0f0d7206 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 14:35:46 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=9B=BD=E5=86=85=20=E6=B8=85=E5=8D=95bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AddDetailedDto.java | 2 + .../impl/SarLawsDetailedListServiceImpl.java | 121 +++++++++++------- 2 files changed, 74 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 4c9dee62..4ce5f080 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -42,4 +42,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; + @ApiModelProperty(value = "适用认证") + private String inforlist4; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 7dcfedc0..a50e0f70 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -323,30 +323,50 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl 0) { - if ("-".equals(putTime[a]) || null == putTime[a]) { - dto.setSsrq(null); - } else { - dto.setSsrq(putTime[a]); - } - if ("-".equals(putTime[a]) || null == xcx[a]) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if ("-".equals(putTime[a]) || null == zcc[a]) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } + + if (putTime.length <= a) { + dto.setSsrq(null); + } else { + dto.setSsrq(putTime[a]); + } + if (xcx.length <= a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (zcc.length <= a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + if (syrz.length <= a) { + dto.setSyrz(null); + } else { + dto.setSyrz(syrz[a]); } timeDto.add(dto); } @@ -356,22 +376,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarStandardsInfos = new ArrayList<>(); - timeDto.forEach(timeDto1 -> { - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); - sarStandardsInfo.setId(timeDto1.getStandId()); - sarStandardsInfo.setIsRelateAccess("1"); - sarStandardsInfos.add(sarStandardsInfo); - }); - sarStandardsInfoService.updateBatchById(sarStandardsInfos); + List list1 = new ArrayList<>(); + List list2 = new ArrayList<>(); + //避免出现数据丢失 处理一下适用认证信息 + list1.addAll(Arrays.asList(addDetailedDto.getInforlist().split(","))); + Hashtable hashtable = new Hashtable<>(); + for (TimeDto dto:timeDto) { + if (StringUtils.isNotBlank(dto.getSyrz())) { + hashtable.put(dto.getStandId(), dto.getSyrz()); + } } + //下面写消息队列了开始 + createUpdateMQService.sendMQ(hashtable, list2, list1); } catch (Exception e) { e.printStackTrace(); @@ -656,16 +679,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl 0) { QueryWrapper wrapper1 = new QueryWrapper<>(); wrapper1.in("stand_id", list1); - List res = sarLawsAttrDetailedListDao.selectList(wrapper); + List res = sarLawsAttrDetailedListDao.selectList(wrapper1); if (res.size() > 0) { res.forEach(sarLawsAttrDetailedList -> { dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList); @@ -869,20 +892,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Thu, 23 Jun 2022 14:56:47 +0800 Subject: [PATCH 03/14] feat: There is no way the, bug #55693 --- .../sarBussionessStandState/SarBussionessStandStateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index f5c10855..b084de85 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -34,7 +34,7 @@ - where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL + where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' and STAND_CODE like concat(concat('%',#{standCode}),'%') From c6a229f0e4b1afb9e55a7a989e0b8c21864e3612 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Jun 2022 15:02:47 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 722f5ea0..bdee27dd 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -3,7 +3,7 @@ @@ -32,7 +33,7 @@ FROM ( SELECT (@i:=@i+1) as rows, - sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, + sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id, sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, @@ -41,6 +42,7 @@ left join ts_user on sar_public_idea_all.user_id=ts_user.USID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID left join ts_institution t2 on ts_institution.parent_id=t2.id + left join ts_institution t3 on t2.parent_id=t3.id WHERE sar_public_idea_all.idea_id = #{ideaId} )c @@ -55,12 +57,13 @@ + SELECT + A.ID, + A.STAND_ID, + A.STAND_NAME, + A.STAND_CODE, + A.REVIEW_TIME, + A.ISSUE_TIME, + A.PUT_TIME, + A.CREATION_TIME, + A.MODIFY_TIME, + A.VALID_FLAG, + A.QCDW, + A.QCRBUSS, + A.standSort + FROM ( + select + , + sar_buss_stand_attr_info.FSRQBUSS AS REVIEW_TIME, + sar_buss_stand_attr_info.QCDW, + sar_buss_stand_attr_info.QCRBUSS + from sar_bussioness_stand + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id + + ) A + ORDER BY + A.REVIEW_TIME DESC, + A.ISSUE_TIME DESC + + SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector ,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName, - wg_committee.committeer , wg_committee_user.committer_id as committorId ,wg_committee_user.committee_deputy as committeeDeputy, + wg_committee.committeer , wg_committee_user.committer_id as committorId ,wg_committee.committee_deputy as committeeDeputy, t3.UNAME as committeeDeputyName from wg_committee LEFT JOIN wg_committee_user ON wg_committee.committeer = wg_committee_user.id LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary - LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committee_deputy + LEFT JOIN ts_user t3 on t3.USID = wg_committee.committee_deputy where 1=1 and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') @@ -33,14 +33,14 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index b44c0faf..9ecee506 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -36,9 +36,36 @@ sar_bussioness_stand.VALID_FLAG - - where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' - AND DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d') + + where sar_bussioness_stand.stand_sort = 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' + AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d') + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + where sar_bussioness_stand.stand_sort != 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' + AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d') and STAND_CODE like concat(concat('%',#{standCode}),'%') @@ -144,33 +171,60 @@ From ae0bb036d44d7fc419d8f418a993921f44061d01 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 24 Jun 2022 18:25:11 +0800 Subject: [PATCH 09/14] feat: There is no way the, BUG #56065 --- .../impl/SarBussionessStandServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 9e1d44df..a1cc3b2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -35,6 +35,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; +import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; @@ -48,6 +50,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; @@ -1564,6 +1567,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = iSarMenuStandardService.list(wrapper); + if(!list.isEmpty()){ + newMap.put(name+"MenuId",list.get(0).getId()); + } + + } if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { String value = entry.getValue().toString(); String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); From 8b2eb6b84a88fbf5a2f5f4cfa01c0901b25736ee Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 10:55:52 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=20=E6=96=B0=E5=A2=9E20s=E6=B2=89=E7=9D=A1=20?= =?UTF-8?q?=E9=81=BF=E5=85=8D=20=E9=A2=91=E7=B9=81=E6=AD=BB=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 51daf309..98d91734 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 @@ -133,6 +133,13 @@ public class ScheduledJob { logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); + log.info("开始修整"+new Date()+"!"); + try { + Thread.sleep(20000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + log.info("结束修整"+new Date()+"!"); logger.info("取消" + remove + "条预警"); //预警期限(当前日期至3个月后) From 19db42504f95490931b3eed0e14b5a4339b77b4d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 11:32:12 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/scheduled/ScheduledJob.java | 8 -------- .../sarStandWarning/entity/StandWarningEO.java | 4 ++++ .../sarStandWarning/EarlyWraningEOMapper.xml | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 10 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 98d91734..9bf24da5 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 @@ -6,7 +6,6 @@ import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; import com.adc.da.scheduled.entity.TermDTO; -import com.adc.da.slrs.ActivityDatas.entity.DataList; import com.adc.da.slrs.processModel.utils.TrainFormDate; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; @@ -22,8 +21,6 @@ import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; - - import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -35,17 +32,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.PostConstruct; -import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; @EnableScheduling diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index d073b263..398b5055 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -95,4 +95,8 @@ public class StandWarningEO extends EarlyWarningEO { @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endIssueTime; + + @ExcelIgnore + @ApiModelProperty("stand标准 item条款") + private String mark; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 8913444b..67421bb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -209,7 +209,12 @@ LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID POWER = '1' - AND (MARK = 'stand') + + AND (MARK = #{mark}) + + + AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND attr.CLLX LIKE CONCAT('%', @@ -255,7 +260,12 @@ LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID POWER = '1' - AND (MARK = 'item') + + AND (MARK = #{mark}) + + + AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' From cd3729ace3a19b786887c9620cdb8ab1ed12ea1c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 14:25:48 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20bu?= =?UTF-8?q?g=20+=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WgCommitteeController.java | 4 ++++ .../slrs/wgCommittee/entity/WgCommittee.java | 4 ++++ .../mapper/wgCommittee/WgCommitteeMapper.xml | 2 ++ .../att/controller/AttFileEOController.java | 9 +++++++++ .../java/com/adc/da/att/dao/AttFileEODao.java | 4 +++- .../adc/da/att/service/IAttFileEOService.java | 2 ++ .../service/impl/AttFileEOServiceImpl.java | 20 +++++++++++++++++++ .../mybatis/mapper/att/AttFileEOMapper.xml | 3 +++ 8 files changed, 47 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java index 35b56e61..a08878b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java @@ -15,8 +15,11 @@ import com.adc.da.slrs.wgCommittee.entity.WgCommittee; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -43,6 +46,7 @@ public class WgCommitteeController extends BaseController { @PostMapping("/insert") public ResponseMessage addWorkCommitter(WgCommittee wgCommittee) { + wgCommittee.setCreateTime(new Date()); if (isDistinct(wgCommittee.getCommitteeName(),null)){ if (iWgCommitteeService.add(wgCommittee)){ return Result.success("200","新增成功"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java index bff59910..5dff6902 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -45,6 +46,9 @@ public class WgCommittee extends BasePage { @ApiModelProperty(value = "委员关联表") private String committeer; + @ApiModelProperty(value = "创建时间") + private Date createTime; + @ApiModelProperty(value = "委员") @TableField(exist = false) private String committeeIds; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml index e32ed03c..405fb81e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml @@ -16,6 +16,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} @@ -45,6 +46,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index bbdd94d2..91709a12 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -752,4 +753,12 @@ public class AttFileEOController { } } + + @ApiOperation(value = "修改文件名称") + @GetMapping("/updateFileName") + public ResponseMessage updateFileName(@Param("fileId") String fileId,@Param("fileName") String fileName) { + AttFileEO attFileEO = attFileEOService.updateFileInfo(fileId,fileName); + return Result.success(attFileEO); + } + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java index 1e2b9c43..b51ade10 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -20,6 +20,8 @@ public interface AttFileEODao extends BaseMapper { public AttFileEO selectFileInfoById(AttFileEO attFileEO); + public int updateFileInfoById(AttFileEO attFileEO); + public int insertData(AttFileEO attFileEO); - + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 60f7922a..9f6a3b41 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -20,6 +20,8 @@ public interface IAttFileEOService extends IService { public AttFileEO getFileInfo(String attId); + public AttFileEO updateFileInfo(String attId,String name); + public List getMultiFileInfos(String fileIds); public List getMultiFileInfosOrderByDateDesc(String fileIds); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 82654b60..5a6ee40d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -333,6 +333,26 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileEO; } + @Override + public AttFileEO updateFileInfo(String attId,String name) { + /** + * 根据ID获取文件信息 + */ + AttFileEO attFileEO = new AttFileEO(); + AttFileEO attFileInfo=null; + Integer flag=0; + try { + attFileEO.setId(attId); + attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); + attFileInfo.setOldFileName(name); + this.baseMapper.updateFileInfoById(attFileEO); + return attFileInfo; + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileInfo; + } + /** * @Author super_liu * @Description 多文件查询 diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index ce248b14..565a95df 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -96,5 +96,8 @@ where id = #{id} + + update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id} + From 7584a3cc51c42396e5907f6026a94a70cf109481 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Mon, 27 Jun 2022 14:57:07 +0800 Subject: [PATCH 13/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84TOKEN=E8=AE=A4=E8=AF=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=90=8E=EF=BC=8C=E6=8A=9B=E5=87=BA=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=B8=AD=E6=97=A0=E6=B3=95=E8=A2=AB=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=88=B0=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=E6=AD=A4=E7=B1=BB=E5=BC=82=E5=B8=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/SysRuntimeExceptionHandler.java | 2 +- .../login/exception/TokenRuntimeException.java | 2 +- .../da/main/advice/AdcDaBaseExceptionAdvice.java | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/SysRuntimeExceptionHandler.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/SysRuntimeExceptionHandler.java index 93006848..549d2847 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/SysRuntimeExceptionHandler.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/SysRuntimeExceptionHandler.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; *

* Created at 2020/8/6 5:03 下午 */ -@RestControllerAdvice +//@RestControllerAdvice public class SysRuntimeExceptionHandler { @ExceptionHandler(TokenRuntimeException.class) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/TokenRuntimeException.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/TokenRuntimeException.java index 71be3519..01fa4a49 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/TokenRuntimeException.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/TokenRuntimeException.java @@ -12,7 +12,7 @@ import lombok.Data; * Created at 2020/8/6 4:58 下午 */ @Data -public class TokenRuntimeException extends RuntimeException{ +public class TokenRuntimeException extends Exception{ private String code = "401"; private String msg; diff --git a/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java index 44ae7eae..38faf354 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java +++ b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java @@ -13,11 +13,23 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import java.util.HashSet; +import java.util.Set; + @Slf4j @ControllerAdvice @Order(value=4) public class AdcDaBaseExceptionAdvice { + private static Set errMsg = new HashSet<>(); + + static { + errMsg.add("token已过期"); + errMsg.add("未登录"); + errMsg.add("token解析错误"); + errMsg.add("员工不存在"); + } + @ResponseStatus(HttpStatus.OK) @ExceptionHandler(AdcDaBaseException.class) @@ -34,8 +46,8 @@ public class AdcDaBaseExceptionAdvice { log.error(exception.getMessage(), exception); // TODO 在数据库中记录程序异常，这个地方的异常是未处理的异常，需要管理员查看并进行处理以防重复出现 if(exception.getStackTrace() != null){ - if("token已过期".equals(exception.getMessage())){ - return Result.error(ResponseMessageCodeEnum.ERROR_TOKEN.getCode(), "token已过期，请重新登录"); + if(errMsg.contains(exception.getMessage())){ + return Result.error(ResponseMessageCodeEnum.ERROR_TOKEN.getCode(), "token无效，请登录"); } } return Result.error(ResponseMessageCodeEnum.ERROR.getCode(), "程序异常，请重试。如果重复出现请联系管理员处理！"); From fa2235a9930699b6c88dc3c850d1166c538a1424 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 27 Jun 2022 16:07:00 +0800 Subject: [PATCH 14/14] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#5?= =?UTF-8?q?5761=208986=E7=9A=84=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SearchCenterController.java | 5 +- .../search/service/SearchCenterService.java | 2 + .../service/impl/SearchCenterServiceImpl.java | 157 ++++++++++++++---- .../da/search/util/ElasticsearchConstant.java | 15 ++ 4 files changed, 146 insertions(+), 33 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index e09f6b97..59214e17 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -18,6 +18,7 @@ import com.adc.da.search.entity.SarAdvanceSearchVO; import com.adc.da.search.entity.SeniorSearchInfoEO; import com.adc.da.search.service.ElasticsearchService; import com.adc.da.search.service.SearchCenterService; +import com.adc.da.search.util.ElasticsearchConstant; import com.adc.da.util.IOUtils; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; @@ -117,7 +118,9 @@ public class SearchCenterController extends BaseController> } else { if (searchInfoEO.getQueryStatus() != null && StringUtils.isNotBlank(searchInfoEO.getQueryStatus()) && searchInfoEO.getQueryStatus().equals("advancedSearch") && null != searchInfoEO.getSelectValue() && StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { result = searchCenterService.searchSarBykey(searchInfoEO); - }else { + }else if("titleSearch".equals(searchInfoEO.getSelectType())){ + result = searchCenterService.searchSarConditionBykeyTitle(searchInfoEO); + }else{ result = searchCenterService.searchSarConditionBykey(searchInfoEO); } // 非动态消息的需要查询为我推荐 diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java b/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java index 418fe9b7..f95e82cc 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java @@ -13,6 +13,8 @@ public interface SearchCenterService { List> searchSarConditionBykey(SeniorSearchInfoEO searchInfoEO) throws Exception; + List> searchSarConditionBykeyTitle(SeniorSearchInfoEO searchInfoEO) throws Exception; + /** * 查询结果集searchResponse装换成List形式 * @param searchResponse 需要转换的数据 diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 1435b43c..35bf27db 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -203,6 +203,115 @@ public class SearchCenterServiceImpl implements SearchCenterService { return result; } + @Override + public List> searchSarConditionBykeyTitle(SeniorSearchInfoEO searchInfoEO) throws Exception { + //判断是否高级查询 isHight = true（searchInfoEO.getIsHigh()为空）时，证明不是高级查询 + boolean isHight = StringUtils.isBlank(searchInfoEO.getIsHigh()); + List> result = new ArrayList<>(); + SearchRequestBuilder searchRequestBuilder; + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); + BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); + + updateIndex(searchInfoEO.getSelectIndex()); + String sortField1 = ""; + String sortField2 = ""; + String sortField3 = ""; + if("laws".equals(searchInfoEO.getSelectIndex())){ + sortField1 = "lawsNumber"; + sortField2 = "lawsYear"; + sortField3 = "lawsType.keyword"; + }else { + sortField1 = "standNumber"; + sortField2 = "standYear"; + sortField3 = "standSort.keyword"; + } + searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) + .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) + .addSort("standSortOrder", SortOrder.ASC) + .addSort(sortField1, SortOrder.ASC) + .addSort(sortField2, SortOrder.DESC) + .addSort(sortField3, SortOrder.ASC) + .addSort("issue_time_data", SortOrder.DESC) + .setSize(searchInfoEO.getPageSize()); + + if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue()) && StringUtils.isBlank(searchInfoEO.getIsHigh())){ + QueryBuilder multiQueryBuilder; + switch (searchInfoEO.getSelectIndex()){ + case "stand": + boolQueryShould + .should(QueryBuilders.wildcardQuery("standSort.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.termQuery("standNumber", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) + .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) + .should(QueryBuilders.wildcardQuery("nameshow.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)); + break; + case "laws": + boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + break; + case "bussstand": + boolQueryShould + .should(QueryBuilders.wildcardQuery("standSort.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.termQuery("standNumber", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) + .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) + .should(QueryBuilders.wildcardQuery("nameshow.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) + .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999F)); + break; + default: break; + } + } + + if(boolQueryShould!=null){ + boolQueryBuilder.must(QueryBuilders.matchQuery("validFlag", 0)); + if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ + if (StringUtils.isNotBlank(searchInfoEO.getType())) { + boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getType()+"*")); + } + if (StringUtils.isNotBlank(searchInfoEO.getStandType()) && StringUtils.isNotBlank(searchInfoEO.getSelectIndex())) { + if(searchInfoEO.getSelectIndex().equals("bussstand")){ + boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getStandType()+"*")); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); + } + } + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } + if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); + } + + if (StringUtils.isNotBlank(searchInfoEO.getLawsSyqy())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSyqy.keyword", "*"+searchInfoEO.getLawsSyqy()+"*")); + } + + if (StringUtils.isNotBlank(searchInfoEO.getLawsSycx())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSycx.keyword", "*"+searchInfoEO.getLawsSycx()+"*")); + } + boolQueryBuilder.must(boolQueryShould); + }else { + if ("stand".equals(searchInfoEO.getSelectIndex()) && StringUtils.isNotBlank(searchInfoEO.getStandType())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); + } + boolQueryBuilder.must(boolQueryShould); + } + + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); + + // 获取查询到的结果 + result = countStandSearchResult(searchRequestBuilder,searchInfoEO); + } + + return result; + } + // 条件 @Override public List> searchSarConditionBykey(SeniorSearchInfoEO searchInfoEO) throws Exception { @@ -259,30 +368,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); boolQueryShould.should(rangeQueryBuilder); } -// boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")); break; case "laws": -// boolQueryShould.should(QueryBuilders.wildcardQuery("lawsTypeName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("issueCompany.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsTextStateName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsYearName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsBulletin.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsLabel.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("lawsRemark.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("lawsEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -295,12 +390,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { } break; case "bussstand": -// boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -798,14 +891,14 @@ public class SearchCenterServiceImpl implements SearchCenterService { String[] lawsStr = null; String[] bussstandStr = null; if (StringUtils.isNotBlank(searchInfoEO.getSelectType()) && "titleSearch".equals(searchInfoEO.getSelectType())){ - standStr = new String[]{"numbershow","nameshow"}; + standStr = new String[]{"numbershow","nameshow","standNumber"}; lawsStr = new String[]{"lawsNo","lawsName"}; bussstandStr = new String[]{"numbershow","nameshow"}; }else { - standStr = new String[]{"content", "standEnName", "standNatureName", + standStr = new String[]{"standEnName", "standNatureName","standNumber", "textStatusName", "isRelateAccessName", "numbershow","nameshow", "standSystem", "NYLXCLASS", "CLLX"}; - lawsStr = new String[]{"content", "lawsEnName","lawsName", "lawsNo", "issueCompany", "lawsTextState", "lawsSyqy", "lawsSycx", "isRelateAccess", "lawsNotisyncNum", "lawsBulletin", "lawsLabel", "lawsRemark"}; - bussstandStr = new String[]{"content", "stand_code", "standEnName", "nameshow", "standstateshow", "numbershow", "textStatusBuss", "textStatusBussName", "NYLXCLASS", "CLLX"}; + lawsStr = new String[]{"lawsEnName","lawsName", "lawsNo", "issueCompany", "lawsTextState", "lawsSyqy", "lawsSycx", "isRelateAccess", "lawsNotisyncNum", "lawsBulletin", "lawsLabel", "lawsRemark"}; + bussstandStr = new String[]{"stand_code", "standEnName", "nameshow", "standstateshow", "numbershow", "textStatusBuss", "textStatusBussName", "NYLXCLASS", "CLLX"}; for (String field : fieldList) { // 关键字查询属性字段 String keyWordField2 = field + "Name"; diff --git a/adc-da-search/src/main/java/com/adc/da/search/util/ElasticsearchConstant.java b/adc-da-search/src/main/java/com/adc/da/search/util/ElasticsearchConstant.java index 5c3a1cd3..88578e2a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/util/ElasticsearchConstant.java +++ b/adc-da-search/src/main/java/com/adc/da/search/util/ElasticsearchConstant.java @@ -14,4 +14,19 @@ public class ElasticsearchConstant { public static final String SUCCESS_DELETED = "DELETED"; //删除过程中未找到对应数据返回结果 public static final String HAVE_NOT_FOUND= "NOT_FOUND"; + + //字符串转换为小写 + public static String exChangeLower(String str){ + //把一个字符串中的大写转为小写 + String real = ""; + for(int i=0;i