shrio跨域，修改vip方案查询分数区间

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -193,13 +193,20 @@
         <include refid="table"/>
         <where>
             is_delete =0
+
             <if test="type != null">
                 and type =#{type}
             </if>
-            <if test="total != null">
-                and lowest_mark=#{total}
+
+            <if test="totalMax != null">
+                and #{totalMax} >= lowest_mark
             </if>
 
+            <if test="totalMin != null">
+                and lowest_mark >= #{totalMin}
+            </if>
+
+
             <if test="locals != null and (locals.size)>0">
                 and
                 <foreach collection="locals" index="index" item="local" separator="or" open="(" close=")">

wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVipVo.java

@@ -31,15 +31,15 @@ public class SchemeVipVo implements Serializable {
 
     /**
      * 文化课成绩
-     */
+     *//*
     @ApiModelProperty(value = "文化课成绩", name = "cultureGrade")
     private String cultureGrade;
 
-    /**
+    *//**
      * 专业课成绩
-     */
+     *//*
     @ApiModelProperty(value = "专业课成绩", name = "majorGrade")
-    private String majorGrade;
+    private String majorGrade;*/
 
     /**
      * 地区
@@ -48,10 +48,15 @@ public class SchemeVipVo implements Serializable {
     private String local;
 
     /**
-     * 综合成绩
+     * 综合成绩（最高分）
+     */
+    @ApiModelProperty(name = "totalMax",value = "综合成绩（最高分）")
+    private Integer totalMax;
+    /**
+     * 综合成绩(最低分)
      */
-    @ApiModelProperty(name = "total",value = "综合成绩")
-    private Integer total;
+    @ApiModelProperty(name = "totalMin",value = "综合成绩(最低分)")
+    private Integer totalMin;
 
     /**
      * 是否展示全部  0:否  1：是

wisenergy-service/src/main/java/cn/wisenergy/service/shir/filter/KickoutSessionControlFilter.java

@@ -21,6 +21,7 @@ import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpStatus;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -76,6 +77,7 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
         log.info("KickoutSessionControlFilter Not Login begin.......");
         Subject subject = getSubject(request, response);
         Map<String, Object> map = new HashMap<>();
+        HttpServletRequest httpServletRequest=(HttpServletRequest) request;
         HttpServletResponse httpServletResponse = (HttpServletResponse) response;
         // 没有登陆或没有设置“记住我”
         HttpServletRequest request1 = (HttpServletRequest) request;
@@ -85,7 +87,7 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
         if (!subject.isAuthenticated() && !subject.isRemembered()) {
             log.info("KickoutSessionControlFilter isAuthenticated and isRemembered Please login first .......");
             // 没有登陆，抛出异常
-            thrLogoutException(httpServletResponse, "1001", "Please login first");
+            thrLogoutException(httpServletRequest,httpServletResponse, "1001", "Please login first");
             return false;
         }
         Session session = subject.getSession();
@@ -114,7 +116,7 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
             try {
                 //退出登录
                 subject.logout();
-                thrLogoutException(httpServletResponse, "1002", "您已经在其他地方登录，请重新登录。如有疑问请联系管理员！");
+                thrLogoutException(httpServletRequest,httpServletResponse, "1002", "您已经在其他地方登录，请重新登录。如有疑问请联系管理员！");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -182,13 +184,16 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
     }
 
     // 抛出未登录异常
-    private void thrLogoutException(HttpServletResponse response,String ErrorCode,String ErrorMsg){
+    private void thrLogoutException(HttpServletRequest request,HttpServletResponse response,String ErrorCode,String ErrorMsg){
         PrintWriter writer = null;
         try {
             Result result = new Result();
             result.setResult(Result.RESULT_FLG.FAIL.getValue());
             result.setErrorCode(ErrorCode);
             result.setErrorMsg(ErrorMsg);
+            setHeader(request, response);
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/json");
             response.setContentType("application/json; charset=UTF-8");
             writer = response.getWriter();
             writer.write(JSON.toJSONString(result));
@@ -202,6 +207,16 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
             }
         }
     }
-
+    private void setHeader(HttpServletRequest request, HttpServletResponse response) {
+        //跨域的header设置
+        response.setHeader("Access-control-Allow-Origin", request.getHeader("Origin"));
+        response.setHeader("Access-Control-Allow-Methods", request.getMethod());
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        //防止乱码，适用于传输JSON数据
+        //Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild
+        response.setHeader("Content-Type", "application/json;charset=UTF-8");
+        response.setStatus(HttpStatus.OK.value());
+    }
 
 }