Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

edu-article/JkEdu/src/com/yihu/jk/api/ArticleApiTest.java

@@ -68,13 +68,15 @@ public class ArticleApiTest {
//		obj.put("articlelevel","1");
//		obj.put("articleTitle","1");
//		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");
		obj.put("roleType",1);
		obj.put("currentUserRole","3502030700");
		obj.put("currentUserRoleLevel",4);//
//		obj.put("currentUserRole","3502110400");
		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");//ylp201703150222
		//obj.put("roleType",1);
		obj.put("currentUserRole","3502110400");
		//obj.put("userCode","0de7295862dd11e69faffa163e8aee56");//ylp201703150222
		obj.put("isMyArticle",true);
		obj.put("page","0");
		obj.put("pageSize","10");
		obj.put("pageSize","9");
		obj.put("currentUserRoleLevel",4);//
		obj.put("sEcho","1");
//		obj.put("articleTitle","我口试");
		im.setParam(obj.toString());

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -684,9 +684,9 @@ public class ArticleDao {
		}else if("4".equals(vo.getOperatorRoleLevel())){//社区、机构
			param.append(" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ");
		}
		param.append(" and UserScope <= ? ");
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and UserScope <= ? ");
			sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
		}else{
			sql.addParamValue(3);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -28,6 +28,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import springfox.documentation.spring.web.json.Json;
import java.util.*;
@@ -732,7 +733,7 @@ public class ThirdJkEduArticleService extends BaseService {
     * @return
     * @throws Exception
     */
    public void checkCategory(String categoryName,Integer categoryLevel) throws Exception {
    public boolean checkCategory(String categoryName,Integer categoryLevel) throws Exception {
        JSONObject json = null;
        try {
            JSONObject param = new JSONObject();
@@ -740,12 +741,15 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("categoryLevel", categoryLevel);
            String response = httpClientUtil.httpPost(articleBaseUrl+"/WsPlatform/rest", getParamsMap(checkCategory, param.toString(), "1"));
            json = JSON.parseObject(response);
            JSONArray j = (JSONArray) json.get("result");
            if(j!=null&&j.size()>0){
                return true;
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (!"10000".equals(json.getString("Code"))) {
            new Exception(json.getString("Message"));
        }
        return false;
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/sms/SMSController.java

@@ -94,6 +94,59 @@ public class SMSController extends BaseController {
		}
	}
	@RequestMapping(value = "checkCaptcha", method = RequestMethod.POST)
	@ResponseBody
	public String send2(String mobile, int type, @RequestParam(required = false) String captchaToken) {
		try {
			if (type > 10 || type < 1) {
				return error(-1, "无效的请求！");
			}
			if (StringUtils.isEmpty(mobile)) {
				return error(-1, "手机号码不允许为空！");
			}
//			if (type == 4) {
//				// 登录时校验用户是否存在
//				List<Patient> patients = patientDao.findByMobile(mobile);
//				if (patients == null||patients.size()==0) {
//					return error(-1, "该手机号未注册！");
//				}
//			} else if (type == 5) {
//				// 登录时校验用户是否存在
//				Doctor doctor = doctorDao.findByMobile(mobile);
//				if (doctor == null) {
//					return error(-1, "该手机号未注册！");
//				}
//			}
			if (StringUtils.isNotEmpty(captchaToken)) {
				String ct = request.getSession().getAttribute("captchaToken").toString();
				if (!StringUtils.equalsIgnoreCase(captchaToken, ct)) {
					return error(-1, "图形验证码错误！");
				}
			}
			// 获取ip地址
			String ip = NetworkUtil.getIpAddress(request);
			if (StringUtils.isEmpty(ip)) {
				return error(-1, "无效的ip请求！");
			}
//			String res = smsService.send(mobile, ip, type, getUID());
			String res = null;
			//内网发送 通过redis的队列
			if("local".equals(springProfiles)){
				res = smsService.sendToNeiWang(mobile, ip, type);
			}else {
				res = smsService.send(mobile, ip, type, getRepUID());
			}
			if (StringUtils.equals(res, "ok")) {
				return write(200, "验证码短信已发送！");
			} else {
				return error(-1, res);
			}
		} catch (Exception e) {
			error(e);
			return error(-1, "短信发送失败！");
		}
	}
	/**
	 * 验证手机验证码
	 * @param type 消息类型:1微信端注册，2微信端找回密码，3医生端找回密码

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -249,6 +249,10 @@ public class ThirdJkEduArticleController extends BaseController {
    ){
        try {
            boolean flag = thirdJkEduArticleService.checkCategory(categoryName,categoryLevel);
            if(flag){
                return error(-2,"文章分类名称重复！");
            }
            thirdJkEduArticleService.addCategory(categoryName,categoryLevel,firstlevelId,secondLevelId,getUID(),getCurrentRoleCode());
            return success("添加成功！");
        }catch (Exception e){