Procházet zdrojové kódy

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

chenweida před 7 roky
rodič
revize
abc7b67697
43 změnil soubory, kde provedl 41 přidání a 51 odebrání
  1. 0 5
      common/common-fegin/pom.xml
  2. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/Contants.java
  3. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/archives/ArchivesContants.java
  4. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/base/base/BaseContants.java
  5. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/base/base/VersionContants.java
  6. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/base/user/BaseUserContants.java
  7. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/base/wx/WechatContants.java
  8. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/iot/DataConstants.java
  9. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/iot/IotCommonContants.java
  10. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/wlyy/AgreementContants.java
  11. 1 1
      web-gateway/src/main/java/com/yihu/jw/commnon/wlyy/PatientContants.java
  12. 0 2
      common/common-fegin/src/main/java/com/yihu/jw/fegin/archives/ArchivesFeign.java
  13. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/archives/ArchivesController.java
  14. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/base/FunctionController.java
  15. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/base/ModuleController.java
  16. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/base/SaasController.java
  17. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/base/SystemDictController.java
  18. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/base/SystemDictListController.java
  19. 1 2
      web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseMenuController.java
  20. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseRoleController.java
  21. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/user/EmployController.java
  22. 1 2
      web-gateway/src/main/java/com/yihu/jw/controller/base/version/UserVersionController.java
  23. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatAccessTokenController.java
  24. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatConfigController.java
  25. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatGraphicMessageController.java
  26. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatMenuController.java
  27. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatTemplateControlle.java
  28. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/common/FileUploadController.java
  29. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/common/IotSystemDictController.java
  30. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/company/IotCompanyController.java
  31. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataInputController.java
  32. 1 2
      web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataSearchController.java
  33. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataStandardConvertController.java
  34. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceController.java
  35. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceOrderController.java
  36. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceQualityController.java
  37. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotPatientDeviceController.java
  38. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/iot/product/IotProductController.java
  39. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementController.java
  40. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementKpiController.java
  41. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementKpiLogController.java
  42. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyySignFamilyController.java
  43. 1 1
      web-gateway/src/main/java/com/yihu/jw/controller/wlyy/patient/AdvertisementControlelr.java

+ 0 - 5
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>

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.
 */

+ 1 - 1
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.

+ 1 - 1
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";

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 0 - 2
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.*;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 2
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 2
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 2
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;