广告开发

svr/svr-base/src/main/java/com/yihu/jw/user/service/PatientService.java

@@ -1,10 +0,0 @@
package com.yihu.jw.user.service;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/5/11.
 */
@Service
public class PatientService {
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/patient/AdvertisementControlelr.java

@@ -6,6 +6,7 @@ import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.patient.WlyyPatientContants;
import com.yihu.jw.wlyy.entity.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.service.patient.AdvertisementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,10 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
@RestController
@RequestMapping(WlyyPatientContants.Advertisement.api_common)
@Api(value = "广告相关操作", description = "广告相关操作")
public class AdvertisementControlelr extends EnvelopRestController {
    @Autowired

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/BaseSaasDao.java

@@ -0,0 +1,17 @@
package com.yihu.jw.wlyy.dao;
import com.yihu.jw.wlyy.entity.BaseSaas;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface BaseSaasDao extends PagingAndSortingRepository<BaseSaas, Long>, JpaSpecificationExecutor<BaseSaas> {
    @Query("from BaseSaas f where f.name=?1 and f.status=1")
    BaseSaas findByName(String name);
    @Query("from BaseSaas f where f.code=?1 and f.status=1")
    BaseSaas findByCode(String code);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/AdvertisementDao.java

@@ -23,6 +23,6 @@ public interface AdvertisementDao extends PagingAndSortingRepository<WlyyAdverti
    List<WlyyAdvertisement> getListBySaasCode(String saasCode);
    //查询默认广告
    @Query("from WlyyAdvertisement w where w.saasId is null and w.status !=-1 order by w.sort")
    @Query("from WlyyAdvertisement w where w.saasId ='0' and w.status !=-1 order by w.sort")
    List<WlyyAdvertisement> getDefaultList();
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/entity/BaseSaas.java

@@ -0,0 +1,124 @@
package com.yihu.jw.wlyy.entity;// default package
import javax.persistence.*;
import java.util.Date;
/**
 * WlyySaas entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_saas")
public class BaseSaas extends IdEntity implements java.io.Serializable {
	// Fields
	private String code;//业务code、
	private String name;//名称
	private Integer status;//状态 -1 已删除 0待审核 1审核通过 2 审核不通过
	private String createUser; //创建人code
	private String createUserName;//创建人名称
	private Date createTime;//创建时间
	private String modifyUser;//修改人
	private String modifyUserName;//修改人名称
	private Date modifyTime;//修改时间
	private String remark;//备注
	// Constructors
	/** default constructor */
	public BaseSaas() {
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "status", precision = 2, scale = 0)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "create_user", length = 200)
	public String getCreateUser() {
		return this.createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@Column(name = "create_user_name", length = 200)
	public String getCreateUserName() {
		return this.createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "create_time", nullable = false, length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@Column(name = "modify_user", length = 200)
	public String getModifyUser() {
		return this.modifyUser;
	}
	public void setModifyUser(String modifyUser) {
		this.modifyUser = modifyUser;
	}
	@Column(name = "modify_user_name", length = 200)
	public String getModifyUserName() {
		return this.modifyUserName;
	}
	public void setModifyUserName(String modifyUserName) {
		this.modifyUserName = modifyUserName;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "modify_time", nullable = false, length = 0)
	public Date getModifyTime() {
		return this.modifyTime;
	}
	public void setModifyTime(Date modifyTime) {
		this.modifyTime = modifyTime;
	}
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "code", length = 100)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/entity/doctor/BaseOrgHospital.java

@@ -1,15 +1,18 @@
package com.yihu.jw.wlyy.entity.doctor;
import com.yihu.jw.base.model.base.IdEntity;
import javax.persistence.*;
import com.yihu.jw.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
@Entity
@Table(name = "base_org_hospital")
public class BaseOrgHospital extends IdEntity{
public class BaseOrgHospital extends IdEntity {
    private static final long serialVersionUID = 5463913446686402252L;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/entity/doctor/Doctors.java

@@ -1,6 +1,7 @@
package com.yihu.jw.wlyy.entity.doctor;
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +10,7 @@ import java.util.Date;
 * Created by Administrator on 2017/6/7 0007.
 */
@Entity
public class Doctors extends IdEntity{
public class Doctors extends IdEntity {
    private static final long serialVersionUID = 3138130150854187709L;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/BaseSaasService.java

@@ -0,0 +1,24 @@
package com.yihu.jw.wlyy.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.BaseSaasDao;
import com.yihu.jw.wlyy.entity.BaseSaas;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class BaseSaasService extends BaseJpaService<BaseSaas, BaseSaasDao> {
    @Autowired
    private BaseSaasDao saasDao;
    public BaseSaas findByCode(String code) {
        return saasDao.findByCode(code);
    }
    public BaseSaas findByName(String cityName) {
        return saasDao.findByName(cityName);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiLogService.java

@@ -1,9 +1,6 @@
package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
@@ -25,8 +22,8 @@ public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiL
    @Autowired
    private WlyyAgreementKpiLogDao wlyyAgreementKpiLogDao;
    @Autowired
    private SaasService saasService;
    //@Autowired
    //private SaasService saasService;
    @Transient
    public WlyyAgreementKpiLog create(WlyyAgreementKpiLog wlyyAgreementKpiLog) {
@@ -34,10 +31,10 @@ public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiL
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        if (StringUtils.isEmpty(wlyyAgreementKpiLog.getPatientCode())) {
            throw new ApiException(WlyyAgreementContants.AgreementKpi.message_fail_patientCode_is_null, CommonContants.common_error_params_code);
        }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiService.java

@@ -1,9 +1,6 @@
package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
@@ -29,8 +26,8 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
    @Autowired
    private WlyyAgreementService wlyyAgreementService;
    @Autowired
    private SaasService saasService;
    //@Autowired
    //private SaasService saasService;
    @Transient
    public WlyyAgreementKpi create(WlyyAgreementKpi wlyyAgreementKpi) {
@@ -41,10 +38,10 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        //判断agreement是否存在
        String agreementCode = wlyyAgreementKpi.getAgreementCode();
        if (StringUtils.isEmpty(agreementCode)) {
@@ -80,10 +77,10 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        //判断agreement是否存在
        String agreementCode = wlyyAgreementKpi.getAgreementCode();
        if (StringUtils.isEmpty(agreementCode)) {

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementService.java

@@ -1,9 +1,6 @@
package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
@@ -25,8 +22,8 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
    @Autowired
    private WlyyAgreementDao wlyyAgreementDao;
    @Autowired
    private SaasService saasService;
    //@Autowired
    //private SaasService saasService;
    @Transient
    public WlyyAgreement create(WlyyAgreement wlyyAgreement) {
@@ -37,10 +34,10 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        if (StringUtils.isEmpty(wlyyAgreement.getName())) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
@@ -67,10 +64,10 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        if (StringUtils.isEmpty(wlyyAgreement.getName())) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_name_is_null, CommonContants.common_error_params_code);
        }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyySignFamilyService.java

@@ -1,9 +1,6 @@
package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
@@ -31,8 +28,8 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
    @Autowired
    private WlyyAgreementService wlyyAgreementService;
    @Autowired
    private SaasService saasService;
    //@Autowired
    //private SaasService saasService;
    @Transient
    public WlyySignFamily create(WlyySignFamily wlyySignFamily) throws ParseException {
@@ -64,10 +61,10 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyAgreementContants.Agreement.message_fail_saasId_is_null, CommonContants.common_error_params_code);
        }
        Saas saas = saasService.findByCode(saasId);
        if(saas==null){
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
        //}
        if (StringUtils.isEmpty(wlyySignFamily.getType())) {
            throw new ApiException(WlyyAgreementContants.SignFamily.message_fail_type_is_null, CommonContants.common_error_params_code);
        }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/DoctorService.java

@@ -4,10 +4,12 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.DoctorDao;
import com.yihu.jw.wlyy.entity.doctor.Doctors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
@Service
public class DoctorService extends BaseJpaService<Doctors, DoctorDao> {
    @Autowired

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/HospitalService.java

@@ -4,10 +4,12 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.HospitalDao;
import com.yihu.jw.wlyy.entity.doctor.BaseOrgHospital;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
@Service
public class HospitalService extends BaseJpaService<BaseOrgHospital, HospitalDao> {
    @Autowired

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java

@@ -1,16 +1,18 @@
package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wlyy.patient.WlyyPatientContants;
import com.yihu.jw.wlyy.dao.patient.AdvertisementDao;
import com.yihu.jw.wlyy.entity.BaseSaas;
import com.yihu.jw.wlyy.entity.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.entity.patient.BasePatient;
import com.yihu.jw.wlyy.entity.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.service.BaseSaasService;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.persistence.Transient;
@@ -20,6 +22,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
@Service
public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, AdvertisementDao> {
    @Autowired
@@ -32,7 +35,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
    private WlyySignFamilyService signFamilyService;
    @Autowired
    private SaasService saasService;
    private BaseSaasService saasService;
    @Transient
     public WlyyAdvertisement create(WlyyAdvertisement advertisement) {
@@ -112,13 +115,27 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
    public List<WlyyAdvertisement> getListByPatientCode(String patientCode) {
        List<WlyyAdvertisement> advertisements = null;
        //查询患者的地址,根据患者的地址显示广告
        //查找已签约的,根据签约的saasId查找地区,获得广告
        List<WlyySignFamily> signs =  signFamilyService.findByPatientCode(patientCode,1);
        if(signs!=null){
            for(WlyySignFamily sign:signs){
                String saasCode = sign.getSaasId();
                if(!StringUtils.isEmpty(sign.getSaasId())){
                    advertisements = getListBySaasCode(saasCode);
                    if(advertisements!=null){
                        return advertisements;
                    }
                }
            }
        }
        //如果广告为空,则查询患者的地址,根据患者的地址显示广告
        BasePatient patient = patientService.findByCode(patientCode);
        if(patient!=null){//patient为空时,查找默认广告
            String cityName = patient.getCityName();
            //根据cityName查找saas
            if(!StringUtils.isEmpty(cityName)){
                Saas saas = saasService.findByName(cityName);
                BaseSaas saas = saasService.findByName(cityName);
                if(saas!=null){
                    String saasCode = saas.getCode();
                    advertisements = getListBySaasCode(saasCode);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/PatientService.java

@@ -4,11 +4,13 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.patient.BasePatientDao;
import com.yihu.jw.wlyy.entity.patient.BasePatient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public class PatientService  extends BaseJpaService<BasePatient, BasePatientDao> {
@Service
public class PatientService extends BaseJpaService<BasePatient, BasePatientDao> {
    @Autowired
    private BasePatientDao basePatientDao;