|
@@ -139,7 +139,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getOverview(10L)).thenReturn(mockOverview);
|
|
when(energyService.getOverview(10L)).thenReturn(mockOverview);
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.getEnergyOverview(params, 10L);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.getEnergyOverview(params, 10L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertNotNull(result.getData());
|
|
assertNotNull(result.getData());
|
|
@@ -169,7 +169,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getOverview(20L)).thenReturn(mockOverview);
|
|
when(energyService.getOverview(20L)).thenReturn(mockOverview);
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.getEnergyOverview(params, 20L);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.getEnergyOverview(params, 20L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(100, result.getData().get("bodyScore"));
|
|
assertEquals(100, result.getData().get("bodyScore"));
|
|
@@ -183,7 +183,7 @@ public class EnergyControllerTest {
|
|
|
public void getEnergyOverview_NullChildId() {
|
|
public void getEnergyOverview_NullChildId() {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.getEnergyOverview(params, null);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.getEnergyOverview(params, null, null);
|
|
|
|
|
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertEquals("childId不能为空", result.getMessage());
|
|
assertEquals("childId不能为空", result.getMessage());
|
|
@@ -200,7 +200,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getOverview(30L)).thenReturn(mockOverview);
|
|
when(energyService.getOverview(30L)).thenReturn(mockOverview);
|
|
|
|
|
|
|
|
- Result<Map<String, Object>> result = controller.getEnergyOverview(params, 30L);
|
|
|
|
|
|
|
+ Result<Map<String, Object>> result = controller.getEnergyOverview(params, 30L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(0, result.getData().get("totalEnergy"));
|
|
assertEquals(0, result.getData().get("totalEnergy"));
|
|
@@ -225,7 +225,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getLogs(10L, null, 1, 10)).thenReturn(page);
|
|
when(energyService.getLogs(10L, null, 1, 10)).thenReturn(page);
|
|
|
|
|
|
|
|
- Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
|
|
|
|
|
|
|
+ Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertNotNull(result.getData());
|
|
assertNotNull(result.getData());
|
|
@@ -249,7 +249,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getLogs(10L, "body", 1, 10)).thenReturn(page);
|
|
when(energyService.getLogs(10L, "body", 1, 10)).thenReturn(page);
|
|
|
|
|
|
|
|
- Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
|
|
|
|
|
|
|
+ Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(1, result.getData().getTotal());
|
|
assertEquals(1, result.getData().getTotal());
|
|
@@ -267,7 +267,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getLogs(10L, null, 1, 10)).thenReturn(emptyPage);
|
|
when(energyService.getLogs(10L, null, 1, 10)).thenReturn(emptyPage);
|
|
|
|
|
|
|
|
- Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
|
|
|
|
|
|
|
+ Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
}
|
|
}
|
|
@@ -276,7 +276,7 @@ public class EnergyControllerTest {
|
|
|
public void getEnergyLogs_NullChildId() {
|
|
public void getEnergyLogs_NullChildId() {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
|
|
- Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, null);
|
|
|
|
|
|
|
+ Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, null, null);
|
|
|
|
|
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertEquals("childId不能为空", result.getMessage());
|
|
assertEquals("childId不能为空", result.getMessage());
|
|
@@ -295,7 +295,7 @@ public class EnergyControllerTest {
|
|
|
|
|
|
|
|
when(energyService.getLogs(99L, null, 1, 10)).thenReturn(emptyPage);
|
|
when(energyService.getLogs(99L, null, 1, 10)).thenReturn(emptyPage);
|
|
|
|
|
|
|
|
- Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 99L);
|
|
|
|
|
|
|
+ Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 99L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(0, result.getData().getTotal());
|
|
assertEquals(0, result.getData().getTotal());
|
|
@@ -317,7 +317,7 @@ public class EnergyControllerTest {
|
|
|
new HashMap<String, Object>() {{ put("dimension", "wealth"); put("ratio", 0.1); }}
|
|
new HashMap<String, Object>() {{ put("dimension", "wealth"); put("ratio", 0.1); }}
|
|
|
));
|
|
));
|
|
|
|
|
|
|
|
- Result<String> result = controller.configureSourceRatios(params, 1L);
|
|
|
|
|
|
|
+ Result<String> result = controller.configureSourceRatios(params, 1L, null);
|
|
|
|
|
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals("配置成功", result.getData());
|
|
assertEquals("配置成功", result.getData());
|
|
@@ -330,7 +330,7 @@ public class EnergyControllerTest {
|
|
|
params.put("sourceId", 5L);
|
|
params.put("sourceId", 5L);
|
|
|
params.put("ratios", Collections.emptyList());
|
|
params.put("ratios", Collections.emptyList());
|
|
|
|
|
|
|
|
- Result<String> result = controller.configureSourceRatios(params, 1L);
|
|
|
|
|
|
|
+ Result<String> result = controller.configureSourceRatios(params, 1L, null);
|
|
|
|
|
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertEquals("sourceType和sourceId不能为空", result.getMessage());
|
|
assertEquals("sourceType和sourceId不能为空", result.getMessage());
|
|
@@ -343,7 +343,7 @@ public class EnergyControllerTest {
|
|
|
params.put("sourceId", 5L);
|
|
params.put("sourceId", 5L);
|
|
|
params.put("ratios", Collections.emptyList());
|
|
params.put("ratios", Collections.emptyList());
|
|
|
|
|
|
|
|
- Result<String> result = controller.configureSourceRatios(params, 1L);
|
|
|
|
|
|
|
+ Result<String> result = controller.configureSourceRatios(params, 1L, null);
|
|
|
|
|
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertEquals("ratios不能为空", result.getMessage());
|
|
assertEquals("ratios不能为空", result.getMessage());
|
|
@@ -356,7 +356,7 @@ public class EnergyControllerTest {
|
|
|
params.put("sourceId", 3L);
|
|
params.put("sourceId", 3L);
|
|
|
// ratios not provided
|
|
// ratios not provided
|
|
|
|
|
|
|
|
- Result<String> result = controller.configureSourceRatios(params, 1L);
|
|
|
|
|
|
|
+ Result<String> result = controller.configureSourceRatios(params, 1L, null);
|
|
|
|
|
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertEquals("ratios不能为空", result.getMessage());
|
|
assertEquals("ratios不能为空", result.getMessage());
|