签到人员在、离线统计

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -44,7 +44,7 @@ public class MybatisGeneratorUtils {
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-fire?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("usky");
         dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_ggp_facility");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("patrol_inspection_abnormal_picture");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAttendanceController.java

@@ -58,9 +58,9 @@ public class PatrolInspectionAttendanceController {
         return ApiResult.success();
     }
 
-    @GetMapping("/bodyCount")
-    public ApiResult<List<Map<String, Integer>>> bodyCount() {
-        return ApiResult.success(patrolInspectionAttendanceService.bodyCount());
+    @GetMapping("/securityStatistics")
+    public ApiResult<Map<String, Integer>> securityStatistics() {
+        return ApiResult.success(patrolInspectionAttendanceService.securityStatistics());
     }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionAttendanceService.java

@@ -47,5 +47,5 @@ public interface PatrolInspectionAttendanceService extends CrudService<PatrolIns
      * 签到、签退状态人数统计
      * @return
      */
-    List<Map<String, Integer>> bodyCount();
+    Map<String, Integer> securityStatistics();
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -185,29 +185,25 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
         return name;
     }
 
-    public List<Map<String, Integer>> bodyCount() {
-        List<Map<String, Integer>> returnList = new ArrayList<>();
-        Map<String, Integer> signIn = new HashMap<>();
-        Map<String, Integer> signOut = new HashMap<>();
+    public Map<String, Integer> securityStatistics() {
+        Map<String, Integer> countMap = new HashMap<>();
         int countOut, countIn;
         countOut = baseMapper.signOut(SecurityUtils.getTenantId());
         countIn = baseMapper.signIn(SecurityUtils.getTenantId());
         if (countOut != 0 && countIn == 0) {
-            signIn.put("signIn", 0);
-            signOut.put("signOut", countOut);
+            countMap.put("signIn", 0);
+            countMap.put("signOut", countOut);
         } else if (countOut == 0 && countIn != 0) {
-            signIn.put("signIn", countIn);
-            signOut.put("signOut", 0);
+            countMap.put("signIn", countIn);
+            countMap.put("signOut", 0);
         } else if (countOut == 0 && countIn == 0) {
-            signIn.put("signIn", 0);
-            signOut.put("signOut", 0);
+            countMap.put("signIn", 0);
+            countMap.put("signOut", 0);
         }else {
-            signIn.put("signIn", countIn);
-            signOut.put("signOut", countOut);
+            countMap.put("signIn", countIn);
+            countMap.put("signOut", countOut);
         }
-        returnList.add(signIn);
-        returnList.add(signOut);
-        return returnList;
+        return countMap;
     }
 
 }