Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/BaseContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base;
package com.yihu.jw.restmodel.base.base;
/**
 * Created by chenweida on 2017/5/19.

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/MFunction.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base;
package com.yihu.jw.restmodel.base.base;
import java.util.Date;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/MModule.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base;
package com.yihu.jw.restmodel.base.base;
import java.util.Date;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/MSaas.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base;
package com.yihu.jw.restmodel.base.base;
import java.util.Date;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/BaseVersionContants.java

@@ -0,0 +1,83 @@
package com.yihu.jw.restmodel.base.version;
/**
 * Created by chenweida on 2017/6/16.
 */
public class BaseVersionContants {
    public static class BaseServerVersion {
        public static final String message_success_create = "ServerVersion create success";
        public static final String message_success_update = "ServerVersion update success";
        public static final String message_success_find = "ServerVersion find success";
        public static final String message_success_find_BaseServerVersions = "ServerVersions find success";
        public static final String message_success_delete = "ServerVersion delete success";
        public static final String message_fail_name_exist = "ServerVersion name exist";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "ServerVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String api_common = "serverVerion";
        public static final String api_create = "create";
        public static final String api_update = "update";
        public static final String api_delete = "delete";
        public static final String api_getByCode = "getByCode";
        public static final String api_getBaseServerVersion="getBaseServerVersions";
        public static final String api_getBaseServerVersionNoPage="getServerVersionNoPage";
    }
    public static class BaseServerVersionLog {
        public static final String message_success_create = "BaseServerVersionLog create success";
        public static final String message_success_update = "BaseServerVersionLog update success";
        public static final String message_success_find = "BaseServerVersionLog find success";
        public static final String message_success_find_BaseServerVersionLog = "BaseServerVersionLog find success";
        public static final String message_success_delete = "BaseServerVersionLog delete success";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "ServerVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String api_common = "serverVersionLog";
        public static final String api_create = "create";
        public static final String api_update = "update";
        public static final String api_delete = "delete";
        public static final String api_getByCode = "getByCode";
        public static final String api_getBaseServerVersionLog="getBaseServerVersionLog";
        public static final String api_getBaseServerVersionLogNoPage="getBaseServerVersionLogNoPage";
    }
    public static class WlyyVersion {
        public static final String message_success_create = "WlyyVersion create success";
        public static final String message_success_update = "WlyyVersion update success";
        public static final String message_success_find = "WlyyVersion find success";
        public static final String message_success_find_WlyyVersions = "WlyyVersion find success";
        public static final String message_success_delete = "WlyyVersion delete success";
        public static final String message_fail_name_exist = "WlyyVersion name exist";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "ServerVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String api_common = "wlyyVersion";
        public static final String api_create = "create";
        public static final String api_update = "update";
        public static final String api_delete = "delete";
        public static final String api_getByCode = "getByCode";
        public static final String api_getWlyyVersion="getWlyyVersions";
        public static final String api_getWlyyVersionNoPage="getWlyyVersionsNoPage";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersion.java

@@ -0,0 +1,126 @@
package com.yihu.jw.restmodel.base.version;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersion {
    private String code; //业务code
    private String saasId;//关联base_saas code
    private String userCode;//用户表code 医生
    private String name; //版本名称
    private Integer versionInt;//版本号
    private Date createTime;
    private String createUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private Integer status;////-1 删除 0 禁用 可用
    private String remark;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getUserCode() {
        return userCode;
    }
    public void setUserCode(String userCode) {
        this.userCode = userCode;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(Integer versionInt) {
        this.versionInt = versionInt;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersionLog.java

@@ -0,0 +1,91 @@
package com.yihu.jw.restmodel.base.version;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersionLog {
    private Long id;
    private String saasId; //关联saas code
    private String userCodes;//此次更新的用户 多个逗号分割
    private String name;//此次更新的版本名称
    private Integer versionInt;//版本号
    private Integer type;//1更新 2回滚
    private Date createTime;
    private String createUser;
    private String createUserName;
    public String getSaasId() {
        return saasId;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getUserCodes() {
        return userCodes;
    }
    public void setUserCodes(String userCodes) {
        this.userCodes = userCodes;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(Integer versionInt) {
        this.versionInt = versionInt;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MWlyyVersion.java

@@ -0,0 +1,153 @@
package com.yihu.jw.restmodel.base.version;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MWlyyVersion {
    private Long id;
    private String saasId; //saas code
    private String code;
    private String name;
    private Double versionInt;
    private String versionStr;
    private String url;//app下载的路径
    private String info;//app更新的信息
    private Double size;//大小 MB
    private Date createTime;
    private String createUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private Integer status;////-1 删除 0 禁用 可用
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Double getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(Double versionInt) {
        this.versionInt = versionInt;
    }
    public String getVersionStr() {
        return versionStr;
    }
    public void setVersionStr(String versionStr) {
        this.versionStr = versionStr;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public Double getSize() {
        return size;
    }
    public void setSize(Double size) {
        this.size = size;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/exception/SecurityException.java

@@ -0,0 +1,26 @@
package com.yihu.jw.restmodel.exception;
/**
 * Created by chenweida on 2017/6/16.
 */
public class SecurityException extends Exception{
    public SecurityException() {
        super();
    }
    public SecurityException(String message) {
        super(message);
    }
    public SecurityException(String message, Throwable cause) {
        super(message, cause);
    }
    public SecurityException(Throwable cause) {
        super(cause);
    }
    protected SecurityException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
        super(message, cause, enableSuppression, writableStackTrace);
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/exception/SystemException.java

@@ -0,0 +1,26 @@
package com.yihu.jw.restmodel.exception;
/**
 * Created by chenweida on 2017/6/16.
 */
public class SystemException extends Exception{
    public SystemException() {
    }
    public SystemException(String message) {
        super(message);
    }
    public SystemException(String message, Throwable cause) {
        super(message, cause);
    }
    public SystemException(Throwable cause) {
        super(cause);
    }
    public SystemException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
        super(message, cause, enableSuppression, writableStackTrace);
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/exception/business/JiWeiException.java

@@ -0,0 +1,25 @@
package com.yihu.jw.restmodel.exception.business;
/**
 * Created by chenweida on 2017/6/16.
 */
public class JiWeiException extends Exception{
    public JiWeiException() {
    }
    public JiWeiException(String message) {
        super(message);
    }
    public JiWeiException(String message, Throwable cause) {
        super(message, cause);
    }
    public JiWeiException(Throwable cause) {
        super(cause);
    }
    public JiWeiException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
        super(message, cause, enableSuppression, writableStackTrace);
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/exception/ManageException.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.exception;
package com.yihu.jw.restmodel.exception.business;
/**
 * Created by chenweida on 2017/6/9.

common/common-swagger/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@@ -1,6 +1,6 @@
package com.yihu.jw.config;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
import com.yihu.jw.restmodel.wlyy.patient.WlyyPatientContants;
import com.yihu.jw.restmodel.wx.WxContants;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.controller;
package com.yihu.jw.base.controller.base;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.service.FunctionService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.MFunction;
import com.yihu.jw.base.model.base.Function;
import com.yihu.jw.base.service.base.FunctionService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;

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

@@ -1,11 +1,9 @@
package com.yihu.jw.base.controller;
package com.yihu.jw.base.controller.base;
import com.yihu.jw.base.model.Module;
import com.yihu.jw.base.model.SaasModule;
import com.yihu.jw.base.service.ModuleService;
import com.yihu.jw.base.service.ModuleService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.MModule;
import com.yihu.jw.base.model.base.Module;
import com.yihu.jw.base.service.base.ModuleService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.controller;
package com.yihu.jw.base.controller.base;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.MSaas;
import com.yihu.jw.base.model.base.Saas;
import com.yihu.jw.base.service.base.SaasService;
import com.yihu.jw.restmodel.base.base.BaseContants;
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.restmodel.exception.ApiException;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.base;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.model.base.Function;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.base;
import com.yihu.jw.base.model.Module;
import com.yihu.jw.base.model.base.Module;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,7 +1,6 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.base;
import com.yihu.jw.base.model.ModuleFunction;
import com.yihu.jw.base.model.SaasModule;
import com.yihu.jw.base.model.base.ModuleFunction;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.base;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.model.base.Saas;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,7 +1,6 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.base;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.model.SaasModule;
import com.yihu.jw.base.model.base.SaasModule;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/sms/SmsDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.base.dao.sms;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.model.sms.BaseSms;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-base/src/main/java/com/yihu/jw/base/model/base/IdEntity.java

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.base.model.base;
package com.yihu.jw.base.model;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;

svr/svr-base/src/main/java/com/yihu/jw/base/model/Function.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/base/model/Module.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/base/model/ModuleFunction.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;

svr/svr-base/src/main/java/com/yihu/jw/base/model/Saas.java

@@ -1,8 +1,7 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.*;

svr/svr-base/src/main/java/com/yihu/jw/base/model/SaasModule.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;

svr/svr-base/src/main/java/com/yihu/jw/base/model/SystemDict.java

@@ -1,7 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import org.hibernate.annotations.GenericGenerator;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;

svr/svr-base/src/main/java/com/yihu/jw/base/model/SystemDictList.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.model;// default package
package com.yihu.jw.base.model.base;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;

svr/svr-base/src/main/java/com/yihu/jw/base/model/sms/BaseSms.java

@@ -1,13 +1,11 @@
package com.yihu.jw.base.model.sms;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.*;
import static javax.persistence.GenerationType.IDENTITY;
/**
 * BaseSms entity. @author MyEclipse Persistence Tools
 */

svr/svr-base/src/main/java/com/yihu/jw/base/model/sms/BaseSmsGateway.java

@@ -1,10 +1,9 @@
package com.yihu.jw.base.model.sms;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**

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

@@ -1,14 +1,12 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.base;
import com.yihu.jw.base.dao.FunctionDao;
import com.yihu.jw.base.dao.ModuleFunctionDao;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.model.ModuleFunction;
import com.yihu.jw.base.model.SaasModule;
import com.yihu.jw.base.dao.base.FunctionDao;
import com.yihu.jw.base.dao.base.ModuleFunctionDao;
import com.yihu.jw.base.model.base.Function;
import com.yihu.jw.base.model.base.ModuleFunction;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.MFunction;
import com.yihu.jw.restmodel.base.MModule;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,14 +1,12 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.base;
import com.yihu.jw.base.dao.ModuleDao;
import com.yihu.jw.base.dao.ModuleDao;
import com.yihu.jw.base.dao.SaasModuleDao;
import com.yihu.jw.base.model.Module;
import com.yihu.jw.base.model.Module;
import com.yihu.jw.base.model.SaasModule;
import com.yihu.jw.base.dao.base.ModuleDao;
import com.yihu.jw.base.dao.base.SaasModuleDao;
import com.yihu.jw.base.model.base.Module;
import com.yihu.jw.base.model.base.SaasModule;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.MModule;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.service;
package com.yihu.jw.base.service.base;
import com.yihu.jw.base.dao.SaasDao;
import com.yihu.jw.base.model.Saas;
import com.yihu.jw.base.dao.base.SaasDao;
import com.yihu.jw.base.model.base.Saas;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-base/src/main/java/com/yihu/jw/base/service/sms/SmsGatewayService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.base.service.sms;
import com.yihu.jw.base.dao.sms.SmsGatewayDao;
import com.yihu.jw.base.model.sms.BaseSmsGateway;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.base.sms.BaseSmsContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;

svr/svr-base/src/main/java/com/yihu/jw/version/controller/ServerVersionController.java

@@ -0,0 +1,130 @@
package com.yihu.jw.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MWlyyVersion;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.model.WlyyVersion;
import com.yihu.jw.version.service.WlyyVersionService;
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.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseVersionContants.WlyyVersion.api_common)
@Api(value = "服务器版本模块", description = "服务器版本模块接口管理")
public class ServerVersionController extends EnvelopRestController {
    @Autowired
    private WlyyVersionService wlyyVersionService;
    @PostMapping(value = BaseVersionContants.WlyyVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建服务器版本", notes = "创建单个服务器版本")
    public Envelop createWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyVersion WlyyVersion = toEntity(jsonData, WlyyVersion.class);
            return Envelop.getSuccess(BaseVersionContants.WlyyVersion.message_success_create, wlyyVersionService.createWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionContants.WlyyVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改服务器版本", notes = "修改服务器版本")
    public Envelop updateWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyVersion WlyyVersion = toEntity(jsonData, WlyyVersion.class);
            return Envelop.getSuccess(BaseVersionContants.WlyyVersion.message_success_update, wlyyVersionService.updateWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.WlyyVersion.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除服务器版本", notes = "删除服务器版本")
    public Envelop deleteWlyyVersion(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            wlyyVersionService.deleteWlyyVersion(code);
            return Envelop.getSuccess(BaseVersionContants.WlyyVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.WlyyVersion.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找服务器版本", notes = "根据code查找服务器版本")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionContants.WlyyVersion.message_success_find, wlyyVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.WlyyVersion.api_getWlyyVersion, method = RequestMethod.GET)
    @ApiOperation(value = "获取服务器版本列表(分页)")
    public Envelop getWlyyVersions(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            //code like 1,name大于aa ,code 等于1 , defaultValue = "code?1;name>aa;code=1"
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyyVersion> list = wlyyVersionService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyVersionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MWlyyVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MWlyyVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.WlyyVersion.api_getWlyyVersionNoPage)
    @ApiOperation(value = "获取服务器版本列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyyVersion> list = wlyyVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MWlyyVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MWlyyVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/version/controller/ServerVersionLogController.java

@@ -0,0 +1,118 @@
package com.yihu.jw.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MBaseServerVersionLog;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.model.BaseServerVersionLog;
import com.yihu.jw.version.service.ServerVersionLogService;
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.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseVersionContants.BaseServerVersionLog.api_common)
@Api(value = "服务器版本日志模块", description = "服务器版本日志模块接口管理")
public class ServerVersionLogController extends EnvelopRestController {
    @Autowired
    private ServerVersionLogService serverVersionLogService;
    @PostMapping(value = BaseVersionContants.BaseServerVersionLog.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建服务器版本日志", notes = "创建单个服务器版本日志")
    public Envelop createBaseServerVersionLog(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerVersionLog baseServerVersionLog = toEntity(jsonData, BaseServerVersionLog.class);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersionLog.message_success_create, serverVersionLogService.createBaseServerVersionLog(baseServerVersionLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.BaseServerVersionLog.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除服务器版本日志", notes = "删除服务器版本日志")
    public Envelop deleteBaseServerVersionLog(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            serverVersionLogService.deleteBaseServerVersionLog(code);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersionLog.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersionLog.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找服务器版本日志", notes = "根据code查找服务器版本日志")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersionLog.message_success_find, serverVersionLogService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.BaseServerVersionLog.api_getBaseServerVersionLog, method = RequestMethod.GET)
    @ApiOperation(value = "获取服务器版本日志列表(分页)")
    public Envelop getBaseServerVersionLogs(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            //code like 1,name大于aa ,code 等于1 , defaultValue = "code?1;name>aa;code=1"
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<BaseServerVersionLog> list = serverVersionLogService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=serverVersionLogService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MBaseServerVersionLog> mBaseServerVersionLogs = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersionLog.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersionLog.api_getBaseServerVersionLogNoPage)
    @ApiOperation(value = "获取服务器版本日志列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseServerVersionLog> list = serverVersionLogService.search(fields,filters,sorts);
        //封装返回格式
        List<MBaseServerVersionLog> mBaseServerVersionLogs = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersionLog.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/version/controller/WlyyVersionController.java

@@ -0,0 +1,130 @@
package com.yihu.jw.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MBaseServerVersion;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.version.service.ServerVersionService;
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.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/6/16.
 */
@RestController
@RequestMapping(BaseVersionContants.BaseServerVersion.api_common)
@Api(value = "i健康APP版本模块", description = "i健康APP版本模块接口管理")
public class WlyyVersionController  extends EnvelopRestController {
    @Autowired
    private ServerVersionService BaseServerVersionService;
    @PostMapping(value = BaseVersionContants.BaseServerVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建i健康APP版本", notes = "创建单个i健康APP版本")
    public Envelop createBaseServerVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerVersion BaseServerVersion = toEntity(jsonData, BaseServerVersion.class);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersion.message_success_create, BaseServerVersionService.createBaseServerVersion(BaseServerVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionContants.BaseServerVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改i健康APP版本", notes = "修改i健康APP版本")
    public Envelop updateBaseServerVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerVersion BaseServerVersion = toEntity(jsonData, BaseServerVersion.class);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersion.message_success_update, BaseServerVersionService.updateBaseServerVersion(BaseServerVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.BaseServerVersion.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除i健康APP版本", notes = "删除i健康APP版本")
    public Envelop deleteBaseServerVersion(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            BaseServerVersionService.deleteBaseServerVersion(code);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersion.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找i健康APP版本", notes = "根据code查找i健康APP版本")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersion.message_success_find, BaseServerVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.BaseServerVersion.api_getBaseServerVersion, method = RequestMethod.GET)
    @ApiOperation(value = "获取i健康APP版本列表(分页)")
    public Envelop getBaseServerVersions(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            //code like 1,name大于aa ,code 等于1 , defaultValue = "code?1;name>aa;code=1"
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<BaseServerVersion> list = BaseServerVersionService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=BaseServerVersionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MBaseServerVersion> mBaseServerVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.BaseServerVersion.message_success_find_BaseServerVersions,mBaseServerVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersion.api_getBaseServerVersionNoPage)
    @ApiOperation(value = "获取i健康APP版本列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseServerVersion> list = BaseServerVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MBaseServerVersion> mBaseServerVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.BaseServerVersion.message_success_find_BaseServerVersions,mBaseServerVersions);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/version/dao/ServerVersionDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.version.dao;
import com.yihu.jw.version.model.BaseServerVersion;
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 ServerVersionDao extends PagingAndSortingRepository<BaseServerVersion, Long>, JpaSpecificationExecutor<BaseServerVersion> {
    @Query("from BaseServerVersion f where f.name=?1 and f.status=1")
    BaseServerVersion findByName(String name);
    @Query("from BaseServerVersion f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseServerVersion findByNameExcludeCode(String name, String code);
    @Query("from BaseServerVersion f where f.code=?1 and f.status=1")
    BaseServerVersion findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/version/dao/ServerVersionLogDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.version.dao;
import com.yihu.jw.version.model.BaseServerVersionLog;
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 ServerVersionLogDao extends PagingAndSortingRepository<BaseServerVersionLog, Long>, JpaSpecificationExecutor<BaseServerVersionLog> {
    @Query("from BaseServerVersionLog f where f.name=?1 and f.status=1")
    BaseServerVersionLog findByName(String name);
    @Query("from BaseServerVersionLog f where f.code=?1 and f.status=1")
    BaseServerVersionLog findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/version/dao/WlyyVersionDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.version.dao;
import com.yihu.jw.version.model.WlyyVersion;
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 WlyyVersionDao extends PagingAndSortingRepository<WlyyVersion, Long>, JpaSpecificationExecutor<WlyyVersion> {
    @Query("from WlyyVersion f where f.name=?1 and f.status=1")
    WlyyVersion findByName(String name);
    @Query("from WlyyVersion f where f.name=?1 and f.status=1 and f.code != ?2")
    WlyyVersion findByNameExcludeCode(String name, String code);
    @Query("from WlyyVersion f where f.code=?1 and f.status=1")
    WlyyVersion findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/version/model/BaseServerVersion.java

@@ -0,0 +1,184 @@
package com.yihu.jw.version.model;// default package
import com.yihu.jw.base.model.IdEntity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * BaseServerVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_server_version")
public class BaseServerVersion  extends IdEntity implements java.io.Serializable {
 
	private String code; //业务code
	private String saasId;//关联base_saas code
	private String userCode;//用户表code 医生
	private String name; //版本名称
	private Integer versionInt;//版本号
	private Date createTime;
	private String createUser;
	private String createUserName;
	private Date updateTime;
	private String updateUser;
	private String updateUserName;
	private Integer status;////-1 删除 0 禁用 可用
	private String remark;
	// Constructors
	/** default constructor */
	public BaseServerVersion() {
	}
	/** minimal constructor */
	public BaseServerVersion(String code, String name, Date createTime,
			Date updateTime) {
		this.code = code;
		this.name = name;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	/** full constructor */
	public BaseServerVersion(String code, String saasId, String userCode,
			String name, Integer versionInt, Date createTime,
			String createUser, String createUserName, Date updateTime,
			String updateUser, String updateUserName, Integer status,
			String remark) {
		this.code = code;
		this.saasId = saasId;
		this.userCode = userCode;
		this.name = name;
		this.versionInt = versionInt;
		this.createTime = createTime;
		this.createUser = createUser;
		this.createUserName = createUserName;
		this.updateTime = updateTime;
		this.updateUser = updateUser;
		this.updateUserName = updateUserName;
		this.status = status;
		this.remark = remark;
	}
	@Column(name = "code", nullable = false, length = 10)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "user_code", length = 100)
	public String getUserCode() {
		return this.userCode;
	}
	public void setUserCode(String userCode) {
		this.userCode = userCode;
	}
	@Column(name = "name", nullable = false, length = 10)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int")
	public Integer getVersionInt() {
		return this.versionInt;
	}
	public void setVersionInt(Integer versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "create_time", nullable = false, length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@Column(name = "create_user", length = 100)
	public String getCreateUser() {
		return this.createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@Column(name = "create_user_name", length = 50)
	public String getCreateUserName() {
		return this.createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	@Column(name = "update_time", nullable = false, length = 0)
	public Date getUpdateTime() {
		return this.updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	@Column(name = "update_user", length = 100)
	public String getUpdateUser() {
		return this.updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	@Column(name = "update_user_name", length = 50)
	public String getUpdateUserName() {
		return this.updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	@Column(name = "status", length = 1)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "remark", length = 1500)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

svr/svr-base/src/main/java/com/yihu/jw/version/model/BaseServerVersionLog.java

@@ -0,0 +1,159 @@
package com.yihu.jw.version.model;// default package
import com.yihu.jw.base.model.IdEntity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * BaseServerVersionLog entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_server_version_log")
public class BaseServerVersionLog extends IdEntity implements java.io.Serializable {
	private String saasId; //关联saas code
	private String userCodes;//此次更新的用户 多个逗号分割
	private String name;//此次更新的版本名称
	private Integer versionInt;//版本号
	private Integer type;//1更新 2回滚
	private Date createTime;
	private String createUser;
	private String createUserName;
	private Date updateTime;
	private String updateUser;
	private String updateUserName;
	private Integer status;////-1 删除 0 禁用 可用
	// Constructors
	/** default constructor */
	public BaseServerVersionLog() {
	}
	/** minimal constructor */
	public BaseServerVersionLog(String name, Date createTime) {
		this.name = name;
		this.createTime = createTime;
	}
	/** full constructor */
	public BaseServerVersionLog(String saasId, String userCodes, String name,
			Integer versionInt, Date createTime, String createUser,
			String createUserName) {
		this.saasId = saasId;
		this.userCodes = userCodes;
		this.name = name;
		this.versionInt = versionInt;
		this.createTime = createTime;
		this.createUser = createUser;
		this.createUserName = createUserName;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "user_codes")
	public String getUserCodes() {
		return this.userCodes;
	}
	public void setUserCodes(String userCodes) {
		this.userCodes = userCodes;
	}
	@Column(name = "name", nullable = false, length = 10)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int")
	public Integer getVersionInt() {
		return this.versionInt;
	}
	public void setVersionInt(Integer versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "create_time", nullable = false, length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@Column(name = "create_user", length = 100)
	public String getCreateUser() {
		return this.createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@Column(name = "create_user_name", length = 50)
	public String getCreateUserName() {
		return this.createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	public String getUpdateUser() {
		return updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	public String getUpdateUserName() {
		return updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

svr/svr-base/src/main/java/com/yihu/jw/version/model/WlyyVersion.java

@@ -0,0 +1,189 @@
package com.yihu.jw.version.model;// default package
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * WlyyVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersion extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId; //saas code
	private String code;
	private String name;
	private Double versionInt;
	private String versionStr;
	private String url;//app下载的路径
	private String info;//app更新的信息
	private Double size;//大小 MB
	private Date createTime;
	private String createUser;
	private String createUserName;
	private Date updateTime;
	private String updateUser;
	private String updateUserName;
	private Integer status;////-1 删除 0 禁用 可用
	// Constructors
	/** default constructor */
	public WlyyVersion() {
	}
	/** minimal constructor */
	public WlyyVersion(String code, String name) {
		this.code = code;
		this.name = name;
	}
	/** full constructor */
	public WlyyVersion(String saasId, String code, String name,
			Double versionInt, String versionStr, String url, String info,
			Double size) {
		this.saasId = saasId;
		this.code = code;
		this.name = name;
		this.versionInt = versionInt;
		this.versionStr = versionStr;
		this.url = url;
		this.info = info;
		this.size = size;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "code", nullable = false, length = 10)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", nullable = false, length = 10)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int", precision = 22, scale = 0)
	public Double getVersionInt() {
		return this.versionInt;
	}
	public void setVersionInt(Double versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "version_str", length = 10)
	public String getVersionStr() {
		return this.versionStr;
	}
	public void setVersionStr(String versionStr) {
		this.versionStr = versionStr;
	}
	@Column(name = "url", length = 300)
	public String getUrl() {
		return this.url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "info", length = 1000)
	public String getInfo() {
		return this.info;
	}
	public void setInfo(String info) {
		this.info = info;
	}
	@Column(name = "size", precision = 22, scale = 0)
	public Double getSize() {
		return this.size;
	}
	public void setSize(Double size) {
		this.size = size;
	}
	public Date getCreateTime() {
		return createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	public String getCreateUser() {
		return createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	public String getCreateUserName() {
		return createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	public String getUpdateUser() {
		return updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	public String getUpdateUserName() {
		return updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

svr/svr-base/src/main/java/com/yihu/jw/version/service/ServerVersionLogService.java

@@ -0,0 +1,58 @@
package com.yihu.jw.version.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerVersionDao;
import com.yihu.jw.version.dao.ServerVersionLogDao;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.version.model.BaseServerVersionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ServerVersionLogService extends BaseJpaService<BaseServerVersion, ServerVersionDao> {
    @Autowired
    private ServerVersionLogDao baseServerVersionLogDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public BaseServerVersionLog createBaseServerVersionLog(BaseServerVersionLog baseServerVersionLog) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersionLog.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
        BaseServerVersionLog BaseServerVersionTmp = baseServerVersionLogDao.findByName(baseServerVersionLog.getName());
        if (BaseServerVersionTmp != null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return baseServerVersionLogDao.save(baseServerVersionLog);
    }
    public BaseServerVersionLog findByCode(String code) {
        BaseServerVersionLog serverVersion = baseServerVersionLogDao.findByCode(code);
        if (serverVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        return serverVersion;
    }
    @Transactional
    public void deleteBaseServerVersionLog(String code) {
        BaseServerVersionLog baseServerVersion = baseServerVersionLogDao.findByCode(code);
        if (baseServerVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        baseServerVersion.setStatus(-1);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/version/service/ServerVersionService.java

@@ -0,0 +1,84 @@
package com.yihu.jw.version.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MBaseServerVersion;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerVersionDao;
import com.yihu.jw.version.model.BaseServerVersion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ServerVersionService extends BaseJpaService<BaseServerVersion, ServerVersionDao> {
    @Autowired
    private ServerVersionDao BaseServerVersionDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public BaseServerVersion createBaseServerVersion(BaseServerVersion BaseServerVersion) throws ApiException {
        if (StringUtils.isEmpty(BaseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
        BaseServerVersion BaseServerVersionTmp = BaseServerVersionDao.findByName(BaseServerVersion.getName());
        if (BaseServerVersionTmp != null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return BaseServerVersionDao.save(BaseServerVersion);
    }
    @Transactional
    public BaseServerVersion updateBaseServerVersion(BaseServerVersion BaseServerVersion) {
        if (StringUtils.isEmpty(BaseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getId())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_id_is_null, CommonContants.common_error_params_code);
        }
        BaseServerVersion BaseServerVersionTmp = BaseServerVersionDao.findByNameExcludeCode(BaseServerVersion.getName(), BaseServerVersion.getCode());
        if (BaseServerVersionTmp != null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return BaseServerVersionDao.save(BaseServerVersion);
    }
    public BaseServerVersion findByCode(String code) {
        BaseServerVersion BaseServerVersion = BaseServerVersionDao.findByCode(code);
        if (BaseServerVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        return BaseServerVersion;
    }
    @Transactional
    public void deleteBaseServerVersion(String code) {
        BaseServerVersion BaseServerVersion = BaseServerVersionDao.findByCode(code);
        if (BaseServerVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        BaseServerVersion.setStatus(-1);
    }
    public List<MBaseServerVersion> getModuleBaseServerVersions(String saasCode) {
        String sql=" select m.code,m.parent_code,m.name from base_BaseServerVersion f,base_module_BaseServerVersion mf where f.code=mf.BaseServerVersion_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MBaseServerVersion.class,saasCode);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/version/service/WlyyVersionService.java

@@ -0,0 +1,73 @@
package com.yihu.jw.version.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MWlyyVersion;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerVersionDao;
import com.yihu.jw.version.dao.WlyyVersionDao;
import com.yihu.jw.version.model.WlyyVersion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class WlyyVersionService extends BaseJpaService<WlyyVersion, WlyyVersionDao> {
    @Autowired
    private WlyyVersionDao wlyyVersionDao;
    @Transactional
    public WlyyVersion createWlyyVersion(WlyyVersion wlyyVersion) throws ApiException {
        if (StringUtils.isEmpty(wlyyVersion.getName())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
        WlyyVersion wlyyVersionTmp = wlyyVersionDao.findByName(wlyyVersion.getName());
        if (wlyyVersionTmp != null) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return wlyyVersionDao.save(wlyyVersion);
    }
    @Transactional
    public WlyyVersion updateWlyyVersion(WlyyVersion WlyyVersion) {
        if (StringUtils.isEmpty(WlyyVersion.getCode())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(WlyyVersion.getName())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(WlyyVersion.getId())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_id_is_null, CommonContants.common_error_params_code);
        }
        WlyyVersion wlyyVersionTmp = wlyyVersionDao.findByNameExcludeCode(WlyyVersion.getName(), WlyyVersion.getCode());
        if (wlyyVersionTmp != null) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return wlyyVersionDao.save(WlyyVersion);
    }
    public WlyyVersion findByCode(String code) {
        WlyyVersion WlyyVersion = wlyyVersionDao.findByCode(code);
        if (WlyyVersion == null) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        return WlyyVersion;
    }
    @Transactional
    public void deleteWlyyVersion(String code) {
        WlyyVersion WlyyVersion = wlyyVersionDao.findByCode(code);
        if (WlyyVersion == null) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        WlyyVersion.setStatus(-1);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/wx/dao/WxAccessTokenDao.java

@@ -1,12 +1,10 @@
package com.yihu.jw.wx.dao;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.wx.model.WxAccessToken;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
/**

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxAccessToken.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wx.model;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxGraphicMessage.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wx.model;
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxMenu.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wx.model;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxTemplate.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wx.model;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;
import java.util.Date;

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxWechat.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wx.model;// default package
import com.yihu.jw.base.model.base.IdEntity;
import com.yihu.jw.base.model.IdEntity;
import javax.persistence.*;
import java.util.Date;

svr/svr-manage/src/main/java/com/yihu/jw/manage/config/MvcConfig.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.springframework.web.filter.HiddenHttpMethodFilter;
import org.springframework.web.servlet.config.annotation.*;
/**
@@ -35,6 +36,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
    /**
     * 判断是否登陆的拦截器
     *
     * @param registry
     */
    @Override
@@ -42,4 +44,8 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
        registry.addInterceptor(userInterceptor).addPathPatterns("/**");
    }
    @Bean
    public HiddenHttpMethodFilter hiddenHttpMethodFilter() {
        return new HiddenHttpMethodFilter();
    }
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/interceptors/UserInterceptor.java

@@ -3,7 +3,6 @@ package com.yihu.jw.manage.interceptors;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.exception.ManageException;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,7 +13,6 @@ import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/login/LoginService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.manage.model.system.MenuItems;
import com.yihu.jw.manage.service.system.MenuService;
import com.yihu.jw.manage.service.system.RoleService;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.restmodel.exception.ManageException;
import com.yihu.jw.restmodel.exception.business.ManageException;
import com.yihu.jw.restmodel.manage.system.ManageUserVO;
import com.yihu.jw.util.security.MD5;
import org.springframework.beans.BeanUtils;

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/UserService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.manage.service.system;
import com.yihu.jw.manage.dao.system.UserDao;
import com.yihu.jw.manage.dao.system.UserRoleDao;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.restmodel.exception.ManageException;
import com.yihu.jw.restmodel.exception.business.ManageException;
import com.yihu.jw.restmodel.wlyy.WlyyContant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

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

@@ -21,7 +21,6 @@ public class WlyyAgreement extends IdEntity implements Serializable{
    private static final long serialVersionUID = -4343130835307199266L;
    private String code;//业务code
    private String parentCode;//
    private String saasId;
    private String name;//套餐名称
    private BigDecimal price;//套餐价格
@@ -35,7 +34,6 @@ public class WlyyAgreement extends IdEntity implements Serializable{
    public WlyyAgreement(String code, String parentCode, String saasId, String name, BigDecimal price, String posterPic, String remark, String type, Date createTime, Date updateTime, Integer status, String createUser) {
        this.code = code;
        this.parentCode = parentCode;
        this.saasId = saasId;
        this.name = name;
        this.price = price;
@@ -61,15 +59,6 @@ public class WlyyAgreement extends IdEntity implements Serializable{
        this.code = code;
    }
    @Column(name = "parent_code")
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;

web-gateway/readMe.MD

@@ -15,4 +15,35 @@
    @RefreshScope
    访问以下路径刷新配置
    curl -X POST http://localhost:8088/refresh
    curl -X POST http://localhost:8088/refresh
    
    
版本控制
    网关对外的版本控制根据访问路径中的第一个参数决定
    例如：http://localhost:8088/v2/patient/hello   那个就是访问v2的这个版本
    对应的代码实现，在方法上添加版本的注解 @ApiVersion() 已经对应的版本号 1
    
    @RestController
    @RequestMapping("/{version}/patient")
    public class PatientController {
    
        @GetMapping("/hello")
        @ApiVersion(1)
        @ResponseBody
        public String hello1(HttpServletRequest request){
            System.out.println("haha1..........");
    
            return "hello";
        }
    
        @GetMapping("/hello")
        @ApiVersion(2)
        @ResponseBody
        public String hello2(HttpServletRequest request){
            System.out.println("haha2.........");
            return "hello";
        }
    }
    
    如果我们传大于v2的版本那么系统会自动识别到最新的版本 v2
    例如http://localhost:8088/v5/patient/hello     那么其实还是调用v2版本

web-gateway/src/main/java/com/yihu/jw/config/mvc/GlobalHandlerExceptionResolver.java

@@ -0,0 +1,72 @@
package com.yihu.jw.config.mvc;
import com.yihu.jw.restmodel.exception.SecurityException;
import com.yihu.jw.restmodel.exception.SystemException;
import com.yihu.jw.restmodel.exception.business.JiWeiException;
import com.yihu.jw.restmodel.exception.business.ManageException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerExceptionResolver;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
 * Created by chenweida on 20170317.
 * 全局异常处理
 */
@Component
public class GlobalHandlerExceptionResolver implements HandlerExceptionResolver {
    private Logger logger = LoggerFactory.getLogger(GlobalHandlerExceptionResolver.class);
    private static Integer status_403 = 403;//没权限 未登录 等权限异常
    private static Integer status_500 = 500;//后台异常
    private static Integer status_510 = 510;//基卫系统异常
    private static Integer status_511 = 511;//后台管理系统异常
    /**
     * 在这里处理所有得异常信息
     */
    @Override
    public ModelAndView resolveException(HttpServletRequest req, HttpServletResponse resp, Object o, Exception ex) {
        String error = ex.getMessage();
        logger.error(error);
        if (ex instanceof ManageException) {
            //后台管理系统异常
            printWrite(status_511, error, resp);
        } else if (ex instanceof SecurityException) {
            //权限异常
            printWrite(status_403, error, resp);
        } else if (ex instanceof JiWeiException) {
            //基卫系统异常
            printWrite(status_510, error, resp);
        }else{
            //系统异常
            printWrite(status_500, error, resp);
        }
        return new ModelAndView();
    }
    /**
     * 将错误信息添加到response中
     */
    public static void printWrite(int status, String msg, HttpServletResponse response) {
        try {
            response.setStatus(status);
            response.setCharacterEncoding("UTF-8");//设置编码
            response.setHeader("Cache-Control", "no-store");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Content-Type", "Content-Type: text/html; charset=utf-8");
            response.setHeader("Accept Encoding", "utf-8");
            PrintWriter pw = response.getWriter();
            pw.write(msg);
            pw.flush();
            pw.close();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

web-gateway/src/main/java/com/yihu/jw/config/MvcConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.config;
package com.yihu.jw.config.mvc;
import com.yihu.jw.version.JWRequestMappingHandlerMapping;
import org.springframework.context.annotation.Bean;
@@ -20,4 +20,9 @@ public class MvcConfig extends WebMvcConfigurationSupport {
        handlerMapping.setInterceptors(getInterceptors());
        return handlerMapping;
    }
    @Bean
    public GlobalHandlerExceptionResolver globalHandlerExceptionResolver() {
        return new GlobalHandlerExceptionResolver();
    }
}

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

@@ -3,6 +3,9 @@ package com.yihu.jw.controller;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.fegin.PatientFegin;
import com.yihu.jw.restmodel.exception.SystemException;
import com.yihu.jw.restmodel.exception.SecurityException;
import com.yihu.jw.restmodel.exception.business.ManageException;
import com.yihu.jw.version.ApiVersion;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,13 +13,8 @@ import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.annotation.SessionScope;
import javax.servlet.http.HttpServletRequest;
@@ -27,13 +25,40 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping("/{version}/patient")
@Api(description = "患者")
public class PatientController {
    private Logger logger= LoggerFactory.getLogger(PatientController.class);
    private Logger logger = LoggerFactory.getLogger(PatientController.class);
    @Autowired
    private PatientFegin patientFegin;
    @Autowired
    private Tracer tracer;
    @GetMapping("/hello")
    @ApiVersion(1)
    @ResponseBody
    public String hello1(Integer id) throws Exception {
        switch (id){
            case 1:{
                throw new ManageException("后台管理系统异常");
            }
            case 2:{
                throw new SecurityException("权限异常");
            }
            case 3:{
                throw new SystemException("后台系统异常");
            }
        }
        return "hello1";
    }
    @GetMapping("/hello")
    @ApiVersion(2)
    @ResponseBody
    public String hello2(HttpServletRequest request) throws Exception {
        System.out.println("haha2.........");
        return "hello2";
    }
    @ApiOperation(value = "根据code查找患者")
    @GetMapping(value = "findByCode")
    //配置HystrixProperty 则调用的方法和fallback是同一个线程 否则就不是
@@ -41,11 +66,11 @@ public class PatientController {
//   @HystrixCommand(fallbackMethod = "findByCodeFallback" )
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
            @HystrixProperty(name = "execution.timeout.enabled", value = "false")})
    public String findByCode(
            @ApiParam(name = "code", value = "患者code", required = true) @RequestParam(value = "code", required = true) String code) {
        tracer.getCurrentSpan().logEvent("开始调用微服务查询患者");
        String text1 =patientFegin.findByCode(code);
        String text1 = patientFegin.findByCode(code);
        tracer.getCurrentSpan().logEvent("查询调用微服务找患者结束");
        return text1;
    }
@@ -60,20 +85,5 @@ public class PatientController {
//        return "启动断路器";
//    }
    @GetMapping("/hello")
    @ApiVersion(1)
    @ResponseBody
    public String hello1(HttpServletRequest request){
        System.out.println("haha1..........");
        return "hello";
    }
    @GetMapping("/hello")
    @ApiVersion(2)
    @ResponseBody
    public String hello2(HttpServletRequest request){
        System.out.println("haha2.........");
        return "hello";
    }
}

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

@@ -0,0 +1,24 @@
package com.yihu.jw.controller.login;
import com.yihu.jw.commnon.wlyy.PatientContants;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
/**
 * Created by chenweida on 2017/6/16.
 */
@RestController
@Api(value = "登陆相关操作", description = "登陆相关操作")
public class LoginController {
    @GetMapping(value = "/login", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "登陆", notes = "登陆")
    public Envelop create(
            @ApiParam(name = "account", value = "", defaultValue = "") @RequestParam(name = "account", required = true) String account) {
        return null;
    }
}

web-gateway/src/main/resources/application.yml

@@ -19,8 +19,8 @@ management:
zuul:
  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割
  routes:
    svr-base: /base/**  ##svr-base方向代理到/base下多层级的路径
    svr-wlyy: /wlyy/**
    svr-base: /v1/base/**  ##svr-base方向代理到/base下多层级的路径
    svr-wlyy: /v1/wlyy/**
#    svr-base:    这种方式和  svr-base: /base/**  一样  svr-base可以随便写 唯一即可
#      path: /base/**  path是代理后的路径
#      serviceId: svr-base  serviceId是微服务name