dkyChenJiang.git

			@@ -5,6 +5,7 @@
			import java.util.List;
			import java.util.Map;

			import cn.hutool.core.util.ObjectUtil;
			import com.javaweb.cms.util.CmsConstants;
			import com.javaweb.common.core.domain.AjaxResult;
			import com.javaweb.common.utils.Arith;
			@@ -13,6 +14,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 +65,9 @@

			@Autowired
			private TubLogMapper tubLogMapper;

			@Autowired
			private ProjectCameraMapper projectCameraMapper;


			private String getAdminIndex() {
			@@ -155,8 +160,11 @@
			List<Hole> holes = holeService.selectHoleProjectProcess();
			Map<String, Double> holeMap = new HashMap<>();
			for (Hole hole : holes) {
			Double val = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
			val = Arith.round(val * 100, 2);
			Double val =0.0d;
			if(ObjectUtil.isNotEmpty(hole.getFootageCpl()) && ObjectUtil.isNotEmpty(hole.getFootage())) {
			val = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
			val = Arith.round(val * 100, 2);
			}
			holeMap.put(hole.getProjectId(), val);
			}

			@@ -241,6 +249,8 @@
			HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
			result.setFileCount(holeMedia.getNumber());

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

			@@ -252,7 +262,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;
			}