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

common-lib-parent-pom/pom.xml

@@ -21,6 +21,8 @@
        <module>../common/common-util</module>
        <module>../common/common-rest-model</module>
        <module>../common/common-mysql</module>
        <module>../common/common-request-mapping</module>
        <module>../common/common-exception</module>
    </modules>
</project>

common/common-exception/pom.xml

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-exception</artifactId>
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-log</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
    </dependencies>
</project>

common/common-exception/readme.MD

@@ -0,0 +1 @@
公共的异常工程

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

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.exception;
package com.yihu.jw.exception;
/**
 * API 异常。使用错误代码初始化，并可接收用于补充错误消息的参数。

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

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

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

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

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

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

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

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

common/common-exception/src/main/java/com/yihu/jw/exception/code/ExceptionCode.java

@@ -0,0 +1,12 @@
package com.yihu.jw.exception.code;
/**
 * Created by chenweida on 2017/5/19.
 * 公共的常量类
 */
public class ExceptionCode {
    public static final Integer common_error_code= -10000; //系统异常
    public static final Integer common_error_params_code= -10100; //接口入参异常
}

common/common-request-mapping/pom.xml

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-request-mapping</artifactId>
    <version>1.0.0</version>
    <dependencies>
    </dependencies>
</project>

common/common-request-mapping/readme.MD

@@ -0,0 +1 @@
common-request-mapping路径

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

@@ -1,10 +1,10 @@
package com.yihu.jw.restmodel.base.base;
package com.yihu.jw.rm.base;
/**
 * Created by chenweida on 2017/5/19.
 * 基础模块的静态变量
 */
public class BaseContants {
public class BaseRequestMapping {
    public static final String api_common = "/bases";
@@ -68,6 +68,8 @@ public class BaseContants {
    public static class ModuleFun{
        public static final String api_getExistFun = "/moduleFun/existFunc/{code}";
        public static final String api_changeFun="/moduleFun/changeFun";
        public static final String moduleCode_is_null="moduleCode is null";
        public static final String funCodes_is_null="funCodes is null";
    }
@@ -88,10 +90,9 @@ public class BaseContants {
        public static final String message_fail_code_no_exist="code no exist";
        public static final String api_common="/saas";
        public static final String api_create="/create";
        public static final String api_update="/update";
        public static final String api_delete="/delete";
        public static final String api_create="/saas";
        public static final String api_update="/saas";
        public static final String api_delete="/saas";
        public static final String api_getByCode="/getByCode";
        public static final String api_getSaass="/getSaass";
        public static final String api_getSaassNoPage="/getSaassNoPage";

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

@@ -1,10 +1,12 @@
package com.yihu.jw.restmodel.base.sms;
package com.yihu.jw.rm.base;
/**
 * Created by chenweida on 2017/5/19.
 * 基础模块的静态变量
 */
public class BaseSmsContants {
public class BaseSmsRequestMapping {
    public static final String api_common="sms";
    //短信常量
    public static class Sms{
        public static final String message_success_create="sms create success";
@@ -20,9 +22,9 @@ public class BaseSmsContants {
        public static final String message_fail_id_is_null="id is null";
        public static final String api_common="sms";
        public static final String api_create="create";
        public static final String api_update="update";
        public static final String api_create="sms";
        public static final String api_update="sms";
        public static final String api_getSmss="getSmss";
        public static final String api_getSmssNoPage="getSmssNoPage";
@@ -44,11 +46,10 @@ public class BaseSmsContants {
        public static final String message_fail_code_no_exist="code no exist";
        public static final String api_common="smsGateway";
        public static final String api_create="create";
        public static final String api_update="update";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_create="smsGateway";
        public static final String api_update="smsGateway";
        public static final String api_delete="smsGateway";
        public static final String api_getByCode="getSmsGatewayByCode";
        public static final String api_getSmsGateways="getSmsGateways";
        public static final String api_getSmsGatewaysNoPage="getSmsGatewaysNoPage";

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

@@ -1,9 +1,9 @@
package com.yihu.jw.restmodel.base.version;
package com.yihu.jw.rm.base;
/**
 * Created by chenweida on 2017/6/16.
 */
public class BaseVersionContants {
public class BaseVersionRequestMapping {
    public static final String api_common = "/version";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/wlyy/WlyyRequestMapping.java

@@ -0,0 +1,147 @@
package com.yihu.jw.rm.wlyy;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WlyyRequestMapping {
    public static final String api_common = "wlyy";
    //协议模块常量
    public static class Agreement {
        public static final String api_create = "agreement";
        public static final String api_delete = "agreement";
        public static final String api_getByCode = "getAgreementByCode";
        public static final String api_update = "agreement";
        public static final String api_queryPage = "queryAgreementPage";
        public static final String api_getList = "getAgreementList";
        public static final String message_success_update = "agreement update success";
        public static final String message_success_delete = "agreement delete success";
        public static final String message_success_find = "agreement find success";
        public static final String message_success_create = "agreement create success";
        public static final String message_success_find_functions = "agreement find success";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_price_is_null = "price is null";
        public static final String message_fail_wlyyAgreement_is_no_exist = "wlyyAgreement is no exist";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_code_exist = "code exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    //协议模块常量
    public static class AgreementKpi {
        public static final String api_create = "agreementKpi";
        public static final String api_delete = "agreementKpi";
        public static final String api_getByCode = "getaAreementKpiByCode";
        public static final String api_update = "agreementKpi";
        public static final String api_queryPage = "queryAgreementKpiPage";
        public static final String api_getList = "getAagreementKpiList";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String message_fail_wlyyAgreementKpi_is_no_exist = "wlyyAgreementKpi is no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_kpiName_is_null = "kpiName is null";
        public static final String message_fail_type_is_null = "type is null";
        public static final String message_fail_patientCode_is_null = "patientCode is null";
        public static final String message_fail_signCode_is_null = "signCode is null";
        public static final String message_fail_kpiCode_is_null = "kpiCode is null";
        public static final String message_fail_agreementCode_is_null = "agreementCode is null";
        public static final String message_fail_agreement_is_null = "agreement is null";
        public static final String message_success_update = "agreementKpi update success";
        public static final String message_success_delete = "agreementKpi delete success";
        public static final String message_success_find = "agreementKpi find success";
        public static final String message_success_create = "agreementKpi create success";
        public static final String message_success_find_functions = "agreementKpi find success";
    }
    //协议模块常量
    public static class AgreementKpiLog {
        public static final String api_create = "agreementKpiLog";
        public static final String api_delete = "agreementKpiLog";
        public static final String api_getByCode = "getAgreementKpiLogByCode";
        public static final String api_update = "agreementKpiLog";
        public static final String api_queryPage = "queryAgreementKpiLogPage";
        public static final String api_getList = "getAgreementKpiLogList";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String message_success_update = "agreementKpiLog update success";
        public static final String message_success_delete = "agreementKpiLog delete success";
        public static final String message_success_find = "agreementKpiLog find success";
        public static final String message_success_create = "agreementKpiLog create success";
        public static final String message_success_find_functions = "agreementKpiLog find success";
    }
    //协议模块常量
    public static class SignFamily {
        public static final String api_create = "signFamily";
        public static final String api_delete = "signFamily";
        public static final String api_getByCode = "getSignFamilyByCode";
        public static final String api_update = "signFamily";
        public static final String api_queryPage = "querySignFamilyPage";
        public static final String api_getList = "getSignFamilyList";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_type_is_null = "type is null";
        public static final String message_fail_idCard_is_null = "idCard is null";
        public static final String message_fail_ssc_is_null = "ssc is null";
        public static final String message_fail_hospital_is_null = "hospital is null";
        public static final String message_fail_hospitalName_is_null = "hospitalName is null";
        public static final String message_fail_expense_is_null = "expense is null";
        public static final String message_fail_expenseStatus_is_null = "expenseStatus is null";
        public static final String message_fail_agreementCode_is_null = "agreementCode is null";
        public static final String message_success_update = "signFamily update success";
        public static final String message_success_delete = "signFamily delete success";
        public static final String message_success_find = "signFamily find success";
        public static final String message_success_create = "signFamily create success";
        public static final String message_success_find_functions = "signFamily find success";
    }
    /*
    广告相关操作
     */
    public static class Advertisement {
        public static final String api_common = "advertisement";
        public static final String api_create = "create";
        public static final String api_delete = "delete";
        public static final String api_getByCode = "getByCode";
        public static final String api_update = "update";
        public static final String api_queryPage = "queryPage";
        public static final String api_getList = "getList";
        public static final String api_getListByPatientCode = "getListByPatientCode";
        public static final String api_getListByHttp = "getListByHttp";
        public static final String api_getListByIp = "getListByIp";
        public static final String message_success_update = "advertisement update success";
        public static final String message_success_delete = "advertisement delete success";
        public static final String message_success_find = "advertisement find success";
        public static final String message_success_create = "advertisement create success";
        public static final String message_success_find_functions = "advertisement find success";
        public static final String message_fail_code_is_null = "code is null";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_code_no_exist = "code no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_code_exist = "code exist";
        public static final String message_fail_saasid_is_null = "saasid is null";
        public static final String message_fail_picture_is_null = "picture is null";
        public static final String message_fail_wlyyAdvertisement_is_not_exist = "WlyyAdvertisement is not exist";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/WechatContants.java

@@ -1,20 +1,21 @@
package com.yihu.jw.restmodel.wx;
package com.yihu.jw.rm.wx;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WechatContants {
public class WechatRequestMapping {
    public static final String api_common="/wechat";
    //微信token模块常量
    public static class WxAccessToken{
        public static final String api_create="accessToken";
        public static final String api_get="accessToken";
        public static final String message_success_get="wxAccessToken get success";
        public static final String api_common="wxAccessToken";
        public static final String api_create="create";
        public static final String api_get="get";
    }
    //微信按钮模块常量

common/common-rest-model/pom.xml

@@ -23,6 +23,10 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-log</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>

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

@@ -0,0 +1,13 @@
package com.yihu.jw.restmodel;
/**
 * Created by chenweida on 2017/10/24.
 */
public class CommonContants {
    //微服务的id start
    public static final String svr_base = "svr-base";
    public static final String svr_wlyy = "svr-wlyy";
    public static final String svr_gateway = "svr-gateway";
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxGraphicMessage.java

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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxMenu.java

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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxTemplate.java

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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxWechat.java

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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/WxContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.wx;
package com.yihu.jw.restmodel.base.wx;
/**
 * Created by Administrator on 2017/5/20 0020.

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

@@ -1,18 +0,0 @@
package com.yihu.jw.restmodel.common;
/**
 * Created by chenweida on 2017/5/19.
 * 公共的常量类
 */
public class CommonContants {
    //微服务的id start
    public static final String svr_base = "svr-base";
    public static final String svr_wlyy = "svr-wlyy";
    public static final String svr_gateway = "svr-gateway";
    public static final Integer common_error_code= -10000; //系统异常
    public static final Integer common_error_params_code= -10100; //接口入参异常
}

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

@@ -2,7 +2,8 @@ package com.yihu.jw.restmodel.common;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.util.date.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +69,7 @@ public class EnvelopRestController {
            T entity = objectMapper.readValue(json, entityCls);
            return entity;
        } catch (IOException ex) {
            throw new ApiException("Unable to parse json, " + ex.getMessage(), CommonContants.common_error_params_code);
            throw new ApiException("Unable to parse json, " + ex.getMessage(), ExceptionCode.common_error_params_code);
        }
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/doctorManage/DoctorContants.java

@@ -1,27 +0,0 @@
package com.yihu.jw.restmodel.doctorManage;
/**
 * Created by Administrator on 2017/7/19 0019.
 */
public class DoctorContants {
    public static final String api_common="/doctorManage";
    public static class Doctor{
        public static final String api_create="/doctor";
        public static final String api_update="/doctor";
        public static final String api_delete="/doctor/{codes}";
        public static final String api_getListNoPage="/doctor/listNoPage";
        public static final String api_getList="/doctor/list";
        public static final String api_getByCode="/doctor/{code}";
        public static final String message_success_create="doctor create success";
        public static final String message_success_update="doctor update success";
        public static final String message_success_find="doctor find success";
        public static final String message_success_find_functions="doctor find success";
        public static final String message_success_delete="doctor delete success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_code_no_exist="code not exist";
        public static final String message_fail_status_is_null="status is null";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wlyy/agreement/WlyyAgreementContants.java

@@ -1,116 +0,0 @@
package com.yihu.jw.restmodel.wlyy.agreement;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WlyyAgreementContants {
    //协议模块常量
    public static class Agreement{
        public static final String api_common="agreement";
        public static final String api_create="create";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_update="update";
        public static final String api_queryPage="queryPage";
        public static final String api_getList="getList";
        public static final String message_success_update="agreement update success";
        public static final String message_success_delete="agreement delete success";
        public static final String message_success_find="agreement find success";
        public static final String message_success_create="agreement create success";
        public static final String message_success_find_functions="agreement find success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_price_is_null="price is null";
        public static final String message_fail_wlyyAgreement_is_no_exist="wlyyAgreement is no exist";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_status_is_null="status is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_code_exist="code exist";
        public static final String message_fail_saasId_is_null="saasId is null";
    }
    //协议模块常量
    public static class AgreementKpi{
        public static final String api_common="agreementKpi";
        public static final String api_create="create";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_update="update";
        public static final String api_queryPage="queryPage";
        public static final String api_getList="getList";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_wlyyAgreementKpi_is_no_exist="wlyyAgreementKpi is no exist";
        public static final String message_fail_status_is_null="status is null";
        public static final String message_fail_kpiName_is_null="kpiName is null";
        public static final String message_fail_type_is_null="type is null";
        public static final String message_fail_patientCode_is_null="patientCode is null";
        public static final String message_fail_signCode_is_null="signCode is null";
        public static final String message_fail_kpiCode_is_null="kpiCode is null";
        public static final String message_fail_agreementCode_is_null="agreementCode is null";
        public static final String message_fail_agreement_is_null="agreement is null";
        public static final String message_success_update="agreementKpi update success";
        public static final String message_success_delete="agreementKpi delete success";
        public static final String message_success_find="agreementKpi find success";
        public static final String message_success_create="agreementKpi create success";
        public static final String message_success_find_functions="agreementKpi find success";
    }
    //协议模块常量
    public static class AgreementKpiLog{
        public static final String api_common="agreementKpiLog";
        public static final String api_create="create";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_update="update";
        public static final String api_queryPage="queryPage";
        public static final String api_getList="getList";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_success_update="agreementKpiLog update success";
        public static final String message_success_delete="agreementKpiLog delete success";
        public static final String message_success_find="agreementKpiLog find success";
        public static final String message_success_create="agreementKpiLog create success";
        public static final String message_success_find_functions="agreementKpiLog find success";
    }
    //协议模块常量
    public static class SignFamily{
        public static final String api_common="signFamily";
        public static final String api_create="create";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_update="update";
        public static final String api_queryPage="queryPage";
        public static final String api_getList="getList";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_status_is_null="status is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_type_is_null="type is null";
        public static final String message_fail_idCard_is_null="idCard is null";
        public static final String message_fail_ssc_is_null="ssc is null";
        public static final String message_fail_hospital_is_null="hospital is null";
        public static final String message_fail_hospitalName_is_null="hospitalName is null";
        public static final String message_fail_expense_is_null="expense is null";
        public static final String message_fail_expenseStatus_is_null="expenseStatus is null";
        public static final String message_fail_agreementCode_is_null="agreementCode is null";
        public static final String message_success_update="signFamily update success";
        public static final String message_success_delete="signFamily delete success";
        public static final String message_success_find="signFamily find success";
        public static final String message_success_create="signFamily create success";
        public static final String message_success_find_functions="signFamily find success";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wlyy/patient/WlyyPatientContants.java

@@ -1,35 +0,0 @@
package com.yihu.jw.restmodel.wlyy.patient;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public class WlyyPatientContants {
    public static class Advertisement{
        public static final String api_common="advertisement";
        public static final String api_create="create";
        public static final String api_delete="delete";
        public static final String api_getByCode="getByCode";
        public static final String api_update="update";
        public static final String api_queryPage="queryPage";
        public static final String api_getList="getList";
        public static final String api_getListByPatientCode="getListByPatientCode";
        public static final String api_getListByHttp="getListByHttp";
        public static final String api_getListByIp="getListByIp";
        public static final String message_success_update="advertisement update success";
        public static final String message_success_delete="advertisement delete success";
        public static final String message_success_find="advertisement find success";
        public static final String message_success_create="advertisement create success";
        public static final String message_success_find_functions="advertisement find success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_status_is_null="status is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_code_exist="code exist";
        public static final String message_fail_saasid_is_null="saasid is null";
        public static final String message_fail_picture_is_null="picture is null";
        public static final String message_fail_wlyyAdvertisement_is_not_exist="WlyyAdvertisement is not exist";
    }
}

common/common-swagger/pom.xml

@@ -13,6 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-swagger</artifactId>
    <version>1.0.0</version>
    <packaging>pom</packaging>
    <dependencies>

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

@@ -1,121 +0,0 @@
package com.yihu.jw.config;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.wlyy.agreement.WlyyAgreementContants;
import com.yihu.jw.restmodel.wlyy.patient.WlyyPatientContants;
import com.yihu.jw.restmodel.wx.WechatContants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
public class SwaggerConfig {
    public static final String PUBLIC_API = "Default";
    public static final String Base_API = "JwBase";
    public static final String Wlyy_API = "Wlyy";
    @Bean
    public Docket publicAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(PUBLIC_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/patient/.*")
                        , regex("/"+ BaseContants.api_common+"/.*")
                        ,regex("/"+ WechatContants.api_common+"/.*")
                        ,regex("/"+ WechatContants.WxAccessToken.api_common+"/.*")
                        ))
                .build()
                .apiInfo(publicApiInfo());
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
    @Bean
    public Docket wlyyAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Wlyy_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + WlyyAgreementContants.Agreement.api_common + "/.*")
                        , regex("/" + WlyyAgreementContants.AgreementKpi.api_common + "/.*")
                        , regex("/" + WlyyAgreementContants.AgreementKpiLog.api_common + "/.*")
                        , regex("/" + WlyyAgreementContants.SignFamily.api_common + "/.*")
                        , regex("/" + WlyyPatientContants.Advertisement.api_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());
    }
    private ApiInfo wlyyApiInfo() {
        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return wlyyInfo;
    }
    @Bean
    public Docket jwBaseAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Base_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                         regex("/"+ BaseContants.api_common+"/.*")
                        ,regex("/"+ BaseContants.Saas.api_common+"/.*")
                        ,regex("/"+ WechatContants.api_common+"/.*")
                        ,regex("/"+ WechatContants.WxAccessToken.api_common+"/.*")
                ))
                .build()
                .apiInfo(jwBaseApiInfo());
    }
    private ApiInfo jwBaseApiInfo() {
        ApiInfo apiInfo = new ApiInfo("基卫2.0API",
                "基卫2.0基础扩展API，提供基卫2.0基础扩展相关服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
}

server/svr-discovery/src/main/resources/application.yml

@@ -11,7 +11,7 @@ eureka:
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    fetch-registry: false ##如果是做高可用的发现服务那就要改成true
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
#eurika界面的账号密码

server/svr-logServer/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@127.0.0.1:8761/eureka/
---
spring:
@@ -43,4 +43,4 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/

svr-lib-parent-pom/pom.xml

@@ -40,7 +40,6 @@
        <!--业务微服务-->
        <module>../svr/svr-base</module><!--基础微服务-->
        <module>../svr/svr-quota</module><!--统计微服务-->
        <module>../svr/svr-wlyy</module><!--i健康微服务-->
        <module>../svr/svr-manage</module><!--基卫后台管理系统-->
@@ -62,8 +61,8 @@
        <version.hibernate>5.0.12.Final</version.hibernate>
        <version.hibernate-jpa>1.0.0.Final</version.hibernate-jpa>
        <version.servlet-api>3.1.0</version.servlet-api>
        <version.swagger>2.4.0</version.swagger>
        <version.swagger-ui>2.4.0</version.swagger-ui>
        <version.swagger>2.7.0</version.swagger>
        <version.swagger-ui>2.7.0</version.swagger-ui>
        <version.quartz>2.3.0</version.quartz>
        <version.logback>1.2.3</version.logback>
        <version.spring-elasticsearch>2.1.3.RELEASE</version.spring-elasticsearch>
@@ -80,6 +79,16 @@
        <dependencies>
            <!--自己的封装 common -->
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-request-mapping</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-exception</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-swagger</artifactId>

svr/svr-base/pom.xml

@@ -15,6 +15,14 @@
    <packaging>jar</packaging>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>

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

@@ -0,0 +1,191 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.base.service.ModuleFunService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
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(BaseRequestMapping.api_common)
@Api(value = "功能模块", description = "功能模块接口管理")
public class FunctionController extends EnvelopRestController {
    @Autowired
    private FunctionService functionService;
    @Autowired
    private ModuleFunService moduleFunService;
    @PostMapping(value = BaseRequestMapping.Function.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建功能", notes = "创建单个功能")
    public Envelop createFunction(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Function function = toEntity(jsonData, Function.class);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_create, functionService.createFunction(function));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseRequestMapping.Function.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改功能", notes = "修改功能")
    public Envelop updateFunction(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Function function = toEntity(jsonData, Function.class);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_update, functionService.updateFunction(function));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseRequestMapping.Function.api_delete)
    @ApiOperation(value = "删除功能", notes = "删除功能")
    public Envelop deleteFunction(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes) {
        try {
            functionService.deleteFunction(codes);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseRequestMapping.Function.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(BaseRequestMapping.Function.message_success_find, functionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseRequestMapping.Function.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取父功能列表(分页)")
    public Envelop getFunctions(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,name,url,parentCode,status,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 {
        if(StringUtils.isBlank(sorts)){
            sorts = "-updateTime";
        }
       if(StringUtils.isBlank(filters)){
            filters = "parentCode=0;";
        }else{
            filters="parentCode=0;"+filters;
        }
        //得到list数据
        List<Function> list = functionService.search(fields, filters, sorts, page, size);
        if(list!=null){
            for(Function func:list){//循环遍历,设置是否有子节点
                List<Function> children = functionService.getChildren(func.getCode());
                func.setChildren(children);
            }
        }
        //获取总数
        long count=functionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(list, new ArrayList<>(list.size()), MFunction.class, fields);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Function.message_success_find_functions,mFunctions, page, size,count);
    }
    @GetMapping(value = BaseRequestMapping.Function.api_getListNoPage)
    @ApiOperation(value = "获取功能列表，并且封装成jstree,不分页")
    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<Function> list = functionService.search(fields,filters,sorts);
        List<Object> functions = new ArrayList<>();
        if(list!=null){
            for(Function func:list){
                String code = func.getCode();
                func = functionService.getAllChildren(code);
                functions.add(func);
            }
        }
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(functions, new ArrayList<>(functions.size()), MFunction.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Function.message_success_find_functions,mFunctions);
    }
    @PutMapping(value = BaseRequestMapping.Function.api_assignFunction, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "给对应的模块分配功能")
    public Envelop assignModule(
            @ApiParam(name = "module_code", value = "module_code", defaultValue = "")
            @RequestParam String moduleCode,
            @ApiParam(name = "functionCodes", value = "功能的code，可以传多个，逗号分割", defaultValue = "")
            @RequestParam String functionCodes) {
        try {
            functionService.assignFunction(moduleCode,functionCodes);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_assign_function);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseRequestMapping.Function.api_getModuleFunctions, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "查询saas的模块")
    public Envelop getModuleFunctions(
            @ApiParam(name = "saas_code", value = "saas_code", defaultValue = "")
            @RequestParam String saasCode) {
        try {
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_find_functions_module,functionService.getModuleFunctions(saasCode));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value =BaseRequestMapping.Function.api_getChildren )
    @ApiOperation(value="查找子节点")
    public Envelop getChildren(@PathVariable String code){
        List<Function> children = functionService.getChildren(code);
        return Envelop.getSuccess("查询成功",children);
    }
}

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

@@ -1,12 +1,12 @@
package com.yihu.jw.base.controller.base;
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.model.base.Module;
import com.yihu.jw.base.service.base.ModuleService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.business.base.model.Module;
import com.yihu.jw.business.base.service.ModuleService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,66 +24,66 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseContants.api_common)
@RequestMapping(BaseRequestMapping.api_common)
@Api(value = "模块模块", description = "模块接口管理")
public class ModuleController extends EnvelopRestController {
    @Autowired
    private ModuleService moduleService;
    @PostMapping(value = BaseContants.Module.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Module.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建模块", notes = "创建单个模块")
    public Envelop createModule(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Module module = toEntity(jsonData, Module.class);
            return Envelop.getSuccess(BaseContants.Module.message_success_create, moduleService.createModule(module));
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_create, moduleService.createModule(module));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseContants.Module.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = BaseRequestMapping.Module.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改模块", notes = "修改模块")
    public Envelop updateModule(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Module module = toEntity(jsonData, Module.class);
            return Envelop.getSuccess(BaseContants.Module.message_success_update, moduleService.updateModule(module));
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_update, moduleService.updateModule(module));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseContants.Module.api_delete)
    @DeleteMapping(value = BaseRequestMapping.Module.api_delete)
    @ApiOperation(value = "删除模块", notes = "删除模块")
    public Envelop deleteModule(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes) {
        try {
            moduleService.deleteModule(codes);
            return Envelop.getSuccess(BaseContants.Module.message_success_delete );
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseContants.Module.api_getByCode)
    @GetMapping(value = BaseRequestMapping.Module.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(BaseContants.Module.message_success_find, moduleService.findByCode(code));
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_find, moduleService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseContants.Module.api_getList, method = RequestMethod.GET)
    @RequestMapping(value = BaseRequestMapping.Module.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取父模块列表(分页)")
    public Envelop getModules(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -131,11 +131,11 @@ public class ModuleController extends EnvelopRestController {
        //封装返回格式
        List<MModule> mModules = convertToModels(list, new ArrayList<>(list.size()), MModule.class, fields);
        return Envelop.getSuccessListWithPage(BaseContants.Module.message_success_find_Modules,mModules, page, size,count);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Module.message_success_find_Modules,mModules, page, size,count);
    }
    @GetMapping(value = BaseContants.Module.api_getListNoPage)
    @GetMapping(value = BaseRequestMapping.Module.api_getListNoPage)
    @ApiOperation(value = "获取模块列表，不分页")
    public Envelop getListNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -148,11 +148,11 @@ public class ModuleController extends EnvelopRestController {
        List<Module> list = moduleService.search(fields,filters,sorts);
        //封装返回格式
        List<MModule> mModules = convertToModels(list, new ArrayList<>(list.size()), MModule.class, fields);
        return Envelop.getSuccessList(BaseContants.Module.message_success_find_Modules,mModules);
        return Envelop.getSuccessList(BaseRequestMapping.Module.message_success_find_Modules,mModules);
    }
    @GetMapping(value =BaseContants.Module.api_getChildren )
    @GetMapping(value =BaseRequestMapping.Module.api_getChildren )
    @ApiOperation(value="查找子节点")
    public Envelop getChildren(@PathVariable String code){
        List<Module> children = moduleService.getChildren(code);

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.controller.base;
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.service.base.ModuleFunService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.business.base.service.ModuleFunService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,20 +16,20 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseContants.api_common)
@RequestMapping(BaseRequestMapping.api_common)
@Api(value = "模块功能模块", description = "模块功能模块")
public class ModuleFunController extends EnvelopRestController {
    @Autowired
    private ModuleFunService moduleFunService;
    @GetMapping(value = BaseContants.ModuleFun.api_getExistFun)
    @GetMapping(value = BaseRequestMapping.ModuleFun.api_getExistFun)
    @ApiOperation(value="查找已存在的功能")
    public Envelop getExistFunc(@PathVariable String code){
        List<String> funcs = moduleFunService.getExistFun(code);
        return Envelop.getSuccess("查询成功",funcs);
    }
    @PutMapping(value =  BaseContants.ModuleFun.api_changeFun,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value =  BaseRequestMapping.ModuleFun.api_changeFun,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "模块更新功能")
    public Envelop changeFun (@RequestBody String jsonData) {
        moduleFunService.changeFun(jsonData);

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

@@ -1,12 +1,12 @@
package com.yihu.jw.base.controller.base;
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.model.base.Saas;
import com.yihu.jw.base.service.base.SaasService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.business.base.model.Saas;
import com.yihu.jw.business.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MSaas;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,65 +23,66 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseContants.Saas.api_common)
@RequestMapping(BaseRequestMapping.api_common)
@Api(value = "Saas配置模块", description = "Saas配置模块接口管理")
public class SaasController extends EnvelopRestController {
    @Autowired
    private SaasService saasService;
    @PostMapping(value = BaseContants.Saas.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Saas.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建Saas配置", notes = "创建单个Saas配置")
    public Envelop createSaas(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Saas saas = toEntity(jsonData, Saas.class);
            return Envelop.getSuccess(BaseContants.Saas.message_success_create, saasService.createSaas(saas));
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_create, saasService.createSaas(saas));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseContants.Saas.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = BaseRequestMapping.Saas.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改Saas配置", notes = "修改Saas配置")
    public Envelop updateSaas(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Saas saas = toEntity(jsonData, Saas.class);
            return Envelop.getSuccess(BaseContants.Saas.message_success_update, saasService.updateSaas(saas));
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_update, saasService.updateSaas(saas));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseContants.Saas.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @DeleteMapping(value = BaseRequestMapping.Saas.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除Saas配置", notes = "删除Saas配置")
    public Envelop deleteSaas(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            saasService.deleteSaas(code);
            return Envelop.getSuccess(BaseContants.Saas.message_success_delete );
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_delete);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseContants.Saas.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @GetMapping(value = BaseRequestMapping.Saas.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找Saas配置", notes = "根据code查找Saas配置")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseContants.Saas.message_success_find, saasService.findByCode(code));
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_find, saasService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseContants.Saas.api_getSaass, method = RequestMethod.GET)
    @RequestMapping(value = BaseRequestMapping.Saas.api_getSaass, method = RequestMethod.GET)
    @ApiOperation(value = "获取Saas配置列表(分页)")
    public Envelop getSaass(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -100,17 +101,17 @@ public class SaasController extends EnvelopRestController {
        //得到list数据
        List<Saas> list = saasService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=saasService.getCount(filters);
        long count = saasService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSaas> mSaass = convertToModels(list, new ArrayList<>(list.size()), MSaas.class, fields);
        return Envelop.getSuccessListWithPage(BaseContants.Saas.message_success_find_saass,mSaass, page, size,count);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Saas.message_success_find_saass, mSaass, page, size, count);
    }
    @GetMapping(value = BaseContants.Saas.api_getSaassNoPage)
    @GetMapping(value = BaseRequestMapping.Saas.api_getSaassNoPage)
    @ApiOperation(value = "获取Saas配置列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,id,remark")
@@ -120,9 +121,9 @@ public class SaasController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<Saas> list = saasService.search(fields,filters,sorts);
        List<Saas> list = saasService.search(fields, filters, sorts);
        //封装返回格式
        List<MSaas> mSaass = convertToModels(list, new ArrayList<>(list.size()), MSaas.class, fields);
        return Envelop.getSuccessList(BaseContants.Saas.message_success_find_saass,mSaass);
        return Envelop.getSuccessList(BaseRequestMapping.Saas.message_success_find_saass, mSaass);
    }
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,155 @@
package com.yihu.jw.business.base.service;
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.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/5/19.
 */
@Service
public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    @Autowired
    private FunctionDao functionDao;
    @Autowired
    private ModuleFunctionDao moduleFunctionDao;
    @Autowired
    private ModuleFunService moduleFunService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public Function createFunction(Function function) throws ApiException {
        if (StringUtils.isEmpty(function.getCode())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(function.getName())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        Function functionTmp = functionDao.findByName(function.getName());
        if (functionTmp != null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return functionDao.save(function);
    }
    @Transactional
    public Function updateFunction(Function function) {
        if (StringUtils.isEmpty(function.getCode())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(function.getName())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(function.getId())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Function functionTmp = functionDao.findByNameExcludeCode(function.getName(), function.getCode());
        if (functionTmp != null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return functionDao.save(function);
    }
    public Function findByCode(String code) {
        Function function = functionDao.findByCode(code);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return function;
    }
    @Transactional
    public void deleteFunction(String code) {
        Function function = functionDao.findByCode(code);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        function.setStatus(-1);
        functionDao.save(function);
    }
    @Transactional
    public void assignFunction(String moduleCode, String functionCodes) {
        //先删除原来已经分配好的功能
        moduleFunctionDao.deleteByModuleCode(moduleCode);
        //分配新的功能
        String [] functionCodeArr=functionCodes.split(",");
        List<ModuleFunction> saasModuleList=new ArrayList<>();
        for(String functionCode:functionCodeArr){
            ModuleFunction saasModule=new ModuleFunction();
            saasModule.setModuleId(moduleCode);
            saasModule.setFunctionId(functionCode);
            saasModuleList.add(saasModule);
        }
        moduleFunctionDao.save(saasModuleList);
    }
    public List<MFunction> getModuleFunctions(String saasCode) {
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MFunction.class,saasCode);
    }
    /**
     * 根据code获得子节点,并判断是否子节点是否还有孙节点 (treegrid点击查询子节点 用到)
     * @param code
     * @return
     */
    public List<Function> getChildren(String code){
        List<Function> childrens = functionDao.getChildren(code);
        for(Function children:childrens){
            List<Function> children1 = functionDao.getChildren(children.getCode());//判断子节点是否有孙节点
            children.setChildren(children1);
        }
        return childrens;
    }
    public List<Function> findAll(){
        return functionDao.findAll();
    }
    /**
     * key为code ,value为功能名称
     * @return
     */
    public Map<String,String> getName(){
        List<Function> functions = findAll();
        Map<String, String> map = new HashMap<>();
        if(null!=functions){
            for(Function function: functions){
                map.put(function.getCode(),function.getName());
            }
        }
        return map;
    }
    /**
     * 根据code获取所有子节点(包括孙节点,曾孙节点....)
     * @param code
     * @return
     */
    public Function getAllChildren(String code){
        Function function = functionDao.findByCode(code);
        List<Function> childrens = functionDao.getChildren(code);
        for(Function children:childrens){
            getAllChildren(children.getCode());
        }
        function.setChildren(childrens);
        return function;
    }
}

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

@@ -1,11 +1,11 @@
package com.yihu.jw.base.service.base;
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.dao.base.ModuleFunctionDao;
import com.yihu.jw.base.model.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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,11 +46,11 @@ public class ModuleFunService extends BaseJpaService<ModuleFunction, ModuleFunct
    public void changeFun(String jsonData) {
        JSONObject jsonObject =  new JSONObject(jsonData);
        if(!jsonObject.has("moduleCode")){
            throw new ApiException(BaseContants.ModuleFun.moduleCode_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.ModuleFun.moduleCode_is_null, ExceptionCode.common_error_params_code);
            //filterStr+="saasId="+jsonObject.get("saasId")+";";
        }
        if(!jsonObject.has("funCodes")){
            throw new ApiException(BaseContants.ModuleFun.funCodes_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.ModuleFun.funCodes_is_null, ExceptionCode.common_error_params_code);
        }
        String moduleCode = jsonObject.get("moduleCode").toString();//模块code
        String funCodes = jsonObject.get("funCodes").toString();//功能code,多个code  ","  分隔

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

@@ -1,14 +1,14 @@
package com.yihu.jw.base.service.base;
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.dao.base.ModuleDao;
import com.yihu.jw.base.dao.base.SaasModuleDao;
import com.yihu.jw.base.model.base.Module;
import com.yihu.jw.base.model.base.SaasModule;
import com.yihu.jw.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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -36,17 +36,17 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    @Transactional
    public Module createModule(Module module) throws ApiException {
        if (StringUtils.isEmpty(module.getCode())) {
            throw new ApiException(BaseContants.Module.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(module.getName())) {
            throw new ApiException(BaseContants.Module.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(module.getSaasId())) {
            throw new ApiException(BaseContants.Module.message_fail_saasid_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
        }
        Module moduleTmp = moduleDao.findByName(module.getName());
        if (moduleTmp != null) {
            throw new ApiException(BaseContants.Module.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return moduleDao.save(module);
    }
@@ -54,17 +54,17 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    @Transactional
    public Module updateModule(Module module) {
        if (StringUtils.isEmpty(module.getCode())) {
            throw new ApiException(BaseContants.Module.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(module.getName())) {
            throw new ApiException(BaseContants.Module.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(module.getId())) {
            throw new ApiException(BaseContants.Module.message_fail_id_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Module moduleTmp = moduleDao.findByNameExcludeCode(module.getName(), module.getCode());
        if (moduleTmp != null) {
            throw new ApiException(BaseContants.Module.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return moduleDao.save(module);
    }
@@ -72,7 +72,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    public Module findByCode(String code) {
        Module module = moduleDao.findByCode(code);
        if (module == null) {
            throw new ApiException(BaseContants.Module.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return module;
    }
@@ -81,7 +81,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    public void deleteModule(String code) {
        Module module = moduleDao.findByCode(code);
        if (module == null) {
            throw new ApiException(BaseContants.Module.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        module.setStatus(-1);
    }

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

@@ -1,11 +1,11 @@
package com.yihu.jw.base.service.base;
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.dao.base.SaasDao;
import com.yihu.jw.base.model.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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,14 +22,14 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    @Transactional
    public Saas createSaas(Saas saas) throws ApiException {
        if (StringUtils.isEmpty(saas.getCode())) {
            throw new ApiException(BaseContants.Saas.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(saas.getName())) {
            throw new ApiException(BaseContants.Saas.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        Saas saasTmp = saasDao.findByName(saas.getName());
        if (saasTmp != null) {
            throw new ApiException(BaseContants.Saas.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return saasDao.save(saas);
    }
@@ -37,17 +37,17 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    @Transactional
    public Saas updateSaas(Saas saas) {
        if (StringUtils.isEmpty(saas.getCode())) {
            throw new ApiException(BaseContants.Saas.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(saas.getName())) {
            throw new ApiException(BaseContants.Saas.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(saas.getId())) {
            throw new ApiException(BaseContants.Saas.message_fail_id_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Saas saasTmp = saasDao.findByNameExcludeCode(saas.getName(), saas.getCode());
        if (saasTmp != null) {
            throw new ApiException(BaseContants.Saas.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return saasDao.save(saas);
    }
@@ -55,7 +55,7 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    public Saas findByCode(String code) {
        Saas saas = saasDao.findByCode(code);
        if (saas == null) {
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return saas;
    }
@@ -64,7 +64,7 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    public void deleteSaas(String code) {
        Saas saas = saasDao.findByCode(code);
        if (saas == null) {
            throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        saas.setStatus(-1);
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,103 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.business.sms.model.BaseSms;
import com.yihu.jw.business.sms.service.SmsService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSms;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
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(BaseSmsRequestMapping.api_common)
@Api(value = "短信模块", description = "短信模块接口管理")
public class SmsController extends EnvelopRestController {
    @Autowired
    private SmsService smsService;
    @PostMapping(value = BaseSmsRequestMapping.Sms.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建短信", notes = "创建单个短信")
    public Envelop createSms(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSms sms = toEntity(jsonData, BaseSms.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseSmsRequestMapping.Sms.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改短信", notes = "修改短信")
    public Envelop updateSms(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSms sms = toEntity(jsonData, BaseSms.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_update, smsService.updateSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseSmsRequestMapping.Sms.api_getSmss, method = RequestMethod.GET)
    @ApiOperation(value = "获取短信列表(分页)")
    public Envelop getSmss(
            @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<BaseSms> list = smsService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=smsService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSms> mSmss = convertToModels(list, new ArrayList<>(list.size()), MSms.class, fields);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss, page, size,count);
    }
    @GetMapping(value = BaseSmsRequestMapping.Sms.api_getSmssNoPage)
    @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<BaseSms> list = smsService.search(fields,filters,sorts);
        //封装返回格式
        List<MSms> mSmss = convertToModels(list, new ArrayList<>(list.size()), MSms.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss);
    }
}

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

@@ -0,0 +1,128 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.business.sms.model.BaseSmsGateway;
import com.yihu.jw.business.sms.service.SmsGatewayService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
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(BaseSmsRequestMapping.api_common)
@Api(value = "功能模块", description = "功能模块接口管理")
public class SmsGatewayController extends EnvelopRestController {
    @Autowired
    private SmsGatewayService smsGatewayService;
    @PostMapping(value = BaseSmsRequestMapping.SmsGateway.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建功能", notes = "创建单个功能")
    public Envelop createSmsGateway(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsGateway smsGateway = toEntity(jsonData, BaseSmsGateway.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_create, smsGatewayService.createSmsGateway(smsGateway));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseSmsRequestMapping.SmsGateway.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改功能", notes = "修改功能")
    public Envelop updateSmsGateway(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsGateway smsGateway = toEntity(jsonData, BaseSmsGateway.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_update, smsGatewayService.updateSmsGateway(smsGateway));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseSmsRequestMapping.SmsGateway.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除功能", notes = "删除功能")
    public Envelop deleteSmsGateway(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            smsGatewayService.deleteSmsGateway(code);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseSmsRequestMapping.SmsGateway.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(BaseSmsRequestMapping.SmsGateway.message_success_find, smsGatewayService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseSmsRequestMapping.SmsGateway.api_getSmsGateways, method = RequestMethod.GET)
    @ApiOperation(value = "获取功能列表(分页)")
    public Envelop getSmsGateways(
            @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<BaseSmsGateway> list = smsGatewayService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=smsGatewayService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MSmsGateway> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), MSmsGateway.class, fields);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.SmsGateway.message_success_find_SmsGateways,mSmsGateways, page, size,count);
    }
    @GetMapping(value = BaseSmsRequestMapping.SmsGateway.api_getSmsGatewaysNoPage)
    @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<BaseSmsGateway> list = smsGatewayService.search(fields,filters,sorts);
        //封装返回格式
        List<MSmsGateway> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), MSmsGateway.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.SmsGateway.message_success_find_SmsGateways,mSmsGateways);
    }
}

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

@@ -0,0 +1,21 @@
package com.yihu.jw.business.sms.dao;
import com.yihu.jw.business.sms.model.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")
    BaseSms findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSms findByNameExcludeCode(String name, String code);
    @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

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

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

@@ -0,0 +1,146 @@
package com.yihu.jw.business.sms.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.*;
/**
 * BaseSms entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_sms")
public class BaseSms extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId;	//saasid 关联base_saas code
	private String mobile;	//电话号码
	private String ip;	//发送短信的ip地址
	private Integer type;	//发送短信的类别
	private String captcha;	//验证码 1微信端注册，2微信端找回密码，3医生端找回密码，4患者登录，5医生登录
	private String content;	// 短信内容
	private Date deadline;	//过期时间
	private Integer status;	//短信状态 状态，0未发送，1已发送
	private Date czrq; //操作时间
	// Constructors
	/** default constructor */
	public BaseSms() {
	}
	/** minimal constructor */
	public BaseSms(String mobile, String ip, Integer type, String captcha,
			String content, Timestamp deadline, Integer status, Timestamp czrq) {
		this.mobile = mobile;
		this.ip = ip;
		this.type = type;
		this.captcha = captcha;
		this.content = content;
		this.deadline = deadline;
		this.status = status;
		this.czrq = czrq;
	}
	/** full constructor */
	public BaseSms(String saasId, String mobile, String ip, Integer type,
			String captcha, String content, Timestamp deadline, Integer status,
			Timestamp czrq) {
		this.saasId = saasId;
		this.mobile = mobile;
		this.ip = ip;
		this.type = type;
		this.captcha = captcha;
		this.content = content;
		this.deadline = deadline;
		this.status = status;
		this.czrq = czrq;
	}
	@Column(name = "saas_id", length = 64)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "mobile", nullable = false, length = 20)
	public String getMobile() {
		return this.mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	@Column(name = "ip", nullable = false, length = 20)
	public String getIp() {
		return this.ip;
	}
	public void setIp(String ip) {
		this.ip = ip;
	}
	@Column(name = "type", nullable = false)
	public Integer getType() {
		return this.type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "captcha", nullable = false, length = 10)
	public String getCaptcha() {
		return this.captcha;
	}
	public void setCaptcha(String captcha) {
		this.captcha = captcha;
	}
	@Column(name = "content", nullable = false, length = 500)
	public String getContent() {
		return this.content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "deadline", nullable = false, length = 0)
	public Date getDeadline() {
		return this.deadline;
	}
	public void setDeadline(Date deadline) {
		this.deadline = deadline;
	}
	@Column(name = "status", nullable = false)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "czrq", nullable = false, length = 0)
	public Date getCzrq() {
		return this.czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

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

@@ -0,0 +1,133 @@
package com.yihu.jw.business.sms.model;// default package
import com.yihu.jw.business.base.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * BaseSmsGateway entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_sms_gateway")
public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	// Fields
	private String code; //业务code
	private String name;//名称
	private String saasId; //关联 base_saas code
	private String orgCode; //机构code
	private String ip; // 短信接口的ip地址
	private String username;  //短信接口的账号
	private String password;	//短信接口的密码
	private String url;	//短信接口的url
	private Integer status;// -1 删除 0 禁用 可用
	// Constructors
	/** default constructor */
	public BaseSmsGateway() {
	}
	/** minimal constructor */
	public BaseSmsGateway(Long id) {
		this.id = id;
	}
	/** full constructor */
	public BaseSmsGateway(Long id, String code, String saasId,
			String orgCode, String ip, String username, String password,
			String url) {
		this.id = id;
		this.code = code;
		this.saasId = saasId;
		this.orgCode = orgCode;
		this.ip = ip;
		this.username = username;
		this.password = password;
		this.url = url;
	}
	@Column(name = "code", length = 64)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "saas_id", length = 64)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "org_code", length = 64)
	public String getOrgCode() {
		return this.orgCode;
	}
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	@Column(name = "ip", length = 20)
	public String getIp() {
		return this.ip;
	}
	public void setIp(String ip) {
		this.ip = ip;
	}
	@Column(name = "username", length = 20)
	public String getUsername() {
		return this.username;
	}
	public void setUsername(String username) {
		this.username = username;
	}
	@Column(name = "password", length = 50)
	public String getPassword() {
		return this.password;
	}
	public void setPassword(String password) {
		this.password = password;
	}
	@Column(name = "url", length = 200)
	public String getUrl() {
		return this.url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

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

@@ -0,0 +1,125 @@
/*******************************************************************************
 * 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

@@ -0,0 +1,71 @@
package com.yihu.jw.business.sms.service;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
/**
 * Created by chenweida on 2017/5/22.
 */
@Service
public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGatewayDao> {
    @Autowired
    private SmsGatewayDao smsGatewayDao;
    @Transactional
    public BaseSmsGateway createSmsGateway(BaseSmsGateway smsGateway) throws ApiException {
        if (StringUtils.isEmpty(smsGateway.getCode())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(smsGateway.getName())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        BaseSmsGateway smsGatewayTmp = smsGatewayDao.findByName(smsGateway.getName());
        if (smsGatewayTmp != null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return smsGatewayDao.save(smsGateway);
    }
    @Transactional
    public BaseSmsGateway updateSmsGateway(BaseSmsGateway smsGateway) {
        if (StringUtils.isEmpty(smsGateway.getCode())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(smsGateway.getName())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(smsGateway.getId())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        BaseSmsGateway smsGatewayTmp = smsGatewayDao.findByNameExcludeCode(smsGateway.getName(), smsGateway.getCode());
        if (smsGatewayTmp != null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return smsGatewayDao.save(smsGateway);
    }
    public BaseSmsGateway findByCode(String code) {
        BaseSmsGateway smsGateway = smsGatewayDao.findByCode(code);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return smsGateway;
    }
    @Transactional
    public void deleteSmsGateway(String code) {
        BaseSmsGateway smsGateway = smsGatewayDao.findByCode(code);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        smsGateway.setStatus(-1);
    }
}

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

@@ -0,0 +1,29 @@
package com.yihu.jw.business.sms.service;
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.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by chenweida on 2017/5/22.
 */
@Service
public class SmsService  extends BaseJpaService<BaseSms, SmsDao> {
    @Autowired
    private SmsDao smsDao;
    @Transactional
    public BaseSms createSms(BaseSms sms) throws ApiException {
        return smsDao.save(sms);
    }
    @Transactional
    public BaseSms updateSms(BaseSms sms) {
        return smsDao.save(sms);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/user/contorller/EmployeeController.java

@@ -1,4 +1,4 @@
package com.yihu.jw.user.contorller;
package com.yihu.jw.business.user.contorller;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;

svr/svr-base/src/main/java/com/yihu/jw/user/contorller/PatientController.java

@@ -1,4 +1,4 @@
package com.yihu.jw.user.contorller;
package com.yihu.jw.business.user.contorller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.user.service;
package com.yihu.jw.business.user.service;
import org.springframework.stereotype.Service;

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

@@ -1,14 +1,14 @@
package com.yihu.jw.version.controller;
package com.yihu.jw.business.version.controller;
import com.yihu.jw.base.service.base.FunctionService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
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.restmodel.exception.ApiException;
import com.yihu.jw.version.model.BaseServerUrlVersion;
import com.yihu.jw.version.service.ServerUrlVersionService;
import com.yihu.jw.version.service.ServerVersionService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -26,7 +26,7 @@ import java.util.Map;
 * Created by chenweida on 2017/6/20.
 */
@RestController
@RequestMapping(BaseVersionContants.api_common)
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "后台URL模块", description = "后台URL模块接口管理")
public class ServerUrlVersionController extends EnvelopRestController {
    @Autowired
@@ -36,59 +36,59 @@ public class ServerUrlVersionController extends EnvelopRestController {
    @Autowired
    private ServerVersionService serverVersionService;
    @PostMapping(value = BaseVersionContants.BaseServerUrlVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerUrlVersion.message_success_create, serverUrlVersionService.createBaseServerUrlVersion(BaseServerUrlVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_create, serverUrlVersionService.createBaseServerUrlVersion(BaseServerUrlVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionContants.BaseServerUrlVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerUrlVersion.message_success_update, serverUrlVersionService.updateBaseServerUrlVersion(BaseServerUrlVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_update, serverUrlVersionService.updateBaseServerUrlVersion(BaseServerUrlVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.BaseServerUrlVersion.api_delete)
    @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(BaseVersionContants.BaseServerUrlVersion.message_success_delete );
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.BaseServerUrlVersion.api_getByCode)
    @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(BaseVersionContants.BaseServerUrlVersion.message_success_find, serverUrlVersionService.findByCode(code));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find, serverUrlVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.BaseServerUrlVersion.api_getList, method = RequestMethod.GET)
    @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")
@@ -121,10 +121,10 @@ public class ServerUrlVersionController extends EnvelopRestController {
        //封装返回格式
        List<MBaseServerUrlVersion> mBaseServerUrlVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerUrlVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions, page, size,count);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.BaseServerUrlVersion.api_getListNoPage)
    @GetMapping(value = BaseVersionRequestMapping.BaseServerUrlVersion.api_getListNoPage)
    @ApiOperation(value = "获取后台URL版本列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -137,6 +137,6 @@ public class ServerUrlVersionController extends EnvelopRestController {
        List<BaseServerUrlVersion> list = serverUrlVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MBaseServerUrlVersion> mBaseServerUrlVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerUrlVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerUrlVersion.message_success_find_BaseServerUrlVersions,mBaseServerUrlVersions);
    }
}

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

@@ -1,15 +1,15 @@
package com.yihu.jw.version.controller;
package com.yihu.jw.business.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
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.restmodel.exception.ApiException;
import com.yihu.jw.version.model.BaseServerUrlVersion;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.version.model.BaseUserUrlVersion;
import com.yihu.jw.version.service.ServerUrlVersionService;
import com.yihu.jw.version.service.ServerVersionService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -26,7 +26,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseVersionContants.api_common)
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "服务器版本模块", description = "服务器版本模块接口管理")
public class ServerVersionController extends EnvelopRestController {
    @Autowired
@@ -34,33 +34,33 @@ public class ServerVersionController extends EnvelopRestController {
    @Autowired
    private ServerUrlVersionService serverUrlVersionService;
    @PostMapping(value = BaseVersionContants.BaseServerVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerVersion.message_success_create, serverVersionService.createBaseServerVersion(serverVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_create, serverVersionService.createBaseServerVersion(serverVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionContants.BaseServerVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerVersion.message_success_update, serverVersionService.updateBaseServerVersion(serverVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_update, serverVersionService.updateBaseServerVersion(serverVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.BaseServerVersion.api_delete)
    @DeleteMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_delete)
      @ApiOperation(value = "删除服务器版本", notes = "删除服务器版本")
      public Envelop deleteWlyyVersion(
            @ApiParam(name = "codes", value = "codes")
@@ -71,27 +71,27 @@ public class ServerVersionController extends EnvelopRestController {
            @RequestParam(value = "userName", required = true) String userName) {
        try {
            serverVersionService.deleteBaseServerVersion(codes,userCode,userName);
            return Envelop.getSuccess(BaseVersionContants.BaseServerVersion.message_success_delete );
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersion.api_getByCode)
    @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(BaseVersionContants.BaseServerVersion.message_success_find, serverVersionService.findByCode(code));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersion.message_success_find, serverVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.BaseServerVersion.api_getList, method = RequestMethod.GET)
    @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")
@@ -127,11 +127,11 @@ public class ServerVersionController extends EnvelopRestController {
        //封装返回格式
        List<MBaseServerVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.BaseServerVersion.message_success_find_BaseServerVersions,mWlyyVersions, page, size,count);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.BaseServerVersion.message_success_find_BaseServerVersions,mWlyyVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersion.api_getListNoPage)
    @GetMapping(value = BaseVersionRequestMapping.BaseServerVersion.api_getListNoPage)
    @ApiOperation(value = "获取服务器版本列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -144,6 +144,6 @@ public class ServerVersionController extends EnvelopRestController {
        List<BaseUserUrlVersion> list = serverVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<BaseUserUrlVersion> userVersion = convertToModels(list, new ArrayList<>(list.size()), BaseUserUrlVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.BaseServerVersion.message_success_find,userVersion);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerVersion.message_success_find,userVersion);
    }
}

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

@@ -1,11 +1,11 @@
package com.yihu.jw.version.controller;
package com.yihu.jw.business.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
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.version.model.BaseServerVersionLog;
import com.yihu.jw.version.service.ServerVersionLogService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -21,53 +21,53 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseVersionContants.BaseServerVersionLog.api_common)
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "服务器版本日志模块", description = "服务器版本日志模块接口管理")
public class ServerVersionLogController extends EnvelopRestController {
    @Autowired
    private ServerVersionLogService serverVersionLogService;
    /*@PostMapping(value = BaseVersionContants.BaseServerVersionLog.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    /*@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(BaseVersionContants.BaseServerVersionLog.message_success_create, serverVersionLogService.createBaseServerVersionLog(baseServerVersionLog));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersionLog.message_success_create, serverVersionLogService.createBaseServerVersionLog(baseServerVersionLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.BaseServerVersionLog.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerVersionLog.message_success_delete );
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersionLog.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersionLog.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.BaseServerVersionLog.message_success_find, serverVersionLogService.findByCode(code));
            return Envelop.getSuccess(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find, serverVersionLogService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }*/
    @RequestMapping(value = BaseVersionContants.BaseServerVersionLog.api_getBaseServerVersionLog, method = RequestMethod.GET)
    @RequestMapping(value = BaseVersionRequestMapping.BaseServerVersionLog.api_getList, method = RequestMethod.GET)
    @ApiOperation(value = "获取服务器版本日志列表(分页)")
    public Envelop getBaseServerVersionLogs(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -92,11 +92,11 @@ public class ServerVersionLogController extends EnvelopRestController {
        //封装返回格式
        List<MBaseServerVersionLog> mBaseServerVersionLogs = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersionLog.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs, page, size,count);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.BaseServerVersionLog.api_getBaseServerVersionLogNoPage)
    @GetMapping(value = BaseVersionRequestMapping.BaseServerVersionLog.api_getListNoPage)
    @ApiOperation(value = "获取服务器版本日志列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -109,7 +109,7 @@ public class ServerVersionLogController extends EnvelopRestController {
        List<BaseServerVersionLog> list = serverVersionLogService.search(fields,filters,sorts);
        //封装返回格式
        List<MBaseServerVersionLog> mBaseServerVersionLogs = convertToModels(list, new ArrayList<>(list.size()), MBaseServerVersionLog.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs);
        return Envelop.getSuccessList(BaseVersionRequestMapping.BaseServerVersionLog.message_success_find_BaseServerVersionLog,mBaseServerVersionLogs);
    }

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

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

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

@@ -1,12 +1,12 @@
package com.yihu.jw.version.controller;
package com.yihu.jw.business.version.controller;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
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.restmodel.exception.ApiException;
import com.yihu.jw.version.model.WlyyVersion;
import com.yihu.jw.version.service.WlyyVersionService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,38 +24,38 @@ import java.util.List;
 */
@RestController
@RequestMapping(BaseVersionContants.api_common)
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(value = "i健康APP版本模块", description = "i健康APP版本模块接口管理")
public class WlyyVersionController  extends EnvelopRestController {
    @Autowired
    private WlyyVersionService wlyyVersionService;
    @PostMapping(value = BaseVersionContants.WlyyVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.WlyyVersion.message_success_create, wlyyVersionService.createWlyyVersion(WlyyVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_create, wlyyVersionService.createWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseVersionContants.WlyyVersion.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @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(BaseVersionContants.WlyyVersion.message_success_update, wlyyVersionService.updateWlyyVersion(WlyyVersion));
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_update, wlyyVersionService.updateWlyyVersion(WlyyVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionContants.WlyyVersion.api_delete)
    @DeleteMapping(value = BaseVersionRequestMapping.WlyyVersion.api_delete)
    @ApiOperation(value = "删除i健康APP版本", notes = "删除i健康APP版本")
    public Envelop deleteWlyyVersion(
            @ApiParam(name = "codes", value = "codes")
@@ -66,27 +66,27 @@ public class WlyyVersionController  extends EnvelopRestController {
            @RequestParam(value = "userName", required = true) String userName) {
        try {
            wlyyVersionService.deleteWlyyVersion(codes,userCode,userName);
            return Envelop.getSuccess(BaseVersionContants.WlyyVersion.message_success_delete );
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseVersionContants.WlyyVersion.api_getByCode)
    @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(BaseVersionContants.WlyyVersion.message_success_find, wlyyVersionService.findByCode(code));
            return Envelop.getSuccess(BaseVersionRequestMapping.WlyyVersion.message_success_find, wlyyVersionService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = BaseVersionContants.WlyyVersion.api_getList, method = RequestMethod.GET)
    @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")
@@ -111,11 +111,11 @@ public class WlyyVersionController  extends EnvelopRestController {
        //封装返回格式
        List<MWlyyVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MWlyyVersion.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionContants.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions, page, size,count);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions, page, size,count);
    }
    @GetMapping(value = BaseVersionContants.WlyyVersion.api_getListNoPage)
    @GetMapping(value = BaseVersionRequestMapping.WlyyVersion.api_getListNoPage)
    @ApiOperation(value = "获取i健康APP版本列表，不分页")
    public Envelop getAppsNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "code,name,saasId,parentCode,remark")
@@ -128,7 +128,7 @@ public class WlyyVersionController  extends EnvelopRestController {
        List<WlyyVersion> list = wlyyVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<MWlyyVersion> mWlyyVersions = convertToModels(list, new ArrayList<>(list.size()), MWlyyVersion.class, fields);
        return Envelop.getSuccessList(BaseVersionContants.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions);
        return Envelop.getSuccessList(BaseVersionRequestMapping.WlyyVersion.message_success_find_WlyyVersions,mWlyyVersions);
    }
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,14 +1,14 @@
package com.yihu.jw.version.service;
package com.yihu.jw.business.version.service;
import com.yihu.jw.base.model.base.Function;
import com.yihu.jw.base.service.base.FunctionService;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerUrlVersionDao;
import com.yihu.jw.version.model.BaseServerUrlVersion;
import com.yihu.jw.version.model.BaseServerVersion;
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;
@@ -34,14 +34,14 @@ public class ServerUrlVersionService extends BaseJpaService<BaseServerUrlVersion
    @Transactional
    public BaseServerUrlVersion createBaseServerUrlVersion(BaseServerUrlVersion baseServerVersion) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.BaseServerUrlVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return serverUrlVersionDao.save(baseServerVersion);
    }
@@ -49,17 +49,17 @@ public class ServerUrlVersionService extends BaseJpaService<BaseServerUrlVersion
    @Transactional
    public BaseServerUrlVersion updateBaseServerUrlVersion(BaseServerUrlVersion baseServerVersion) {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getId())) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_id_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.BaseServerUrlVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return serverUrlVersionDao.save(baseServerVersion);
    }
@@ -67,7 +67,7 @@ public class ServerUrlVersionService extends BaseJpaService<BaseServerUrlVersion
    public BaseServerUrlVersion findByCode(String code) {
        BaseServerUrlVersion baseServerVersion = serverUrlVersionDao.findByCode(code);
        if (baseServerVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerUrlVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerUrlVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        String serverCode = baseServerVersion.getServerCode();
        BaseServerVersion serverVersion = serverVersionService.findByCode(serverCode);

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

@@ -1,8 +1,8 @@
package com.yihu.jw.version.service;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.version.dao.ServerVersionLogDao;
import com.yihu.jw.version.model.BaseServerVersionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;

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

@@ -1,12 +1,12 @@
package com.yihu.jw.version.service;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MBaseServerVersion;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerVersionDao;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -32,14 +32,14 @@ public class ServerVersionService extends BaseJpaService<BaseServerVersion, Serv
    @Transactional
    public BaseServerVersion createBaseServerVersion(BaseServerVersion baseServerVersion) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(baseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.BaseServerVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersionDao.save(baseServerVersion);
    }
@@ -47,17 +47,17 @@ public class ServerVersionService extends BaseJpaService<BaseServerVersion, Serv
    @Transactional
    public BaseServerVersion updateBaseServerVersion(BaseServerVersion BaseServerVersion) {
        if (StringUtils.isEmpty(BaseServerVersion.getCode())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(BaseServerVersion.getId())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_id_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.BaseServerVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersionDao.save(BaseServerVersion);
    }
@@ -65,7 +65,7 @@ public class ServerVersionService extends BaseJpaService<BaseServerVersion, Serv
    public BaseServerVersion findByCode(String code) {
        BaseServerVersion baseServerVersion = baseServerVersionDao.findByCode(code);
        if (baseServerVersion == null) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.BaseServerVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return baseServerVersion;
    }
@@ -73,7 +73,7 @@ public class ServerVersionService extends BaseJpaService<BaseServerVersion, Serv
    @Transactional
    public void deleteBaseServerVersion(String codes,String userCode,String userName) {
        if(StringUtils.isEmpty(codes)){
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            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);

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

@@ -1,11 +1,11 @@
package com.yihu.jw.version.service;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.version.dao.ServerVersionLogDao;
import com.yihu.jw.version.dao.UserUrlVersionDao;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.version.model.BaseServerVersionLog;
import com.yihu.jw.version.model.BaseUserUrlVersion;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -33,9 +33,10 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
    /**
     * 更改后台用户版本
     * @param serverCode (bsvCode)
     * @param userCodes (通过,分隔的userCode)
     * @param userCode //创建/修改人
     *
     * @param serverCode       (bsvCode)
     * @param userCodes        (通过,分隔的userCode)
     * @param userCode         //创建/修改人
     * @param userName//创建/修改人
     * @param saasId
     * @return
@@ -59,7 +60,7 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
        _newUserCodes.removeAll(oldUserCodes);// 去除相同元素---->>需要添加 的权限
        //先删除 在添加...
        for(String delCode:_oldUserCodes){
        for (String delCode : _oldUserCodes) {
            BaseUserUrlVersion userUrlVersion = findByUserCodeAndSaasId(delCode, saasId);
            userUrlVersion.setUpdateUser(userCode);
            userUrlVersion.setUpdateUserName(userName);
@@ -70,7 +71,7 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
        String deleteUserCodes = StringUtils.join(_oldUserCodes.toArray(), ",");
        //不为空,记录日志
        if(StringUtils.isNotBlank(deleteUserCodes)){
        if (StringUtils.isNotBlank(deleteUserCodes)) {
            BaseServerVersionLog serverVersionLog = new BaseServerVersionLog();
            serverVersionLog.setSaasId(saasId);
            serverVersionLog.setUserCodes(deleteUserCodes);
@@ -83,17 +84,17 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
            serverVersionLog.setCreateUserName(userName);
            serverVersionLog.setUpdateUser(userCode);
            serverVersionLog.setUpdateUserName(userName);
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-",""));
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            serverVersionLogDao.save(serverVersionLog);
        }
        for(String usercode:_newUserCodes){
        for (String usercode : _newUserCodes) {
            //同一个saasId下,usercode只能关联一个bsvCode(serverCode)
            BaseUserUrlVersion baseUserUrlVersion = findByUserCodeAndSaasId(usercode, saasId);
            if(baseUserUrlVersion!=null){
            if (baseUserUrlVersion != null) {
                //存在
                if(baseUserUrlVersion.getBsvCode().equals(serverCode)){
                if (baseUserUrlVersion.getBsvCode().equals(serverCode)) {
                    continue;
                }
                baseUserUrlVersion.setStatus(-1);
@@ -102,7 +103,7 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
                userUrlVersionDao.save(baseUserUrlVersion);
            }
            BaseUserUrlVersion userUrlVersion = new BaseUserUrlVersion();
            userUrlVersion.setCode(UUID.randomUUID().toString().replaceAll("-",""));
            userUrlVersion.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            userUrlVersion.setSaasId(saasId);
            userUrlVersion.setBsvCode(serverCode);
            userUrlVersion.setUserCode(usercode);
@@ -116,7 +117,7 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
        String updateUserCodes = StringUtils.join(_newUserCodes.toArray(), ",");
        //不为空,记录日志
        if(StringUtils.isNotBlank(updateUserCodes)){
        if (StringUtils.isNotBlank(updateUserCodes)) {
            BaseServerVersionLog serverVersionLog = new BaseServerVersionLog();
            serverVersionLog.setSaasId(saasId);
            serverVersionLog.setUserCodes(updateUserCodes);
@@ -129,7 +130,7 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
            serverVersionLog.setCreateUserName(userName);
            serverVersionLog.setUpdateUser(userCode);
            serverVersionLog.setUpdateUserName(userName);
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-",""));
            serverVersionLog.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
            serverVersionLogDao.save(serverVersionLog);
        }
    }
@@ -137,27 +138,29 @@ public class UserUrlVersionService extends BaseJpaService<BaseUserUrlVersion, Us
    /**
     * 通过bsvCode,saasId查找已存在的userCode
     *
     * @param bsvCode
     * @param saasId
     * @return
     */
    public  List<String> findByBsvCode(String bsvCode,String saasId){
    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);
        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){
    public BaseUserUrlVersion findByUserCodeAndSaasId(String userCode, String saasId) {
        return userUrlVersionDao.findByBsvCodeAndSaasId(userCode, saasId);
    }

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

@@ -1,11 +1,11 @@
package com.yihu.jw.version.service;
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.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.WlyyVersionDao;
import com.yihu.jw.version.model.WlyyVersion;
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;
@@ -27,11 +27,11 @@ public class WlyyVersionService extends BaseJpaService<WlyyVersion, WlyyVersionD
            wlyyVersion.setCode(UUID.randomUUID().toString().replaceAll("-",""));
        }
        if (StringUtils.isEmpty(wlyyVersion.getName())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.WlyyVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return wlyyVersionDao.save(wlyyVersion);
    }
@@ -39,17 +39,17 @@ public class WlyyVersionService extends BaseJpaService<WlyyVersion, WlyyVersionD
    @Transactional
    public WlyyVersion updateWlyyVersion(WlyyVersion wlyyVersion) {
        if (StringUtils.isEmpty(wlyyVersion.getCode())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_code_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_code_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(wlyyVersion.getName())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(wlyyVersion.getId())) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_id_is_null, CommonContants.common_error_params_code);
            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(BaseVersionContants.WlyyVersion.message_fail_name_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return wlyyVersionDao.save(wlyyVersion);
    }
@@ -57,7 +57,7 @@ public class WlyyVersionService extends BaseJpaService<WlyyVersion, WlyyVersionD
    public WlyyVersion findByCode(String code) {
        WlyyVersion WlyyVersion = wlyyVersionDao.findByCode(code);
        if (WlyyVersion == null) {
            throw new ApiException(BaseVersionContants.WlyyVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
            throw new ApiException(BaseVersionRequestMapping.WlyyVersion.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
        return WlyyVersion;
    }

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wx;
package com.yihu.jw.business.wx;
/**
 * Created by Administrator on 2017/5/27 0027.

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

@@ -1,12 +1,12 @@
package com.yihu.jw.wx.controller;
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wx.MWxWechat;
import com.yihu.jw.restmodel.wx.WechatContants;
import com.yihu.jw.wx.model.WxWechat;
import com.yihu.jw.wx.service.WechatService;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,40 +24,40 @@ import java.util.List;
 * Created by chenweida on 2017/5/11.
 */
@RestController
@RequestMapping(WechatContants.api_common)
@RequestMapping(WechatRequestMapping.api_common)
@Api(value = "微信相关操作", description = "微信相关操作")
public class WechatConfigController extends EnvelopRestController {
    @Autowired
    private WechatService wechatService;
    @PostMapping(value = WechatContants.WxConfig.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxConfig.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建微信配置", notes = "创建微信配置")
    public Envelop createWechat(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxWechat wechat = toEntity(jsonData, WxWechat.class);
            return Envelop.getSuccess(WechatContants.WxConfig.message_success_create, wechatService.createWechat(wechat));
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_create, wechatService.createWechat(wechat));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = WechatContants.WxConfig.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = WechatRequestMapping.WxConfig.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改微信配置", notes = "修改微信配置")
    public Envelop updateWechat(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxWechat wechat = toEntity(jsonData, WxWechat.class);
            return Envelop.getSuccess(WechatContants.WxConfig.message_success_update, wechatService.updateWxchat(wechat));
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_update, wechatService.updateWxchat(wechat));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = WechatContants.WxConfig.api_delete)
    @DeleteMapping(value = WechatRequestMapping.WxConfig.api_delete)
    @ApiOperation(value = "删除微信配置", notes = "删除微信配置")
    public Envelop deleteWechat(
            @ApiParam(name = "codes", value = "codes")
@@ -69,26 +69,26 @@ public class WechatConfigController extends EnvelopRestController {
            ) {
        try {
            wechatService.deleteWechat(codes,userCode,userName);
            return Envelop.getSuccess(WechatContants.WxConfig.message_success_delete );
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = WechatContants.WxConfig.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxConfig.api_getByCode)
    @ApiOperation(value = "根据code查找微信配置", notes = "根据code查找微信配置")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(WechatContants.WxConfig.message_success_find, wechatService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_find, wechatService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = WechatContants.WxConfig.api_getWechats, method = RequestMethod.GET)
    @RequestMapping(value = WechatRequestMapping.WxConfig.api_getWechats, method = RequestMethod.GET)
    @ApiOperation(value = "获取微信配置列表(分页)")
    public Envelop getWechats(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
@@ -115,11 +115,11 @@ public class WechatConfigController extends EnvelopRestController {
        //封装返回格式
        List<MWxWechat> mWxWechats = convertToModels(list, new ArrayList<>(list.size()), MWxWechat.class, fields);
        return Envelop.getSuccessListWithPage(WechatContants.WxConfig.message_success_find_functions,mWxWechats, page, size,count);
        return Envelop.getSuccessListWithPage(WechatRequestMapping.WxConfig.message_success_find_functions,mWxWechats, page, size,count);
    }
    @GetMapping(value = WechatContants.WxConfig.api_getWechatNoPage)
    @GetMapping(value = WechatRequestMapping.WxConfig.api_getWechatNoPage)
    @ApiOperation(value = "获取微信列表配置，不分页")
    public Envelop getWechatNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,name,saasId,appId,appSecret,baseUrl,remark")
@@ -132,7 +132,7 @@ public class WechatConfigController extends EnvelopRestController {
        List<WxWechat> list = wechatService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxWechat> mWxWechats = convertToModels(list, new ArrayList<>(list.size()), MWxWechat.class, fields);
        return Envelop.getSuccessList(WechatContants.WxConfig.message_success_find_functions,mWxWechats);
        return Envelop.getSuccessList(WechatRequestMapping.WxConfig.message_success_find_functions,mWxWechats);
    }
}

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

@@ -1,11 +1,11 @@
package com.yihu.jw.wx.controller;
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.business.wx.service.WxAccessTokenService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wx.WechatContants;
import com.yihu.jw.wx.model.WxAccessToken;
import com.yihu.jw.wx.service.WxAccessTokenService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * Created by cyx on 2017/5/11.
 */
@RestController
@RequestMapping(WechatContants.WxAccessToken.api_common)
@RequestMapping(WechatRequestMapping.api_common)
@Api(value = "微信token模块", description = "微信token模块接口管理")
public class WxAccessTokenController extends EnvelopRestController {
@@ -32,14 +32,14 @@ public class WxAccessTokenController extends EnvelopRestController {
     * @return MWxAccessToken
     * @throws Exception
     */
    @GetMapping(value = WechatContants.WxAccessToken.api_get)
    @GetMapping(value = WechatRequestMapping.WxAccessToken.api_get)
    @ApiOperation(value = "根据wechatCode获取最新的WxAccessToken")
    public Envelop getWxAccessToken(
            @ApiParam(name = "wechatCode", value = "wechatCode")
            @RequestParam(value = "wechatCode") String wechatCode) {
        try {
            WxAccessToken wxAccessToken = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
            return Envelop.getSuccess(WechatContants.WxAccessToken.message_success_get, wxAccessToken);
            return Envelop.getSuccess(WechatRequestMapping.WxAccessToken.message_success_get, wxAccessToken);
        }catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -1,12 +1,12 @@
package com.yihu.jw.wx.controller;
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.model.WxGraphicMessage;
import com.yihu.jw.business.wx.service.WxGraphicMessageService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wx.MWxGraphicMessage;
import com.yihu.jw.restmodel.wx.WechatContants;
import com.yihu.jw.wx.model.WxGraphicMessage;
import com.yihu.jw.wx.service.WxGraphicMessageService;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,41 +24,41 @@ import java.util.List;
 *   2017/5/11.
 */
@RestController
@RequestMapping(WechatContants.api_common)
@RequestMapping(WechatRequestMapping.api_common)
@Api(value = "微信图文相关操作", description = "微信图文相关操作")
public class WxGraphicMessageController extends EnvelopRestController {
    @Autowired
    private WxGraphicMessageService wxGraphicMessageService;
    @PostMapping(value = WechatContants.WxGraphicMessage.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxGraphicMessage.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建微信图文消息", notes = "创建微信图文消息")
    public Envelop createWxGraphicMessage(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxGraphicMessage WxGraphicMessage = toEntity(jsonData, WxGraphicMessage.class);
            return Envelop.getSuccess(WechatContants.WxGraphicMessage.message_success_create, wxGraphicMessageService.createWxGraphicMessage(WxGraphicMessage));
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_create, wxGraphicMessageService.createWxGraphicMessage(WxGraphicMessage));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = WechatContants.WxGraphicMessage.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = WechatRequestMapping.WxGraphicMessage.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改微信图文消息", notes = "修改微信图文消息")
    public Envelop updateWxGraphicMessage(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxGraphicMessage WxGraphicMessage = toEntity(jsonData, WxGraphicMessage.class);
            return Envelop.getSuccess(WechatContants.WxGraphicMessage.message_success_update, wxGraphicMessageService.updateWxGraphicMessage(WxGraphicMessage));
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_update, wxGraphicMessageService.updateWxGraphicMessage(WxGraphicMessage));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = WechatContants.WxGraphicMessage.api_delete)
    @DeleteMapping(value = WechatRequestMapping.WxGraphicMessage.api_delete)
    @ApiOperation(value = "删除微信图文消息", notes = "删除微信图文消息")
    public Envelop deleteWxGraphicMessage(
            @ApiParam(name = "codes", value = "codes")
@@ -70,26 +70,26 @@ public class WxGraphicMessageController extends EnvelopRestController {
    ) {
        try {
            wxGraphicMessageService.deleteWxGraphicMessage(codes, userCode, userName);
            return Envelop.getSuccess(WechatContants.WxGraphicMessage.message_success_delete );
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = WechatContants.WxGraphicMessage.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getByCode)
    @ApiOperation(value = "根据code查找微信图文消息", notes = "根据code查找微信图文消息")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(WechatContants.WxGraphicMessage.message_success_find, wxGraphicMessageService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_find, wxGraphicMessageService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = WechatContants.WxGraphicMessage.api_getWxGraphicMessages, method = RequestMethod.GET)
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_getWxGraphicMessages, method = RequestMethod.GET)
    @ApiOperation(value = "获取微信图文消息列表(分页)")
    public Envelop getWxGraphicMessages(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,title,description,url,pic_url,remark,status")
@@ -116,11 +116,11 @@ public class WxGraphicMessageController extends EnvelopRestController {
        //封装返回格式
        List<MWxGraphicMessage> mWxGraphicMessages = convertToModels(list, new ArrayList<>(list.size()), MWxGraphicMessage.class, fields);
        return Envelop.getSuccessListWithPage(WechatContants.WxGraphicMessage.message_success_find_functions,mWxGraphicMessages, page, size,count);
        return Envelop.getSuccessListWithPage(WechatRequestMapping.WxGraphicMessage.message_success_find_functions,mWxGraphicMessages, page, size,count);
    }
    @GetMapping(value = WechatContants.WxGraphicMessage.api_getWxGraphicMessageNoPage)
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getWxGraphicMessageNoPage)
    @ApiOperation(value = "获取图文消息列表，不分页")
    public Envelop getWxGraphicMessageNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,title,description,url,pic_url,remark,status")
@@ -133,7 +133,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
        List<WxGraphicMessage> list = wxGraphicMessageService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxGraphicMessage> mWxGraphicMessages = convertToModels(list, new ArrayList<>(list.size()), MWxGraphicMessage.class, fields);
        return Envelop.getSuccessList(WechatContants.WxGraphicMessage.message_success_find_functions,mWxGraphicMessages);
        return Envelop.getSuccessList(WechatRequestMapping.WxGraphicMessage.message_success_find_functions,mWxGraphicMessages);
    }
    //@GetMapping(value = WlyyContants.WxGraphicMessage.api_sendGraphicMessages)
@@ -145,7 +145,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
    //    return Envelop.getSuccess("成功",messages);
    //}
    @GetMapping(value = WechatContants.WxGraphicMessage.api_sendGraphicMessages)
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_sendGraphicMessages)
    @ApiOperation(value = "发送图文消息")
    @ResponseBody
    public String sendGraphicMessages(

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

@@ -1,16 +1,16 @@
package com.yihu.jw.wx.controller;
package com.yihu.jw.business.wx.controller;
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;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wx.MWxMenu;
import com.yihu.jw.restmodel.wx.MWxWechat;
import com.yihu.jw.restmodel.wx.WechatContants;
import com.yihu.jw.wx.WechatResponse;
import com.yihu.jw.wx.model.WxMenu;
import com.yihu.jw.wx.model.WxWechat;
import com.yihu.jw.wx.service.WechatService;
import com.yihu.jw.wx.service.WxMenuService;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -30,7 +30,7 @@ import java.util.Map;
 * Created by Administrator on 2017/5/19 0019.
 */
@RestController
@RequestMapping(WechatContants.api_common)
@RequestMapping(WechatRequestMapping.api_common)
@Api(value = "微信菜单相关操作", description = "微信菜单相关操作")
public class WxMenuController extends EnvelopRestController {
@@ -40,34 +40,34 @@ public class WxMenuController extends EnvelopRestController {
    @Autowired
    private WechatService wechatService;
    @PostMapping(value = WechatContants.WxMenu.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxMenu.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "添加微信菜单", notes = "添加微信菜单")
    public Envelop createWxMenu(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxMenu wxMenu = toEntity(jsonData, WxMenu.class);
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_create, wxMenuService.createWxMenu(wxMenu));
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_create, wxMenuService.createWxMenu(wxMenu));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = WechatContants.WxMenu.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = WechatRequestMapping.WxMenu.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改微信菜单", notes = "修改微信菜单")
    public Envelop updateWxMenu(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxMenu wxMenu = toEntity(jsonData, WxMenu.class);
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_update, wxMenuService.updateWxMenu(wxMenu));
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_update, wxMenuService.updateWxMenu(wxMenu));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = WechatContants.WxMenu.api_delete)
    @DeleteMapping(value = WechatRequestMapping.WxMenu.api_delete)
    @ApiOperation(value = "删除微信菜单", notes = "删除微信菜单")
    public Envelop deleteWxMenu(
            @ApiParam(name = "codes", value = "codes")
@@ -79,26 +79,26 @@ public class WxMenuController extends EnvelopRestController {
    ) {
        try {
            wxMenuService.deleteWxMenu(codes, userCode, userName);
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_delete );
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = WechatContants.WxMenu.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getByCode)
    @ApiOperation(value = "根据code查找微信菜单", notes = "根据code查找微信菜单")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_find, wxMenuService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_find, wxMenuService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = WechatContants.WxMenu.api_getWxMenus, method = RequestMethod.GET)
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getWxMenus, method = RequestMethod.GET)
    @ApiOperation(value = "获取微信菜单列表(分页)")
    public Envelop getWxMenus(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,name,saasId,appId,appSecret,baseUrl,remark")
@@ -133,11 +133,11 @@ public class WxMenuController extends EnvelopRestController {
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MWxWechat> mwechats = convertToModels(wechats, new ArrayList<>(wechats.size()), MWxWechat.class, fields);
        return Envelop.getSuccessListWithPage(WechatContants.WxMenu.message_success_find_functions,mwechats, page, size,count);
        return Envelop.getSuccessListWithPage(WechatRequestMapping.WxMenu.message_success_find_functions,mwechats, page, size,count);
    }
    @GetMapping(value = WechatContants.WxMenu.api_getWxMenuNoPage)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getWxMenuNoPage)
    @ApiOperation(value = "获取微信菜单列表，不分页")
    public Envelop getWxMenuNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,name,saasId,appId,appSecret,baseUrl,remark")
@@ -163,7 +163,7 @@ public class WxMenuController extends EnvelopRestController {
        for(MWxMenu menu:mWxMenus){
            menu.setWechatName(map.get(menu.getWechatCode()));
        }
        return Envelop.getSuccessList(WechatContants.WxMenu.message_success_find_functions,mWxMenus);
        return Envelop.getSuccessList(WechatRequestMapping.WxMenu.message_success_find_functions,mWxMenus);
    }
    /**
@@ -172,7 +172,7 @@ public class WxMenuController extends EnvelopRestController {
     * @return
     */
    @ApiOperation(value = "创建微信公众号菜单", notes = "创建微信公众号菜单")
    @RequestMapping(value = WechatContants.WxMenu.api_createMenu ,method = RequestMethod.GET)
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_createMenu ,method = RequestMethod.GET)
    public Envelop createWechatMenu(
            @ApiParam(name = "wechatCode", value = "", defaultValue = "")
            @RequestParam(value = "wechatCode", required = true)String wechatCode){
@@ -192,7 +192,7 @@ public class WxMenuController extends EnvelopRestController {
     * @param wechatCode
     * @return
     */
    @GetMapping(value = WechatContants.WxMenu.api_getParentMenu)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getParentMenu)
    @ApiOperation(value = "根据微信code查找父菜单", notes = "根据微信code查找父菜单")
    public Envelop getParentMenu(
            @ApiParam(name = "wechatCode", value = "wechatCode")
@@ -208,7 +208,7 @@ public class WxMenuController extends EnvelopRestController {
                    parentMenu.setState("open");
                }
            }
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_find, parentMenus);
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_find, parentMenus);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -220,14 +220,14 @@ public class WxMenuController extends EnvelopRestController {
     * @param parentCode
     * @return
     */
    @GetMapping(value = WechatContants.WxMenu.api_getChildMenus)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getChildMenus)
    @ApiOperation(value = "根据父级菜单code查找子菜单", notes = "根据父级菜单code查找子菜单")
    public Envelop getChildMenus(
            @ApiParam(name = "parentCode", value = "parentCode")
            @PathVariable(value = "parentCode", required = true) String parentCode
    ) {
        try {
            return Envelop.getSuccess(WechatContants.WxMenu.message_success_find, wxMenuService.findChildMenus(parentCode));
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_find, wxMenuService.findChildMenus(parentCode));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -1,17 +1,17 @@
package com.yihu.jw.wx.controller;
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.business.wx.service.WechatService;
import com.yihu.jw.business.wx.service.WxTemplateService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.restmodel.wx.MWxTemplate;
import com.yihu.jw.restmodel.wx.MWxWechat;
import com.yihu.jw.restmodel.wx.WechatContants;
import com.yihu.jw.wx.WechatResponse;
import com.yihu.jw.wx.model.Miniprogram;
import com.yihu.jw.wx.model.WxTemplate;
import com.yihu.jw.wx.model.WxWechat;
import com.yihu.jw.wx.service.WechatService;
import com.yihu.jw.wx.service.WxTemplateService;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -30,7 +30,7 @@ import java.util.List;
 * Created by Administrator on 2017/5/19 0019.
 */
@RestController
@RequestMapping(WechatContants.api_common)
@RequestMapping(WechatRequestMapping.api_common)
@Api(value = "微信模版相关操作", description = "微信模版相关操作")
public class WxTemplateController extends EnvelopRestController {
    @Autowired
@@ -39,33 +39,33 @@ public class WxTemplateController extends EnvelopRestController {
    @Autowired
    private WechatService wechatService;
    @PostMapping(value = WechatContants.WxTemplate.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建微信模版", notes = "创建微信模版")
    public Envelop createWxTemplate(
            @ApiParam(name = "json_data", value = "微信模版json字符串")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            return Envelop.getSuccess(WechatContants.WxTemplate.message_success_create, wxTemplateService.createWxTemplate(WxTemplate));
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_create, wxTemplateService.createWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = WechatContants.WxTemplate.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PutMapping(value = WechatRequestMapping.WxTemplate.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改微信模版", notes = "修改微信模版")
    public Envelop updateWxTemplate(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            return Envelop.getSuccess(WechatContants.WxTemplate.message_success_update, wxTemplateService.updateWxTemplate(WxTemplate));
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_update, wxTemplateService.updateWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = WechatContants.WxTemplate.api_delete)
    @DeleteMapping(value = WechatRequestMapping.WxTemplate.api_delete)
    @ApiOperation(value = "删除微信模版", notes = "删除微信模版")
    public Envelop deleteWxTemplate(
            @ApiParam(name = "codes", value = "codes")
@@ -77,26 +77,26 @@ public class WxTemplateController extends EnvelopRestController {
    ) {
        try {
            wxTemplateService.deleteWxTemplate(codes, userCode, userName);
            return Envelop.getSuccess(WechatContants.WxTemplate.message_success_delete );
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = WechatContants.WxTemplate.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getByCode)
    @ApiOperation(value = "根据code查找微信模版", notes = "根据code查找微信模版")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(WechatContants.WxTemplate.message_success_find, wxTemplateService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_find, wxTemplateService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = WechatContants.WxTemplate.api_getWxTemplates, method = RequestMethod.GET)
    @RequestMapping(value = WechatRequestMapping.WxTemplate.api_getWxTemplates, method = RequestMethod.GET)
    @ApiOperation(value = "获取微信模版列表(分页)")
    public Envelop getWechats(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,title,wechatCode,templateId,content,remark,status")
@@ -131,12 +131,12 @@ public class WxTemplateController extends EnvelopRestController {
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MWxWechat> mwechats = convertToModels(wechats, new ArrayList<>(wechats.size()), MWxWechat.class, fields);
        return Envelop.getSuccessListWithPage(WechatContants.WxMenu.message_success_find_functions,mwechats, page, size,count);
        return Envelop.getSuccessListWithPage(WechatRequestMapping.WxMenu.message_success_find_functions,mwechats, page, size,count);
    }
    @GetMapping(value = WechatContants.WxTemplate.api_getWxTemplatesNoPage)
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getWxTemplatesNoPage)
    @ApiOperation(value = "获取微信模版列表(不分页)")
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,title,wechatCode,templateId,content,remark,status")
@@ -149,10 +149,10 @@ public class WxTemplateController extends EnvelopRestController {
        List<WxTemplate> list = wxTemplateService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxTemplate> mMWxTemplates = convertToModels(list, new ArrayList<>(list.size()), MWxTemplate.class, fields);
        return Envelop.getSuccessList(WechatContants.WxTemplate.message_success_find_functions,mMWxTemplates);
        return Envelop.getSuccessList(WechatRequestMapping.WxTemplate.message_success_find_functions,mMWxTemplates);
    }
    @GetMapping(value = WechatContants.WxTemplate.api_sendTemplateMessage)
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_sendTemplateMessage)
    @ApiOperation(value = "发送微信模板消息")
    @ResponseBody
    public Envelop sendTemplateMessage(