diff --git a/adc-da-base/src/main/java/com/adc/da/util/JwtSysUtils.java b/adc-da-base/src/main/java/com/adc/da/util/JwtSysUtils.java index e204a9df..28780178 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/JwtSysUtils.java +++ b/adc-da-base/src/main/java/com/adc/da/util/JwtSysUtils.java @@ -4,6 +4,7 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; @@ -65,8 +66,12 @@ public class JwtSysUtils { String user = ""; if(attributes != null){ HttpServletRequest request = attributes.getRequest(); - Claims claim = getClaimsByToken(request.getHeader("token")); - user = claim.getSubject(); + if(StringUtils.isNotBlank(request.getHeader("token"))){ + Claims claim = getClaimsByToken(request.getHeader("token")); + user = claim.getSubject(); + }else { + user = "chenchunmei"; + } } return user; } 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 d2c92c47..f117718f 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 @@ -109,6 +109,11 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); + // 重置ES + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetAStandSearchCenter"); + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetBLawsSearchCenter"); + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetCBussStandSearchCenter"); + //// //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 65e7bfc9..3b0c5147 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -236,7 +236,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textItems",textItemContent.toString()); if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { - fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime")); + fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime")))); }else { fullTextSearchEO.put("issue_time", "--"); } @@ -298,7 +298,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textContent",textContent.toString()); if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { - fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime")); + fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime")))); }else { fullTextSearchEO.put("issue_time", "--"); } @@ -349,14 +349,28 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); fullTextSearchEO.put("textContent",textContent.toString()); if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { - fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime")); + fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime")))); }else { - fullTextSearchEO.put("issue_time", ""); + fullTextSearchEO.put("issue_time", "--"); } } return fullTextSearchEO; } + private String dateFormatToStr(String dateStr){ + if(dateStr == null || dateStr.equals("")){ + return ""; + } + String dateToStr = ""; + try { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateToStr = dateFormat.format(dateFormat.parse(dateStr.trim().substring(0,10))); + }catch (Exception e){ + e.getMessage(); + } + return dateToStr; + } + FullTextSearchEO getFullTextSearch(StandLawsEO standLawsEO){ FullTextSearchEO fullTextSearchEO = new FullTextSearchEO(); fullTextSearchEO.setId(standLawsEO.getId()); 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 dab4871e..89027ee5 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 @@ -863,6 +863,9 @@ END, sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + + sar_standards_info.stand_sort ASC +