1、页面右上角空值时提示

2、apiaop预警时初始化限定值
3、roll平台垃圾分类api接口调用实现接口

ruoyi-ui/src/layout/components/Navbar.vue

@@ -237,6 +237,8 @@ export default {
         if (json.warningMessage !== undefined) {
           // this.visible = true
           return json.warningMessage
+        }else {
+          return '暂无提示！！！'
         }
       }
     },

ruoyi-ui/src/views/business/openapi/translation/index.vue

@@ -178,8 +178,8 @@ export default {
 
   watch: {
     'dict.type.translation_type'(newVal) {
-      if (newVal[0]) {
+      if (newVal[2]) {
-        this.translationData.translationType= newVal[0].value
+        this.translationData.translationType= newVal[2].value
       }
     }
   },

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/ApiConst.java

@@ -56,6 +56,8 @@ public class ApiConst {
 
     public static final String ROLL_FORECAST_WEATHER = "ROLL-预报天气";
 
+    public static final String ROLL_GARBAGE_SORTING = "ROLL-垃圾分类";
+
 
     //-------------------url------------------------------
 
@@ -115,6 +117,11 @@ public class ApiConst {
      */
     public static final String ROLL_WEATHER_URL = "https://www.mxnzp.com/api/weather";
 
+    /**
+     * 接口文档：https://www.mxnzp.com/doc/detail?id=14
+     */
+    public static final String ROLL_GARBAGE_SORTING_URL = "https://www.mxnzp.com/api/rubbish/type";
+
 
 
 

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java

@@ -3,10 +3,7 @@ package com.xjs.apitools.controller;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.xjs.apitools.domain.ApiForecastWeather;
+import com.xjs.apitools.domain.*;
-import com.xjs.apitools.domain.ApiHoliday;
-import com.xjs.apitools.domain.ApiMobileBelong;
-import com.xjs.apitools.domain.ApiNowWeather;
 import com.xjs.apitools.service.ApiToolsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,6 +69,14 @@ public class ApiToolsController {
     }
 
 
+    @GetMapping("garbagesorting/{name}")
+    @ApiOperation("获取垃圾分类信息")
+    @Log(title = "获取垃圾分类")
+    public R<ApiGarbageSorting> getGarbageSortingApiData(@PathVariable("name") String name) {
+        return R.ok(apiToolsService.getGarbageSorting(name));
+    }
+
+
 
 
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiGarbageSorting.java

@@ -0,0 +1,33 @@
+package com.xjs.apitools.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * api垃圾分类实体
+ *
+ * @author xiejs
+ * @since 2022-01-19
+ */
+@Data
+public class ApiGarbageSorting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 查询出来的匹配结果
+     */
+    private Map<String, String> aim;
+
+
+    /**
+     * 物品垃圾分类类型
+     */
+    private Map<String, String> recommendList;
+
+
+
+
+}

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/RequestBody.java

@@ -30,4 +30,9 @@ public class RequestBody {
      * 目标城市
      */
     private String city;
+
+    /**
+     * 物品名称
+     */
+    private String name;
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java

@@ -0,0 +1,42 @@
+package com.xjs.apitools.factory.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xjs.apitools.domain.ApiGarbageSorting;
+import com.xjs.apitools.domain.RequestBody;
+import com.xjs.apitools.factory.ApiToolsFactory;
+import com.xjs.common.client.api.roll.RollGarbageSortingDeignClient;
+import com.xjs.config.RollProperties;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
+import static com.xjs.consts.ApiConst.ROLL_CODE_SUCCESS;
+
+/**
+ * roll平台获取垃圾分类api工厂实现
+ * @author xiejs
+ * @since 2022-01-19
+ */
+@Component
+@Log4j2
+public class RollGarbageSortingFactory implements ApiToolsFactory<ApiGarbageSorting, RequestBody> {
+
+    @Autowired
+    private RollProperties rollProperties;
+    @Autowired
+    private RollGarbageSortingDeignClient rollGarbageSortingDeignClient;
+
+
+    @Override
+    public ApiGarbageSorting apiData(RequestBody req) {
+        req.setApp_secret(rollProperties.getApp_secret());
+        req.setApp_id(rollProperties.getApp_id());
+        JSONObject jsonObject = rollGarbageSortingDeignClient.garbageSortingApi(req);
+        if (!jsonObject.containsKey(DEMOTE_ERROR) && jsonObject.getInteger("code") == ROLL_CODE_SUCCESS.intValue()) {
+            JSONObject jsonData = jsonObject.getJSONObject("data");
+            return jsonData.toJavaObject(ApiGarbageSorting.class);
+        }
+        return null;
+    }
+}

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/ApiToolsService.java

@@ -1,9 +1,6 @@
 package com.xjs.apitools.service;
 
-import com.xjs.apitools.domain.ApiForecastWeather;
+import com.xjs.apitools.domain.*;
-import com.xjs.apitools.domain.ApiHoliday;
-import com.xjs.apitools.domain.ApiMobileBelong;
-import com.xjs.apitools.domain.ApiNowWeather;
 
 import java.util.List;
 
@@ -44,5 +41,13 @@ public interface ApiToolsService {
     ApiForecastWeather getForecastWeather(String city);
 
 
+    /**
+     * 获取垃圾分类
+     * @param name 垃圾名称
+     * @return ApiGarbageSorting
+     */
+    ApiGarbageSorting getGarbageSorting(String name);
+
+
 
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java

@@ -2,10 +2,7 @@ package com.xjs.apitools.service.impl;
 
 import com.xjs.apitools.domain.*;
 import com.xjs.apitools.factory.ApiToolsFactory;
-import com.xjs.apitools.factory.impl.RollForecastWeatherFactory;
+import com.xjs.apitools.factory.impl.*;
-import com.xjs.apitools.factory.impl.RollHolidayFactory;
-import com.xjs.apitools.factory.impl.RollMobileBelongFactory;
-import com.xjs.apitools.factory.impl.RollNowWeatherFactory;
 import com.xjs.apitools.service.ApiToolsService;
 import com.xjs.exception.ApiException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +26,7 @@ public class ApiToolsServiceImpl implements ApiToolsService {
     private ApiToolsFactory<ApiMobileBelong, RequestBody> mobileBelongFactory;
     private ApiToolsFactory<ApiNowWeather, RequestBody> nowWeatherFactory;
     private ApiToolsFactory<ApiForecastWeather,RequestBody> forecastWeatherFactory;
+    private ApiToolsFactory<ApiGarbageSorting,RequestBody> garbageSortingFactory;
 
     @Autowired
     public void setHolidayFactory(RollHolidayFactory rollHolidayFactory) {
@@ -50,6 +48,11 @@ public class ApiToolsServiceImpl implements ApiToolsService {
         this.forecastWeatherFactory = rollForecastWeatherFactory;
     }
 
+    @Autowired
+    public void setGarbageSortingFactory(RollGarbageSortingFactory rollGarbageSortingFactory) {
+        this.garbageSortingFactory = rollGarbageSortingFactory;
+    }
+
 
     @Override
     public List<ApiHoliday> getApiHolidayList() {
@@ -89,4 +92,12 @@ public class ApiToolsServiceImpl implements ApiToolsService {
         return Optional.ofNullable(forecastWeatherFactory.apiData(requestBody))
                 .orElseThrow(ApiException::new);
     }
+
+    @Override
+    public ApiGarbageSorting getGarbageSorting(String name) {
+        RequestBody requestBody = new RequestBody();
+        requestBody.setName(name);
+        return Optional.ofNullable(garbageSortingFactory.apiData(requestBody))
+                .orElseThrow(ApiException::new);
+    }
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java

@@ -167,6 +167,7 @@ public class ApiLogAspect {
                                 //设置初始请求次数
                                 apiRecord.setTotalCount(1L);
                                 apiRecord.setDayCount(1L);
+                                apiRecord.setLimitCount(30L);
                                 remoteWarningCRUDFeign.saveApiRecordForRPC(apiRecord);
                             } else {
                                 ApiRecord haveApiRecord = data.get(0);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/api/roll/RollGarbageSortingDeignClient.java

@@ -0,0 +1,29 @@
+package com.xjs.common.client.api.roll;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xjs.annotation.ApiLog;
+import com.xjs.apitools.domain.RequestBody;
+import com.xjs.common.client.factory.RollGarbageSortingFeignFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import static com.xjs.consts.ApiConst.ROLL_GARBAGE_SORTING;
+import static com.xjs.consts.ApiConst.ROLL_GARBAGE_SORTING_URL;
+
+
+/**
+ * roll 垃圾分类api接口feign远程调用
+ * @author xiejs
+ * @since 2022-01-19
+ */
+@FeignClient(name = "rollGarbageSorting", url = ROLL_GARBAGE_SORTING_URL, fallbackFactory = RollGarbageSortingFeignFactory.class)
+public interface RollGarbageSortingDeignClient {
+
+    @GetMapping()
+    @ApiLog(name = ROLL_GARBAGE_SORTING,
+            url = ROLL_GARBAGE_SORTING_URL,
+            method = "Get")
+    JSONObject garbageSortingApi(@SpringQueryMap RequestBody requestBody);
+
+}

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/factory/RollGarbageSortingFeignFactory.java

@@ -0,0 +1,29 @@
+package com.xjs.common.client.factory;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.common.client.api.roll.RollGarbageSortingDeignClient;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
+
+/**
+ * roll 垃圾分类api接口feign降级
+ * @author xiejs
+ * @since 2022-01-19
+ */
+@Component
+@Log4j2
+public class RollGarbageSortingFeignFactory implements FallbackFactory<RollGarbageSortingDeignClient> {
+    @Override
+    public RollGarbageSortingDeignClient create(Throwable cause) {
+        log.error("api模块roll 垃圾分类服务调用失败:{},执行降级处理", cause.getMessage());
+        return requestBody -> {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put(DEMOTE_ERROR, R.FAIL);
+            return jsonObject;
+        };
+    }
+}