Merge branch 'dev' of chinawu123/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2251,8 +2251,8 @@ public class ImService {
     * @param type
     * @return
     */
    public Integer SessionsUnreadMessageCount(String userid, String type) {
        return imUtil.SessionsUnreadMessageCount(userid, type);
    public Integer SessionsUnreadMessageCount(String userid, String type,String senderId) {
        return imUtil.SessionsUnreadMessageCount(userid, type,senderId);
    }
    public Integer SessionsUnreadMessageCountByUserId(String userid) {

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -820,8 +820,11 @@ public class ImUtil {
	 * @param type
	 * @return
	 */
	public Integer SessionsUnreadMessageCount(String userid,String type){
	public Integer SessionsUnreadMessageCount(String userid,String type,String senderId){
		String url = im_host + "api/v2/sessions/unread_message_count?user_id="+userid+"&type="+type;
		if (StringUtils.isNotBlank(senderId)){
			url+="&senderId="+senderId;
		}
		String ret = HttpClientUtil.get(url,"utf-8");
		JSONObject obj = JSON.parseObject(ret);
//		if(obj.getInteger("count") ==200){

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -429,13 +429,14 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            }
            //账户密码登录的才验证密码强度
        String grant_type = parameters.get("grant_type");
        /*if ("password".equals(grant_type)) {
            if (!testPwd(parameters.get("password"))) {
                throw new PwdException("密码强度低，请用验证码登录，或者修改密码后在从新登录！");
        if ("hz_yyyzh_wx".equals(wechatId)) {
            String grant_type = parameters.get("grant_type");
            if ("password".equals(grant_type)) {
                if (!testPwd(parameters.get("password"))) {
                    throw new PwdException("密码强度低，请用验证码登录，或者修改密码后在从新登录！");
                }
            }
        }*/
        }
        /*如果是移动端登陆则移除之前的token，
        在网关处通过HTTP状态码告知前端是过期（402）还是账号在别处登陆（403），
        实现同一账号只能在一处登陆*/
@@ -785,7 +786,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            String captcha = wlyyRedisVerifyCodeService.getCodeNumber();
            int result =  zhongShanSMSService.ZhongShangSendSMS(username,"您好，你的手机登录短信验证码是："+captcha+"，5分钟内有效。");
            if (1 == result) {
            if (0 == result) {
                Captcha _captcha = new Captcha();
                _captcha.setCode(captcha);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/customerService/CustomerService.java

@@ -139,7 +139,7 @@ public class CustomerService {
    public JSONObject consultNoReply(String doctor) {
        JSONObject result = new JSONObject();
        Integer integer = imService.SessionsUnreadMessageCount(doctor,"2");
        Integer integer = imService.SessionsUnreadMessageCount(doctor,"2","8a92aba9825c559d01833f47893d0027");
        result.put("total", integer);
        return result;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -488,8 +488,8 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            Integer unreadMessageCount = imService.SessionsUnreadMessageCountByUserId(doctor);
            object.put("unreadMessageCount",unreadMessageCount);//未读消息数量
            object.put("doorCoachOrder",coachOrderDOList.size());//上门辅导待完成数量
            Integer unConsultMsgCount = imService.SessionsUnreadMessageCount(doctor,"23");
            Integer unConsultMsgCount2 = imService.SessionsUnreadMessageCount(doctor,"24");
            Integer unConsultMsgCount = imService.SessionsUnreadMessageCount(doctor,"23",null);
            Integer unConsultMsgCount2 = imService.SessionsUnreadMessageCount(doctor,"24",null);
            object.put("unConsultMsgCount",unConsultMsgCount+unConsultMsgCount2);//咨询未读消息数量
            return object;
//        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -15,19 +15,16 @@ import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.enterprise.WxEnterpriseDO;
import com.yihu.jw.entity.hospital.enterprise.WxEnterpriseTokenDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.util.AesEncryptUtils;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.es.service.StatisticsEsService;
import com.yihu.jw.es.service.yqfk.YqfkService;
@@ -73,13 +70,10 @@ import com.yihu.jw.sms.service.YkyyINSMSService;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.XMLUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.enterprise.dao.WxEnterpriseDao;
import com.yihu.jw.wechat.enterprise.dao.WxEnterpriseTokenDao;
import com.yihu.jw.wechat.service.WechatInfoService;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import com.ylzinfo.onepay.sdk.OnepayClient;
@@ -97,31 +91,21 @@ import net.sf.json.JSONArray;
import net.sf.json.xml.XMLSerializer;
import org.apache.axis.utils.StringUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.http.entity.ContentType;
import org.apache.poi.util.IOUtils;
import org.apache.tomcat.util.http.fileupload.FileItem;
import org.apache.tomcat.util.http.fileupload.FileItemFactory;
import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
import org.hibernate.validator.constraints.SafeHtml;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.activation.MimetypesFileTypeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.math.BigDecimal;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -529,7 +513,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                Integer zjqzCount = imService.sessionCountByType(doctor.getId(),15,0);
                //专家咨询
                Integer unreadMessageCount = imService.SessionsUnreadMessageCount(doctor.getId(),"1");
                Integer unreadMessageCount = imService.SessionsUnreadMessageCount(doctor.getId(),"1",null);
                result.put("zjCount",zjCount+zjqzCount);//专家咨询数量
                result.put("zjUnreadMessageCount",unreadMessageCount);//专家咨询未读数
            }else{
@@ -558,9 +542,9 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            }
            //医生咨询
            Integer zxCount = imService.SessionsUnreadMessageCount(doctor.getId(), "1");
            Integer fzCount = imService.SessionsUnreadMessageCount(doctor.getId(), "9");
            Integer spCount = imService.SessionsUnreadMessageCount(doctor.getId(), "16");
            Integer zxCount = imService.SessionsUnreadMessageCount(doctor.getId(), "1",null);
            Integer fzCount = imService.SessionsUnreadMessageCount(doctor.getId(), "9",null);
            Integer spCount = imService.SessionsUnreadMessageCount(doctor.getId(), "16",null);
            result.put("zxCount",zxCount);//专家咨询咨询数量
            result.put("fzCount",fzCount);//图文复诊数量
            result.put("spCount",spCount);//图文复诊数量
@@ -2409,7 +2393,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        result.put("videoConsultTotal",prescriptionService.getVideoCount(doctor,"2","3",wxId));//视频咨询总数量
        result.put("homeConsultCount",prescriptionService.getWaitVideoCount(doctor,"3","3",wxId));//家医咨询数量
        result.put("homeConsultTotal",prescriptionService.getVideoCount(doctor,"3","3",wxId));//家医咨询总数量
        Integer unreadMessageCount = imService.SessionsUnreadMessageCount(doctor,"1");
        Integer unreadMessageCount = imService.SessionsUnreadMessageCount(doctor,"1",null);
        result.put("zjUnreadMessageCount",unreadMessageCount);//专家咨询未读数
        if ("sd_tnzyy_wx".equalsIgnoreCase(wxId)){
            result.put("doorServiceCount",prescriptionService.waitUpdoorCount(doctor));//上门服务数量