|
@@ -8,13 +8,16 @@ import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
+import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 仓库摄像头Controller
|
|
@@ -45,8 +48,19 @@ public class TWarehouseWebcamController extends BaseController {
|
|
|
@GetMapping("/appList")
|
|
|
public TableDataInfo appList(TWarehouseWebcam tWarehouseWebcam) {
|
|
|
startPage();
|
|
|
- List<TWarehouseWebcam> list = tWarehouseWebcamService.selectTWarehouseWebcamList(tWarehouseWebcam);
|
|
|
- return getDataTable(list);
|
|
|
+ List<TWarehouseWebcam> list = tWarehouseWebcamService.selectAppTWarehouseWebcamList(tWarehouseWebcam);
|
|
|
+ Map<Long, List<TWarehouseWebcam>> grouping = list.stream().collect(Collectors.groupingBy(TWarehouseWebcam::getfWarehouseId));
|
|
|
+
|
|
|
+ List<Map<String, Object>> data = new ArrayList<>();
|
|
|
+ grouping.forEach((k, v) -> {
|
|
|
+ Map<String, Object> tempMap = new HashMap<>();
|
|
|
+ tempMap.put("warehouseName", v.get(0).getfWarehouseName());
|
|
|
+ tempMap.put("createTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, v.get(0).getCreateTime()));
|
|
|
+ tempMap.put("webcam", v);
|
|
|
+ data.add(tempMap);
|
|
|
+ });
|
|
|
+
|
|
|
+ return getDataTable(data);
|
|
|
}
|
|
|
|
|
|
/**
|