dkyChenJiang.git

			@@ -5,16 +5,16 @@
			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;
			import com.javaweb.common.utils.StringUtils;
			import com.javaweb.geo.domain.Hole;
			import com.javaweb.geo.domain.HoleMedia;
			import com.javaweb.geo.domain.Project;
			import com.javaweb.geo.domain.TubLog;
			import com.javaweb.geo.enums.RecordType;
			import com.javaweb.geo.mapper.HoleMapper;
			import com.javaweb.geo.mapper.ProjectCameraMapper;
			import com.javaweb.geo.mapper.TubLogMapper;
			import com.javaweb.geo.service.IHoleMediaService;
			import com.javaweb.geo.service.IHoleService;
			@@ -65,6 +65,9 @@

			@Autowired
			private TubLogMapper tubLogMapper;

			@Autowired
			private ProjectCameraMapper projectCameraMapper;


			private String getAdminIndex() {
			@@ -124,7 +127,7 @@

			// 系统介绍
			@ResponseBody
			@GetMapping("/system/project")
			@GetMapping("/system/stat/project")
			public AjaxResult project() {
			AjaxResult ajaxResult = AjaxResult.success();
			List<Project> projects = projectService.selectProjectList(new Project());
			@@ -137,7 +140,7 @@
			* @return
			*/
			@ResponseBody
			@GetMapping("/system/totalProcess")
			@GetMapping("/system/stat/totalProcess")
			public AjaxResult totalProcess() {
			AjaxResult ajaxResult = AjaxResult.success();
			Hole hole = holeService.selectHoleTotalProcess();
			@@ -151,14 +154,17 @@
			* @return
			*/
			@ResponseBody
			@GetMapping("/system/projectProcess")
			@GetMapping("/system/stat/projectProcess")
			public AjaxResult projectProcess() {
			AjaxResult ajaxResult = AjaxResult.success();
			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);
			}

			@@ -207,7 +213,7 @@
			* @return
			*/
			@ResponseBody
			@GetMapping("/system/indexDataCount")
			@GetMapping("/system/stat/indexDataCount")
			public AjaxResult indexDataCount() {
			IndexVo result = new IndexVo();
			//=============================查询场地数量===============================
			@@ -243,6 +249,8 @@
			HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
			result.setFileCount(holeMedia.getNumber());

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

			@@ -251,10 +259,10 @@
			* @return
			*/
			@ResponseBody
			@GetMapping("/system/tubLogData")
			@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;
			}