Merge remote-tracking branch 'remotes/jiwei/dev' into dev

common/common-entity/src/main/java/com/yihu/jw/base/login/BaseLoginAccountDO.java

@@ -19,6 +19,7 @@ import java.util.Date;
@Table(name = "base_login_account")
public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable {
	private String userName;//'账号
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
	private String salt;//'盐值'
@@ -26,7 +27,14 @@ public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable
	private String saasId;//'saas配置id'
	private String email;//'邮箱'
	@Column(name = "user_name", length = 50)
	public String getUserName() {
		return userName;
	}
	public void setUserName(String userName) {
		this.userName = userName;
	}
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)

common/common-entity/src/main/java/com/yihu/jw/base/login/WlyyLoginAccountDO.java

@@ -1,123 +0,0 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
import java.util.Date;
/**
 * 账号实体 包含医生 患者的账号
 */
@Entity
@Table(name = "wlyy_login_account")
public class WlyyLoginAccountDO extends IdEntityWithOperation implements java.io.Serializable {
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
	private String salt;//'盐值'
	private String accountStatus;//'状态 ( -2  锁定 -1 删除，0可用 )'
	private String saasId;//'saas配置id'
	private String email;//'邮箱'
	// Constructors
	/** default constructor */
	public WlyyLoginAccountDO() {
	}
	/** minimal constructor */
	public WlyyLoginAccountDO(Date createTime, Date updateTime) {
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	/** full constructor */
	public WlyyLoginAccountDO( String userType,
			String password, String salt, String accountStatus, Date createTime,
			Date updateTime, String saasId, String email) {
		this.userType = userType;
		this.password = password;
		this.salt = salt;
		this.accountStatus = accountStatus;
		this.createTime = createTime;
		this.updateTime = updateTime;
		this.saasId = saasId;
		this.email = email;
	}
	@Column(name = "user_type", precision = 2, scale = 0)
	public String getUserType() {
		return this.userType;
	}
	public void setUserType(String userType) {
		this.userType = userType;
	}
	@Column(name = "password", length = 100)
	public String getPassword() {
		return this.password;
	}
	public void setPassword(String password) {
		this.password = password;
	}
	@Column(name = "salt", length = 100)
	public String getSalt() {
		return this.salt;
	}
	public void setSalt(String salt) {
		this.salt = salt;
	}
	@Column(name = "account_status", precision = 2, scale = 0)
	public String getAccountStatus() {
		return this.accountStatus;
	}
	public void setAccountStatus(String accountStatus) {
		this.accountStatus = accountStatus;
	}
	@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;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "update_time", nullable = false, length = 0)
	public Date getUpdateTime() {
		return this.updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "email", length = 100)
	public String getEmail() {
		return this.email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/login/WlyyLoginLogDO.java

@@ -1,113 +0,0 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.IdEntity;
import javax.persistence.*;
import java.util.Date;
/**
 * 登陆日志
 */
@Entity
@Table(name = "wlyy_login_log")
public class WlyyLoginLogDO extends IdEntity implements java.io.Serializable {
	private String loginType;//'1 短信登录  2 密码登录'
	private String userCode;//'登录用户主键 患者code或者医生code'
	private String saasId;//'saas配置id'
	private String userType;//'1 患者 2医生 '
	private Date createTime;
	private Integer tokenId;//'tokenid'
	private String type;//'1 成功 2失败'
	private String errorMessage;//'错误信息'
	private String phone;//'电话号码'
	// Constructors
	/** default constructor */
	public WlyyLoginLogDO() {
	}
	@Column(name = "login_type", length = 2)
	public String getLoginType() {
		return this.loginType;
	}
	public void setLoginType(String loginType) {
		this.loginType = loginType;
	}
	@Column(name = "user_code", length = 100)
	public String getUserCode() {
		return this.userCode;
	}
	public void setUserCode(String userCode) {
		this.userCode = userCode;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "user_type", length = 2)
	public String getUserType() {
		return this.userType;
	}
	public void setUserType(String userType) {
		this.userType = userType;
	}
	@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 = "token_id")
	public Integer getTokenId() {
		return this.tokenId;
	}
	public void setTokenId(Integer tokenId) {
		this.tokenId = tokenId;
	}
	@Column(name = "type", length = 1)
	public String getType() {
		return this.type;
	}
	public void setType(String type) {
		this.type = type;
	}
	@Column(name = "error_message", length = 1000)
	public String getErrorMessage() {
		return this.errorMessage;
	}
	public void setErrorMessage(String errorMessage) {
		this.errorMessage = errorMessage;
	}
	@Column(name = "phone", length = 20)
	public String getPhone() {
		return this.phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/user/BaseEmployDO.java

@@ -17,24 +17,24 @@ public class BaseEmployDO extends IdEntityWithOperation implements java.io.Seria
	// Fields
	private String saasId;
	private String name;
	private String pyCode;
	private String sex;
	private String photo;
	private String skill;
	private String workPortal;
	private String email;
	private String phone;
	private String secondPhone;
	private String familyTel;
	private String officeTel;
	private String introduction;
	private String jxzc;
	private String lczc;
	private String xlzc;
	private String xzzc;
	private Integer status;
	private String saasId; //saasIDF
	private String name; //名字
	private String pyCode; //拼音
	private String sex; //性别
	private String photo; //头像
	private String skill;//专长
	private String workPortal;//医生门户首页
	private String email;//邮箱
	private String phone;//联系电话
	private String secondPhone;//备用电话
	private String familyTel;//家庭电话（固）
	private String officeTel;//办公电话（固）
	private String introduction;//简介
	private String jxzc;//教学职称
	private String lczc;//临床职称
	private String xlzc;//学历职称
	private String xzzc;//行政职称
	private Integer status;//-1 删除 0 禁用 1可用
	// Constructors

common/common-entity/src/main/java/com/yihu/jw/base/user/BaseMenuDO.java

@@ -17,7 +17,8 @@ import javax.persistence.Table;
public class BaseMenuDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String url;//请求路径
	private String method;//请求方式 get post
	private String saasId;
	private String parentId;
	private String name;
@@ -104,4 +105,21 @@ public class BaseMenuDO extends IdEntityWithOperation implements java.io.Seriali
		this.remark = remark;
	}
	@Column(name = "url", length = 255)
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "method", length = 255)
	public String getMethod() {
		return method;
	}
	public void setMethod(String method) {
		this.method = method;
	}
}

svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/SaasController.java

@@ -3,7 +3,6 @@ package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.business.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MSaas;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -105,7 +104,7 @@ public class SaasController extends EnvelopRestController {
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSaas> mSaass = convertToModels(list, new ArrayList<>(list.size()), MSaas.class, fields);
        List<SaasDO> mSaass = convertToModels(list, new ArrayList<>(list.size()), SaasDO.class, fields);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Saas.message_success_find_saass, mSaass, page, size, count);
    }
@@ -123,7 +122,7 @@ public class SaasController extends EnvelopRestController {
        //得到list数据
        List<SaasDO> list = saasService.search(fields, filters, sorts);
        //封装返回格式
        List<MSaas> mSaass = convertToModels(list, new ArrayList<>(list.size()), MSaas.class, fields);
        List<SaasDO> mSaass = convertToModels(list, new ArrayList<>(list.size()), SaasDO.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Saas.message_success_find_saass, mSaass);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/controller/SmsController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.business.sms.controller;
import com.yihu.jw.base.sms.BaseSmsDO;
import com.yihu.jw.business.sms.service.SmsService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSms;
import com.yihu.jw.restmodel.base.sms.SmsVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
@@ -30,15 +30,15 @@ public class SmsController extends EnvelopRestController {
    private SmsService smsService;
    @PostMapping(value = BaseSmsRequestMapping.Sms.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建短信", notes = "创建单个短信")
    public Envelop createSms(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            @ApiOperation(value = "创建短信", notes = "创建单个短信")
            public Envelop createSms(
                    @ApiParam(name = "json_data", value = "", defaultValue = "")
                    @RequestBody String jsonData) {
                try {
                    BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
                    return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
                } catch (ApiException e) {
                    return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -79,7 +79,7 @@ public class SmsController extends EnvelopRestController {
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSms> mSmss = convertToModels(list, new ArrayList<>(list.size()), MSms.class, fields);
        List<SmsVO> mSmss = convertToModels(list, new ArrayList<>(list.size()), SmsVO.class, fields);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss, page, size,count);
    }
@@ -97,7 +97,7 @@ public class SmsController extends EnvelopRestController {
        //得到list数据
        List<BaseSmsDO> list = smsService.search(fields,filters,sorts);
        //封装返回格式
        List<MSms> mSmss = convertToModels(list, new ArrayList<>(list.size()), MSms.class, fields);
        List<SmsVO> mSmss = convertToModels(list, new ArrayList<>(list.size()), SmsVO.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/controller/SmsGatewayController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.business.sms.controller;
import com.yihu.jw.base.sms.BaseSmsGatewayDO;
import com.yihu.jw.business.sms.service.SmsGatewayService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;
import com.yihu.jw.restmodel.base.sms.SmsGatewayVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
@@ -104,7 +104,7 @@ public class SmsGatewayController extends EnvelopRestController {
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSmsGateway> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), MSmsGateway.class, fields);
        List<SmsGatewayVO> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), SmsGatewayVO.class, fields);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.SmsGateway.message_success_find_SmsGateways,mSmsGateways, page, size,count);
    }
@@ -122,7 +122,7 @@ public class SmsGatewayController extends EnvelopRestController {
        //得到list数据
        List<BaseSmsGatewayDO> list = smsGatewayService.search(fields,filters,sorts);
        //封装返回格式
        List<MSmsGateway> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), MSmsGateway.class, fields);
        List<SmsGatewayVO> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), SmsGatewayVO.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.SmsGateway.message_success_find_SmsGateways,mSmsGateways);
    }
}

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

@@ -36,8 +36,6 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisementDO, Ad
    @Autowired
    private AdvertisementDao advertisementDao;
    @Autowired
    private PatientService patientService;
    @Autowired
    private WlyySignFamilyService signFamilyService;

web-gateway/pom.xml

@@ -35,6 +35,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>

web-gateway/src/main/java/com/yihu/jw/controller/login/LoginController.java

@@ -19,47 +19,15 @@ public class LoginController {
    private Tracer tracer;
    @GetMapping(value = "/doctorlogin", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "医生登陆", notes = "医生登陆")
    public Envelop doctorlogin(
            @ApiParam(name = "account", value = "账号", defaultValue = "") @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "") @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "") @RequestParam(name = "type", required = true, defaultValue = "1") Integer type) throws Exception {
        //获取用户信息
        //判断用户是否存在
        //判断密码是否正确
        //获取用户的版本信息
        //获取用户的模块信息
        //用户登陆的信息放入缓存中
        //保存登陆日志
        return null;
    }
    @GetMapping(value = "/employLogin", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "患者登陆", notes = "患者登陆")
    public Envelop employLogin(
            @ApiParam(name = "account", value = "账号", defaultValue = "") @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "") @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "") @RequestParam(name = "type", required = true, defaultValue = "1") Integer type) throws Exception {
        //获取用户信息
        //判断用户是否存在
        //判断密码是否正确
        //获取用户的版本信息
        //用户登陆的信息放入缓存中
        //保存登陆日志
            @ApiParam(name = "account", value = "账号", defaultValue = "")
            @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "")
            @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "")
            @RequestParam(name = "type", required = false, defaultValue = "1") Integer type) throws Exception {
        return null;
    }

web-gateway/src/main/java/com/yihu/jw/interceptors/PatientInterceptor.java

@@ -1,33 +0,0 @@
package com.yihu.jw.interceptors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * Created by chenweida on 2017/5/23.
 */
@Component
public class PatientInterceptor implements HandlerInterceptor {
    private Logger logger = LoggerFactory.getLogger(PatientInterceptor.class);
    @Override
    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
        return false;
    }
    @Override
    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
    }
    @Override
    public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
    }
}