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

common/common-fegin/pom.xml

@@ -31,11 +31,6 @@
            <groupId>com.yihu.base</groupId>
            <artifactId>common-swagger</artifactId>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>com.yihu.base</groupId>-->
        <!--<artifactId>common-security</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>

web-gateway/src/main/java/com/yihu/jw/commnon/Contants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon;
package com.yihu.jw.common;
/**
 * Created by chenweida on 2017/5/15.

web-gateway/src/main/java/com/yihu/jw/commnon/archives/ArchivesContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.archives;
package com.yihu.jw.common.archives;
/**
 * Created by Trick on 2018/2/12.

web-gateway/src/main/java/com/yihu/jw/commnon/base/base/BaseContants.java

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

web-gateway/src/main/java/com/yihu/jw/commnon/base/base/VersionContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.base.base;
package com.yihu.jw.common.base.base;
/**
 * Created by chenweida on 2017/11/13.

web-gateway/src/main/java/com/yihu/jw/commnon/base/user/BaseUserContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.base.user;
package com.yihu.jw.common.base.user;
/**
 * Created by LiTaohong on 2017/11/28.
 */

web-gateway/src/main/java/com/yihu/jw/commnon/base/wx/WechatContants.java

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

web-gateway/src/main/java/com/yihu/jw/commnon/iot/DataConstants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.iot;
package com.yihu.jw.common.iot;
public class DataConstants {
    public static final String api_iot_common = "/svr-iot";

web-gateway/src/main/java/com/yihu/jw/commnon/iot/IotCommonContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.iot;
package com.yihu.jw.common.iot;
/**
 * @author yeshijie on 2018/1/20.

web-gateway/src/main/java/com/yihu/jw/commnon/wlyy/AgreementContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.wlyy;
package com.yihu.jw.common.wlyy;
/**
 * Created by Administrator on 2017/6/2 0002.

web-gateway/src/main/java/com/yihu/jw/commnon/wlyy/PatientContants.java

@@ -1,4 +1,4 @@
package com.yihu.jw.commnon.wlyy;
package com.yihu.jw.common.wlyy;
/**
 * Created by Administrator on 2017/6/6 0006.

common/common-fegin/src/main/java/com/yihu/jw/fegin/archives/ArchivesFeign.java

@@ -6,8 +6,6 @@ import com.yihu.jw.restmodel.archives.PatientArchivesInfoVO;
import com.yihu.jw.restmodel.archives.PatientArchivesVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.archives.PatientArchivesMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.*;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.archives;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.archives.ArchivesContants;
import com.yihu.jw.common.archives.ArchivesContants;
import com.yihu.jw.fegin.archives.ArchivesFeign;
import com.yihu.jw.restmodel.archives.PatientArchivesInfoVO;
import com.yihu.jw.restmodel.archives.PatientArchivesVO;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.common.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.base.FunctionFeign;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.common.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.base.ModuleFeign;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.common.base.base.BaseContants;
import com.yihu.jw.fegin.base.base.SaasFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.common.base.base.BaseContants;
import com.yihu.jw.fegin.base.base.SaasFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.common.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.base.SystemDictListFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseMenuController.java

@@ -2,10 +2,9 @@ package com.yihu.jw.controller.base.user;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.common.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.user.BaseMenuFeign;
import com.yihu.jw.fegin.base.user.BaseMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseRoleController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.user;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.common.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.user.BaseRoleFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/EmployController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.user;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.common.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.user.EmployFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/version/UserVersionController.java

@@ -1,7 +1,6 @@
package com.yihu.jw.controller.base.version;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.fegin.base.version.UserVersionFeign;
import com.yihu.jw.common.base.base.BaseContants;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatAccessTokenController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.common.base.wx.WechatContants;
import com.yihu.jw.fegin.base.wx.AccessTokenFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.common.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.wx.WechatFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatGraphicMessageController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.common.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.wx.GraphicMessageFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatMenuController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.common.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.wx.WechatMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatTemplateControlle.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.common.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.base.wx.WechatTemplateFeign;
import com.yihu.jw.restmodel.common.Envelop;

web-gateway/src/main/java/com/yihu/jw/controller/iot/common/FileUploadController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.iot.common;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.common.IotFileUploadFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.common.UploadVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/common/IotSystemDictController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.iot.common;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.common.IotSystemDictFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/company/IotCompanyController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.iot.company;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.company.IotCompanyFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataInputController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.iot.data_input;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.common.iot.DataConstants;
import com.yihu.jw.fegin.iot.data_input.DataInputFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataSearchController.java

@@ -2,9 +2,8 @@ package com.yihu.jw.controller.iot.data_input;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.common.iot.DataConstants;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.fegin.iot.data_input.DataInputFeign;
import com.yihu.jw.fegin.iot.data_input.DataSearchFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataStandardConvertController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.iot.data_input;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.common.iot.DataConstants;
import com.yihu.jw.fegin.iot.data_input.DataStandardConvertFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.device.IotDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceOrderController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.device.IotDeviceOrderFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceQualityController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.device.IotDeviceQualityFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotPatientDeviceController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.device.IotPatientDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/iot/product/IotProductController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.iot.product;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.common.iot.IotCommonContants;
import com.yihu.jw.fegin.iot.product.IotProductFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementController.java

@@ -2,7 +2,7 @@ package com.yihu.jw.controller.wlyy.agreement;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.common.wlyy.AgreementContants;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementKpiController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.wlyy.agreement;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.common.wlyy.AgreementContants;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementKpiFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementKpiLogController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.wlyy.agreement;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.common.wlyy.AgreementContants;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementKpiLogFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyySignFamilyController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.wlyy.agreement;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.common.wlyy.AgreementContants;
import com.yihu.jw.fegin.wlyy.agreement.WlyySignFamilyFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/patient/AdvertisementControlelr.java

@@ -1,6 +1,6 @@
package com.yihu.jw.controller.wlyy.patient;
import com.yihu.jw.commnon.wlyy.PatientContants;
import com.yihu.jw.common.wlyy.PatientContants;
import com.yihu.jw.fegin.wlyy.patient.AdvertisementFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;