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

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

@@ -3,6 +3,7 @@ package com.yihu.jw.hospital.message.dao;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -11,7 +12,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * Created at 2020.07.08
 */
public interface BaseBannerDoctorDao extends PagingAndSortingRepository<BaseBannerDoctorDO, String>, JpaSpecificationExecutor<BaseBannerDoctorDO> {
    //批量新增的接口
    //获取医生获得锦旗总量的接口
    @Query( value = "SELECT COUNT(1) AS \"total\"  FROM base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id where a.doctor = ?1",nativeQuery = true)
    Integer getTotalBannerCount(String doctor);
}

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

@@ -1,17 +1,23 @@
package com.yihu.jw.hospital.message.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.swing.plaf.PanelUI;
import javax.transaction.Transactional;
import java.util.List;
import java.util.Map;
@Service
public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO, BaseBannerDoctorDao> {
@@ -20,7 +26,38 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
    @Autowired
    private JdbcTemplate jdbcTemplate;
    //批量新增锦旗
    public void bannerGive(String patientId, String doctorId, List<String> list,Integer relationType){
    @Transactional
    public void bannerGive(String patientId,String patientName, List<String> list,String content,
                           String doctor,String doctorName){
        if (list.size()>0){
            for (int i=0;i<list.size();i++){
                BaseBannerDoctorDO baseBannerDoctorDO = new BaseBannerDoctorDO();
                baseBannerDoctorDO.setBannerId(list.get(i));
                baseBannerDoctorDO.setContent(content);
                baseBannerDoctorDO.setDoctor(doctor);
                baseBannerDoctorDO.setDoctorName(doctorName);
                baseBannerDoctorDO.setPatientId(patientId);
                baseBannerDoctorDO.setPatientName(patientName);
                baseBannerDoctorDO.setRelationType(1);
                baseBannerDoctorDO.setRerelationName("送锦旗留言");
                baseBannerDoctorDO.setRelationCode("system");
                baseBannerDoctorDao.save(baseBannerDoctorDO);
            }
        }
    }
    //获取医生锦旗数量接口
    public JSONObject getDoctorBanners(String doctorID){
        StringBuffer sql = new StringBuffer();
        sql.append("SELECT COUNT(1) AS \"total\",b.name  FROM base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id\n" +
                "where 1=1 ");
        sql.append("and a.doctor = "+doctorID);
        sql.append( " GROUP BY a.banner_id");
        //获取每个锦旗数量
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql.toString());
        int count = baseBannerDoctorDao.getTotalBannerCount(doctorID);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("count",count);
        jsonObject.put("resultlist",list);
        return jsonObject;
    }
}

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

@@ -7,6 +7,7 @@ import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -57,6 +58,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        Map<String,Object> params = new HashedMap();
        String sqlcount = dealSql(name,status,true);
        String sql  = dealSql(name,status,false);
        DateUtil dateUtil =new DateUtil();
        if (StringUtils.isNotEmpty(status)){
            params.put("status",status);
        }
@@ -67,6 +69,12 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
            count = hibenateUtils.objTransformLong(total.get(0).get("total"));
        }
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql,params,page,pageSize);
        /*for (Map<String,Object> map:list){
            String createTime= map.get("create_time").toString();
            String updateTime = map.get("update_time").toString();
            map.replace("create_time",createTime,dateUtil.stampToString(createTime));
            map.replace("update_time",createTime,dateUtil.stampToString(updateTime));
        }*/
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, pageSize, count);
    }
    private String dealSql(String name, String status,Boolean isCount){
@@ -115,7 +123,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
     * @return
     * @throws Exception
     */
    public BaseBannerDO updateBanner(String id,String name,String img,String status,String updateUser,String updateUserName){
    public BaseBannerDO updateBanner(String id,String name,String img,String status,String updateUser,String updateUserName,String description){
        BaseBannerDO bannerDO = baseBannerDao.findOne(id);
        if (null == bannerDO){
            return null;
@@ -136,6 +144,9 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        if (!StringUtil.isEmpty(status)){
            bannerDO.setStatus(Integer.valueOf(status));
        }
        if (!StringUtil.isEmpty(description)){
            bannerDO.setDescription(description);
        }
        baseBannerDao.save(bannerDO);
        return bannerDO;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.hospital.message;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -43,13 +44,13 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
    /**
     *业务名称
     */
    private String receiverName;
    private String rerelationName;
    /**
     *内容
     */
    private String content;
    /**
     *给医生送锦旗/评价送锦旗
     *给医生送锦旗1/评价送锦旗0
     */
    private Integer relationType;
@@ -92,15 +93,15 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    public String getReceiverName() {
        return receiverName;
    @Column(name = "relation_name")
    public String getRerelationName() {
        return rerelationName;
    }
    public void setReceiverName(String receiverName) {
        this.receiverName = receiverName;
    public void setRerelationName(String rerelationName) {
        this.rerelationName = rerelationName;
    }
    @Column(name = "banner_id")
    public String getBannerId() {
        return bannerId;
    }
@@ -108,7 +109,7 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
    public void setBannerId(String bannerId) {
        this.bannerId = bannerId;
    }
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
@@ -116,7 +117,7 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1126,6 +1126,15 @@ public class BaseHospitalRequestMapping {
        public static final String downBanner = "/downBanner";
        public static final String onOff = "/onOff";
    }
    /**
     * 医生礼物管理
     */
    public static class DoctorBanner extends Basic{
        public static final String doctorBanner  = "/doctorBanner";
        public static final String giveBanner  = "/giveBanner";
        public static final String getBanner  = "/getBanner";
    }
    /**
     * 医生分析总览
     */

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

@@ -0,0 +1,52 @@
package com.yihu.jw.hospital.endpoint.message;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.service.BaseBannerDoctorService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.apache.commons.lang.StringUtils;
import java.util.Arrays;
import java.util.List;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.DoctorBanner.doctorBanner)
@Api(value = "患者赠送锦旗", description = "患者锦旗管理", tags = {"互联网医院 - 患者锦旗管理接口"})
public class BannerDoctorController extends EnvelopRestEndpoint {
    @Autowired
    private BaseBannerDoctorService baseBannerDoctorService;
    @ApiOperation("批量赠送锦旗")
    @PostMapping(value= BaseHospitalRequestMapping.DoctorBanner.giveBanner)
    public Envelop giveBanner(@ApiParam(name = "bannerIds", value = "bannerIds", required = true)
                                  @RequestParam(value = "bannerIds", required = true)String bannerIds,
                              @ApiParam(name = "doctor", value = "doctor", required = false)
                                  @RequestParam(value = "doctor", required = false)String doctor,
                              @ApiParam(name = "doctorName", value = "doctorName", required = false)
                                  @RequestParam(value = "doctorName", required = false)String doctorName,
                              @ApiParam(name = "content", value = "content", required = false)
                                  @RequestParam(value = "content", required = false)String content){
        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);
        }
    return success("赠送成功");
    }
    @ApiOperation("查询赠送锦旗")
    @PostMapping(value= BaseHospitalRequestMapping.DoctorBanner.getBanner)
    public JSONObject getBanners(@ApiParam(name = "doctor", value = "doctor", required = false)
                                     @RequestParam(value = "doctor", required = false)String doctor){
        return baseBannerDoctorService.getDoctorBanners(doctor);
    }
}

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

@@ -69,10 +69,12 @@ public class BaseBannerController extends EnvelopRestEndpoint{
            @ApiParam(name = "img", value = "img", required = false)
            @RequestParam(value = "img", required = false)String img,
            @ApiParam(name = "status", value = "status", required = false)
            @RequestParam(value = "status", required = false)String status)throws Exception {
            @RequestParam(value = "status", required = false)String status,
            @ApiParam(name = "description", value = "description", required = false)
            @RequestParam(value = "description", required = false)String description)throws Exception {
        String updateUser = getUID();
        String updateUserName = getUNAME();
        BaseBannerDO result = baseBannerService.updateBanner(id,name,img,status,updateUser,updateUserName);
        BaseBannerDO result = baseBannerService.updateBanner(id,name,img,status,updateUser,updateUserName,description);
        if (null == result) {
            return failed("更新失败,礼物不存在");
        }