Saas提示

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

@@ -3,6 +3,7 @@ package com.gogirl.interfaces.dashboard;
 import com.gogirl.application.dashboard.DashboardService;
 import com.gogirl.application.store.store.StoreManageService;
 import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.feign.AdminFeign;
 import com.gogirl.shared.admin.AdminPage;
 import com.gogirl.shared.admin.dashboard.req.*;
@@ -45,15 +46,18 @@ public class DashboardController {
     @PostMapping("/no_getStoreTrendApi")
     public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(@RequestBody GetStoreTrendApiRequest request) {
 
+
         GetStoreTrendApiResp resp = dashboardService.getStoreTrendApi(request);
-        return JsonResult.success(resp);
+        throw new RRException("Saas服务升级中");
+//        return JsonResult.success(resp);
     }
 
     @ApiOperation("见doc文档getStoreListApi")
     @PostMapping("/no_getStoreListApi")
     public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request) {
         List<Map<String, Object>> result = dashboardService.getStoreListApi(request);
-        return JsonResult.success(result);
+//        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
 
     }
 
@@ -61,7 +65,8 @@ public class DashboardController {
     @PostMapping("/no_preStorageSumApi")
     public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request) {
         Map<String, Object> result = dashboardService.preStorageSumApi(request);
-        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
+
 
     }
 
@@ -70,7 +75,8 @@ public class DashboardController {
     @PostMapping(value = "/api/Report/no_revenueSumByTypeApi")
     public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request) {
         Map<String, Object> result = dashboardService.revenueSumByTypeApi(request);
-        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
+
     }
 
 
@@ -78,7 +84,8 @@ public class DashboardController {
     @PostMapping("/no_revenueTypeListApi")
     public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request) {
         List<Map<String, Object>> result = dashboardService.revenueTypeListApi(request);
-        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
+
     }
 
 
@@ -86,7 +93,8 @@ public class DashboardController {
     @PostMapping("/no_revenueSumApi")
     public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) {
         List<Map<String, Object>> result = dashboardService.revenueSumApi(request);
-        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
+
     }
 
 
@@ -94,7 +102,8 @@ public class DashboardController {
     @PostMapping("/no_getTechnicianPage")
     public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
         AdminPage<AdminTechnicianScoreResp> respAdminPage = dashboardService.getTechnicianPage(request);
-        return JsonResult.success(respAdminPage);
+        throw new RRException("Saas服务升级中");
+
     }
 
 
@@ -102,7 +111,8 @@ public class DashboardController {
     @PostMapping("/no_achievementsPersonaResultPageApi")
     public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) {
         AdminPage<AchievementsPersonaResult> page = dashboardService.achievementsPersonaResultPageApi(request);
-        return JsonResult.success(page);
+        throw new RRException("Saas服务升级中");
+
     }
 
 
@@ -110,6 +120,7 @@ public class DashboardController {
     @PostMapping("/no_revenueServiceListApi")
     public JsonResult<List<Map<String, Object>>> revenueServiceListApi(@RequestBody RevenueServiceListApiRequest request) {
         List<Map<String, Object>> result = dashboardService.revenueServiceListApi(request);
-        return JsonResult.success(result);
+        throw new RRException("Saas服务升级中");
+
     }
 }

src/main/java/com/gogirl/shared/admin/dashboard/req/RevenueSumApiRequest.java

@@ -19,4 +19,5 @@ public class RevenueSumApiRequest {
     @JsonProperty("date_utc")
     private List<String> dateUtc;
 
+
 }

src/test/java/com/gogirl/infrastructure/feign/AdminFeignTest.java

@@ -21,7 +21,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +33,7 @@ import java.util.Map;
  * @author robbendev
  * @since 2020/8/17 10:35 上午
  */
-@ActiveProfiles("dev")
+@ActiveProfiles("pre")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @Slf4j
@@ -48,10 +47,7 @@ public class AdminFeignTest {
     public void getStoreTrendApi() {
         GetStoreTrendApiRequest request = new GetStoreTrendApiRequest();
 
-        request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
-
-        request.setSearchType(1);
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));     request.setSearchType(1);
         request.setUserStoreIds(Lists.newArrayList(19));
         request.setFields(Lists.newArrayList());
 
@@ -67,10 +63,7 @@ public class AdminFeignTest {
     public void getStoreListApi() {
 
         GetStoreListApiRequest request = new GetStoreListApiRequest();
-        request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
-
-        request.setTitle("2");
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));    request.setTitle("2");
         AdminResult<List<Map<String, Object>>> result = adminFeign.getStoreListApi(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
 
@@ -81,9 +74,7 @@ public class AdminFeignTest {
     public void preStorageSumApi() {
 
         PreStorageSumApiRequest request = new PreStorageSumApiRequest();
-        request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
-
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
         AdminResult<Map<String, Object>> result = adminFeign.preStorageSumApi(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
 
@@ -92,8 +83,7 @@ public class AdminFeignTest {
     @Test
     public void revenueSumByTypeApi() {
         RevenueSumByTypeApiRequest request = new RevenueSumByTypeApiRequest();
-        request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
 
         AdminResult<Map<String, Object>> result = adminFeign.revenueSumByTypeApi(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
@@ -102,9 +92,7 @@ public class AdminFeignTest {
     @Test
     public void revenueTypeListApi() {
         RevenueTypeListRequest request = new RevenueTypeListRequest();
-        request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
-
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
         AdminResult<List<Map<String, Object>>> result = adminFeign.revenueTypeListApi(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
     }
@@ -114,7 +102,7 @@ public class AdminFeignTest {
     public void revenueSumApi() {
         RevenueSumApiRequest request = new RevenueSumApiRequest();
 
-        request.setDateUtc(Lists.newArrayList("2020-08-27T06:46:27.223Z", "2020-08-28T06:46:27.223Z"));
+        request.setDateUtc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
         AdminResult<List<Map<String, Object>>> result = adminFeign.revenueSumApi(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
     }
@@ -129,9 +117,7 @@ public class AdminFeignTest {
                 //在职
                 .status(1)
                 .build();
-        request.setDate_utc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2018, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
-                ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
-
+        request.setDate_utc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
         AdminResult<AdminPage<AdminTechnicianScoreResp>> result = adminFeign.getTechnicianPage(request);
         log.info(JsonUtilByJackson.writeValueAsString(result));
     }