生物防控人员

huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -1,28 +1,28 @@
-
-package com.huimv.receive.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @Description: 注册验证tocken的拦截器
- * @Author
- * @Date 2021/4/19 20:41
- * @Version V1.0
- */
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-    @Bean
-    public JWTInterceptor jwtInterceptor(){
-        return new JWTInterceptor();
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/secureApi/admin/my/*")
-                .excludePathPatterns("/secureApi/receive/feed","/secureApi/bill-personnel-admission/printAdmission");
-    }
-}
+//
+//package com.huimv.receive.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+///**
+// * @Description: 注册验证tocken的拦截器
+// * @Author
+// * @Date 2021/4/19 20:41
+// * @Version V1.0
+// */
+//@Configuration
+//public class InterceptorConfig implements WebMvcConfigurer {
+//    @Bean
+//    public JWTInterceptor jwtInterceptor(){
+//        return new JWTInterceptor();
+//    }
+//
+//    @Override
+//    public void addInterceptors(InterceptorRegistry registry) {
+//        registry.addInterceptor(jwtInterceptor()).
+//                excludePathPatterns("/secureApi/admin/my/*")
+//                .excludePathPatterns("/secureApi/receive/feed","/secureApi/bill-personnel-admission/printAdmission");
+//    }
+//}

huimv-receive/src/main/java/com/huimv/receive/config/JWTInterceptor.java

@@ -1,82 +1,82 @@
-package com.huimv.receive.config;
-
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.receive.common.token.TokenConstant;
-import com.huimv.receive.common.token.TokenSign;
-import io.jsonwebtoken.Claims;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * jwt拦截器
- * </p>
- *
- * @since 2021/4/19
- */
-public class JWTInterceptor implements HandlerInterceptor {
-
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        // 如果不是映射到方法，则直接通过
-        if (!(handler instanceof HandlerMethod)) {
-            return true;
-        }
-
-        response.setContentType("application/json;charset=utf-8");
-        // 获取token
-        String token = request.getHeader("accessToken");
-
-
-        if (null == token) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("data", "token is null");
-            map.put("code", "401");
-            response.setStatus(401);
-            response.getWriter().write(JSONObject.toJSONString(map));
-            return false;
-        } else {
-            Claims claims = TokenSign.getClaims(token);
-            if (claims == null) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("data", "token is overdue");
-                map.put("code", "403");
-                response.setStatus(403);
-                response.getWriter().write(JSONObject.toJSONString(map));
-                return false;
-            }
-
-            boolean result = TokenSign.verify(token);
-            if (result) {
-                //更新存储的token信息
-                TokenConstant.updateTokenMap(token);
-                return true;
-            }
-            Map<String, Object> map = new HashMap<>();
-            map.put("data", "token is null");
-            map.put("code", "401");
-            response.setStatus(401);
-            response.getWriter().write(JSONObject.toJSONString(map));
-            return false;
-
-        }
-    }
-
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-
-    }
-}
+//package com.huimv.receive.config;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.huimv.receive.common.token.TokenConstant;
+//import com.huimv.receive.common.token.TokenSign;
+//import io.jsonwebtoken.Claims;
+//import org.springframework.web.method.HandlerMethod;
+//import org.springframework.web.servlet.HandlerInterceptor;
+//import org.springframework.web.servlet.ModelAndView;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * jwt拦截器
+// * </p>
+// *
+// * @since 2021/4/19
+// */
+//public class JWTInterceptor implements HandlerInterceptor {
+//
+//
+//    @Override
+//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+//        // 如果不是映射到方法，则直接通过
+//        if (!(handler instanceof HandlerMethod)) {
+//            return true;
+//        }
+//
+//        response.setContentType("application/json;charset=utf-8");
+//        // 获取token
+//        String token = request.getHeader("accessToken");
+//
+//
+//        if (null == token) {
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("data", "token is null");
+//            map.put("code", "401");
+//            response.setStatus(401);
+//            response.getWriter().write(JSONObject.toJSONString(map));
+//            return false;
+//        } else {
+//            Claims claims = TokenSign.getClaims(token);
+//            if (claims == null) {
+//                Map<String, Object> map = new HashMap<>();
+//                map.put("data", "token is overdue");
+//                map.put("code", "403");
+//                response.setStatus(403);
+//                response.getWriter().write(JSONObject.toJSONString(map));
+//                return false;
+//            }
+//
+//            boolean result = TokenSign.verify(token);
+//            if (result) {
+//                //更新存储的token信息
+//                TokenConstant.updateTokenMap(token);
+//                return true;
+//            }
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("data", "token is null");
+//            map.put("code", "401");
+//            response.setStatus(401);
+//            response.getWriter().write(JSONObject.toJSONString(map));
+//            return false;
+//
+//        }
+//    }
+//
+//
+//    @Override
+//    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+//
+//    }
+//
+//    @Override
+//    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+//
+//    }
+//}

huimv-receive/src/main/java/com/huimv/receive/mapper/BaseProcessMapper.java

@@ -7,6 +7,8 @@ import com.huimv.receive.entity.BaseProcess;
 import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 流程表 Mapper 接口
@@ -17,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface BaseProcessMapper extends BaseMapper<BaseProcess> {
 
-    IPage<BaseProcessByLocationVo> pageByLocationId( @Param("locationId")String locationId, @Param("processId")String processId);
+    List<BaseProcessByLocationVo> pageByLocationId(@Param("locationId")String locationId, @Param("processId")String processId);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -58,7 +58,7 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
     public Result pageByLocationId(Map<String, String> map) {
         String locationId = map.get("locationId");
         String processId = map.get("processId");
-        IPage<BaseProcessByLocationVo> userAccountVoIPage =  baseProcessMapper.pageByLocationId(locationId,processId);
-        return new Result(ResultCode.SUCCESS,userAccountVoIPage);
+        List<BaseProcessByLocationVo> baseProcessByLocationVos =  baseProcessMapper.pageByLocationId(locationId,processId);
+        return new Result(ResultCode.SUCCESS,baseProcessByLocationVos);
     }
 }

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -30,7 +30,7 @@
    isolate_end_date ,
    isolate_end_date as test_location_id  ,bill_status, isolate_day_num,
   4 as `type`
-    FROM  `bill_isolate`) a  and a.process_id , = #{processId,} and admission_user_id  = #{locationId} order by a.check_date desc
+    FROM  `bill_isolate`) a  where  a.process_id  = #{processId} and admission_user_id  = #{locationId} order by a.check_date desc
 
     </select>