Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-28 3f1889e77f861a8284770c85bdd83204f6863f39

 javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java

@@ -13,6 +13,7 @@
import com.javaweb.geo.domain.Project;
import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.enums.RecordType;
import com.javaweb.geo.mapper.ProjectCameraMapper;
import com.javaweb.geo.mapper.TubLogMapper;
import com.javaweb.geo.service.IHoleMediaService;
import com.javaweb.geo.service.IHoleService;
@@ -63,6 +64,9 @@

    @Autowired
    private TubLogMapper tubLogMapper;

    @Autowired
    private ProjectCameraMapper projectCameraMapper;


    private String getAdminIndex() {
@@ -241,6 +245,8 @@
        HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
        result.setFileCount(holeMedia.getNumber());

        Integer cameraCount = projectCameraMapper.count();
        result.setCameraCount(cameraCount);
        return AjaxResult.success("查询成功",result);
    }

@@ -252,7 +258,7 @@
    @GetMapping("/system/stat/tubLogData")
    public AjaxResult tubLogData() {
        AjaxResult ajaxResult = new AjaxResult();
        List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
        List<TubLog> tubLogs = tubLogMapper.countTubLogDate(null);
        ajaxResult.put("tubLogs",tubLogs);
        return  ajaxResult;
    }