dashboard 缓存

src/main/java/com/gogirl/application/dashboard/DashboardService.java

+package com.gogirl.application.dashboard;
+
+import com.gogirl.shared.admin.AdminPage;
+import com.gogirl.shared.admin.dashboard.req.*;
+import com.gogirl.shared.admin.dashboard.resp.GetStoreTrendApiResp;
+import com.gogirl.shared.admin.techcnian.AchievementsPersonaResult;
+import com.gogirl.shared.admin.techcnian.AchievementsPersonaResultPageApiRequest;
+import com.gogirl.shared.admin.techcnian.AdminTechnicianScoreResp;
+import com.gogirl.shared.admin.techcnian.GetTechnicianPageRequest;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/8/31 9:13 上午
+ */
+public interface DashboardService {
+
+    /**
+     * <p>
+     * 见doc文档getStoreTrendApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    GetStoreTrendApiResp getStoreTrendApi(GetStoreTrendApiRequest request);
+
+    /**
+     * <p>
+     * 见doc文档getStoreListApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    List<Map<String, Object>> getStoreListApi(GetStoreListApiRequest request);
+
+    /**
+     * <p>
+     * 见doc文档preStorageSumApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    Map<String, Object> preStorageSumApi(PreStorageSumApiRequest request);
+
+    /**
+     * <p>
+     * 见doc文档revenueSumByTypeApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    Map<String, Object> revenueSumByTypeApi(RevenueSumByTypeApiRequest request);
+
+    /**
+     * <p>
+     * 见doc文档revenueTypeListApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    List<Map<String, Object>> revenueTypeListApi(RevenueTypeListRequest request);
+
+    /**
+     * <p>
+     * 见doc文档revenueSumApi
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    List<Map<String, Object>> revenueSumApi(RevenueSumApiRequest request);
+
+    /**
+     * <p>
+     * 美甲师信息
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    AdminPage<AdminTechnicianScoreResp> getTechnicianPage(GetTechnicianPageRequest request);
+
+    /**
+     * <p>
+     * 美甲师业绩
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    AdminPage<AchievementsPersonaResult> achievementsPersonaResultPageApi(AchievementsPersonaResultPageApiRequest request);
+
+    /**
+     * <p>
+     * 1级/2级/3级 sku
+     * </p>
+     *
+     * @param request
+     * @return
+     */
+    List<Map<String, Object>> revenueServiceListApi(RevenueServiceListApiRequest request);
+}

src/main/java/com/gogirl/infrastructure/common/util/JsonUtilByFsJson.java

@@ -112,8 +112,8 @@ public class JsonUtilByFsJson {
      * @param <T>
      * @return
      */
-    public static <T> T jsonToBean(String json, Class clazz) {
-        return (T) JSON.parseObject(json, clazz);
+    public static <T> T jsonToBean(String json, Class<T> clazz) {
+        return JSON.parseObject(json, clazz);
     }
 
     /**
@@ -124,7 +124,7 @@ public class JsonUtilByFsJson {
      * @param <T>
      * @return
      */
-    public static <T> List<T> jsonToList(String json, Class clazz) {
+    public static <T> List<T> jsonToList(String json, Class<T> clazz) {
         return JSON.parseArray(json, clazz);
     }
 

src/main/java/com/gogirl/interfaces/dashboard/DashboardController.java

 package com.gogirl.interfaces.dashboard;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gogirl.application.dashboard.DashboardService;
 import com.gogirl.application.store.store.StoreManageService;
-import com.gogirl.domain.store.store.StoreManage;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.feign.AdminFeign;
 import com.gogirl.shared.admin.AdminPage;
@@ -37,24 +36,32 @@ import java.util.Map;
 public class DashboardController {
     @Resource
     AdminFeign adminFeign;
+    @Resource
+    DashboardService dashboardService;
+    @Resource
+    StoreManageService storeManageService;
 
     @ApiOperation("见doc文档getStoreTrendApi")
     @PostMapping("/no_getStoreTrendApi")
     public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(@RequestBody GetStoreTrendApiRequest request) {
-        return JsonResult.success(adminFeign.getStoreTrendApi(request).getData());
+
+        GetStoreTrendApiResp resp = dashboardService.getStoreTrendApi(request);
+        return JsonResult.success(resp);
     }
 
     @ApiOperation("见doc文档getStoreListApi")
     @PostMapping("/no_getStoreListApi")
     public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request) {
-        return JsonResult.success(adminFeign.getStoreListApi(request).getData());
+        List<Map<String, Object>> result = dashboardService.getStoreListApi(request);
+        return JsonResult.success(result);
 
     }
 
     @ApiOperation("见doc文档preStorageSumApi")
     @PostMapping("/no_preStorageSumApi")
     public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request) {
-        return JsonResult.success(adminFeign.preStorageSumApi(request).getData());
+        Map<String, Object> result = dashboardService.preStorageSumApi(request);
+        return JsonResult.success(result);
 
     }
 
@@ -62,51 +69,47 @@ public class DashboardController {
     @ApiOperation("见doc文档revenueSumByTypeApi")
     @PostMapping(value = "/api/Report/no_revenueSumByTypeApi")
     public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request) {
-        return JsonResult.success(adminFeign.revenueSumByTypeApi(request).getData());
+        Map<String, Object> result = dashboardService.revenueSumByTypeApi(request);
+        return JsonResult.success(result);
     }
 
 
     @ApiOperation("见doc文档revenueTypeListApi")
     @PostMapping("/no_revenueTypeListApi")
     public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request) {
-        return JsonResult.success(adminFeign.revenueTypeListApi(request).getData());
-
+        List<Map<String, Object>> result = dashboardService.revenueTypeListApi(request);
+        return JsonResult.success(result);
     }
 
-    @Resource
-    StoreManageService storeManageService;
 
     @ApiOperation("见doc文档revenueSumApi")
     @PostMapping("/no_revenueSumApi")
     public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) {
-        List<Map<String, Object>> data = adminFeign.revenueSumApi(request).getData();
-        data.forEach(stringObjectMap -> {
-            String storeName = String.valueOf(stringObjectMap.get("store_name"));
-            StoreManage storeManage = storeManageService.getOne(new LambdaQueryWrapper<StoreManage>()
-                    .eq(StoreManage::getName, storeName));
-            stringObjectMap.put("departmentId", storeManage == null ? 0 : storeManage.getId());
-        });
-        return JsonResult.success(data);
+        List<Map<String, Object>> result = dashboardService.revenueSumApi(request);
+        return JsonResult.success(result);
     }
 
 
     @ApiOperation("美甲师信息")
     @PostMapping("/no_getTechnicianPage")
     public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
-        return JsonResult.success(adminFeign.getTechnicianPage(request).getData());
+        AdminPage<AdminTechnicianScoreResp> respAdminPage = dashboardService.getTechnicianPage(request);
+        return JsonResult.success(respAdminPage);
     }
 
 
     @ApiOperation("美甲师业绩")
     @PostMapping("/no_achievementsPersonaResultPageApi")
     public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) {
-        return JsonResult.success(adminFeign.achievementsPersonaResultPageApi(request).getData());
+        AdminPage<AchievementsPersonaResult> page = dashboardService.achievementsPersonaResultPageApi(request);
+        return JsonResult.success(page);
     }
 
 
     @ApiOperation("1级/2级/3级 sku")
     @PostMapping("/no_revenueServiceListApi")
     public JsonResult<List<Map<String, Object>>> revenueServiceListApi(@RequestBody RevenueServiceListApiRequest request) {
-        return JsonResult.success(adminFeign.revenueServiceListApi(request).getData());
+        List<Map<String, Object>> result = dashboardService.revenueServiceListApi(request);
+        return JsonResult.success(result);
     }
 }

src/main/resources/application-prod.yml

@@ -67,6 +67,7 @@ spring:
         max-idle: 200
         min-idle: 0
     timeout: 60000ms
+#    password: 'gogirl2020test.'
 
 
 #项目属性
@@ -113,11 +114,17 @@ wx:
 server:
   port: 5444
 
-feign:
-  hystrix:
-    enabled: false
-  client:
-    config:
-      default:
-        connectTimeout: 30000
-        readTimeout: 30000
+##hystrix的超时时间
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+##Ribbon超时
+ribbon:
+  ConnectTimeout: 20000  #毫秒    连接超时时间
+  ReadTimeout: 20000     #毫秒      逻辑处理超时时间

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: prod
   servlet:
     #文件上传最大容量
     multipart: