Merge branch 'dev' of chenjiasheng/wlyy2.0 into medicare

business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyHospitalSysDictDao.java

@@ -45,4 +45,11 @@ public interface WlyyHospitalSysDictDao extends PagingAndSortingRepository<WlyyH
    @Query("from WlyyHospitalSysDictDO where dictName = ?1  and  dictCode=?2 ")
    WlyyHospitalSysDictDO findOneByDictNameAndDictCode(String dictName,String dictCode);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 and imgUrl is not null order by sort asc")
    List<WlyyHospitalSysDictDO> findByDictNameOrderBySort(String dictName);
    WlyyHospitalSysDictDO findByDictNameAndSort(String dictName, Integer sort);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 and sort>?2")
    List<WlyyHospitalSysDictDO> findByDictNameAndSortNear(String dictName,Integer sort);
}

business/base-service/src/main/java/com/yihu/jw/hospital/dict/service/WlyyHospitalSysDictService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.hospital.family.dao.BasePatientMemberDictDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -105,6 +107,7 @@ public class WlyyHospitalSysDictService extends BaseJpaService<WlyyHospitalSysDi
        wlyyHospitalSysDictDO.setModelName(modelName);
        if(StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getId())){
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO1 = wlyyHospitalSysDictDao.findById(wlyyHospitalSysDictDO.getId());
            List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOList=new ArrayList<>();
            if (wlyyHospitalSysDictDO1!=null){
                wlyyHospitalSysDictDO1.setDictValue(wlyyHospitalSysDictDO.getDictValue());
                wlyyHospitalSysDictDO1.setDictCode(wlyyHospitalSysDictDO.getDictCode());
@@ -112,7 +115,31 @@ public class WlyyHospitalSysDictService extends BaseJpaService<WlyyHospitalSysDi
                wlyyHospitalSysDictDO1.setHospital(wlyyHospitalSysDictDO.getHospital());
                wlyyHospitalSysDictDO1.setPyCode(wlyyHospitalSysDictDO.getPyCode());
                wlyyHospitalSysDictDO1.setImgUrl(wlyyHospitalSysDictDO.getImgUrl());
                wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                if (wlyyHospitalSysDictDO.getDictName().equalsIgnoreCase("ONLINE_HOSPITAL_BANNER")){
                    if (wlyyHospitalSysDictDO.getSort()==null||wlyyHospitalSysDictDO.getSort()<=0){
                        return null;
                    }
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDOs = wlyyHospitalSysDictDao.findByDictNameAndSort(wlyyHospitalSysDictDO.getDictName(),wlyyHospitalSysDictDO.getSort());
                    wlyyHospitalSysDictDOList= wlyyHospitalSysDictDao.findByDictNameAndSortNear("ONLINE_HOSPITAL_BANNER",wlyyHospitalSysDictDO.getSort());
                    if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()>0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs!=null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDOs.setSort(wlyyHospitalSysDictDOs.getSort()+1);
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else {
                        for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                            wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                            Integer sort = wlyyHospitalSysDictDO2.getSort();
                            sort++;
                            wlyyHospitalSysDictDO2.setSort(sort);
                        }
                        wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDOList);
                    }
                }else {
                    wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                }
                wlyyHospitalSysDictDO1.setModelName(modelName);
            }else {
                wlyyHospitalSysDictDO1 = new WlyyHospitalSysDictDO();
@@ -122,7 +149,31 @@ public class WlyyHospitalSysDictService extends BaseJpaService<WlyyHospitalSysDi
                wlyyHospitalSysDictDO1.setHospital(wlyyHospitalSysDictDO.getHospital());
                wlyyHospitalSysDictDO1.setPyCode(wlyyHospitalSysDictDO.getPyCode());
                wlyyHospitalSysDictDO1.setImgUrl(wlyyHospitalSysDictDO.getImgUrl());
                wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                if (wlyyHospitalSysDictDO.getDictName().equalsIgnoreCase("ONLINE_HOSPITAL_BANNER")){
                    if (wlyyHospitalSysDictDO.getSort()==null||wlyyHospitalSysDictDO.getSort()<=0){
                        return null;
                    }
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDOs = wlyyHospitalSysDictDao.findByDictNameAndSort(wlyyHospitalSysDictDO.getDictName(),wlyyHospitalSysDictDO.getSort());
                     wlyyHospitalSysDictDOList= wlyyHospitalSysDictDao.findByDictNameAndSortNear("ONLINE_HOSPITAL_BANNER",wlyyHospitalSysDictDO.getSort());
                    if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()>0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs!=null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDOs.setSort(wlyyHospitalSysDictDOs.getSort()+1);
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else {
                        for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                            wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                            Integer sort = wlyyHospitalSysDictDO2.getSort();
                            sort++;
                            wlyyHospitalSysDictDO2.setSort(sort);
                        }
                        wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDOList);
                    }
                }else {
                    wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                }
                wlyyHospitalSysDictDO1.setModelName(modelName);
            }
@@ -456,4 +507,7 @@ public class WlyyHospitalSysDictService extends BaseJpaService<WlyyHospitalSysDi
        return re;
    }
    public List<WlyyHospitalSysDictDO> findByDictName(String dictName) {
        return wlyyHospitalSysDictDao.findByDictNameOrderBySort(dictName);
    }
}

business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java

@@ -129,7 +129,6 @@ public class WlyyHttpService {
                headerMap.put("accesstoken",token);
                logger.info("sendWlyyMes url ："+oauthWlyyConfigDO.getUrl()+param);
                String rs = httpClientUtil.get(oauthWlyyConfigDO.getUrl()+param,"utf-8",headerMap);
                JSONObject re = JSONObject.parseObject(rs);
                Integer s = re.getInteger("status");

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedrugs.java

@@ -13,6 +13,44 @@ import java.io.Serializable;
public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Serializable {
    @Override
    public String toString() {
        return "Mediicinedrugs{" +
                "state='" + state + '\'' +
                ", drugName='" + drugName + '\'' +
                ", barcode='" + barcode + '\'' +
                ", drugCode='" + drugCode + '\'' +
                ", drugShortCode='" + drugShortCode + '\'' +
                ", drugClass='" + drugClass + '\'' +
                ", earlywarningcate='" + earlywarningcate + '\'' +
                ", medCabinet='" + medCabinet + '\'' +
                ", pic='" + pic + '\'' +
                ", drugNameAlies='" + drugNameAlies + '\'' +
                ", drugBarCode='" + drugBarCode + '\'' +
                ", drugClassCode='" + drugClassCode + '\'' +
                ", dosForm='" + dosForm + '\'' +
                ", drugTypeCode='" + drugTypeCode + '\'' +
                ", unit='" + unit + '\'' +
                ", price=" + price +
                ", inventory='" + inventory + '\'' +
                ", saleVolume='" + saleVolume + '\'' +
                ", selfCode='" + selfCode + '\'' +
                ", specif='" + specif + '\'' +
                ", manufactor='" + manufactor + '\'' +
                ", approvalNum='" + approvalNum + '\'' +
                ", brand='" + brand + '\'' +
                ", drugSku='" + drugSku + '\'' +
                ", drugNum=" + drugNum +
                ", useNum=" + useNum +
                ", useWay='" + useWay + '\'' +
                ", useRate='" + useRate + '\'' +
                ", useDose='" + useDose + '\'' +
                ", useWayAdd='" + useWayAdd + '\'' +
                ", orgCode='" + orgCode + '\'' +
                ", orgName='" + orgName + '\'' +
                '}';
    }
    /**
     * 状态
     */
@@ -129,6 +167,7 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
     */
    private String brand;
    /**
     * 药品SKU
     */
@@ -178,6 +217,8 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
    public Mediicinedrugs() {
    }
    public String getState() {
        return state;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -39,6 +39,8 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     */
    private Date prescribeTime;
    /**
     * 处方号
     */
@@ -81,6 +83,24 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     */
    private String pickUpNum;
    /**
     *诊断信息
     */
    private String info;
    public String getAttr() {
        return attr;
    }
    public void setAttr(String attr) {
        this.attr = attr;
    }
    /*
    * 订单属性
    * */
    private String attr;
    /**
     * 订单金额
     */
@@ -156,8 +176,69 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    /**
     * 货道信息
     */
    /**
     * 医院信息
     */
    private String hospitalInfo;
    private String cargoInfo;
    /**
     * 出生日期
     */
    private Date birth;
    /*
    科室信息
    * */
    private String deptNum;
    private String deptName;
    /*医生信息*/
    private String doctorNum;
    private String doctorName;
    /*医嘱*/
    private String doctorAdvice;
    /*过敏史*/
    private String allergyInfo;
    /*商户id*/
    private String userId;
    /*门店编号*/
    private String shopNo;
    /*
    社保卡号
     */
    private String socialSecurityCardNum;
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getShopNo() {
        return shopNo;
    }
    public void setShopNo(String shopNo) {
        this.shopNo = shopNo;
    }
    public String getAllergyInfo() {
        return allergyInfo;
    }
    public void setAllergyInfo(String allergyInfo) {
        this.allergyInfo = allergyInfo;
    }
    /**
     *订单属性
@@ -216,6 +297,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    }
    public String getOrderNum() {
        return orderNum;
    }
@@ -227,6 +309,63 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    public String getOrderState() {
        return orderState;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getBirth() {
        return birth;
    }
    public String getDoctorAdvice() {
        return doctorAdvice;
    }
    public void setDoctorAdvice(String doctorAdvice) {
        this.doctorAdvice = doctorAdvice;
    }
    public String getDoctorNum() {
        return doctorNum;
    }
    public void setDoctorNum(String doctorNum) {
        this.doctorNum = doctorNum;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getDeptNum() {
        return deptNum;
    }
    public void setDeptNum(String deptNum) {
        this.deptNum = deptNum;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public void setBirth(Date birth) {
        this.birth = birth;
    }
    public String getHospitalInfo() {
        return hospitalInfo;
    }
    public void setHospitalInfo(String hospitalInfo) {
        this.hospitalInfo = hospitalInfo;
    }
    public void setOrderState(String orderState) {
        this.orderState = orderState;
@@ -256,6 +395,14 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.prescribeTime = prescribeTime;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public String getPrescribeNum() {
        return prescribeNum;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/adv/AdvertisementLaunchDO.java

@@ -0,0 +1,36 @@
package com.yihu.jw.entity.adv;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@Entity
@Table(name = "adv_launch")
public class AdvertisementLaunchDO extends UuidIdentityEntityWithOperator implements Serializable {
    /*
    广告id
     */
    private String advId;
    /*
    设备id
     */
    private String devId;
    public String getAdvId() {
        return advId;
    }
    public void setAdvId(String advId) {
        this.advId = advId;
    }
    public String getDevId() {
        return devId;
    }
    public void setDevId(String devId) {
        this.devId = devId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/adv/AdvertisementPuttingAdminDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.adv;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -12,50 +13,24 @@ import java.io.Serializable;
@Entity
@Table(name = "advertisement_putting_admin")
public class AdvertisementPuttingAdminDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "title")
    private String title;//标题
    @Column(name = "category_code")
    private int categoryCode; //广告类型 1视频 2图片
    @Column(name = "category_name")
    private Integer categoryCode; //广告类型 1视频 2图片
    private String categoryName;//缩略图
    @Column(name = "url")
    private String url;//视频或图片路径
    @Column(name = "del")
    private int del; //是否删除 1删除 0没删除
    @Column(name = "launch")
    private int launch; //是否投放 1投放
    @Column(name = "forbidden")
    private int forbidden; //是否禁用 1禁用
    @Column(name = "play_id")
    private int playId; //播放方式对应id
//    //创建时间
//    @CreatedDate
//    @Column(name = "create_time", updatable = false)
//    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
//    private Date createTime;
//
//    //创建者
//    @CreatedBy
//    @Column(name = "create_user", updatable = false)
//    private String createUser;
//
//    //创建者
//    @CreatedBy
//    @Column(name = "create_user_name", updatable = false)
//    private String createUserName;
//
//    //更新时间
//    @LastModifiedDate
//    @Column(name = "update_time")
//    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
//    private Date updateTime;
//
//    //更新者
//    @LastModifiedBy
//    @Column(name = "update_user")
//    private String updateUser;
    private Integer del; //是否删除 1删除 0没删除
    private Integer launch; //是否投放 1投放
    private Integer forbidden; //是否禁用 1禁用
    private Integer playId; //播放方式对应id
    public String getTitle() {
        return title;
@@ -65,11 +40,11 @@ public class AdvertisementPuttingAdminDO extends UuidIdentityEntityWithOperator
        this.title = title;
    }
    public int getCategoryCode() {
    public Integer getCategoryCode() {
        return categoryCode;
    }
    public void setCategoryCode(int categoryCode) {
    public void setCategoryCode(Integer categoryCode) {
        this.categoryCode = categoryCode;
    }
@@ -89,90 +64,37 @@ public class AdvertisementPuttingAdminDO extends UuidIdentityEntityWithOperator
        this.url = url;
    }
    public int getDel() {
    public Integer getDel() {
        return del;
    }
    public void setDel(int del) {
    public void setDel(Integer del) {
        this.del = del;
    }
    public int getLaunch() {
    public Integer getLaunch() {
        return launch;
    }
    public void setLaunch(int launch) {
    public void setLaunch(Integer launch) {
        this.launch = launch;
    }
    public int getForbidden() {
    public Integer getForbidden() {
        return forbidden;
    }
    public void setForbidden(int forbidden) {
    public void setForbidden(Integer forbidden) {
        this.forbidden = forbidden;
    }
//    //更新者
//    @LastModifiedBy
//    @Column(name = "update_user_username")
//    private String updateUserName;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "create_time", updatable = false)
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//
//    @Column(name = "create_user", updatable = false)
//    public String getCreateUser() {
//        return createUser;
//    }
//
//    public void setCreateUser(String createUser) {
//        this.createUser = createUser;
//    }
//
//    @Column(name = "create_user_name", updatable = false)
//    public String getCreateUserName() {
//        return createUserName;
//    }
//
//    public void setCreateUserName(String createUserName) {
//        this.createUserName = createUserName;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "update_time", length = 0)
//    public Date getUpdateTime() {
//        return updateTime;
//    }
//
//    public void setUpdateTime(Date updateTime) {
//        this.updateTime = updateTime;
//    }
//
//    @Column(name = "update_user")
//    public String getUpdateUser() {
//        return updateUser;
//    }
//
//    public void setUpdateUser(String updateUser) {
//        this.updateUser = updateUser;
//    }
//
//    @Column(name = "update_user_name")
//    public String getUpdateUserName() {
//        return updateUserName;
//    }
//
//    public void setUpdateUserName(String updateUserName) {
//        this.updateUserName = updateUserName;
//    }
    public Integer getPlayId() {
        return playId;
    }
    public void setPlayId(Integer playId) {
        this.playId = playId;
    }
    @Override
    public String toString() {
@@ -194,12 +116,4 @@ public class AdvertisementPuttingAdminDO extends UuidIdentityEntityWithOperator
                ", id='" + id + '\'' +
                '}';
    }
    public int getPlayId() {
        return playId;
    }
    public void setPlayId(int playId) {
        this.playId = playId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalSysDictDO.java

@@ -125,6 +125,25 @@ public class  WlyyHospitalSysDictDO extends UuidIdentityEntityWithOperator {
        this.hospital = hospital;
    }
    @Override
    public String toString() {
        return "WlyyHospitalSysDictDO{" +
                "saasId='" + saasId + '\'' +
                ", dictName='" + dictName + '\'' +
                ", dictCode='" + dictCode + '\'' +
                ", dictValue='" + dictValue + '\'' +
                ", pyCode='" + pyCode + '\'' +
                ", sort=" + sort +
                ", hospital='" + hospital + '\'' +
                ", imgUrl='" + imgUrl + '\'' +
                ", modelName='" + modelName + '\'' +
                ", createTime=" + createTime +
                ", createUser='" + createUser + '\'' +
                ", createUserName='" + createUserName + '\'' +
                ", updateTime=" + updateTime +
                ", updateUser='" + updateUser + '\'' +
                ", updateUserName='" + updateUserName + '\'' +
                ", id='" + id + '\'' +
                '}';
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MedicineorderDao.java

@@ -0,0 +1,30 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
public interface MedicineorderDao extends PagingAndSortingRepository<Mediicineorder, Long>, JpaSpecificationExecutor<Mediicineorder> {
    //统计时间段的销售额
    @Query("select sum(a.amount) from Mediicineorder a where a.prescribeTime >=?1 and a.prescribeTime<=?2")
    float getsumamount(Date beg , Date end);
    //统计时间段的天的订单数量
    @Query("select count(1) from Mediicineorder a where a.prescribeTime >= ?1 and a.prescribeTime<=?2")
    int getcount(Date beg , Date end);
    @Query("select a from Mediicineorder a where a.prescribeNum = ?1")
    Mediicineorder findMediicineorderByPrescribeNum(String prescribeNum);
    @Query("select a from Mediicineorder a where a.id=?1")
    Mediicineorder findById(String id);
    @Query("select a from Mediicineorder a where a.orderNum=?1")
    Mediicineorder findByOrderNum(String order);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinedrugsDao.java

@@ -2,6 +2,7 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -14,7 +15,8 @@ public interface MediicinedrugsDao extends PagingAndSortingRepository<Mediicined
    @Query("select a from Mediicinedrugs a  ")
    List<Mediicinedrugs> getorderdetail();
    boolean existsByDrugCodeAndOrgCode(String drugCode,String orgCode);
    Mediicinedrugs findByDrugCodeAndOrgCode(String drugCode, String orgCode);
    Mediicinedrugs findByDrugCodeAndOrgCode(String drugCode,String orgCode);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineorderDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.patient.Message;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -20,6 +20,14 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    @Query("select count(1) from Mediicineorder a where a.prescribeTime >= ?1 and a.prescribeTime<=?2")
    int getcount(Date beg , Date end);
    @Query("select a from Mediicineorder a where a.prescribeNum = ?1")
    Mediicineorder findMediicineorderByPrescribeNum(String prescribeNum);
    @Query("select a from Mediicineorder a where a.id=?1")
    Mediicineorder findById(String id);
    @Query("select a from Mediicineorder a where a.orderNum=?1")
    Mediicineorder findByOrderNum(String order);
    Mediicineorder findMediicineorderByPickUpNum(String pickUpNum);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvPlaySetDAO.java

@@ -1,12 +0,0 @@
//package com.yihu.jw.base.dao.advertisement;
//
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//
//import java.util.List;
//
//public interface AdvPlaySetDAO extends PagingAndSortingRepository<AdvPlaySetVo,String> {
//    @Query(value = "select * from adv_play_set",nativeQuery = true)
//    List<AdvPlaySetVo> lists();
//}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementLaunchDAO.java

@@ -0,0 +1,35 @@
package com.yihu.jw.base.dao.advertisement;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface AdvertisementLaunchDAO extends PagingAndSortingRepository<AdvertisementLaunchDO, String>, JpaSpecificationExecutor<AdvertisementLaunchDO> {
    @Query(value = "delete from AdvertisementLaunchDO a where a.advId=?1")
    @Modifying
    @Transactional
    void deleteByAdvId(String advId);
    List<AdvertisementLaunchDO> findByAdvId(String advId);
    List<AdvertisementLaunchDO> findByDevId(String devId);
    AdvertisementLaunchDO findByAdvIdAndDevId(String advId,String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join AdvertisementPuttingAdminDO b on a.advId=b.id where a.devId=?1")
    List<AdvertisementPuttingAdminDO> findByDevIdInfo(String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where a.advId=?1")
    List<Mediicinedevice> findByAdvIdInfo(String advId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where b.machineCode=?1")
    Mediicinedevice findByMachineCode(String machineCode);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementPuttingAdminDAO.java

@@ -2,28 +2,25 @@ package com.yihu.jw.base.dao.advertisement;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import org.apache.ibatis.annotations.Insert;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public interface AdvertisementPuttingAdminDAO extends PagingAndSortingRepository<AdvertisementPuttingAdminDO, String>, JpaSpecificationExecutor<AdvertisementPuttingAdminDO> {
    @Query(value = "select * FROM advertisement_putting_admin  where id=?1",nativeQuery = true) //查询id为参数的数据信息 主要用于删除禁用投放操作
    AdvertisementPuttingAdminDO findAdvertisementPuttingAdminDOById(String id);
    @Query(value = "select * from advertisement_putting_admin order by update_time  desc limit ?1,?2",nativeQuery = true) //按照修改时间进行排序 并从前端页面获取请求分页的数据
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByUpdateTime(int page,int size);
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByUpdateTime(int page, int size);
    @Query(value = "select * from advertisement_putting_admin where del=0 and launch = 1 and forbidden = 0 order by update_time desc limit ?1,?2" ,nativeQuery = true)//查询所有不在删除状态并且处于投放状态并且没有被禁用的数据 可以用于投放广告的播放
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByDelStatusAndLaunchStatusAndForbiddenStatus(int page,int size);
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByDelStatusAndLaunchStatusAndForbiddenStatus(int page, int size);
    @Query(value = "select * from advertisement_putting_admin where title like concat('%',?1,'%') order by update_time desc limit ?2,?3",nativeQuery = true)//按照标题模糊查询所有数据
    List<AdvertisementPuttingAdminDO>findAdvertisementSByLike(String title,int page,int size);
    List<AdvertisementPuttingAdminDO>findAdvertisementSByLike(String title, int page, int size);
    @Query(value = "select * from advertisement_putting_admin where title like concat('%',?1,'%') and del = 0 and launch = 1 and forbidden = 0 order by update_time desc limit ?2,?3" ,nativeQuery = true)//按照标题模糊查询可以使用的数据
    List<AdvertisementPuttingAdminDO>findAdvertisementsCanByLike(String title,int page,int size);
    List<AdvertisementPuttingAdminDO>findAdvertisementsCanByLike(String title, int page, int size);
    @Transactional
    @Modifying
@@ -55,6 +52,12 @@ public interface AdvertisementPuttingAdminDAO extends PagingAndSortingRepository
    @Query(value = "update advertisement_putting_admin set forbidden=0 where id=?1",nativeQuery = true)//取消禁用广告
    void updateForbiddenStatus(String id);
    @Transactional
    @Modifying
    @Query(value = "update AdvertisementPuttingAdminDO set playId = ?1 where id is not null",nativeQuery = true)
    void updatePlayId(Integer playId);
//    @Transactional
//    @Modifying
//    @Query(value = "update advertisement_putting_admin set playId=?1 where playId in (1,3)" ,nativeQuery = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineEndpoint.java

@@ -0,0 +1,37 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.yihu.jw.base.service.a3service.MedicineServive;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@Api(description = "获取同步信息")
@RestController
public class MedicineEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicineServive servive;
    @ApiOperation( value = "获取药品字典")
    @GetMapping("wlyygc/webHospital/getOrgPhysicDict")
    @ResponseBody
    public Envelop getOrgPhysicDict(@ApiParam(value ="orgCode",name = "orgCode",required = false)
                                   @RequestParam(value = "orgCode",required = false)String orgCode,
                                    @ApiParam(value = "name",name = "name",required = false)
                                   @RequestParam(value = "name",required = false)String name,
                                    @ApiParam(value = "orgName",name = "orgName",required = false)
                                   @RequestParam(value = "orgName",required = false)String orgName,
                                    @ApiParam(value = "physicCode",name = "physicCode",required = false)
                                   @RequestParam(value = "physicCode",required = false)String physicCode){
        servive.getOrgPhysicDict(orgCode, name, orgName, physicCode);
        return success("同步药品字典成功",200);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderDrugsEndpoint.java

@@ -0,0 +1,44 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.yihu.jw.base.service.a3service.MedOrderService;
import com.yihu.jw.base.service.a3service.MedicineDrugsService;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
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 java.util.Map;
@RestController
@RequestMapping(value = BaseRequestMapping.BaseOrder.PREFIX)
@Api(value = "订单续方管理",description = "订单续方管理" ,tags = "MedOrder - 续方管理服务接口")
public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedOrderService medOrderService;
    @Autowired
    MedicineDrugsService medicineDrugsService;
    @PostMapping(value = "/open/renew")
    @ApiOperation(value = "接收续方订单接口",notes = "接收续方订单接口" )
    public Envelop renew(@ApiParam(name = "jsonData",value = "json数据",required = true)
                                @RequestParam(value = "jsonData",required = true)String jsonData){
        Map <String,Object>map =medOrderService.saveOrder(jsonData);
        Mediicineorder mediicineorder=(Mediicineorder)map.get("order");
        Object mediicinedrugs= map.get("drugs");
        if (map.size()>0&&mediicineorder!=null&&mediicinedrugs!=null) {
            return success(map);
        }
        return failed("处方已存在",500);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvPlaySetEndPoint.java

@@ -1,26 +0,0 @@
//package com.yihu.jw.base.endpoint.adv;
//
//import com.yihu.jw.base.service.advrtisement.AdvPlaySetService;
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import com.yihu.jw.rm.adv.AdvsementMapping;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiModelProperty;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.util.List;
//
//@RestController
//@RequestMapping(value = "play")
//@Api(value = "播放设置",description = "播放设置",tags = {"播放设置"})
//public class AdvPlaySetEndPoint {
//    @Autowired
//    AdvPlaySetService advPlaySetService;
//
//    @GetMapping("/list")
//    public List<AdvPlaySetVo> list(){
//        return advPlaySetService.list();
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@@ -2,28 +2,27 @@ package com.yihu.jw.base.endpoint.adv;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.service.advrtisement.AdvertisementLaunchService;
import com.yihu.jw.base.service.advrtisement.AdvrtisementService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.restmodel.advertisement.AdvertisementPuttingAdminVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.adv.AdvsementMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.text.ParseException;
import java.util.List;
@@ -34,7 +33,10 @@ import java.util.List;
public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @Autowired
    AdvrtisementService advrtisementService;
    @Autowired
    AdvertisementLaunchService launchService;
    @Autowired
    MedicinedeviceService medicinedeviceService;
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.DELADVERTISEMENT)
    @ApiOperation(value = "删除广告")
@@ -42,37 +44,48 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
        if (id==null||"".equals(id)){
            return "请确认该广告是否存在！";
        }
        System.out.println(id);
        String str=advrtisementService.updateDelStatus(id);
        System.out.println(str);
        return str;
    }
//    @GetMapping(value = "/single")
//    @ApiOperation(value = "获取单条广告信息")
//    public Envelop doctorHosplist(
//            @ApiParam(name = "id", value = "广告id")
//            @RequestParam(value = "id", required = true) String doctorId) throws Exception {
//        JSONObject jsonObject = advrtisementService.getOneDoctorInfo(doctorId);
//        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
//            return failed(jsonObject.getString("msg"));
//        }
//        return success(jsonObject.getJSONObject("msg"));
//    }
    @GetMapping(value = "/single")
    @ApiOperation(value = "获取单条广告信息")
    public Envelop single(
            @ApiParam(name = "id", value = "广告id")
            @RequestParam(value = "id", required = true) String id) throws Exception {
        JSONObject jsonObject = advrtisementService.getOneAdvInfo(id);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"),200,jsonObject.getJSONObject("obj"));
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.LAUNCHADVERTISEMENT )
    @ApiOperation(value = "投放广告")
    public String launchAdvertisement(@RequestParam String id){
        if (id==null||"".equals(id)){
            return "请确认该广告是否存在！";
    public Envelop launchAdvertisement(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
                                          @RequestParam(value = "advIds",required = true) String advIds,
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开,所有设备不传",required = true)
                                      @RequestParam(value = "ids",required = false)String devIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在！");
        }
        return success(advrtisementService.updateLaunchStatus(advIds,devIds));
    }
    @GetMapping(value = "/unlaunch")
    @ApiOperation(value = "取消投放广告")
    public Envelop unLaunch(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
                            @RequestParam(value = "advIds",required = true)String advIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在！");
        }
        return advrtisementService.updateLaunchStatus(id);
        return success(advrtisementService.unLaunch(advIds));
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.FORBIDDENADVERTISEMENT)
    @ApiOperation(value = "禁用广告")
    public String forbiddenAdverisement(@RequestParam String id){
    public String forbiddenAdvertisement(@RequestParam String id){
        if (id==null||"".equals(id)){
            return "请确认广告是否存在";
        }
@@ -80,30 +93,20 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    }
    @PostMapping(value = AdvsementMapping.AdvsementReusetMapping.SENDADVERTISEMENT)
    @ApiOperation(value = "新增广告")
    public ObjEnvelop<AdvertisementPuttingAdminVO> sendAdvertisement(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        AdvertisementPuttingAdminDO adminDO=toEntity(jsonData,AdvertisementPuttingAdminDO.class);
        advrtisementService.save(adminDO);
        return success(adminDO,AdvertisementPuttingAdminVO.class);
    @ApiOperation(value = "新增/更新广告")
    public Envelop sendAdvertisement(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        try {
            AdvertisementPuttingAdminDO adminDO=advrtisementService.saveAdv(jsonData);
            return success("操作成功",adminDO);
        } catch (Exception e) {
            return failedException(e);
        }
    }
    @PostMapping(value = AdvsementMapping.AdvsementReusetMapping.UPDATE,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新广告")
    public ObjEnvelop<AdvertisementPuttingAdminVO> update(
            @ApiParam(name = "json_data",value = "json数据",required = true)
            @RequestBody String jsonData) throws IOException {
        AdvertisementPuttingAdminDO adminDO=toEntity(jsonData,AdvertisementPuttingAdminDO.class);
        if (null == adminDO.getId()||"".equals(adminDO.getId())) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        adminDO=advrtisementService.save(adminDO);
        return success(adminDO,AdvertisementPuttingAdminVO.class);
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SEL)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<AdvertisementPuttingAdminVO> page (
@@ -121,34 +124,11 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
        int count = (int)advrtisementService.getCount(filters);
        return success(list, count, page, size, AdvertisementPuttingAdminVO.class);
    }
//    public List<AdvertisementPuttingAdminDO>findLike(
//            @ApiParam(name = "title",value = "模糊查询",required = false)
//            @RequestParam(value = "title",required = false) String title,
//            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
//            @RequestParam(value = "page") int page,
//            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
//            @RequestParam(value = "size") int size){
//        if (title==null){
//            return advrtisementService.findAllAdvertisement((page-1)*size,size);
//        }
//        return advrtisementService.titleLike(title,(page-1)*size,size);
//    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SELECTLike)
    @ApiOperation(value = "获取列表")
//    public List<AdvertisementPuttingAdminDO>findLikeCan(
//            @ApiParam(name = "title",value = "模糊查询",required = false,defaultValue = "")
//            @RequestParam(value = "title",required = false) String title,
//            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
//            @RequestParam(value = "page") int page,
//            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
//            @RequestParam(value = "size") int size) {
//        if (title==null){
//            return advrtisementService.findAdvertisementList((page-1)*size,size);
//        }
//        return advrtisementService.titleLikeAndCan(title,(page-1)*size,size);
//    }
    public ListEnvelop<AdvertisementPuttingAdminVO> page(
    public ListEnvelop<AdvertisementPuttingAdminDO> page(
            @ApiParam(name = "fields",value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields",required = false)String fields,
            @ApiParam(name = "filters",value = "过滤器,为空检索所有条件")
@@ -156,15 +136,90 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "sorts",value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts",required = false)String sorts) throws ParseException {
        List<AdvertisementPuttingAdminDO>list=advrtisementService.search(fields,filters,sorts);
        return success(list,AdvertisementPuttingAdminVO.class);
        return success(list, AdvertisementPuttingAdminDO.class);
    }
    @GetMapping(value = "/all")
    @ApiOperation(value = "获取全部投放信息")
    public ListEnvelop<AdvertisementLaunchDO> all(
            @ApiParam(name = "fields",value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields",required = false)String fields,
            @ApiParam(name = "filters",value = "过滤器,为空检索所有条件")
            @RequestParam(name = "filters",required = false)String filters,
            @ApiParam(name = "sorts",value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts",required = false)String sorts) throws ParseException{
        List<AdvertisementLaunchDO> list=launchService.search(fields, filters, sorts);
        return success(list,AdvertisementLaunchDO.class);
    }
//    @GetMapping(value = "/play")
//    @ApiOperation(value = "播放设置")
//    public String updatePlay(@ApiParam(value = "play_id")
//                                 @RequestParam(value = "play_id") int playId){
//        advrtisementService.updatePlay(playId);
//        return "设置成功";
//    }
    @GetMapping(value = "/allpage")
    @ApiOperation(value = "分页查询广告投放设备信息")
    public PageEnvelop<AdvertisementLaunchDO> allPage (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<AdvertisementLaunchDO> list = launchService.search(fields, filters, sorts, page, size);
        int count = (int)launchService.getCount(filters);
        return success(list, count, page, size, AdvertisementLaunchDO.class);
    }
    @GetMapping(value = "/one")
    @ApiOperation(value = "单条广告投放到的全部设备")
    public ListEnvelop<AdvertisementLaunchDO> one(
            @ApiParam(name = "advId",value = "广告id")
            @RequestParam(value = "advId",required = true)String advId){
        List<AdvertisementLaunchDO> list=launchService.one(advId);
        if (list==null||list.size()==0){
            return failedListEnvelopException(new Exception("请查看广告ID是否正确"));
        }
        return success("获取单条广告投放设备成功",list);
    }
    @GetMapping(value = "/open/info")
    @ApiOperation(value = "获取单个设备上的所有广告")
    public ListEnvelop<AdvertisementLaunchDO>solo(
            @ApiParam(name = "machineCode",value = "设备编码")
            @RequestParam(value = "machineCode",required = true)String machineCode){
        return success(launchService.solo(machineCode));
    }
    @GetMapping(value = "/info")
    @ApiOperation(value = "获取单个设备上的所有广告明细")
    public Envelop info(
            @ApiParam(name = "devId",value = "设备id")
            @RequestParam(value = "devId",required = true)String devId){
        List<AdvertisementPuttingAdminDO>list=launchService.info(devId);
        if (list==null||list.size()==0){
            return failed("该设备没有广告或者该设备id不存在");
        }
        return success("获取单个设备上所有广告明细成功",list);
    }
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单条广告投放的所有设备明细")
    public Envelop devInfo(@ApiParam(name = "advId",value = "广告id")
                               @RequestParam(value = "advId",required = true)String advId) {
        List<AdvertisementLaunchDO> list = launchService.one(advId);
        if (list==null||list.size()==0){
            return failed("该广告未投放或者广告id错误");
        }
        List<Mediicinedevice> mediicinedeviceList=launchService.devInfo(advId);
        return success("获取单条广告所有投放设备明细成功",mediicinedeviceList);
    }
    @GetMapping(value = "selectdev")
    @ApiOperation(value = "投放广告可选择的设备")
    public ListEnvelop<Mediicinedevice> selectDev(){
        Iterable<Mediicinedevice> iterable=medicinedeviceService.findAll();
        List<Mediicinedevice> list= IterableUtils.toList(iterable);
        return success("所有设备获取成功",list);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/WlyyHospitalSysDictEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.service.WlyyHospitalSysDictService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -50,8 +51,11 @@ public class WlyyHospitalSysDictEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value= BaseHospitalRequestMapping.PatientNoLogin.createOrUpdateDict)
    public Envelop createOrUpdateDict(@ApiParam(name = "json", value = "id", required = true)
                                      @RequestParam(value = "json", required = true)String json) throws Exception{
        return success(wlyyHospitalSysDictService.updateOrCreateDict(json));
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictService.updateOrCreateDict(json);
        if (wlyyHospitalSysDictDO==null){
            return failed("请设置轮播图排序");
        }
        return success(wlyyHospitalSysDictDO);
    }
    @ApiOperation("查单条")

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -0,0 +1,108 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.a2dao.MedicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderdetailDao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Transactional
@Service
public class MedOrderService {
    private static Logger logger = LoggerFactory.getLogger(MedOrderService.class);
    @Autowired
    MedicineorderDao mediicineorderDao;
    @Autowired
    MediicineorderdetailDao mediicineorderdetailDao;
    /**
     * 获取续方订单及药方
     * @return
     */
    public Map<String,Object> saveOrder(String jsonData){
        Map<String,Object>result=new HashMap<>();
        if (StringUtils.isNotBlank(jsonData)){
            JSONObject params=JSONObject.parseObject(jsonData);
            String order=params.getString("realOrder");
            Mediicineorder mediicineorder=new Mediicineorder();
            if (mediicineorderDao.findByOrderNum(order)==null) {
                mediicineorder.setOrderNum(order);
            }else{
                result.put("failed","订单号已存在");
                return result;
            }
            String sex=params.getString("rx_patient_sex");
            mediicineorder.setSex(sex);
            String equNum=params.getString("device_no");
            mediicineorder.setEquNum(equNum);
            String name=params.getString("rx_patient_name");
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setOrderType(params.getString("rx_type"));
            mediicineorder.setOrderState(params.getString("rx_state"));
            mediicineorder.setAttr(params.getString("rx_attr"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setPrescribeTime(params.getDate("rx_time"));
            mediicineorder.setBirth(params.getDate("rx_patient_birth"));
            mediicineorder.setInfo(params.getString("rx_diagnosis_info"));
            mediicineorder.setHospitalInfo(params.getString("rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString("rx_department_no"));
            mediicineorder.setDeptName(params.getString("rx_department_name"));
            mediicineorder.setDoctorNum(params.getString("rx_doctor_no"));
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            for (int i = 0; i <jsonArray.size() ; i++) {
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
                mediicineorderdetail.setSpecif(jsonObject.getString("drug_specs"));
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString(" drug_firm_name"));
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);
            result.put("order",ord);
            result.put("drugs",mediicineorderdetails);
            return result;
        }
        return null;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineDrugsService.java

@@ -306,4 +306,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
    }
    public void getOrgPhysicDict(String jsonData) {
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineServive.java

@@ -0,0 +1,81 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class MedicineServive {
    private static final Logger logger = LoggerFactory.getLogger(MedicineServive.class);
    @Autowired
    private WlyyHttpService wlyyHttpService;
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
    public void getOrgPhysicDict(String orgCode,String name,String orgName,String physicCode){
        String param="";
        if (StringUtils.isNoneBlank(orgCode)){
            param="?orgCode="+orgCode;
        }
        if (StringUtils.isNoneBlank(name)){
            param+="?name="+name;
        }
        if (StringUtils.isNoneBlank(orgName)){
            param+="?orgName"+orgName;
        }
        if (StringUtils.isNoneBlank(physicCode)){
            param+="?physicCode"+physicCode;
        }
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getOrgPhysicDict",param);
        if(re!=null){
            JSONArray jsonArray = JSONArray.parseArray(re.getString("data"));
            logger.info("mediicinedrugs size:"+jsonArray.size());
            if(jsonArray!=null&&jsonArray.size()>0){
                Integer addCount = 0;
                Integer updateCount =0;
                List<Mediicinedrugs>list=new ArrayList<>();
                for(int i=0;i<jsonArray.size();i++){
                    JSONObject h = (JSONObject) jsonArray.get(i);
                    String drugCode = h.getString("physic_code");
                    if(!mediicinedrugsDao.existsByDrugCodeAndOrgCode(drugCode,orgCode)){
                        Mediicinedrugs org = new Mediicinedrugs();
                        org.setDrugCode(drugCode);
                        org.setDrugName(h.getString("physic_name"));
                        org.setSpecif(h.getString("physic_spec"));
                        org.setDrugClass(h.getString("subject_class"));
                        org.setUnit(h.getString("dose_unit"));
                        org.setUseDose(h.getString("min_dose"));
                        org.setOrgCode(h.getString("orgCode"));
                        list.add(org);
                        addCount++;
                    }else{
                        Mediicinedrugs org = mediicinedrugsDao.findByDrugCodeAndOrgCode(drugCode,orgCode);
                        org.setDrugCode(drugCode);
                        org.setDrugName(h.getString("physic_name"));
                        org.setSpecif(h.getString("physic_spec"));
                        org.setDrugClass(h.getString("subject_class"));
                        org.setUnit(h.getString("dose_unit"));
                        org.setUseDose(h.getString("min_dose"));
                        org.setOrgCode(h.getString("orgCode"));
                        list.add(org);
                        updateCount++;
                    }
                }
                mediicinedrugsDao.save(list);
                logger.info("mediicinedrugs:addCount:"+addCount+" updateCount:"+updateCount);
            }
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -1440,4 +1440,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return list;
    }
    //获取所有设备
    public Iterable<Mediicinedevice> findAll() {
        return deviceDao.findAll();
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvPlaySetService.java

@@ -1,18 +0,0 @@
//package com.yihu.jw.base.service.advrtisement;
//
//import com.yihu.jw.base.dao.advertisement.AdvPlaySetDAO;
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.List;
//
//@Service
//public class AdvPlaySetService {
//    @Autowired
//    AdvPlaySetDAO advPlaySetDAO;
//
//    public List<AdvPlaySetVo> list() {
//        return advPlaySetDAO.lists();
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvertisementLaunchService.java

@@ -0,0 +1,34 @@
package com.yihu.jw.base.service.advrtisement;
import com.yihu.jw.base.dao.advertisement.AdvertisementLaunchDAO;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaunchDO, AdvertisementLaunchDAO> {
    @Autowired
    AdvertisementLaunchDAO advertisementLaunchDAO;
    public List<AdvertisementLaunchDO> one(String advId) {
        return advertisementLaunchDAO.findByAdvId(advId);
    }
    public List<AdvertisementLaunchDO> solo(String machineCode) {
        Mediicinedevice mediicinedevice = advertisementLaunchDAO.findByMachineCode(machineCode);
        return advertisementLaunchDAO.findByDevId(mediicinedevice.getId());
    }
    public List<AdvertisementPuttingAdminDO> info(String devId) {
        return advertisementLaunchDAO.findByDevIdInfo(devId);
    }
    public List<Mediicinedevice> devInfo(String advId) {
        return advertisementLaunchDAO.findByAdvIdInfo(advId);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvrtisementService.java

@@ -2,46 +2,61 @@ package com.yihu.jw.base.service.advrtisement;
import com.alibaba.fastjson.JSONObject;
import com.ibm.disthub2.impl.formats.Envelop;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.advertisement.AdvertisementLaunchDAO;
import com.yihu.jw.base.dao.advertisement.AdvertisementPuttingAdminDAO;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@Service
public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdminDO, AdvertisementPuttingAdminDAO> {
    @Autowired
    AdvertisementPuttingAdminDAO advertisementPuttingAdminDAO;
    @Autowired
    UserDao userDao;
    @Autowired
    WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    AdvertisementLaunchDAO launchDAO;
    @Autowired
    private MediicineDeviceDao deviceDao;
    //按照分页查询
    public List<AdvertisementPuttingAdminDO>findAllAdvertisement(int page,int size){
    public List<AdvertisementPuttingAdminDO>findAllAdvertisement(int page, int size){
        return advertisementPuttingAdminDAO.findAdvertisementPuttingAdminUtilsByUpdateTime(page, size);
    }
    //可投放的广告
    public List<AdvertisementPuttingAdminDO> findAdvertisementList(int page,int size){
    public List<AdvertisementPuttingAdminDO> findAdvertisementList(int page, int size){
        return advertisementPuttingAdminDAO.findAdvertisementPuttingAdminUtilsByDelStatusAndLaunchStatusAndForbiddenStatus(page, size);
    }
    //根据title模糊分页查询
    //所有广告
    public List<AdvertisementPuttingAdminDO>titleLike(String title,int page,int size){
    public List<AdvertisementPuttingAdminDO>titleLike(String title, int page, int size){
        return advertisementPuttingAdminDAO.findAdvertisementSByLike(title, page, size);
    }
    //可投放的广告
    public List<AdvertisementPuttingAdminDO>titleLikeAndCan(String title,int page,int size){
    public List<AdvertisementPuttingAdminDO>titleLikeAndCan(String title, int page, int size){
        return advertisementPuttingAdminDAO.findAdvertisementsCanByLike(title, page, size);
    }
@@ -52,6 +67,7 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        }
        if (advertisementExist(id).getDel()==0) {
            advertisementPuttingAdminDAO.updateDelStatusTo1(id);
            launchDAO.deleteByAdvId(id);
            return "删除成功";
        }else {
            advertisementPuttingAdminDAO.updateDelStatus(id);
@@ -61,24 +77,51 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
    }
    //投放
    public String updateLaunchStatus(String id){
        if (advertisementExist(id)==null) {
            return "广告不存在！";
        }
        if (advertisementExist(id).getDel()==1){
            return "广告已删除";
        }
        if (advertisementExist(id).getForbidden()==1){
            return "广告已禁用";
        }
        if (advertisementExist(id).getLaunch()==1){
            advertisementPuttingAdminDAO.updateLaunStatus(id);
            return "已取消投放！";
    public String updateLaunchStatus(String advIds, String devIds){
        List<AdvertisementLaunchDO> list = new ArrayList<>();
        AdvertisementLaunchDO launchDO;
        String[] strings=advIds.split(",");
        if (devIds!=null) {
            String[] str = devIds.split(",");
            for (int i = 0; i < strings.length; i++) {
                if (advertisementExist(strings[i]) == null) {
                    return "广告id:" + strings[i] + "不存在！";
                }
                if (advertisementExist(strings[i]).getDel() == 1) {
                    return "广告id:" + strings[i] + "已删除！";
                }
                if (advertisementExist(strings[i]).getForbidden() == 1) {
                    return "广告id:" + strings[i] + "已禁用！";
                }
                for (int j = 0; j < str.length; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
                }
                advertisementPuttingAdminDAO.updateLaunStatusTo1(strings[i]);
                for (int j = 0; j < str.length; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
                }
            }
            launchDAO.save(list);
        }else {
            advertisementPuttingAdminDAO.updateLaunStatusTo1(id);
            return "已投放广告！";
            Iterable<Mediicinedevice> iterable = deviceDao.findAll();
            List<Mediicinedevice> mediicinedevices=IterableUtils.toList(iterable);
            for (int i = 0; i <mediicinedevices.size() ; i++) {
                for (int j = 0; j <strings.length ; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setDevId(mediicinedevices.get(i).getId());
                    launchDO.setAdvId(strings[j]);
                    list.add(launchDO);
                }
            }
            launchDAO.save(list);
        }
        return "已投放广告";
    }
    //禁用
@@ -92,9 +135,10 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        if (advertisementExist(id).getForbidden()==0) {
           // SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            advertisementPuttingAdminDAO.updateForbiddenStatusTo1(id);
            launchDAO.deleteByAdvId(id);
            return "广告已禁用";
        }else {
            advertisementPuttingAdminDAO.updateForbiddenStatus( id);
            advertisementPuttingAdminDAO.updateForbiddenStatus(id);
            return "广告已解禁";
        }
    }
@@ -110,54 +154,83 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        if (advertisementPuttingAdminDO==null){
            return null;
        }
        System.out.println(advertisementPuttingAdminDO);
        return advertisementPuttingAdminDO;
    }
//    public JSONObject getOneDoctorInfo(String id) throws Exception{
//        JSONObject result = new JSONObject();
//        if(StringUtils.isEmpty(id)){
//            result.put("msg","parameter id is null ");
//            result.put("response", ConstantUtils.FAIL);
//            return result;
//        }
//
//
//        AdvertisementPuttingAdminDO adminDO = advertisementPuttingAdminDAO.findOne(id);
//        if(null == adminDO){
//            result.put("msg","广告不存在:" + id);
//            result.put("response",ConstantUtils.FAIL);
//            return result;
//        }
//        List<AdvertisementPuttingAdminDO> list = advertisementPuttingAdminDAO.findByDictName("doctor_level");
//        for (AdvertisementPuttingAdminDO advertisementPuttingAdminDO:list){
//            if (adminDO.getCategoryCode()==(advertisementPuttingAdminDO.getCategoryCode())){
//                adminDO.setCategoryName(advertisementPuttingAdminDO.getCategoryName());
//            }
//        }
//        //医生归属业务模块角色信息，非必填，数据可有可没有
//        String[] paramNames = {"doctorCode"};
//        Object[] paramValue = {doctorId};
//        JSONObject jsonObject = new JSONObject();
//        List<BaseTeamMemberDO> baseTeamMemberDO = baseTeamMemberDao.findUseDoctorCode(doctorId);
//        List<BaseTeamDO> teamlist = new ArrayList<>();
//        if (baseTeamMemberDO!=null&&baseTeamMemberDO.size()>0){
//            for (BaseTeamMemberDO baseTeamMemberDO1:baseTeamMemberDO){
//                String teamCode = baseTeamMemberDO1.getTeamCode();
//                BaseTeamDO baseTeamDO = baseTeamDao.findOne(teamCode);
//                teamlist.add(baseTeamDO);
//            }
//            jsonObject.put("teamInfo",teamlist);
//        }
//        List<BaseDoctorRoleDO> roleList = baseDoctorRoleService.findByFields(paramNames,paramValue);
//        jsonObject.put("doctor",doctors);
//        jsonObject.put("role",roleList);
//        List<BaseDoctorHospitalDO> baseDoctorHospitalDO = baseDoctorHospitalDao.findByDoctorCode(doctorId);
//        jsonObject.put("hospital",baseDoctorHospitalDO);
//        result.put("response",ConstantUtils.SUCCESS);
//        result.put("msg",jsonObject);
//        return result;
//    }
    public JSONObject getOneAdvInfo(String id) throws Exception{
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(id)){
            result.put("msg","parameter id is null ");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        AdvertisementPuttingAdminDO adminDO = advertisementPuttingAdminDAO.findOne(id);
        if(null == adminDO){
            result.put("msg","广告不存在:" + id);
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("categoryCode",adminDO.getCategoryCode());
        jsonObject.put("categoryName",adminDO.getCategoryName());
        jsonObject.put("id",id);
        jsonObject.put("url",adminDO.getUrl());
        jsonObject.put("del",adminDO.getDel());
        jsonObject.put("launch",adminDO.getLaunch());
        jsonObject.put("forbidden",adminDO.getForbidden());
        jsonObject.put("title",adminDO.getTitle());
        jsonObject.put("createTime",adminDO.getCreateTime());
        jsonObject.put("createUser",adminDO.getCreateUser());
        jsonObject.put("updateTime",adminDO.getUpdateTime());
        jsonObject.put("updateUser",adminDO.getUpdateUser());
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg","查询单条明细成功");
        result.put("obj",jsonObject);
        return result;
    }
    public AdvertisementPuttingAdminDO saveAdv(String jsonData) throws Exception{
        AdvertisementPuttingAdminDO advertisementPuttingAdminDO= EntityUtils.jsonToEntity(jsonData, AdvertisementPuttingAdminDO.class);
        if (!StringUtils.isNotBlank(advertisementPuttingAdminDO.getId())){
            advertisementPuttingAdminDO.setId(UUID.randomUUID().toString().replace("-",""));
            advertisementPuttingAdminDO.setCreateTime(new Date());
            advertisementPuttingAdminDO.setDel(0);
            advertisementPuttingAdminDO.setForbidden(0);
            advertisementPuttingAdminDO.setLaunch(0);
            UserDO userDO=userDao.findById(advertisementPuttingAdminDO.getCreateUser());
            if (userDO!=null){
                advertisementPuttingAdminDO.setCategoryName(userDO.getName());
                advertisementPuttingAdminDO.setUpdateUserName(userDO.getName());
            }
            if (advertisementPuttingAdminDO.getCategoryCode()==1){
                advertisementPuttingAdminDO.setCategoryCode(1);
                advertisementPuttingAdminDO.setCategoryName("视频");
            }else if (advertisementPuttingAdminDO.getCategoryCode()==2){
                advertisementPuttingAdminDO.setCategoryCode(2);
                advertisementPuttingAdminDO.setCategoryName("图片");
            }
            advertisementPuttingAdminDO=advertisementPuttingAdminDAO.save(advertisementPuttingAdminDO);
            return advertisementPuttingAdminDO;
        }else {
            AdvertisementPuttingAdminDO one=advertisementPuttingAdminDAO.findOne(advertisementPuttingAdminDO.getId());
            one.setTitle(advertisementPuttingAdminDO.getTitle());
            one.setUrl(advertisementPuttingAdminDO.getUrl());
            one.setUpdateTime(new Date());
            one.setCategoryCode(advertisementPuttingAdminDO.getCategoryCode());
            one.setCategoryName(advertisementPuttingAdminDO.getCategoryCode()==1?"视频":"图片");
            advertisementPuttingAdminDAO.save(one);
            return  one;
        }
    }
    public String unLaunch(String advIds) {
        String[] str=advIds.split(",");
        for (int i = 0; i <str.length ; i++) {
            launchDAO.deleteByAdvId(str[i]);
        }
        return "删除成功";
    }
//    public AdvertisementPuttingAdminDO saveUpdate(String id,AdvertisementPuttingAdminDO puttingAdminDO) {

svr/svr-base/src/main/resources/application.yml

@@ -2,7 +2,7 @@
server:
  port: ${server.svr-base-port}
  tomcat:
      basedir: /data/apps/temp2
    basedir: /data/apps/temp2
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: JKZL
@@ -26,9 +26,9 @@ spring:
    test-while-idle: true #指明连接是否被空闲连接回收器(如果有)进行检验，如果检测失败，则连接将被从池中去除
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
  #  sleuth:
  #    sampler:
  #      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
  redis:
    database: 0 # Database index used by the connection factory.
    password: # Login password of the redis server.
@@ -40,18 +40,18 @@ spring:
      min-idle: 5  # 连接池中的最小空闲连接
  mail:
    default-encoding: UTF-8
#端口
    #端口
    port: 25
#协议
    #协议
    protocol: smtp
    properties.mail.smtp.auth: true
    properties.mail.smtp.starttls.enable: true
    properties.mail.smtp.starttls.required: true
    timeout: 1000
    host: smtp.163.com
#发送者的邮箱密码
    #发送者的邮箱密码
    password: xmijk181016jkzl
#发送者的邮箱账号
    #发送者的邮箱账号
    username: i_jiankang@163.com
es:
  index:
@@ -85,9 +85,9 @@ wechat:
spring:
  profiles: jwdev
  datasource:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    #    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    #    username: ssgg
    #    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
@@ -140,9 +140,9 @@ spring:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  #    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
  #    username: root
  #    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -189,9 +189,9 @@ spring:
    url: jdbc:mysql://172.26.0.104/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  #    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
  #    username: root
  #    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -239,9 +239,9 @@ spring:
    url: jdbc:mysql://172.26.0.195/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: jkzlehr
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  #    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
  #    username: root
  #    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -360,7 +360,7 @@ hospital:
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
#  id: xm_ykyy_wx
  #  id: xm_ykyy_wx
  id: d24d1367-7f4f-43af-910e-a0a43799e040
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
@@ -424,9 +424,9 @@ spring:
    url: jdbc:mysql://10.90.32.3:20002/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy_new
    password: J4&y9sk#1G
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  #    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
  #    username: root
  #    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 10.90.32.3:20010,10.90.32.3:20012 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -599,9 +599,9 @@ im:
spring:
  profiles: hzprod
  datasource:
     url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: '0XxS3W*!cRj'
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 10.18.43.40:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/med/MediicineorderdetailDao.java

@@ -0,0 +1,22 @@
package com.yihu.jw.hospital.dao.med;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface MediicineorderdetailDao extends PagingAndSortingRepository<Mediicineorderdetail, String> {
    //统计时间段的药品销量
    @Query("select sum(a.quantity) from Mediicineorderdetail a where a.prescribeTime >=  ?1 and a.prescribeTime<= ?2")
    float getsumquantity(Date beg , Date end);
    //返回订单明细
    @Query("select a from Mediicineorderdetail a where a.idOrder =  ?1 ")
    List<Mediicineorderdetail> getorderdetail(String idOrder);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/mediicine/MedicineOrderDrugsEndpoint.java

@@ -0,0 +1,45 @@
package com.yihu.jw.hospital.endpoint.mediicine;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.hospital.service.med.MedOrderService;
import com.yihu.jw.hospital.service.med.MedicineDrugsService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
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.*;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseRequestMapping.BaseOrder.PREFIX)
@Api(value = "订单续方管理",description = "订单续方管理" ,tags = "MedOrder - 续方管理服务接口")
public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedOrderService medOrderService;
    @Autowired
    MedicineDrugsService medicineDrugsService;
    @PostMapping(value = "/open/renew")
    @ApiOperation(value = "接收续方订单接口",notes = "接收续方订单接口" )
    public Envelop renew(@ApiParam(name = "jsonData",value = "json数据",required = true)
                                @RequestParam(value = "jsonData",required = true)String jsonData){
        Map <String,Object>map =medOrderService.saveOrder(jsonData);
        Mediicineorder mediicineorder=(Mediicineorder)map.get("order");
        Object mediicinedrugs= map.get("drugs");
        if (map.size()>0&&mediicineorder!=null&&mediicinedrugs!=null) {
            return success(map);
        }
        return failed("处方已存在",500);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/ykyy/BaseTopBannerController.java

@@ -0,0 +1,29 @@
package com.yihu.jw.hospital.endpoint.ykyy;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.service.WlyyHospitalSysDictService;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping(value = "/banner")
@Api(description = "眼科医院首页轮播图",tags = "眼科医院首页轮播图")
public class BaseTopBannerController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyHospitalSysDictService wlyyHospitalSysDictService;
    @GetMapping(value = "/open/show")
    @ApiOperation("眼科医院首页顶部轮播图展示")
    public ListEnvelop<WlyyHospitalSysDictDO> bannerShow(){
        List<WlyyHospitalSysDictDO> list=wlyyHospitalSysDictService.findByDictName("ONLINE_HOSPITAL_BANNER");
        return success(list);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedOrderService.java

@@ -0,0 +1,109 @@
package com.yihu.jw.hospital.service.med;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.hospital.dao.med.MedicineorderDao;
import com.yihu.jw.hospital.dao.med.MediicineorderdetailDao;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Transactional
@Service
public class MedOrderService {
    private static Logger logger = LoggerFactory.getLogger(MedOrderService.class);
    @Autowired
    MedicineorderDao mediicineorderDao;
    @Autowired
    MediicineorderdetailDao mediicineorderdetailDao;
    /**
     * 获取续方订单及药方
     * @return
     */
    public Map<String,Object> saveOrder(String jsonData){
        Map<String,Object>result=new HashMap<>();
        if (StringUtils.isNotBlank(jsonData)){
            JSONObject params=JSONObject.parseObject(jsonData);
            String order=params.getString("realOrder");
            Mediicineorder mediicineorder=new Mediicineorder();
            if (mediicineorderDao.findByOrderNum(order)==null) {
                mediicineorder.setOrderNum(order);
            }else{
                result.put("failed","订单号已存在");
                return result;
            }
            String sex=params.getString("rx_patient_sex");
            mediicineorder.setSex(sex);
            String equNum=params.getString("device_no");
            mediicineorder.setEquNum(equNum);
            String name=params.getString("rx_patient_name");
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setOrderType(params.getString("rx_type"));
            mediicineorder.setOrderState(params.getString("rx_state"));
            mediicineorder.setAttr(params.getString("rx_attr"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setPrescribeTime(params.getDate("rx_time"));
            mediicineorder.setBirth(params.getDate("rx_patient_birth"));
            mediicineorder.setInfo(params.getString("rx_diagnosis_info"));
            mediicineorder.setHospitalInfo(params.getString("rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString("rx_department_no"));
            mediicineorder.setDeptName(params.getString("rx_department_name"));
            mediicineorder.setDoctorNum(params.getString("rx_doctor_no"));
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            for (int i = 0; i <jsonArray.size() ; i++) {
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
                mediicineorderdetail.setSpecif(jsonObject.getString("drug_specs"));
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setOrgCode(jsonObject.getString("org_code"));
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);
            result.put("order",ord);
            result.put("drugs",mediicineorderdetails);
            return result;
        }
        return null;
    }
}

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -26,8 +26,8 @@ spring:
    multipart:
      max-file-size: 30MB
      max-request-size: 100MB
#      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
#      resolve-lazily: true
  #      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
  #      resolve-lazily: true
  redis:
    database: 0 # Database index used by the connection factory.
@@ -40,17 +40,17 @@ spring:
      min-idle: 5  # 连接池中的最小空闲连接
  mail:
    default-encoding: UTF-8
#端口
    #端口
    port: 25
#协议
    #协议
    protocol: smtp
    properties.mail.smtp.auth: true
    properties.mail.smtp.starttls.enable: true
    properties.mail.smtp.starttls.required: true
    host: smtp.163.com
#发送者的邮箱密码
    #发送者的邮箱密码
    password: xmijk181016jkzl
#发送者的邮箱账号
    #发送者的邮箱账号
    username: i_jiankang@163.com
es:
  index:
@@ -88,14 +88,14 @@ spring:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  #  elasticsearch:
  #    cluster-name: jkzl #集群名 默认elasticsearch
  #    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
  #    client-transport-sniff: false
  #    jest:
  #      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.116:61616
    user: admin
@@ -159,10 +159,10 @@ es:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
qywx:
  url: 2
@@ -180,14 +180,14 @@ spring:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  #  elasticsearch:
  #    cluster-name: jkzl #集群名 默认elasticsearch
  #    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
  #    client-transport-sniff: false
  #    jest:
  #      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.116:61616
    user: admin
@@ -239,10 +239,10 @@ es:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -256,7 +256,7 @@ qywx:
express:
  sf_url: http://mrds-admin-ci.sit.sf-express.com:45478
  sa_code: HD000001
  sf_code: HD000001
  sf_check_word: AAAABBBBCCCCDDDD
---
spring:
@@ -318,10 +318,10 @@ es:
FileTempPath: # 上传文件临时路径配置
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
@@ -352,17 +352,17 @@ spring:
        dialect: org.hibernate.dialect.Oracle10gDialect
        show_sql: true
    database: oracle
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  #    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
  #    username: root
  #    password: 123456
  #  elasticsearch:
  #    cluster-name: jkzl #集群名 默认elasticsearch
  #    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
  #    client-transport-sniff: false
  #    jest:
  #      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.116:61616
    user: admin
@@ -401,10 +401,10 @@ im:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
@@ -447,14 +447,14 @@ spring:
        show_sql: true
    database: oracle
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  #  elasticsearch:
  #    cluster-name: jkzl #集群名 默认elasticsearch
  #    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
  #    client-transport-sniff: false
  #    jest:
  #      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.116:61616
    user: admin
@@ -493,10 +493,10 @@ im:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
@@ -581,10 +581,10 @@ im:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
@@ -666,10 +666,10 @@ im:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
@@ -755,10 +755,10 @@ im:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
@@ -808,7 +808,7 @@ spring:
    user: admin
    password: admin
  redis:
#    host: 172.26.0.253 # Redis server host.
    #    host: 172.26.0.253 # Redis server host.
    host: 172.26.0.190 # Redis server host
    port: 6379 # Redis server port
fastDFS:
@@ -856,10 +856,10 @@ es:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
@@ -885,14 +885,14 @@ spring:
    url: jdbc:mysql://10.9.1.247:3310/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 192.0.33.26:9200 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://192.0.33.26:9300
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  #  elasticsearch:
  #    cluster-name: jkzl #集群名 默认elasticsearch
  #    cluster-nodes: 192.0.33.26:9200 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
  #    client-transport-sniff: false
  #    jest:
  #      uris: http://192.0.33.26:9300
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
@@ -946,10 +946,10 @@ es:
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
@@ -1024,10 +1024,10 @@ es:
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
testPattern:
  sign: 0
@@ -1106,10 +1106,10 @@ es:
FileTempPath: # 上传文件临时路径配置
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用
@@ -1189,10 +1189,10 @@ es:
FileTempPath: # 上传文件临时路径配置
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
  upload_temp_path: /var/local/temp
  image_path: /var/local/upload/images
  voice_path: /var/local/upload/voice
  chat_file_path: /var/local/upload/chat
testPattern: #文件服务器上传配置 0本地，1.I健康,2.内网调用