From 45dab725151c6f746517606f7ab5f46fc200fdbe Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Dec 2021 16:55:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 38 +++++++++++++++++++ .../service/ISarStandardsInfoService.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 28 ++++++++++++++ .../SarStandardsInfoMapper.xml | 3 ++ 4 files changed, 71 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 17084c8b..17b851a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -127,6 +127,44 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/getSarStandardsInfoPageByWk1") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.getSarStandardsInfoPageByWk1(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + + return Result.success(getPageInfo(page.getPager(), rows)); + } + private void nowOrderFunc(SarStandardsInfoEOPage page) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index aa4617f5..4caf6161 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -21,6 +21,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; 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 91c7ebed..48b557dc 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 @@ -321,6 +321,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page,"996"); + attrInfoCollect(sarlist); + return sarlist; + } + @Override public List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 5a0d04b0..59dcc305 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -758,6 +758,9 @@ (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) + + or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + ) From a86fe68308c24c93223392566c85a711a501c1ce Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 17:49:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA=20?= =?UTF-8?q?=E5=92=8C=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 8 +- .../controller/EarlyWarningEOController.java | 7 +- .../dao/EarlyWarningEODao.java | 5 +- .../entity/EarlyWarningEO.java | 5 + .../sarStandWarning/entity/WarningDate.java | 3 + .../Impl/EarlyWarningEOServiceImpl.java | 8 +- .../sarStandWarning/EarlyWraningEOMapper.xml | 95 +++++++++++++++++-- .../sarStandWarning/SarStandardWarningDao.xml | 73 +++++++++----- 8 files changed, 164 insertions(+), 40 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index d9051d84..058ac857 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -74,6 +74,10 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); + //预警导出 + addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); + + //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); @@ -94,7 +98,7 @@ public class WebMvcConfig implements WebMvcConfigurer { - // 添加自定义拦截器，并拦截对应 url - addInterceptor.addPathPatterns("/**"); +// // 添加自定义拦截器，并拦截对应 url +// addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 575f096e..5a97d919 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -131,9 +131,11 @@ public class EarlyWarningEOController extends BaseController { - @GetMapping("/exprotWarning") + @GetMapping("/exportWarning") @ApiOperation("导出预警") public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman try { response.setContentType("application/vnd.ms-excel"); @@ -145,11 +147,12 @@ public class EarlyWarningEOController extends BaseController { String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), SarStandIssueControlProduct.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 0aac00c8..6bef46dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -11,6 +11,9 @@ import java.util.List; public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO,@Param("idList") List ids); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); + + + List exportWarning(@Param("idList") List ids); } 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 0471434c..9ad1b399 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 @@ -37,6 +37,11 @@ public class EarlyWarningEO extends BaseEntity { @TableField("STAND_ID") private String standId; + @ExcelIgnore + @ApiModelProperty("分解单条款id") + @TableField("ITEM_ID") + private String itemId; + @ExcelIgnore @ApiModelProperty("标准类别") @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java index 13ea497b..b1915f6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -14,6 +14,9 @@ public class WarningDate { @TableField("law_id") private String lawId; + @TableField("itemId") + private String itemId; + @TableField("SSRQ") private String SSRQ; 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 d22a9db3..57569568 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 @@ -112,7 +112,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); - return earlyWarningEODao.selectWarningPage(iPage,queryPage,null); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); } /** @@ -121,8 +121,10 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, excelVO.getIds()); - return standWarningEOIPage.getRecords(); + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); +// IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); + + return standWarningEOList; } 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 4c5861f7..fdc9655e 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 @@ -38,16 +38,7 @@ - - warning.ID - IN - - - #{id} - - - AND trim(replace(CONCAT( @@ -83,6 +74,92 @@ ) + SELECT - law_id as STAND_ID, - '-1' AS itemsId, - 'stand' AS mark, - '1' as power + law_id AS standId, + item_id AS itemId, + CASE + WHEN item_id = '-1' THEN + 'stand' + WHEN + item_id IS NULL THEN + 'stand' + ELSE + 'item' + END AS mark, + '1' as power FROM warning_date AS warning WHERE DATE_FORMAT(warning.SSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') - UNION + @@ -79,25 +87,44 @@ SELECT lawId,timeName,DATE_FORMAT(SSRQ,'%Y-%m-%d') as SSRQ FROM ( - select attr.STAND_ID as lawId,'SSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL + UNION ALL - select attr.STAND_ID as lawId,'XCXSSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.XCXSSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL - select attr.STAND_ID as lawId,'ZCCSSRQ' as timeName, - substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.XCXSSRQ) - length(replace(attr.XCXSSRQ,',',''))+1) + + + + UNION ALL + select attr.STAND_ID as lawId,'-1' as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.ZCCSSRQ,',',''))+1) + + + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(item.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.ZCCSSRQ) - length(replace(item.ZCCSSRQ,',',''))+1) + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(item.XCXSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.XCXSSRQ) - length(replace(item.XCXSSRQ,',',''))+1) ) as T WHERE