Merge branch 'dev' of chenweida/jw2.0 into dev

common/common-entity/pom.xml

@@ -14,4 +14,19 @@
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
    </dependencies>
</project>

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

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.business.base.model;
package com.yihu.jw.base;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;

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

@@ -1,6 +1,8 @@
package com.yihu.jw.business.base.model;// default package
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

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

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

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

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

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

@@ -1,6 +1,8 @@
package com.yihu.jw.business.base.model;// default package
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

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

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

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

@@ -1,6 +1,10 @@
package com.yihu.jw.business.base.model;// default package
package com.yihu.jw.base.base;// default package
import javax.persistence.*;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDict entity. @author MyEclipse Persistence Tools

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

@@ -1,6 +1,10 @@
package com.yihu.jw.business.base.model;// default package
package com.yihu.jw.base.base;// default package
import javax.persistence.*;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDictList entity. @author MyEclipse Persistence Tools

svr/svr-base/src/main/java/com/yihu/jw/business/login/model/BaseLoginAccount.java

@@ -1,8 +1,11 @@
package com.yihu.jw.business.login.model;// default package
package com.yihu.jw.base.login;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.*;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**

svr/svr-base/src/main/java/com/yihu/jw/business/login/model/BaseLoginLog.java

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

svr/svr-base/src/main/java/com/yihu/jw/business/login/model/WlyyLoginAccount.java

@@ -1,7 +1,7 @@
package com.yihu.jw.business.login.model;// default package
package com.yihu.jw.base.login;// default package
import java.util.Date;
import javax.persistence.*;
import java.util.Date;
/**
 * 账号实体 包含医生 患者的账号

svr/svr-base/src/main/java/com/yihu/jw/business/login/model/WlyyLoginLog.java

@@ -1,7 +1,7 @@
package com.yihu.jw.business.login.model;// default package
package com.yihu.jw.base.login;// default package
import java.util.Date;
import javax.persistence.*;
import java.util.Date;
/**
 * 登陆日志

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

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

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

@@ -1,6 +1,7 @@
package com.yihu.jw.business.sms.model;// default package
package com.yihu.jw.base.sms;// default package
import com.yihu.jw.business.base.model.IdEntity;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import java.io.Serializable;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import java.io.Serializable;
import java.util.Map;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import java.io.Serializable;

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

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

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

@@ -1,8 +1,11 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.*;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**

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

@@ -1,6 +1,7 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import com.yihu.jw.business.base.model.IdEntity;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,8 +1,11 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import com.yihu.jw.business.base.model.IdEntity;
import com.yihu.jw.base.IdEntity;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.model;
package com.yihu.jw.base.wx;
import com.yihu.jw.business.base.model.IdEntity;
import com.yihu.jw.base.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

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

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

@@ -1,8 +1,9 @@
package com.yihu.jw.wlyy.entity.agreement;
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,8 +1,8 @@
package com.yihu.jw.wlyy.entity.agreement;
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.wlyy.entity.agreement;
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,6 +1,7 @@
package com.yihu.jw.wlyy.entity.agreement;
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
public class WlyySignFamily extends IdEntity{
public class WlyySignFamily extends IdEntity {
    private static final long serialVersionUID = -6759565631854462880L;
@@ -60,7 +61,7 @@ public class WlyySignFamily extends IdEntity{
    private String agentDoctorName;//代签的健康管理师
    private String agentDoctorLevel;//代签的健康管理师
    private Integer adminTeamCode;//行政团队
    private java.util.Date expensesTime;//缴费时间
    private Date expensesTime;//缴费时间
    private String agreementCode;//协议code
    private String criticalPeopleMobile;//紧急联系人电话
    private String criticalPeople;//紧急联系人

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

@@ -1,7 +1,8 @@
package com.yihu.jw.wlyy.entity.doctor;
package com.yihu.jw.wlyy.doctor;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,11 +1,13 @@
package com.yihu.jw.wlyy.entity.doctor;
package com.yihu.jw.wlyy.doctor;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/7 0007.
 */

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

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.entity.patient;
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

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

@@ -1,6 +1,7 @@
package com.yihu.jw.wlyy.entity.patient;
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.wlyy.entity.IdEntity;
import com.yihu.jw.wlyy.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

svr-lib-parent-pom/pom.xml

@@ -93,6 +93,12 @@
        <dependencies>
            <!--自己的封装 common -->
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-entity</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-request-mapping</artifactId>

svr/svr-base/pom.xml

@@ -15,6 +15,11 @@
    <packaging>jar</packaging>
    <dependencies>
        <!--公共的 start-->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
@@ -43,6 +48,8 @@
            <groupId>com.yihu.base</groupId>
            <artifactId>common-data-mysql</artifactId>
        </dependency>
        <!--公共的 end-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>

svr/svr-base/src/main/java/com/yihu/jw/SvrBaseApplication.java

@@ -4,15 +4,19 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
/**
 * Created by chenweida on 2017/5/10.
 * localhost:10020/refresh  刷新当个微服务的配置 可以在需要刷新的bean上面@RefreshScope
 */
@EnableJpaAuditing
@SpringBootApplication
@EnableDiscoveryClient//服务注册到发现服务
@EnableJpaRepositories(
        entityManagerFactoryRef="baseEntityManagerFactory",
        transactionManagerRef = "baseTransactionManager"
)
public class SvrBaseApplication {
    public static void main(String[] args) {

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.base.base.Function;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.base.service.ModuleFunService;
import com.yihu.jw.exception.ApiException;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.business.base.model.Module;
import com.yihu.jw.base.base.Module;
import com.yihu.jw.business.base.service.ModuleService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MModule;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.business.base.model.Saas;
import com.yihu.jw.base.base.Saas;
import com.yihu.jw.business.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MSaas;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.base.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/business/base/dao/ModuleDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.business.base.model.Module;
import com.yihu.jw.base.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/business/base/dao/ModuleFunctionDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.business.base.model.ModuleFunction;
import com.yihu.jw.base.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/business/base/dao/SaasDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.business.base.model.Saas;
import com.yihu.jw.base.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/business/base/dao/SaasModuleDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.business.base.model.SaasModule;
import com.yihu.jw.base.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/business/base/service/FunctionService.java

@@ -1,9 +1,9 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.ModuleFunction;
import com.yihu.jw.business.base.dao.FunctionDao;
import com.yihu.jw.business.base.dao.ModuleFunctionDao;
import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.business.base.model.ModuleFunction;
import com.yihu.jw.base.base.Function;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.ModuleFunction;
import com.yihu.jw.business.base.dao.ModuleFunctionDao;
import com.yihu.jw.business.base.model.ModuleFunction;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.Module;
import com.yihu.jw.base.base.SaasModule;
import com.yihu.jw.business.base.dao.ModuleDao;
import com.yihu.jw.business.base.dao.SaasModuleDao;
import com.yihu.jw.business.base.model.Module;
import com.yihu.jw.business.base.model.SaasModule;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.Saas;
import com.yihu.jw.business.base.dao.SaasDao;
import com.yihu.jw.business.base.model.Saas;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/business/login/dao/BaseLoginAccountDao.java

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

svr/svr-base/src/main/java/com/yihu/jw/business/login/dao/BaseLoginLogDao.java

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

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.business.sms.model.BaseSms;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.business.sms.service.SmsService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSms;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.business.sms.model.BaseSmsGateway;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.business.sms.service.SmsGatewayService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;

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

@@ -1,13 +1,11 @@
package com.yihu.jw.business.sms.dao;
import com.yihu.jw.business.sms.model.BaseSms;
import com.fasterxml.jackson.databind.deser.Deserializers;
import com.yihu.jw.base.sms.BaseSms;
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/22.
 */
public interface SmsDao extends PagingAndSortingRepository<BaseSms, Long>, JpaSpecificationExecutor<BaseSms> {
    @Query("from Function f where f.name=?1 and f.status=1")
@@ -18,4 +16,6 @@ public interface SmsDao extends PagingAndSortingRepository<BaseSms, Long>, JpaSp
    @Query("from Function f where f.code=?1 and f.status=1")
    BaseSms findByCode(String code);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.dao;
import com.yihu.jw.business.sms.model.BaseSmsGateway;
import com.yihu.jw.base.sms.BaseSmsGateway;
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/business/sms/model/IdEntity.java

@@ -1,125 +0,0 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.business.sms.model;// default package
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.util.Date;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时，不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IdEntity {
	@Id
	@GeneratedValue(strategy = GenerationType.AUTO)
	protected Long id;  // 非业务主键
	@Column(name="code")
	protected String code;
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	protected Date createTime;
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	protected String createUser;
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	protected String createUserName;
	@LastModifiedDate
	@Column(name = "update_time", nullable = false, length = 0)
	protected Date updateTime;
	@LastModifiedBy
	@Column(name = "update_user", length = 100)
	protected String updateUser;
	@LastModifiedBy
	@Column(name = "update_user_name", length = 50)
	protected String updateUserName;
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
	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 String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
}

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.sms.service;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.business.sms.model.BaseSmsGateway;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.sms.service;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.business.sms.dao.SmsDao;
import com.yihu.jw.business.sms.model.BaseSms;
import com.yihu.jw.exception.ApiException;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,142 +0,0 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.version.model.BaseServerUrlVersion;
import com.yihu.jw.business.version.service.ServerUrlVersionService;
import com.yihu.jw.business.version.service.ServerVersionService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.version.MBaseServerUrlVersion;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
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;
import java.util.Map;
/**
 * Created by chenweida on 2017/6/20.
 */
@RestController
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "后台URL模块", description = "后台URL模块接口管理")
public class ServerUrlVersionController extends EnvelopRestController {
    @Autowired
    private ServerUrlVersionService serverUrlVersionService;
    @Autowired
    private FunctionService functionService;
    @Autowired
    private ServerVersionService serverVersionService;
    @PostMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建后台URL版本", notes = "创建单个后台URL版本")
    public Envelop createBaseServerUrlVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerUrlVersion BaseServerUrlVersion = toEntity(jsonData, BaseServerUrlVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_create, serverUrlVersionService.createBaseServerUrlVersion(BaseServerUrlVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改后台URL版本", notes = "修改后台URL版本")
    public Envelop updateBaseServerUrlVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerUrlVersion BaseServerUrlVersion = toEntity(jsonData, BaseServerUrlVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_update, serverUrlVersionService.updateBaseServerUrlVersion(BaseServerUrlVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_delete)
    @ApiOperation(value = "删除后台URL版本", notes = "删除后台URL版本")
    public Envelop deleteBaseServerUrlVersion(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes) {
        try {
            serverUrlVersionService.deleteBaseServerUrlVersion(codes);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_getByCode)
    @ApiOperation(value = "根据code查找后台URL版本", notes = "根据code查找后台URL版本")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find, serverUrlVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取后台URL版本列表(分页)")
    public Envelop getBaseServerUrlVersions(
            @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<BaseServerUrlVersion> list = serverUrlVersionService.search(fields, filters, sorts, page, size);
        Map<String, String> serverVersions = serverVersionService.getName();
        Map<String, String> functions= functionService.getName();
        for(BaseServerUrlVersion version:list){
            String serverName = serverVersions.get(version.getServerCode());
            String functionName = functions.get(version.getFunctionCode());
            version.setServerName(serverName);
            version.setFunctionName(functionName);
        }
        //获取总数
        long count=serverUrlVersionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MBaseServerUrlVersion> mBaseServerUrlVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerUrlVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_getListNoPage)
    @ApiOperation(value = "获取后台URL版本列表，不分页")
    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<BaseServerUrlVersion> list = serverUrlVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MBaseServerUrlVersion> mBaseServerUrlVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerUrlVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions);
    }
}

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

@@ -1,149 +0,0 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.business.version.model.BaseServerUrlVersion;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.business.version.model.BaseUserUrlVersion;
import com.yihu.jw.business.version.service.ServerUrlVersionService;
import com.yihu.jw.business.version.service.ServerVersionService;
import com.yihu.jw.exception.ApiException;
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.rm.base.BaseVersionRequestMapping;
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(BaseVersionRequestMapping.api_common)
@Api(value = "服务器版本模块", description = "服务器版本模块接口管理")
public class ServerVersionController extends EnvelopRestController {
    @Autowired
    private ServerVersionService serverVersionService;
    @Autowired
    private ServerUrlVersionService serverUrlVersionService;
    @PostMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建服务器版本", notes = "创建单个服务器版本")
    public Envelop createWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerVersion serverVersion = toEntity(jsonData, BaseServerVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_create, serverVersionService.createBaseServerVersion(serverVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改服务器版本", notes = "修改服务器版本")
    public Envelop updateWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseServerVersion serverVersion = toEntity(jsonData, BaseServerVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_update, serverVersionService.updateBaseServerVersion(serverVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_delete)
      @ApiOperation(value = "删除服务器版本", notes = "删除服务器版本")
      public Envelop deleteWlyyVersion(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes,
            @ApiParam(name = "userCode", value = "userCode")
            @RequestParam(value = "userCode", required = true) String userCode,
            @ApiParam(name = "userName", value = "userName")
            @RequestParam(value = "userName", required = true) String userName) {
        try {
            serverVersionService.deleteBaseServerVersion(codes,userCode,userName);
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_getByCode)
    @ApiOperation(value = "根据code查找服务器版本", notes = "根据code查找服务器版本")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_find, serverVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取服务器版本列表(分页)")
    public Envelop getWlyyVersions(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,name,saasId,versionInt,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 = serverVersionService.search(fields, filters, sorts, page, size);
        //查找是否存在功能版本
        for(BaseServerVersion baseServerVersion:list){
            List<BaseServerUrlVersion> serverUrlVersions = serverUrlVersionService.findByServer(baseServerVersion.getCode());
            if(serverUrlVersions.size()>0){
                baseServerVersion.setState("closed");
            }else{
                baseServerVersion.setState("open");
            }
        }
        //获取总数
        long count=serverVersionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MBaseServerVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.BaseServerVersion.message_success_find_BaseServerVersions,mWlyyVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_getListNoPage)
    @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<BaseUserUrlVersion> list = serverVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<BaseUserUrlVersion> userVersion = convertToModels(list, new ArrayList<>(list.size()), BaseUserUrlVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerVersion.message_success_find,userVersion);
    }
}

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

@@ -1,116 +0,0 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.business.version.model.BaseServerVersionLog;
import com.yihu.jw.business.version.service.ServerVersionLogService;
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.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import 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(BaseVersionRequestMapping.api_common)
@Api(value = "服务器版本日志模块", description = "服务器版本日志模块接口管理")
public class ServerVersionLogController extends EnvelopRestController {
    @Autowired
    private ServerVersionLogService serverVersionLogService;
    /*@PostMapping(value = BaseVersionRequestMapping.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(BaseVersionRequestMapping.BaseServerVersionLog.message_success_create, serverVersionLogService.createBaseServerVersionLog(baseServerVersionLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionRequestMapping.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(BaseVersionRequestMapping.BaseServerVersionLog.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionRequestMapping.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(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find, serverVersionLogService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }*/
    @RequestMapping(value = BaseVersionRequestMapping.BaseServerVersionLog.api_getList, 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(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs, page, size,count);
    }
    @GetMapping(value = BaseVersionRequestMapping.BaseServerVersionLog.api_getListNoPage)
    @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(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs);
    }
}

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

@@ -1,66 +0,0 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.business.version.model.BaseUserUrlVersion;
import com.yihu.jw.business.version.service.UserUrlVersionService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by Administrator on 2017/7/17 0017.
 */
@RestController
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "后台用户版本模块", description = "后台用户版本管理模块")
public class UserUrlVersionController extends EnvelopRestController {
    @Autowired
    private UserUrlVersionService userUrlVersionService;
    @GetMapping(value = BaseVersionRequestMapping.UserUrlVersion.api_getListNoPage)
    @ApiOperation(value = "获取后台用户版本列表，不分页")
    public Envelop getListNoPage(
            @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<BaseUserUrlVersion> list = userUrlVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<BaseUserUrlVersion> versionList = convertToModels(list, new ArrayList<>(list.size()), BaseUserUrlVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerVersion.message_success_find_BaseServerVersions,versionList);
    }
    @GetMapping(value = BaseVersionRequestMapping.UserUrlVersion.api_changeUserVersion)
    @ApiOperation(value = "更改后台用户版本")
    public Envelop changeUserVersion(
            @ApiParam(name = "serverCode",value="后台版本code")
            @RequestParam(value = "serverCode") String serverCode,
            @ApiParam(name = "userCodes", value = "更改的用户codes")
            @RequestParam(value = "userCodes") String userCodes,
            @ApiParam(name = "userCode", value = "修改人code")
            @RequestParam(value = "userCode") String userCode,
            @ApiParam(name = "userName", value = "修改人")
            @RequestParam(value = "userName") String userName,
            @ApiParam(name = "saasId")
            @RequestParam(value = "saasId") String saasId
    ) {
        userUrlVersionService.changeUserVersion(serverCode, userCodes, userCode,userName,saasId);
        return Envelop.getSuccess(BaseVersionRequestMapping.UserUrlVersion.message_success_update,null);
    }
}

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

@@ -1,134 +0,0 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.business.version.model.WlyyVersion;
import com.yihu.jw.business.version.service.WlyyVersionService;
import com.yihu.jw.exception.ApiException;
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.rm.base.BaseVersionRequestMapping;
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(BaseVersionRequestMapping.api_common)
@Api(value = "i健康APP版本模块", description = "i健康APP版本模块接口管理")
public class WlyyVersionController  extends EnvelopRestController {
    @Autowired
    private WlyyVersionService wlyyVersionService;
    @PostMapping(value = BaseVersionRequestMapping.WlyyVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建i健康APP版本", notes = "创建单个i健康APP版本")
    public Envelop createWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyVersion WlyyVersion = toEntity(jsonData, WlyyVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_create, wlyyVersionService.createWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionRequestMapping.WlyyVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改i健康APP版本", notes = "修改i健康APP版本")
    public Envelop updateWlyyVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyVersion WlyyVersion = toEntity(jsonData, WlyyVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_update, wlyyVersionService.updateWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionRequestMapping.WlyyVersion.api_delete)
    @ApiOperation(value = "删除i健康APP版本", notes = "删除i健康APP版本")
    public Envelop deleteWlyyVersion(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes,
            @ApiParam(name = "userCode", value = "userCode")
            @RequestParam(value = "userCode", required = true) String userCode,
            @ApiParam(name = "userName", value = "userName")
            @RequestParam(value = "userName", required = true) String userName) {
        try {
            wlyyVersionService.deleteWlyyVersion(codes,userCode,userName);
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionRequestMapping.WlyyVersion.api_getByCode)
    @ApiOperation(value = "根据code查找i健康APP版本", notes = "根据code查找i健康APP版本")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_find, wlyyVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionRequestMapping.WlyyVersion.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取i健康APP版本列表(分页)")
    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(BaseVersionRequestMapping.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionRequestMapping.WlyyVersion.api_getListNoPage)
    @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<WlyyVersion> list = wlyyVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MWlyyVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MWlyyVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionRequestMapping.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions);
    }
}

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

@@ -1,32 +0,0 @@
package com.yihu.jw.business.version.dao;// default package
import com.yihu.jw.business.version.model.BaseServerUrlVersion;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface ServerUrlVersionDao extends PagingAndSortingRepository<BaseServerUrlVersion, Long>, JpaSpecificationExecutor<BaseServerUrlVersion> {
    @Query("from BaseServerUrlVersion f where f.name=?1 and f.status=1")
    BaseServerUrlVersion findByName(String name);
    @Query("from BaseServerUrlVersion f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseServerUrlVersion findByNameExcludeCode(String name, String code);
    @Query("from BaseServerUrlVersion f where f.code=?1 and f.status=1")
    BaseServerUrlVersion findByCode(String code);
    @Query("from BaseServerUrlVersion f where f.serverCode=?1 and f.status=1")
    List<BaseServerUrlVersion> findByServer(String serverCode);
    @Transactional
    @Modifying
    @Query("update BaseServerUrlVersion b set b.status=-1 , b.updateUserName=?2 , b.updateUser =?3 where b.serverCode = ?1")
    void deleteByServer(String serverCode, String userName, String userCode);
}

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

@@ -1,26 +0,0 @@
package com.yihu.jw.business.version.dao;// default package
import com.yihu.jw.business.version.model.BaseServerVersion;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * 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);
    @Query("from BaseServerVersion v where v.status!=-1")
    List<BaseServerVersion> findAll();
}

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

@@ -1,18 +0,0 @@
package com.yihu.jw.business.version.dao;// default package
import com.yihu.jw.business.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.id=?1 and f.status=1")
    BaseServerVersionLog findByCode(String code);
}

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

@@ -1,24 +0,0 @@
package com.yihu.jw.business.version.dao;// default package
import com.yihu.jw.business.version.model.BaseUserUrlVersion;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import javax.transaction.Transactional;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface UserUrlVersionDao extends PagingAndSortingRepository<BaseUserUrlVersion, Long>, JpaSpecificationExecutor<BaseUserUrlVersion> {
    @Query("from BaseUserUrlVersion f where f.code=?1 and f.status=1")
    BaseUserUrlVersion findByCode(String code);
    @Query("from BaseUserUrlVersion f where f.userCode=?1 and f.saasId=?2 and f.status=1")
    BaseUserUrlVersion findByBsvCodeAndSaasId(String userCode, String saasId);
}

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

@@ -1,21 +0,0 @@
package com.yihu.jw.business.version.dao;// default package
import com.yihu.jw.business.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/business/version/model/BaseServerUrlVersion.java

@@ -1,148 +0,0 @@
package com.yihu.jw.business.version.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * BaseServerUrlVersion entity. @author MyEclipse Persistence Tools
 * 功能版本
 */
@Entity
@Table(name = "base_server_url_version")
public class BaseServerUrlVersion extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId;
	private String functionCode;//关联功能表 base_function code
	@Transient
	private String functionName;//功能名字
	private String serverCode;//关联 base_server_version code
	@Transient
	private String serverName;//base_server_version name
	private String name;//版本名称
	private Integer versionInt;//数字版本号
	private Integer status;//1: 正常 0：不可用  -1删除
	private String remark;
	// Constructors
	/** default constructor */
	public BaseServerUrlVersion() {
	}
	/** minimal constructor */
	public BaseServerUrlVersion(String code, String name, Date createTime,
			Date updateTime) {
		this.code = code;
		this.name = name;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	/** full constructor */
	public BaseServerUrlVersion(String code, String saasId,
			String functionCode, String serverCode, 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.functionCode = functionCode;
		this.serverCode = serverCode;
		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 = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "function_code", length = 100)
	public String getFunctionCode() {
		return this.functionCode;
	}
	public void setFunctionCode(String functionCode) {
		this.functionCode = functionCode;
	}
	@Column(name = "server_code", length = 100)
	public String getServerCode() {
		return this.serverCode;
	}
	public void setServerCode(String serverCode) {
		this.serverCode = serverCode;
	}
	@Column(name = "name",  length = 100)
	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 = "status")
	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;
	}
	public String getFunctionName() {
		return functionName;
	}
	public void setFunctionName(String functionName) {
		this.functionName = functionName;
	}
	public String getServerName() {
		return serverName;
	}
	public void setServerName(String serverName) {
		this.serverName = serverName;
	}
}

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

@@ -1,131 +0,0 @@
package com.yihu.jw.business.version.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * BaseServerVersion entity. @author MyEclipse Persistence Tools
 * 后台版本model
 */
@Entity
@Table(name = "base_server_version")
public class BaseServerVersion  extends IdEntity implements java.io.Serializable {
 
	private String saasId;//关联base_saas code
	private String name; //版本名称
	private Integer versionInt;//版本号
	private Integer status;////-1 删除 0 禁用 可用
	private String remark;
	@Transient
	private List<BaseServerUrlVersion> children = new ArrayList<>();
	//children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
	// children长度>0时,  state   “open,closed”表示是节点的打开关闭
	@Transient
	private String state;
	// 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.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 = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@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 = "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;
	}
	public List<BaseServerUrlVersion> getChildren() {
		return children;
	}
	public void setChildren(List<BaseServerUrlVersion> children) {
		this.children = children;
	}
	public String getState() {
		return state;
	}
	public void setState(String state) {
		this.state = state;
	}
}

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

@@ -1,110 +0,0 @@
package com.yihu.jw.business.version.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 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 bsvCode;//关联 base_server_version code
	private String name;//此次更新的版本名称
	private Integer versionInt;//版本号
	private Integer type;//1更新 2回滚
	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;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	public String getBsvCode() {
		return bsvCode;
	}
	public void setBsvCode(String bsvCode) {
		this.bsvCode = bsvCode;
	}
}

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

@@ -1,65 +0,0 @@
package com.yihu.jw.business.version.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * BaseUserUrlVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_user_url_version")
public class BaseUserUrlVersion extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId;//saasid 关联 base_saas
	private String userCode;//关联用户
	private String bsvCode;//关联base_url_server_version code
	private Integer status;//1: 正常 0：不可用  -1删除
	// Constructors
	/** default constructor */
	public BaseUserUrlVersion() {
	}
	@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 = "bsv_code", length = 100)
	public String getBsvCode() {
		return this.bsvCode;
	}
	public void setBsvCode(String bsvCode) {
		this.bsvCode = bsvCode;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

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

@@ -1,124 +0,0 @@
package com.yihu.jw.business.version.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 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 name;
	private Double versionInt;
	private String versionStr;
	private String url;//app下载的路径
	private String info;//app更新的信息
	private Double size;//大小 MB
	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 = "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 Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

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

@@ -1,108 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.version.dao.ServerUrlVersionDao;
import com.yihu.jw.business.version.model.BaseServerUrlVersion;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
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/6/20.
 */
@Service
public class ServerUrlVersionService extends BaseJpaService<BaseServerUrlVersion, ServerUrlVersionDao> {
     @Autowired
    private ServerUrlVersionDao serverUrlVersionDao;
    @Autowired
    private ServerVersionService serverVersionService;
    @Autowired
    private FunctionService functionService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public BaseServerUrlVersion createBaseServerUrlVersion(BaseServerUrlVersion baseServerVersion) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        BaseServerUrlVersion baseServerVersionTmp = serverUrlVersionDao.findByName(baseServerVersion.getName());
        if (baseServerVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return serverUrlVersionDao.save(baseServerVersion);
    }
    @Transactional
    public BaseServerUrlVersion updateBaseServerUrlVersion(BaseServerUrlVersion baseServerVersion) {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getId())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        BaseServerUrlVersion baseServerVersionTmp = serverUrlVersionDao.findByNameExcludeCode(baseServerVersion.getName(), baseServerVersion.getCode());
        if (baseServerVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return serverUrlVersionDao.save(baseServerVersion);
    }
    public BaseServerUrlVersion findByCode(String code) {
        BaseServerUrlVersion baseServerVersion = serverUrlVersionDao.findByCode(code);
        if (baseServerVersion == null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        String serverCode = baseServerVersion.getServerCode();
        BaseServerVersion serverVersion = serverVersionService.findByCode(serverCode);
        String functionCode = baseServerVersion.getFunctionCode();
        Function function = functionService.findByCode(functionCode);
        baseServerVersion.setFunctionName(function.getName());
        baseServerVersion.setServerName(serverVersion.getName());
        return baseServerVersion;
    }
    @Transactional
    public void deleteBaseServerUrlVersion(String codes) {
        if(!StringUtils.isEmpty(codes)){
            for(String code:codes.split(",")){
                BaseServerUrlVersion baseServerVersion = serverUrlVersionDao.findByCode(code);
                if (baseServerVersion == null) {
                    continue;
                }
                baseServerVersion.setStatus(-1);
                serverUrlVersionDao.save(baseServerVersion);
            }
        }
    }
    /**
     * 通过serverCode查找
     * @param serverCode
     * @return
     */
    public List<BaseServerUrlVersion> findByServer(String serverCode){
        return serverUrlVersionDao.findByServer(serverCode);
    }
    @Transactional
    public void deleteByServer(String serverCode, String userName, String userCode) {
        serverUrlVersionDao.deleteByServer(serverCode,userName,userCode);
    }
}

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

@@ -1,20 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.business.version.dao.ServerVersionLogDao;
import com.yihu.jw.business.version.model.BaseServerVersionLog;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ServerVersionLogService extends BaseJpaService<BaseServerVersionLog, ServerVersionLogDao> {
    @Autowired
    private ServerVersionLogDao baseServerVersionLogDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
}

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

@@ -1,117 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.business.version.dao.ServerVersionDao;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.MBaseServerVersion;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
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.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ServerVersionService extends BaseJpaService<BaseServerVersion, ServerVersionDao> {
    @Autowired
    private ServerVersionDao baseServerVersionDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private ServerUrlVersionService serverUrlVersionService;
    @Transactional
    public BaseServerVersion createBaseServerVersion(BaseServerVersion baseServerVersion) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        BaseServerVersion BaseServerVersionTmp = baseServerVersionDao.findByName(baseServerVersion.getName());
        if (BaseServerVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersionDao.save(baseServerVersion);
    }
    @Transactional
    public BaseServerVersion updateBaseServerVersion(BaseServerVersion BaseServerVersion) {
        if (StringUtils.isEmpty(BaseServerVersion.getCode())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getId())) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        BaseServerVersion BaseServerVersionTmp = baseServerVersionDao.findByNameExcludeCode(BaseServerVersion.getName(), BaseServerVersion.getCode());
        if (BaseServerVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersionDao.save(BaseServerVersion);
    }
    public BaseServerVersion findByCode(String code) {
        BaseServerVersion baseServerVersion = baseServerVersionDao.findByCode(code);
        if (baseServerVersion == null) {
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersion;
    }
    @Transactional
    public void deleteBaseServerVersion(String codes,String userCode,String userName) {
        if(StringUtils.isEmpty(codes)){
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        for(String code:codes.split(",")){
            BaseServerVersion baseServerVersion = baseServerVersionDao.findByCode(code);
            if (baseServerVersion == null) {
                continue;
            }
            baseServerVersion.setStatus(-1);
            baseServerVersion.setUpdateUserName(userName);
            baseServerVersion.setUpdateUser(userCode);
            baseServerVersionDao.save(baseServerVersion);
            //同时删除后台url版本
            serverUrlVersionService.deleteByServer(code, userName,userCode);
        }
    }
    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);
    }
    public List<BaseServerVersion> findAll(){
        return baseServerVersionDao.findAll();
    }
    /**
     * key为code ,value为版本名字
     * @return
     */
    public Map<String,String> getName(){
        List<BaseServerVersion> baseServerVersion = findAll();
        Map<String, String> map = new HashMap<>();
        if(null!=baseServerVersion){
            for(BaseServerVersion version: baseServerVersion){
                map.put(version.getCode(),version.getName());
            }
        }
        return map;
    }
}

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

@@ -1,167 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.business.version.dao.ServerVersionLogDao;
import com.yihu.jw.business.version.dao.UserUrlVersionDao;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.business.version.model.BaseServerVersionLog;
import com.yihu.jw.business.version.model.BaseUserUrlVersion;
import com.yihu.base.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
/**
 * Created by chenweida on 2017/6/20.
 */
@Service
public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, UserUrlVersionDao> {
    @Autowired
    private UserUrlVersionDao userUrlVersionDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private ServerVersionLogDao serverVersionLogDao;
    @Autowired
    private ServerVersionService serverVersionService;
    /**
     * 更改后台用户版本
     *
     * @param serverCode       (bsvCode)
     * @param userCodes        (通过,分隔的userCode)
     * @param userCode         //创建/修改人
     * @param userName//创建/修改人
     * @param saasId
     * @return
     */
    @Transactional
    public void changeUserVersion(String serverCode, String userCodes, String userCode, String userName, String saasId) {
        //通过serverCode,查找该版本信息
        BaseServerVersion baseServerVersionbyCode = serverVersionService.findByCode(serverCode);
        String[] user_codes = userCodes.split(",");
        List<String> userList = new ArrayList<String>();//现有版本的用户
        Collections.addAll(userList, user_codes);
        List<String> oldUserCodes = findByBsvCode(serverCode, saasId);//原有版本的用户
        List<String> _oldUserCodes = new ArrayList<String>(oldUserCodes);//构建该版本原有的用户  oldUserCodes
        _oldUserCodes.removeAll(userList);// 去除相同元素--->>需要删除的用户
        List<String> _newUserCodes = new ArrayList<String>(userList);//构建userList的副本
        _newUserCodes.removeAll(oldUserCodes);// 去除相同元素---->>需要添加 的权限
        //先删除 在添加...
        for (String delCode : _oldUserCodes) {
            BaseUserUrlVersion userUrlVersion = findByUserCodeAndSaasId(delCode, saasId);
            userUrlVersion.setUpdateUser(userCode);
            userUrlVersion.setUpdateUserName(userName);
            userUrlVersion.setStatus(-1);
            userUrlVersionDao.save(userUrlVersion);
        }
        String deleteUserCodes = StringUtils.join(_oldUserCodes.toArray(), ",");
        //不为空,记录日志
        if (StringUtils.isNotBlank(deleteUserCodes)) {
            BaseServerVersionLog serverVersionLog = new BaseServerVersionLog();
            serverVersionLog.setSaasId(saasId);
            serverVersionLog.setUserCodes(deleteUserCodes);
            serverVersionLog.setBsvCode(serverCode);
            serverVersionLog.setName(baseServerVersionbyCode.getName());
            serverVersionLog.setVersionInt(baseServerVersionbyCode.getVersionInt());
            serverVersionLog.setType(2);
            serverVersionLog.setStatus(1);
            serverVersionLog.setCreateUser(userCode);
            serverVersionLog.setCreateUserName(userName);
            serverVersionLog.setUpdateUser(userCode);
            serverVersionLog.setUpdateUserName(userName);
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            serverVersionLogDao.save(serverVersionLog);
        }
        for (String usercode : _newUserCodes) {
            //同一个saasId下,usercode只能关联一个bsvCode(serverCode)
            BaseUserUrlVersion baseUserUrlVersion = findByUserCodeAndSaasId(usercode, saasId);
            if (baseUserUrlVersion != null) {
                //存在
                if (baseUserUrlVersion.getBsvCode().equals(serverCode)) {
                    continue;
                }
                baseUserUrlVersion.setStatus(-1);
                baseUserUrlVersion.setUpdateUser(userCode);
                baseUserUrlVersion.setUpdateUserName(userName);
                userUrlVersionDao.save(baseUserUrlVersion);
            }
            BaseUserUrlVersion userUrlVersion = new BaseUserUrlVersion();
            userUrlVersion.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            userUrlVersion.setSaasId(saasId);
            userUrlVersion.setBsvCode(serverCode);
            userUrlVersion.setUserCode(usercode);
            userUrlVersion.setStatus(1);
            userUrlVersion.setCreateUser(userCode);
            userUrlVersion.setCreateUserName(userName);
            userUrlVersion.setUpdateUser(userCode);
            userUrlVersion.setUpdateUserName(userName);
            userUrlVersionDao.save(userUrlVersion);
        }
        String updateUserCodes = StringUtils.join(_newUserCodes.toArray(), ",");
        //不为空,记录日志
        if (StringUtils.isNotBlank(updateUserCodes)) {
            BaseServerVersionLog serverVersionLog = new BaseServerVersionLog();
            serverVersionLog.setSaasId(saasId);
            serverVersionLog.setUserCodes(updateUserCodes);
            serverVersionLog.setBsvCode(serverCode);
            serverVersionLog.setName(baseServerVersionbyCode.getName());
            serverVersionLog.setVersionInt(baseServerVersionbyCode.getVersionInt());
            serverVersionLog.setType(1);
            serverVersionLog.setStatus(1);
            serverVersionLog.setCreateUser(userCode);
            serverVersionLog.setCreateUserName(userName);
            serverVersionLog.setUpdateUser(userCode);
            serverVersionLog.setUpdateUserName(userName);
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            serverVersionLogDao.save(serverVersionLog);
        }
    }
    /**
     * 通过bsvCode,saasId查找已存在的userCode
     *
     * @param bsvCode
     * @param saasId
     * @return
     */
    public List<String> findByBsvCode(String bsvCode, String saasId) {
        String sql = "select v.user_code from base_user_url_version v where v.status=1 and v.bsv_code=? and v.saas_id = ?";
        Object[] objs = new Object[2];
        objs[0] = bsvCode;
        objs[1] = saasId;
        List<String> userCodes = jdbcTemplate.queryForList(sql, objs, String.class);
        return userCodes;
    }
    /**
     * 通过两个参数,判断是否存在BaseUserUrlVersion,存在返回 BaseUserUrlVersion对象
     * 不存在,返回null
     *
     * @param userCode
     * @param saasId
     * @return
     */
    public BaseUserUrlVersion findByUserCodeAndSaasId(String userCode, String saasId) {
        return userUrlVersionDao.findByBsvCodeAndSaasId(userCode, saasId);
    }
}

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

@@ -1,80 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.business.version.dao.WlyyVersionDao;
import com.yihu.jw.business.version.model.WlyyVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.UUID;
/**
 * 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.getCode())) {
            wlyyVersion.setCode(UUID.randomUUID().toString().replaceAll("-",""));
        }
        if (StringUtils.isEmpty(wlyyVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyVersion wlyyVersionTmp = wlyyVersionDao.findByName(wlyyVersion.getName());
        if (wlyyVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return wlyyVersionDao.save(wlyyVersion);
    }
    @Transactional
    public WlyyVersion updateWlyyVersion(WlyyVersion wlyyVersion) {
        if (StringUtils.isEmpty(wlyyVersion.getCode())) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(wlyyVersion.getName())) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(wlyyVersion.getId())) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyVersion wlyyVersionTmp = wlyyVersionDao.findByNameExcludeCode(wlyyVersion.getName(), wlyyVersion.getCode());
        if (wlyyVersionTmp != null) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return wlyyVersionDao.save(wlyyVersion);
    }
    public WlyyVersion findByCode(String code) {
        WlyyVersion WlyyVersion = wlyyVersionDao.findByCode(code);
        if (WlyyVersion == null) {
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return WlyyVersion;
    }
    @Transactional
    public void deleteWlyyVersion(String codes, String userCode, String userName) {
        if(!StringUtils.isEmpty(codes)){
            for (String code: codes.split(",")){
                WlyyVersion wlyyVersion = wlyyVersionDao.findByCode(code);
                if (wlyyVersion == null) {
                    continue;
                }
                wlyyVersion.setStatus(-1);
                wlyyVersion.setUpdateUserName(userName);
                wlyyVersion.setUpdateUser(userCode);
                wlyyVersionDao.save(wlyyVersion);
            }
        }
    }
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.business.wx.service.WxAccessTokenService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxGraphicMessage;
import com.yihu.jw.base.wx.WxGraphicMessage;
import com.yihu.jw.business.wx.service.WxGraphicMessageService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -1,8 +1,8 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.base.wx.WxMenu;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.WechatResponse;
import com.yihu.jw.business.wx.model.WxMenu;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.business.wx.service.WxMenuService;
import com.yihu.jw.exception.ApiException;

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

@@ -1,9 +1,9 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.WechatResponse;
import com.yihu.jw.business.wx.model.Miniprogram;
import com.yihu.jw.business.wx.model.WxTemplate;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.base.wx.Miniprogram;
import com.yihu.jw.base.wx.WxTemplate;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.business.wx.service.WxTemplateService;
import com.yihu.jw.exception.ApiException;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.base.wx.WxWechat;
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/business/wx/dao/WxAccessTokenDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.base.wx.WxAccessToken;
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/business/wx/dao/WxGraphicMessageDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.business.wx.model.WxGraphicMessage;
import com.yihu.jw.base.wx.WxGraphicMessage;
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/business/wx/dao/WxMenuDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.business.wx.model.WxMenu;
import com.yihu.jw.base.wx.WxMenu;
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/business/wx/dao/WxTemplateDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.business.wx.model.WxTemplate;
import com.yihu.jw.base.wx.WxTemplate;
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/business/wx/service/WechatService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java

@@ -1,9 +1,9 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.business.wx.dao.WxAccessTokenDao;
import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxGraphicMessage;
import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
import com.yihu.jw.business.wx.model.WxGraphicMessage;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java

@@ -1,9 +1,9 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxMenu;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.business.wx.dao.WxMenuDao;
import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.business.wx.model.WxMenu;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java

@@ -2,8 +2,8 @@ package com.yihu.jw.business.wx.service;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.wx.*;
import com.yihu.jw.business.wx.dao.WxTemplateDao;
import com.yihu.jw.business.wx.model.*;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/config/jpa/BaseJpa.java

@@ -0,0 +1,57 @@
package com.yihu.jw.config.jpa;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "baseEntityManagerFactory",
        transactionManagerRef = "baseTransactionManager",
        basePackages = {"com.yihu.jw.business"})   //设置Repository所在位置
public class BaseJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "baseEntityManagerFactory")
    @Primary
    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.jw.base");
        emfb.setPersistenceUnitName("base");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        emfb.setJpaProperties(hibernateProperties.hibProperties());
        return emfb;
    }
    @Bean(name = "baseTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("baseEntityManagerFactory") EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/config/jpa/HibernateProperties.java

@@ -0,0 +1,29 @@
package com.yihu.jw.config.jpa;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
 */
@Component
@RefreshScope
public class HibernateProperties {
    @Value("${hibernate.dialect}")
    private String dialect;
    @Value("${hibernate.show_sql}")
    private String show_sql;
    @Value("${hibernate.ejb.naming_strategy}")
    private String naming_strategy;
    public  Properties hibProperties() {
        Properties properties = new Properties();
        properties.put("hibernate.dialect",dialect);
        properties.put("hibernate.show_sql", show_sql);
        properties.put("hibernate.ejb.naming_strategy", naming_strategy);
        return properties;
    }
}

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

@@ -4,6 +4,15 @@ spring:
    name:  svr-base  ##注册到发现服务的id 如果id一样 eurika会自动做负载
#hibernate 配置
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: false
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
---

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

@@ -20,7 +20,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
      defaultZone: http://jw:jkzl@localhost:8761/eureka/
---
spring:

svr/svr-wlyy/pom.xml

@@ -15,6 +15,10 @@
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>

svr/svr-wlyy/src/main/java/com/yihu/jw/SvrWlyyApplication.java

@@ -3,6 +3,7 @@ package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
/**
 * Created by chenweida on 2017/5/10.
@@ -10,6 +11,10 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 */
@SpringBootApplication
@EnableDiscoveryClient//服务注册到发现服务
@EnableJpaRepositories(
        entityManagerFactoryRef="wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager"
)
public class SvrWlyyApplication {
    public static void main(String[] args) {

svr/svr-wlyy/src/main/java/com/yihu/jw/config/jpa/HibernateProperties.java

@@ -0,0 +1,29 @@
package com.yihu.jw.config.jpa;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
 */
@Component
@RefreshScope
public class HibernateProperties {
    @Value("${hibernate.dialect}")
    private String dialect;
    @Value("${hibernate.show_sql}")
    private String show_sql;
    @Value("${hibernate.ejb.naming_strategy}")
    private String naming_strategy;
    public  Properties hibProperties() {
        Properties properties = new Properties();
        properties.put("hibernate.dialect",dialect);
        properties.put("hibernate.show_sql", show_sql);
        properties.put("hibernate.ejb.naming_strategy", naming_strategy);
        return properties;
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/config/jpa/WlyyJpa.java

@@ -0,0 +1,55 @@
package com.yihu.jw.config.jpa;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager",
        basePackages = {"com.yihu.jw.wlyy"})   //设置Repository所在位置
public class WlyyJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "wlyyEntityManagerFactory")
    @Primary
    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.jw.wlyy");
        emfb.setPersistenceUnitName("wlyy");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        emfb.setJpaProperties(hibernateProperties.hibProperties());
        return emfb;
    }
    @Bean(name = "wlyyTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("wlyyEntityManagerFactory") EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}