Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleDO.java

@@ -75,6 +75,34 @@ public class ModuleDO extends UuidIdentityEntityWithOperator {
		}
	}
	public enum Must {
		nonMust("非必选", 0),
		must("必选", 1);
		private String name;
		private Integer value;
		Must(String name, Integer value) {
			this.name = name;
			this.value = value;
		}
		public String getName() {
			return name;
		}
		public void setName(String name) {
			this.name = name;
		}
		public Integer getValue() {
			return value;
		}
		public void setValue(Integer value) {
			this.value = value;
		}
	}
	//模块名称
	private String name;
	//模块连接

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasModuleDO.java

@@ -0,0 +1,154 @@
package com.yihu.jw.entity.base.module;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.List;
/**
 * Entity - 租户模块
 * Created by yeshijie on 2018/10/11.
 */
@Entity
@Table(name = "base_saas_module")
public class SaasModuleDO extends UuidIdentityEntityWithOperator {
	//saasId
	private String saasId;
	//模块名称
	private String name;
	//模块连接
	private String url;
	//模块id
	private String moduleId;
	//父模块id
	private String parentModuleId;
	//状态
	private Integer status;
	//类型
	private Integer type;
	//备注
	private String remark;
	//0-表示有子节点，1-表示没有子节点
	private Integer isEnd ;
	//0-表示非必选，1-表示必选
	private Integer isMust ;
	//逻辑删除标志1正常，0删除
	private Integer del ;
	//子集
	private List<SaasModuleDO> children = new ArrayList<>();
	// Constructors
	@Column(name = "saas_id")
	public String getSaasId() {
		return saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "name")
    public String getName() {
        return this.name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "module_id")
	public String getModuleId() {
		return moduleId;
	}
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	@Column(name = "parent_module_id")
	public String getParentModuleId() {
		return parentModuleId;
	}
	public void setParentModuleId(String parentModuleId) {
		this.parentModuleId = parentModuleId;
	}
	@Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
	@Column(name = "remark")
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "url")
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "type")
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "is_end")
	public Integer getIsEnd() {
		return isEnd;
	}
	public void setIsEnd(Integer isEnd) {
		this.isEnd = isEnd;
	}
	@Column(name = "del")
	public Integer getDel() {
		return del;
	}
	public void setDel(Integer del) {
		this.del = del;
	}
	@Column(name = "is_must")
	public Integer getIsMust() {
		return isMust;
	}
	public void setIsMust(Integer isMust) {
		this.isMust = isMust;
	}
	@Transient
	public List<SaasModuleDO> getChildren() {
		return children;
	}
	public void setChildren(List<SaasModuleDO> children) {
		this.children = children;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasTypeModuleDO.java

@@ -0,0 +1,154 @@
package com.yihu.jw.entity.base.module;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.List;
/**
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
 */
@Entity
@Table(name = "base_saas_type_module")
public class SaasTypeModuleDO extends UuidIdentityEntityWithOperator {
	//租户类型id
	private String saasTypeId;
	//模块名称
	private String name;
	//模块连接
	private String url;
	//模块id
	private String moduleId;
	//父模块id
	private String parentModuleId;
	//状态
	private Integer status;
	//类型
	private Integer type;
	//备注
	private String remark;
	//0-表示有子节点，1-表示没有子节点
	private Integer isEnd ;
	//0-表示非必选，1-表示必选
	private Integer isMust ;
	//逻辑删除标志1正常，0删除
	private Integer del ;
	//子集
	private List<SaasTypeModuleDO> children = new ArrayList<>();
	// Constructors
	@Column(name = "saas_type_id")
	public String getSaasTypeId() {
		return saasTypeId;
	}
	public void setSaasTypeId(String saasTypeId) {
		this.saasTypeId = saasTypeId;
	}
	@Column(name = "name")
    public String getName() {
        return this.name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "module_id")
	public String getModuleId() {
		return moduleId;
	}
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	@Column(name = "parent_module_id")
	public String getParentModuleId() {
		return parentModuleId;
	}
	public void setParentModuleId(String parentModuleId) {
		this.parentModuleId = parentModuleId;
	}
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
	@Column(name = "remark")
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "url")
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "type")
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "is_end")
	public Integer getIsEnd() {
		return isEnd;
	}
	public void setIsEnd(Integer isEnd) {
		this.isEnd = isEnd;
	}
	@Column(name = "del")
	public Integer getDel() {
		return del;
	}
	public void setDel(Integer del) {
		this.del = del;
	}
	@Column(name = "is_must")
	public Integer getIsMust() {
		return isMust;
	}
	public void setIsMust(Integer isMust) {
		this.isMust = isMust;
	}
	@Transient
	public List<SaasTypeModuleDO> getChildren() {
		return children;
	}
	public void setChildren(List<SaasTypeModuleDO> children) {
		this.children = children;
	}
}

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

@@ -0,0 +1,137 @@
package com.yihu.jw.restmodel.base.module;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
/**
 * Entity - 租户模块
 * Created by yeshijie on 2018/10/11.
 */
@ApiModel(value = "SaasModuleVO", description = "租户模块")
public class SaasModuleVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "saasId", example = "saasId")
	private String saasId;
	@ApiModelProperty(value = "模块名称", example = "模块1")
	private String name;
	@ApiModelProperty(value = "模块链接", example = "模块链接")
	private String url;
	@ApiModelProperty(value = "模块id", example = "模块id")
	private String moduleId;
	@ApiModelProperty(value = "父模块id", example = "父模块id")
	private String parentModuleId;
	@ApiModelProperty(value = "状态", example = "1有效，0失效")
	private Integer status;
	@ApiModelProperty(value = "类型", example = "0通用，1医生端你，2居民端")
	private Integer type;
	@ApiModelProperty(value = "备注", example = "备注")
	private String remark;
	@ApiModelProperty(value = "0-表示有子节点，1-表示没有子节点", example = "1")
	private Integer isEnd ;
	@ApiModelProperty(value = "必选 0-表示非必选，1-表示必选", example = "1")
	private Integer isMust ;
	@ApiModelProperty(value = "逻辑删除标志1正常，0删除", example = "1")
	private Integer del ;
	@ApiModelProperty(value = "子集", example = "子集")
	private List<SaasModuleVO> children = new ArrayList<>();
	public String getSaasId() {
		return saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public String getModuleId() {
		return moduleId;
	}
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	public String getParentModuleId() {
		return parentModuleId;
	}
	public void setParentModuleId(String parentModuleId) {
		this.parentModuleId = parentModuleId;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getRemark() {
		return remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	public Integer getIsEnd() {
		return isEnd;
	}
	public void setIsEnd(Integer isEnd) {
		this.isEnd = isEnd;
	}
	public Integer getIsMust() {
		return isMust;
	}
	public void setIsMust(Integer isMust) {
		this.isMust = isMust;
	}
	public Integer getDel() {
		return del;
	}
	public void setDel(Integer del) {
		this.del = del;
	}
	public List<SaasModuleVO> getChildren() {
		return children;
	}
	public void setChildren(List<SaasModuleVO> children) {
		this.children = children;
	}
}

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

@@ -0,0 +1,137 @@
package com.yihu.jw.restmodel.base.module;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
/**
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
 */
@ApiModel(value = "SaasTypeModuleVO", description = "租户类型模块")
public class SaasTypeModuleVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "租户类型id", example = "saasTypeId")
	private String saasTypeId;
	@ApiModelProperty(value = "模块名称", example = "模块1")
	private String name;
	@ApiModelProperty(value = "模块链接", example = "模块链接")
	private String url;
	@ApiModelProperty(value = "模块id", example = "模块id")
	private String moduleId;
	@ApiModelProperty(value = "父模块id", example = "父模块id")
	private String parentModuleId;
	@ApiModelProperty(value = "状态", example = "1有效，0失效")
	private Integer status;
	@ApiModelProperty(value = "类型", example = "0通用，1医生端你，2居民端")
	private Integer type;
	@ApiModelProperty(value = "备注", example = "备注")
	private String remark;
	@ApiModelProperty(value = "0-表示有子节点，1-表示没有子节点", example = "1")
	private Integer isEnd ;
	@ApiModelProperty(value = "必选 0-表示非必选，1-表示必选", example = "1")
	private Integer isMust ;
	@ApiModelProperty(value = "逻辑删除标志1正常，0删除", example = "1")
	private Integer del ;
	@ApiModelProperty(value = "子集", example = "子集")
	private List<SaasTypeModuleVO> children = new ArrayList<>();
	public String getSaasTypeId() {
		return saasTypeId;
	}
	public void setSaasTypeId(String saasTypeId) {
		this.saasTypeId = saasTypeId;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public String getModuleId() {
		return moduleId;
	}
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	public String getParentModuleId() {
		return parentModuleId;
	}
	public void setParentModuleId(String parentModuleId) {
		this.parentModuleId = parentModuleId;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getRemark() {
		return remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	public Integer getIsEnd() {
		return isEnd;
	}
	public void setIsEnd(Integer isEnd) {
		this.isEnd = isEnd;
	}
	public Integer getIsMust() {
		return isMust;
	}
	public void setIsMust(Integer isMust) {
		this.isMust = isMust;
	}
	public Integer getDel() {
		return del;
	}
	public void setDel(Integer del) {
		this.del = del;
	}
	public List<SaasTypeModuleVO> getChildren() {
		return children;
	}
	public void setChildren(List<SaasTypeModuleVO> children) {
		this.children = children;
	}
}

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

@@ -0,0 +1,14 @@
package com.yihu.jw.base.dao.module;
import com.yihu.jw.entity.base.module.SaasModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Entity - 租户模块
 * Created by yeshijie on 2018/10/11.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
}

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

@@ -0,0 +1,14 @@
package com.yihu.jw.base.dao.module;
import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
 */
public interface SaasTypeModuleDao extends PagingAndSortingRepository<SaasTypeModuleDO, String>, JpaSpecificationExecutor<SaasTypeModuleDO> {
}

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

@@ -24,12 +24,16 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
     * @param moduleDO
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public ModuleDO addModule(ModuleDO moduleDO){
        if(StringUtils.isBlank(moduleDO.getParentId())){
            moduleDO.setParentId(CommonContant.DEFAULT_PARENTID);
        }
        moduleDao.save(moduleDO);
        //若新增某必选业务模块，则需为所有已创建的租户和租户类型添加此业务模块
        if (ModuleDO.Must.must.getValue().equals(moduleDO.getIsMust())){
        }
        return moduleDO;
    }

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

@@ -0,0 +1,16 @@
package com.yihu.jw.base.service.module;
import com.yihu.jw.base.dao.module.SaasModuleDao;
import com.yihu.jw.entity.base.module.SaasModuleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Entity - 租户模块
 * Created by yeshijie on 2018/10/11.
 */
@Service
public class SaasModuleService extends BaseJpaService<SaasModuleDO, SaasModuleDao> {
}

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

@@ -0,0 +1,16 @@
package com.yihu.jw.base.service.module;
import com.yihu.jw.base.dao.module.SaasTypeModuleDao;
import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
 */
@Service
public class SaasTypeModuleService extends BaseJpaService<SaasTypeModuleDO, SaasTypeModuleDao> {
}