fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PatrolSuperData.java
@@ -14,6 +14,7 @@ @Data public class PatrolSuperData implements Serializable { /*----------------列表使用--------------------*/ private String companyId; //组织编码 @@ -31,6 +32,13 @@ private Date updateTime; /*----------------统计使用--------------------*/ private Integer isDeptNum = 0; //已巡检库区数; private Integer noDeptNum = 0; //未巡检库区数; private Integer yesterdaySum = 0; //昨天巡检人次; private Integer weekSum = 0; //近7天巡检人次; public PatrolSuperData() { super(); } fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -58,6 +58,19 @@ for (Patrol patrol : weekList) { patrolSuperData = map.get(patrol.getDeptId()); //7天内统计 patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1); //当天统计 if(patrol.getCreateTime().after(end)){ patrolSuperData.setCurNum(patrolSuperData.getCurNum() + 1); patrolSuperData.setIsPatrol("Y"); } //昨天统计 if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){ patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1); } } }
@@ -5,6 +5,7 @@ import com.fzzy.igds.constant.CameraPlayType; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.data.PageResponse; import com.fzzy.igds.data.PatrolSuperData; import com.fzzy.igds.domain.Camera; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.SystemUtil; @@ -205,6 +206,10 @@ String deptId = ContextUtil.subDeptId(user); view.put("deptId", deptId); PatrolSuperData patrolSuperData = secManager.patrolTrack(); view.put("patrolSuperData", patrolSuperData); return prefix + "/patrol-count"; }
@@ -5,14 +5,23 @@ import com.fzzy.igds.camera.data.ApiCameraResp; import com.fzzy.igds.constant.RespCodeEnum; import com.fzzy.igds.data.PageResponse; import com.fzzy.igds.data.PatrolSuperData; import com.fzzy.igds.domain.Camera; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.domain.Patrol; import com.fzzy.igds.service.CoreDeptService; import com.fzzy.igds.service.PatrolService; import com.fzzy.igds.service.SecCameraService; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description @@ -27,6 +36,10 @@ private SecCameraService secCameraService; @Resource private ApiCameraManager apiCameraManager; @Resource private PatrolService patrolService; @Resource private CoreDeptService coreDeptService; /** * @@ -147,4 +160,50 @@ secCameraService.refreshCache(ContextUtil.getCompanyId()); return new PageResponse<>(RespCodeEnum.CODE_0000, "执行成功！！"); } /** * 巡检统计 * @return */ public PatrolSuperData patrolTrack() { PatrolSuperData patrolSuperData = new PatrolSuperData(); List<Dept> deptList = coreDeptService.getDeptData(); if(null == deptList || deptList.isEmpty()){ return patrolSuperData; } //库区转换 Map<String, Integer> map = new HashMap<>(); for (Dept dept : deptList) { map.put(dept.getId(), 0); } List<Patrol> weekList = patrolService.getWeekList(); if(null != weekList && weekList.size() > 0){ Date start = DateUtil.getCurZero(DateUtil.getNewByDay(new Date(), -1)); //昨天零点零分 Date end = DateUtil.getCurZero(new Date()); //今天零点零分 for (Patrol patrol : weekList) { //7天内人次 patrolSuperData.setWeekSum(patrolSuperData.getWeekSum() + 1); //昨天人次 if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){ patrolSuperData.setYesterdaySum(patrolSuperData.getYesterdaySum() + 1); } //当天统计 if(patrol.getCreateTime().after(end)){ if(map.get(patrol.getDeptId()) == 0){ patrolSuperData.setIsDeptNum(patrolSuperData.getIsDeptNum() + 1); map.put(patrol.getDeptId(), map.get(patrol.getDeptId()) + 1); } } } } patrolSuperData.setNoDeptNum(deptList.size() - patrolSuperData.getIsDeptNum()); return patrolSuperData; } } fzzy-igdss-web/src/main/resources/templates/security/patrol-count.html
@@ -94,28 +94,28 @@ <div class="layui-row layui-col-space15" style="background: #FFFFFF;margin: 10px"> <div class="layui-col-sm3 layui-col-xs6"> <div class="console-link-block"> <div class="console-link-block-num">0</div> <div class="console-link-block-num" th:text="${patrolSuperData.isDeptNum}">0</div> <div class="console-link-block-text">已巡检库区数(当天)</div> <i class="console-link-block-icon layui-icon layui-icon-form"></i> </div> </div> <div class="layui-col-sm3 layui-col-xs6"> <div class="console-link-block"> <div class="console-link-block-num">0</div> <div class="console-link-block-num" th:text="${patrolSuperData.noDeptNum}">0</div> <div class="console-link-block-text">未巡检库区数(当天)</div> <i class="console-link-block-icon layui-icon layui-icon-survey"></i> </div> </div> <div class="layui-col-sm3 layui-col-xs6"> <div class="console-link-block"> <div class="console-link-block-num">0</div> <div class="console-link-block-num" th:text="${patrolSuperData.yesterdaySum}">0</div> <div class="console-link-block-text">巡检人次(昨天)</div> <i class="console-link-block-icon layui-icon layui-icon-chart"></i> </div> </div> <div class="layui-col-sm3 layui-col-xs6"> <div class="console-link-block"> <div class="console-link-block-num">0</div> <div class="console-link-block-num" th:text="${patrolSuperData.weekSum}">0</div> <div class="console-link-block-text">巡检人次(近7天)</div> <i class="console-link-block-icon layui-icon layui-icon-chart"></i> </div> @@ -125,17 +125,6 @@ </div> <!-- js部分 --> <script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script> <!--<script src="${ctxPath}/assets/js/common.js"></script>--> <script th:src="@{/ajax/libs/echarts/echarts.min.js}"></script> <script th:src="@{/ajax/libs/echarts/china.js}"></script> <script th:src="@{/ajax/libs/echarts/echarts-wordcloud.min.js}"></script> <script> layui.use(['layer'], function () { var $ = layui.jquery; var layer = layui.layer; }); </script> </body> </html>
