Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequired.java

@@ -1,14 +0,0 @@
package com.yihu.wlyy.aop;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
 * Created by Trick on 2017/6/24.
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ObserverRequired {
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequiredAOP.java

@@ -1,90 +0,0 @@
package com.yihu.wlyy.aop;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.json.JSONObject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
 * Created by Trick on 2017/6/24.
 */
@Aspect
@Component
public class ObserverRequiredAOP {
    //Controller层切点路径
    @Pointcut("execution(* com.yihu.wlyy.web..*.*(..))")
    public void controllerAspect() {
    }
    public ObserverRequiredAOP() {
        //System.out.println("Observer---------------------------------------");
    }
    @Around("controllerAspect() && @annotation(com.yihu.wlyy.aop.ObserverRequired)")
    public Object checkToken(ProceedingJoinPoint point) throws Throwable {
        Object o = null;
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
        String error = "";
        try {
            response.setCharacterEncoding("UTF-8");
            JSONObject json = getAgent(request);
            String observer = json.has("observer") ? json.getString("observer") : "";
            if(StringUtils.isNotBlank(observer)&&"1".equals(observer)){
                PrintWriter writer=response.getWriter();
                writer.write(error(403, "该操作没有权限"));
                writer.flush();
                return o;
            }
        }catch (Exception e){
            //return o;
        }
         o = point.proceed();
        return o;
    }
    public String write(int code, String msg) {
        try {
            JSONObject json = new JSONObject();
            json.put("status", code);
            json.put("msg", msg);
            return json.toString();
        } catch (Exception e) {
            return null;
        }
    }
    public String error(int code, String msg) {
        try {
            JSONObject json = new JSONObject();
            json.put("status", code);
            json.put("msg", msg);
            return json.toString();
        } catch (Exception e) {
            return null;
        }
    }
    public JSONObject getAgent(HttpServletRequest request) {
        try {
            String userAgent = request.getHeader("userAgent");
            if (StringUtils.isEmpty(userAgent)) {
                userAgent = request.getHeader("User-Agent");
            }
            System.out.println("userAgent:" + userAgent);
            return new JSONObject(userAgent);
        } catch (Exception e) {
            return null;
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/UserFilterAOP.java

@@ -1,57 +0,0 @@
package com.yihu.wlyy.aop;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.yihu.wlyy.repository.security.TokenDao;
@Component
@Aspect
public class UserFilterAOP {
	@Autowired
	public TokenDao tokenDao;
//	private JSONObject getAgent() {
//		try {
//			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
//			String userAgent = request.getHeader("User-Agent");
//			return new JSONObject(userAgent);
//		} catch (Exception e) {
//			return null;
//		}
//	}
//
//	@Before("execution(* com.yihu.wlyy.service.app..*.*(..))")
//	public void before() throws Exception {
//		JSONObject json = getAgent();
//		if(json == null){
//			// 未登录
//			throw new InvalidUserException(SystemConf.NOT_LOGIN, "请登录后再操作！");
//		}
//		String user = json.getString("uid");
//		String imei = json.getString("imei");
//		int platform = json.getInt("platform");
//
//		Token token = SystemData.allUserTokens.get(user);
//		if (token == null) {
//			token = tokenDao.findByUser(user, platform);
//			if (token == null) {
//				// 未登录
//				throw new InvalidUserException(SystemConf.NOT_LOGIN, "请登录后再操作！");
//			} else {
//				if (token.getTimeout().getTime() < new Date().getTime()) {
//					// 登录超时
//					throw new InvalidUserException(SystemConf.LOGIN_TIMEOUT, "登录超时，请重新登录");
//				} else if (!StringUtils.equals(imei, token.getImei())) {
//					// 别处登录
//					throw new InvalidUserException(SystemConf.LOGIN_OTHER, "帐号在别处登录，请重新登录");
//				} else {
//					// 登录正常，更新缓存
//					SystemData.allUserTokens.put(user, token);
//				}
//			}
//		}
//	}
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/consult/EvaluateService.java

@@ -1,8 +1,5 @@
package com.yihu.wlyy.service.app.consult;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.consult.Evaluate;
import com.yihu.wlyy.entity.consult.EvaluateLabel;