Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteDictService.java

@@ -0,0 +1,27 @@
+package com.usky.system;
+
+import com.usky.system.factory.RemoteDictFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/**
+ * 消息服务
+ * 
+ * @author ruoyi
+ */
+@FeignClient(contextId = "remoteDictService", value = "usky-system", fallbackFactory = RemoteDictFallbackFactory.class)
+public interface RemoteDictService
+{
+    /**
+     * 新增消息推送
+     *
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 结果
+     */
+    @GetMapping("/selectNameById")
+    String selectNameById(@RequestParam("dictType") String dictType,
+                          @RequestParam("dictValue") String dictValue);
+}

base-modules/service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteDictFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.usky.system.factory;
+
+
+import com.usky.common.core.exception.FeignBadRequestException;
+import com.usky.system.RemoteDictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 消息服务降级处理
+ * 
+ * @author ruoyi
+ */
+@Component
+public class RemoteDictFallbackFactory implements FallbackFactory<RemoteDictService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteDictFallbackFactory.class);
+
+    @Override
+    public RemoteDictService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteDictService()
+        {
+            @Override
+            public String selectNameById(String dictType,String dictValue)
+            {
+                throw new FeignBadRequestException(500,"查询字典异常"+throwable.getMessage());
+            }
+        };
+    }
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysDictControllerApi.java

@@ -0,0 +1,21 @@
+package com.usky.system.controller.api;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.RemoteDictService;
+import com.usky.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+public class SysDictControllerApi implements RemoteDictService {
+
+
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
+
+    @Override
+    public String selectNameById(String dictType, String dictValue) {
+        return iSysDictDataService.selectDictLabel(dictType,dictValue);
+    }
+}