Home Explore Help
Register Sign In
zd_123
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 0
Star 0
Fork 0
Files
Browse Source

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

trick9191 7 years ago
parent
f9fd515fb1 cb471f001a
commit
a2bc80790f
3 changed files with 125 additions and 125 deletions
Unified View Show Diff Stats
  1. 54 54
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/ModuleFeign.java
  2. 26 26
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SaasFeign.java
  3. 45 45
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SystemDictFeign.java

+ 54 - 54
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/ModuleFeign.java
View File 

@ -1,54 +1,54 @@
 
package com.yihu.jw.fegin.base.base;
 
import com.yihu.jw.exception.business.JiWeiException;
 
import com.yihu.jw.fegin.fallbackfactory.base.base.ModuleFeignFallbackFactory;
 
import com.yihu.jw.restmodel.CommonContants;
 
import com.yihu.jw.restmodel.common.Envelop;
 
import com.yihu.jw.rm.base.BaseRequestMapping;
 
import org.springframework.cloud.netflix.feign.FeignClient;
 
import org.springframework.http.MediaType;
 
import org.springframework.web.bind.annotation.*;
 
@FeignClient(
 
        name = CommonContants.svr_base // name值是eurika的实例名字
 
        ,fallbackFactory  = ModuleFeignFallbackFactory.class
 
)
 
@RequestMapping(value = BaseRequestMapping.api_base_common)
 
public interface ModuleFeign {
 
    @PostMapping(value = BaseRequestMapping.Module.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
    Envelop create(@RequestBody String jsonData) throws JiWeiException;
 
    @PutMapping(value =  BaseRequestMapping.Module.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
    Envelop update(@RequestBody String jsonData) throws JiWeiException;
 
    @DeleteMapping(value =BaseRequestMapping.Module.api_delete)
 
    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.Module.api_getById)
 
    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
 
    @RequestMapping(value = BaseRequestMapping.Module.api_getList, method = RequestMethod.GET)
 
    Envelop getList(
 
            @RequestParam(value = "fields", required = false) String fields,
 
            @RequestParam(value = "filters", required = false) String filters,
 
            @RequestParam(value = "sorts", required = false) String sorts,
 
            @RequestParam(value = "size", required = false) int size,
 
            @RequestParam(value = "page", required = false) int page) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.Module.api_getListNoPage)
 
    Envelop getListNoPage(
 
            @RequestParam(value = "fields", required = false) String fields,
 
            @RequestParam(value = "filters", required = false) String filters,
 
            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.Module.api_getChildren)
 
    Envelop getChildren(@PathVariable(value = "id") String id) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.ModuleFun.api_getExistFun)
 
    Envelop getExistFunc(@PathVariable(value = "id") String id) throws JiWeiException;
 
    @PutMapping(value =  BaseRequestMapping.ModuleFun.api_changeFun,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
    Envelop changeFun(@RequestBody String jsonData) throws JiWeiException;
 
}
 
//package com.yihu.jw.fegin.base.base;
 
//
 
//import com.yihu.jw.exception.business.JiWeiException;
 
//import com.yihu.jw.fegin.fallbackfactory.base.base.ModuleFeignFallbackFactory;
 
//import com.yihu.jw.restmodel.CommonContants;
 
//import com.yihu.jw.restmodel.common.Envelop;
 
//import com.yihu.jw.rm.base.BaseRequestMapping;
 
//import org.springframework.cloud.netflix.feign.FeignClient;
 
//import org.springframework.http.MediaType;
 
//import org.springframework.web.bind.annotation.*;
 
//
 
//
 
//@FeignClient(
 
//        name = CommonContants.svr_base // name值是eurika的实例名字
 
//        ,fallbackFactory  = ModuleFeignFallbackFactory.class
 
//)
 
//@RequestMapping(value = BaseRequestMapping.api_base_common)
 
//public interface ModuleFeign {
 
//
 
//    @PostMapping(value = BaseRequestMapping.Module.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
//    Envelop create(@RequestBody String jsonData) throws JiWeiException;
 
//
 
//    @PutMapping(value =  BaseRequestMapping.Module.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
//    Envelop update(@RequestBody String jsonData) throws JiWeiException;
 
//
 
//    @DeleteMapping(value =BaseRequestMapping.Module.api_delete)
 
//    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.Module.api_getById)
 
//    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
 
//
 
//    @RequestMapping(value = BaseRequestMapping.Module.api_getList, method = RequestMethod.GET)
 
//    Envelop getList(
 
//            @RequestParam(value = "fields", required = false) String fields,
 
//            @RequestParam(value = "filters", required = false) String filters,
 
//            @RequestParam(value = "sorts", required = false) String sorts,
 
//            @RequestParam(value = "size", required = false) int size,
 
//            @RequestParam(value = "page", required = false) int page) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.Module.api_getListNoPage)
 
//    Envelop getListNoPage(
 
//            @RequestParam(value = "fields", required = false) String fields,
 
//            @RequestParam(value = "filters", required = false) String filters,
 
//            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.Module.api_getChildren)
 
//    Envelop getChildren(@PathVariable(value = "id") String id) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.ModuleFun.api_getExistFun)
 
//    Envelop getExistFunc(@PathVariable(value = "id") String id) throws JiWeiException;
 
//
 
//    @PutMapping(value =  BaseRequestMapping.ModuleFun.api_changeFun,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
//    Envelop changeFun(@RequestBody String jsonData) throws JiWeiException;
 
//}

+ 26 - 26
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SaasFeign.java
View File 

@ -1,26 +1,26 @@
 
package com.yihu.jw.fegin.base.base;
 
import com.yihu.jw.fegin.fallbackfactory.base.base.SaasFeignFallbackFactory;
 
import com.yihu.jw.restmodel.CommonContants;
 
import com.yihu.jw.restmodel.common.Envelop;
 
import com.yihu.jw.rm.base.BaseRequestMapping;
 
import org.springframework.cloud.netflix.feign.FeignClient;
 
import org.springframework.http.MediaType;
 
import org.springframework.web.bind.annotation.GetMapping;
 
import org.springframework.web.bind.annotation.RequestMapping;
 
import org.springframework.web.bind.annotation.RequestParam;
 
@FeignClient(
 
        name = CommonContants.svr_base // name值是eurika的实例名字
 
        ,fallbackFactory  = SaasFeignFallbackFactory.class
 
)
 
@RequestMapping(value = BaseRequestMapping.api_base_common)
 
public interface SaasFeign {
 
    @GetMapping(value = BaseRequestMapping.Saas.api_getSaassNoPage)
 
    Envelop getList(@RequestParam(value = "fields",required = false)String fields,@RequestParam(value = "filters",required = false) String filters,@RequestParam(value = "sorts",required = false) String sorts);
 
    @GetMapping(value = BaseRequestMapping.Saas.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
    Envelop findByCode(@RequestParam(value = "id", required = true) String id);
 
}
 
//package com.yihu.jw.fegin.base.base;
 
//
 
//import com.yihu.jw.fegin.fallbackfactory.base.base.SaasFeignFallbackFactory;
 
//import com.yihu.jw.restmodel.CommonContants;
 
//import com.yihu.jw.restmodel.common.Envelop;
 
//import com.yihu.jw.rm.base.BaseRequestMapping;
 
//import org.springframework.cloud.netflix.feign.FeignClient;
 
//import org.springframework.http.MediaType;
 
//import org.springframework.web.bind.annotation.GetMapping;
 
//import org.springframework.web.bind.annotation.RequestMapping;
 
//import org.springframework.web.bind.annotation.RequestParam;
 
//
 
//
 
//@FeignClient(
 
//        name = CommonContants.svr_base // name值是eurika的实例名字
 
//        ,fallbackFactory  = SaasFeignFallbackFactory.class
 
//)
 
//@RequestMapping(value = BaseRequestMapping.api_base_common)
 
//public interface SaasFeign {
 
//
 
//    @GetMapping(value = BaseRequestMapping.Saas.api_getSaassNoPage)
 
//    Envelop getList(@RequestParam(value = "fields",required = false)String fields,@RequestParam(value = "filters",required = false) String filters,@RequestParam(value = "sorts",required = false) String sorts);
 
//
 
//    @GetMapping(value = BaseRequestMapping.Saas.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
//    Envelop findByCode(@RequestParam(value = "id", required = true) String id);
 
//}

+ 45 - 45
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SystemDictFeign.java
View File 

@ -1,45 +1,45 @@
 
package com.yihu.jw.fegin.base.base;
 
import com.yihu.jw.exception.business.JiWeiException;
 
import com.yihu.jw.fegin.fallbackfactory.base.base.SystemDictFeignFallbackFactory;
 
import com.yihu.jw.restmodel.CommonContants;
 
import com.yihu.jw.restmodel.common.Envelop;
 
import com.yihu.jw.rm.base.BaseRequestMapping;
 
import org.springframework.cloud.netflix.feign.FeignClient;
 
import org.springframework.http.MediaType;
 
import org.springframework.web.bind.annotation.*;
 
@FeignClient(
 
        name = CommonContants.svr_base // name值是eurika的实例名字
 
        ,fallbackFactory  = SystemDictFeignFallbackFactory.class
 
)
 
@RequestMapping(value = BaseRequestMapping.api_base_common)
 
public interface SystemDictFeign {
 
    @RequestMapping(value = BaseRequestMapping.SystemDict.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.POST)
 
    Envelop create(@RequestBody String jsonData) throws JiWeiException;
 
    @RequestMapping(value =  BaseRequestMapping.SystemDict.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.PUT)
 
    Envelop update(@RequestBody String jsonData) throws JiWeiException;
 
    @RequestMapping(value =  BaseRequestMapping.SystemDict.api_delete,method = RequestMethod.DELETE)
 
    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.SystemDict.api_getById)
 
    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
 
    @RequestMapping(value = BaseRequestMapping.SystemDict.api_getList, method = RequestMethod.GET)
 
    Envelop getList(
 
            @RequestParam(value = "fields", required = false) String fields,
 
            @RequestParam(value = "filters", required = false) String filters,
 
            @RequestParam(value = "sorts", required = false) String sorts,
 
            @RequestParam(value = "size", required = false) int size,
 
            @RequestParam(value = "page", required = false) int page) throws JiWeiException;
 
    @GetMapping(value = BaseRequestMapping.SystemDict.api_getListNoPage)
 
    Envelop getListNoPage(
 
            @RequestParam(value = "fields", required = false) String fields,
 
            @RequestParam(value = "filters", required = false) String filters,
 
            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
 
}
 
//package com.yihu.jw.fegin.base.base;
 
//
 
//import com.yihu.jw.exception.business.JiWeiException;
 
//import com.yihu.jw.fegin.fallbackfactory.base.base.SystemDictFeignFallbackFactory;
 
//import com.yihu.jw.restmodel.CommonContants;
 
//import com.yihu.jw.restmodel.common.Envelop;
 
//import com.yihu.jw.rm.base.BaseRequestMapping;
 
//import org.springframework.cloud.netflix.feign.FeignClient;
 
//import org.springframework.http.MediaType;
 
//import org.springframework.web.bind.annotation.*;
 
//
 
//
 
//@FeignClient(
 
//        name = CommonContants.svr_base // name值是eurika的实例名字
 
//        ,fallbackFactory  = SystemDictFeignFallbackFactory.class
 
//)
 
//@RequestMapping(value = BaseRequestMapping.api_base_common)
 
//public interface SystemDictFeign {
 
//
 
//    @RequestMapping(value = BaseRequestMapping.SystemDict.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.POST)
 
//    Envelop create(@RequestBody String jsonData) throws JiWeiException;
 
//
 
//    @RequestMapping(value =  BaseRequestMapping.SystemDict.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.PUT)
 
//    Envelop update(@RequestBody String jsonData) throws JiWeiException;
 
//
 
//    @RequestMapping(value =  BaseRequestMapping.SystemDict.api_delete,method = RequestMethod.DELETE)
 
//    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.SystemDict.api_getById)
 
//    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
 
//
 
//    @RequestMapping(value = BaseRequestMapping.SystemDict.api_getList, method = RequestMethod.GET)
 
//    Envelop getList(
 
//            @RequestParam(value = "fields", required = false) String fields,
 
//            @RequestParam(value = "filters", required = false) String filters,
 
//            @RequestParam(value = "sorts", required = false) String sorts,
 
//            @RequestParam(value = "size", required = false) int size,
 
//            @RequestParam(value = "page", required = false) int page) throws JiWeiException;
 
//
 
//    @GetMapping(value = BaseRequestMapping.SystemDict.api_getListNoPage)
 
//    Envelop getListNoPage(
 
//            @RequestParam(value = "fields", required = false) String fields,
 
//            @RequestParam(value = "filters", required = false) String filters,
 
//            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
 
//}