4.0报表

src/main/java/com/gogirl/infrastructure/feign/AdminFeign.java

 package com.gogirl.infrastructure.feign;
 
+import com.gogirl.shared.admin.AdminPage;
 import com.gogirl.shared.admin.AdminResult;
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
@@ -55,6 +60,16 @@ public interface AdminFeign {
     AdminResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request);
 
 
+    @PostMapping(value = "/api/ReportTable/GetTechnicianPage",
+            consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    AdminResult<AdminTechnicianScoreResp> getTechnicianPage(@RequestBody GetTechnicianPageRequest request);
+
+    @PostMapping(value = "/api/ReportTable/AchievementsPersonaResultPageApi",
+            consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    AdminResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request);
+
     @Component
     class AdminFeignFallback implements AdminFeign {
 
@@ -88,5 +103,15 @@ public interface AdminFeign {
         public AdminResult<List<Map<String, Object>>> revenueSumApi(RevenueSumApiRequest request) {
             return new AdminResult<>();
         }
+
+        @Override
+        public AdminResult<AdminTechnicianScoreResp> getTechnicianPage(GetTechnicianPageRequest request) {
+            return new AdminResult<>();
+        }
+
+        @Override
+        public AdminResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(AchievementsPersonaResultPageApiRequest request) {
+            return new AdminResult<>();
+        }
     }
 }

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

@@ -2,10 +2,17 @@ package com.gogirl.interfaces.dashboard;
 
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.feign.AdminFeign;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,35 +31,55 @@ import java.util.Map;
 @Api(tags = "4.0报表")
 @RestController
 @RequestMapping("/technician/dashboard")
-public class DashboardController  {
+public class DashboardController {
     @Resource
     AdminFeign adminFeign;
 
+    @ApiOperation("见doc文档getStoreTrendApi")
     @PostMapping("/getStoreTrendApi")
     public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(GetStoreTrendApiRequest request) {
         return JsonResult.success(adminFeign.getStoreTrendApi(request).getData());
     }
 
+    @ApiOperation("见doc文档getStoreListApi")
     @PostMapping("/getStoreListApi")
     public JsonResult<List<Map<String, Object>>> getStoreListApi(GetStoreListApiRequest request) {
         return JsonResult.success(adminFeign.getStoreListApi(request).getData());
 
     }
 
+    @ApiOperation("见doc文档preStorageSumApi")
     @PostMapping("/preStorageSumApi")
     public JsonResult<Map<String, Object>> preStorageSumApi(PreStorageSumApiRequest request) {
         return JsonResult.success(adminFeign.preStorageSumApi(request).getData());
 
     }
 
+    @ApiOperation("见doc文档revenueTypeListApi")
     @PostMapping("/revenueTypeListApi")
     public JsonResult<List<Map<String, Object>>> revenueTypeListApi(RevenueTypeListRequest request) {
         return JsonResult.success(adminFeign.revenueTypeListApi(request).getData());
 
     }
 
+    @ApiOperation("见doc文档revenueSumApi")
     @PostMapping("/revenueSumApi")
     public JsonResult<List<Map<String, Object>>> revenueSumApi(RevenueSumApiRequest request) {
         return JsonResult.success(adminFeign.revenueSumApi(request).getData());
     }
+
+
+    @ApiOperation("美甲师信息")
+    @PostMapping("/getTechnicianPage")
+    public JsonResult<AdminTechnicianScoreResp> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
+        return JsonResult.success(adminFeign.getTechnicianPage(request).getData());
+    }
+
+
+    @ApiOperation("美甲师业绩")
+    @PostMapping("/achievementsPersonaResultPageApi")
+    public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) {
+        return JsonResult.success(adminFeign.achievementsPersonaResultPageApi(request).getData());
+    }
+
 }