Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerDoctorService.java

@@ -1,15 +1,19 @@
package com.yihu.jw.hospital.message.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -29,10 +33,17 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BaseUserMessageDao baseUserMessageDao;
    @Autowired
    private BasePatientDao patientDao;
    //批量新增锦旗
    @Transactional
    public void bannerGive(String patientId,String patientName, List<String> list,String content,
    public void bannerGive(String patientId, List<String> list,String content,
                           String doctor,String doctorName){
        String patientName = null;
        BasePatientDO basePatientDO=patientDao.findById(patientId);
        if(null!=basePatientDO){
            patientName = basePatientDO.getName();
        }
        if (list.size()>0){
            for (int i=0;i<list.size();i++){
                BaseBannerDoctorDO baseBannerDoctorDO = new BaseBannerDoctorDO();

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseUserMsgService.java

@@ -1,6 +1,8 @@
package com.yihu.jw.hospital.message.service;
import com.google.j2objc.annotations.AutoreleasePool;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
@@ -50,6 +52,8 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
    private BaseEvaluateDao baseEvaluateDao;
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @Value("${wechat.id}")
    private String wxId;
@@ -59,8 +63,13 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
    private boolean flag;
    //患者给医生自身留言接口
    public void leaveMessage(String content, String reciverId, String reciverName, String senderId, String senderName) {
    public void leaveMessage(String content, String reciverId, String reciverName, String senderId) {
        BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
        BasePatientDO patientDO= basePatientDao.findById(senderId);
        String senderName=null;
        if(null!=patientDO){
            senderName = patientDO.getName();
        }
        String relationCode=UUID.randomUUID().toString();
        baseUserMessageDO.setContent(content);
        baseUserMessageDO.setSender(senderId);
@@ -77,13 +86,27 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
    }
    //回复留言接口
    @Transactional
    public void responseMessage(String contentId,String content, String reciverId, String reciverName, String senderId, String senderName) {
    public void responseMessage(String contentId,String content, String reciverId, String reciverName, String senderId,Integer isDoctor) {
        BaseUserMessageDO baseUserMessageDOS = baseUserMessageDao.findOne(contentId);
        if(null!=baseUserMessageDOS){
            baseUserMessageDOS.setStatus(2);
        }
        baseUserMessageDao.save(baseUserMessageDOS);
        BaseUserMsgContentDO baseUserMsgContentDO =new BaseUserMsgContentDO();
        String senderName = null;
        if(1==isDoctor){
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(senderId);
            if(null!=baseDoctorDO){
                senderName = baseDoctorDO.getName();
            }
            baseUserMsgContentDO.setIsDoctor(1);
        }else {
            BasePatientDO patientDO= basePatientDao.findById(senderId);
            if(null!=patientDO){
                senderName = patientDO.getName();
            }
            baseUserMsgContentDO.setIsDoctor(0);
        }
        baseUserMsgContentDO.setBaseUserMsgId(contentId);
        baseUserMsgContentDO.setContent(content);
        baseUserMsgContentDO.setSender(senderId);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseUserMsgContentDO.java

@@ -39,6 +39,18 @@ public class BaseUserMsgContentDO extends UuidIdentityEntityWithOperator {
     *是否删除（1正常0删除）
     */
    private Integer del;
    /**
     *是否是医生（1是0不是）
     */
    private Integer isDoctor;
    public Integer getIsDoctor() {
        return isDoctor;
    }
    public void setIsDoctor(Integer isDoctor) {
        this.isDoctor = isDoctor;
    }
    private BaseUserMessageDO baseUserMessageDO;
    @Transient

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BannerDoctorController.java

@@ -38,8 +38,7 @@ public class BannerDoctorController extends EnvelopRestEndpoint {
        if(StringUtils.isNotEmpty(bannerIds)){
            List<String> list =  Arrays.asList(bannerIds.split(","));
            String patientId= getUID();
            String patientName = getUNAME();
            baseBannerDoctorService.bannerGive(patientId,patientName,list,content,doctor,doctorName);
            baseBannerDoctorService.bannerGive(patientId,list,content,doctor,doctorName);
        }
    return success("赠送成功");
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BaseUserMsgController.java

@@ -35,10 +35,11 @@ public class BaseUserMsgController extends EnvelopRestEndpoint {
                                   @ApiParam(name = "content", value = "content", required = false)
                                       @RequestParam(value = "content", required = false)String content,
                                   @ApiParam(name = "contentId", value = "contentId", required = false)
                                       @RequestParam(value = "contentId", required = false)String  contentId){
                                       @RequestParam(value = "contentId", required = false)String  contentId,
                                   @ApiParam(name = "isDoctor", value = "isDoctor", required = false)
                                       @RequestParam(value = "isDoctor", required = false)Integer  isDoctor){
        String patient = getUID();
        String patinetName = getUNAME();
        baseUserMsgService.responseMessage(contentId,content,reciverId,reciverName,patient,patinetName);
        baseUserMsgService.responseMessage(contentId,content,reciverId,reciverName,patient,isDoctor);
        return success("回复成功" );
    }
    @ApiOperation("自身评论")
@@ -51,8 +52,8 @@ public class BaseUserMsgController extends EnvelopRestEndpoint {
                              @RequestParam(value = "content", required = false)String content
                              ){
        String senderId = getUID();
        String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId,senderName);
        //String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId);
        return success("留言成功" );
}
    @ApiOperation("医生评论展示")