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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/MvcConfig.java

@@ -17,6 +17,8 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import java.io.File;
/**
 * Created by chenweida on 2017/4/6.
 */
@@ -83,7 +85,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
    @Override
    public void addResourceHandlers(ResourceHandlerRegistry registry) {
        String tempPath = SystemConf.getInstance().getTempPath() ;
        registry.addResourceHandler(tempPath+"/**").addResourceLocations("file:"+tempPath+"/");
        registry.addResourceHandler(tempPath+"/**").addResourceLocations("file:"+tempPath+ File.separator);
        super.addResourceHandlers(registry);
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -1062,7 +1062,7 @@ public class JMJkEduArticleService extends BaseService {
     * @param id
     * @throws Exception
     */
    public void saveOrUpdateArticleQR(String currentRoleLevel,String currentRoleCode,Integer position,String imgUrl,String userCode,Integer id) throws Exception{
    public void saveOrUpdateArticleQR(String currentRoleLevel,String currentRoleCode,Integer position,String imgUrl,String userCode,Integer id,String identification) throws Exception{
//        thirdJkEduArticleService.getArticleQRCode(currentRoleLevel,currentRoleCode);
//        if(StringUtils.isEmpty()){
//
@@ -1082,10 +1082,10 @@ public class JMJkEduArticleService extends BaseService {
        String orgId = doctor.getHospital();
        String orgName = doctor.getHospitalName();
        if(id!=null){
            thirdJkEduArticleService.updateArticleQRCode(currentRoleLevel,currentRoleCode,imgUrl,position,userCode,userName,orgId,orgName,id);
            thirdJkEduArticleService.updateArticleQRCode(currentRoleLevel,currentRoleCode,imgUrl,position,userCode,userName,orgId,orgName,id,identification);
        }else {
            thirdJkEduArticleService.saveArticleQRCode(currentRoleLevel,currentRoleCode,imgUrl,position,userCode,userName,orgId,orgName);
            thirdJkEduArticleService.saveArticleQRCode(currentRoleLevel,currentRoleCode,imgUrl,position,userCode,userName,orgId,orgName,identification);
        }
    }

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

@@ -801,7 +801,7 @@ public class ThirdJkEduArticleService extends BaseService {
     * @throws Exception
     */
    public void updateArticleQRCode(String currentRoleLevel,String currentRoleCode,String imgUrl,Integer position,String userId,String userName,
                                          String orgId,String orgName,Integer id) throws Exception {
                                          String orgId,String orgName,Integer id,String identification) throws Exception {
        JSONObject json = null;
        try{
@@ -815,6 +815,7 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("userName",userName);
            param.put("orgId",orgId);
            param.put("orgName",orgName);
            param.put("identification",identification);
            String response = httpClientUtil.httpPost(articleBaseUrl+"/WsPlatform/rest", getParamsMap(updateArticleQRCode, param.toString(), "1"));
            json = JSON.parseObject(response);
        }catch (Exception e) {
@@ -827,7 +828,7 @@ public class ThirdJkEduArticleService extends BaseService {
    }
    public void saveArticleQRCode(String currentRoleLevel,String currentRoleCode,String imgUrl,Integer position,String userId,String userName,
                                          String orgId,String orgName) throws Exception {
                                          String orgId,String orgName,String identification) throws Exception {
        JSONObject json = null;
        try{
            JSONObject param = new JSONObject();
@@ -837,8 +838,9 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("userName",userName);
            param.put("orgId",orgId);
            param.put("orgName",orgName);
            param.put("identification",identification);
            param.put("operatorRoleCode",currentRoleCode);
            param.put("currentRoleLevel",currentRoleLevel);//saveArticleQRCode
            param.put("operatorRoleLevel",currentRoleLevel);//saveArticleQRCode
            String response = httpClientUtil.httpPost(articleBaseUrl+"/WsPlatform/rest", getParamsMap(saveArticleQRCode, param.toString(), "1"));
            json = JSON.parseObject(response);
        }catch (Exception e) {

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

@@ -567,4 +567,13 @@ public class FileUploadController extends BaseController {
            return error(-1,"失败！");
        }
    }
//    @RequestMapping(value = "fastDFSImags", method = RequestMethod.POST)
//    @ApiOperation("编辑文章上传图片")
//    @ResponseBody
//    public String pushArticleList(@ApiParam(name = "file", value = "文件", required = true)
//                                  @RequestParam(value = "file", required = true) MultipartFile file){
//
//
//    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -535,4 +535,6 @@ public class LoginController extends BaseController {
            return error(-1, "手机号验证失败");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -212,8 +212,8 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
    public  String saveOrUpdateArticleQR(
//                                        @ApiParam(name = "currentRoleLevel", value = "当前登录角色的级别")
//                                         @RequestParam(value = "currentRoleLevel", required = true) String currentRoleLevel,
//                                         @ApiParam(name = "currentRoleCode", value = "当前登录角色的code")
//                                         @RequestParam(value = "currentRoleCode", required = true) String currentRoleCode,
                                         @ApiParam(name = "identification", value = "认证标识文字")
                                         @RequestParam(value = "identification", required = false) String identification,
                                         @ApiParam(name = "position", value = "位置")
                                         @RequestParam(value = "position", required = false) Integer position,
                                         @ApiParam(name = "imgUrl", value = "二维码图片地址")
@@ -222,7 +222,7 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                                         @RequestParam(value = "id", required = false) Integer id){
        try{
            jmJkEduArticleService.saveOrUpdateArticleQR(getCurrentRoleLevel(),getCurrentRoleCode(),position,imgUrl,getUID(),id);
            jmJkEduArticleService.saveOrUpdateArticleQR(getCurrentRoleLevel(),getCurrentRoleCode(),position,imgUrl,getUID(),id,identification);
            return success("保存成功！");
        } catch (Exception e){
            e.printStackTrace();