feat: There is no way the, 重置ES

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"));
+      if(StringUtils.isNotBlank(request.getHeader("token"))){
-      user = claim.getSubject();
+        Claims claim = getClaimsByToken(request.getHeader("token"));
+        user = claim.getSubject();
+      }else {
+        user = "chenchunmei";
+      }
     }
     return user;
   }

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/**");

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());

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
         </if>
+        <if test='page.standType != null and page.standType == "ALL"'>
+            sar_standards_info.stand_sort ASC
+        </if>
     </sql>
     <sql id="standSort_out">
         <if test='standType != null and standType == "INLAND"'>