ソースを参照

停车场代码完善

hanzhengyi 3 日 前
コミット
802788bae0

+ 4 - 3
service-ids/service-ids-biz/src/main/java/com/usky/ids/controller/MybatisGeneratorUtils.java

@@ -44,10 +44,11 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&serverTimezone=GMT&useSSL=false" +
+                "&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("yt123456");
+        dsc.setPassword("hs@94950212");
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -72,7 +73,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("ids_park_map");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("access_entry_exit_record");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成,调整生成 至 根目录

+ 19 - 3
service-ids/service-ids-biz/src/main/java/com/usky/ids/controller/web/AccessAlarmController.java

@@ -1,21 +1,37 @@
 package com.usky.ids.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.ids.domain.AccessAlarm;
+import com.usky.ids.service.AccessAlarmService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警信息表 前端控制器
  * </p>
  *
  * @author han
- * @since 2025-03-10
+ * @since 2025-03-01
  */
-@Controller
+@RestController
 @RequestMapping("/accessAlarm")
 public class AccessAlarmController {
+    @Autowired
+    private AccessAlarmService accessAlarmService;
 
+    /**
+     * 告警查询接口
+     * @return
+     */
+    @GetMapping("/getAlarmList")
+    public ApiResult<List<AccessAlarm>> getAlarmList(@RequestParam(value = "deviceId", required = false) String deviceId){
+        return ApiResult.success(accessAlarmService.getAlarmList(deviceId));
+    }
 }
 

+ 17 - 3
service-ids/service-ids-biz/src/main/java/com/usky/ids/controller/web/AccessEntryExitRecordController.java

@@ -1,9 +1,14 @@
 package com.usky.ids.controller.web;
 
 
+import com.usky.common.core.bean.ApiResult;
+import com.usky.ids.service.AccessAlarmService;
+import com.usky.ids.service.AccessEntryExitRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,9 +18,18 @@ import org.springframework.stereotype.Controller;
  * @author han
  * @since 2025-03-26
  */
-@Controller
+@RestController
 @RequestMapping("/accessEntryExitRecord")
 public class AccessEntryExitRecordController {
-
+    @Autowired
+    private AccessEntryExitRecordService accessEntryExitRecordService;
+    /**
+     * 获取车位信息
+     * @return
+     */
+    @GetMapping("entryExitCount")
+    ApiResult<Object> entryExitCount(){
+        return ApiResult.success(accessEntryExitRecordService.entryExitCount());
+    }
 }
 

+ 4 - 2
service-ids/service-ids-biz/src/main/java/com/usky/ids/service/AccessAlarmService.java

@@ -3,14 +3,16 @@ package com.usky.ids.service;
 import com.usky.ids.domain.AccessAlarm;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警信息表 服务类
  * </p>
  *
  * @author han
- * @since 2025-03-10
+ * @since 2025-03-01
  */
 public interface AccessAlarmService extends CrudService<AccessAlarm> {
-
+    List<AccessAlarm> getAlarmList(String deviceId);
 }

+ 3 - 1
service-ids/service-ids-biz/src/main/java/com/usky/ids/service/AccessEntryExitRecordService.java

@@ -3,6 +3,8 @@ package com.usky.ids.service;
 import com.usky.ids.domain.AccessEntryExitRecord;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆进出记录 服务类
@@ -12,5 +14,5 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2025-03-26
  */
 public interface AccessEntryExitRecordService extends CrudService<AccessEntryExitRecord> {
-
+    List<Object> entryExitCount();
 }

+ 16 - 2
service-ids/service-ids-biz/src/main/java/com/usky/ids/service/impl/AccessAlarmServiceImpl.java

@@ -1,20 +1,34 @@
 package com.usky.ids.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.ids.domain.AccessAlarm;
 import com.usky.ids.mapper.AccessAlarmMapper;
 import com.usky.ids.service.AccessAlarmService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警信息表 服务实现类
  * </p>
  *
  * @author han
- * @since 2025-03-10
+ * @since 2025-03-01
  */
 @Service
 public class AccessAlarmServiceImpl extends AbstractCrudService<AccessAlarmMapper, AccessAlarm> implements AccessAlarmService {
-
+    public List<AccessAlarm> getAlarmList(String deviceId){
+        LambdaQueryWrapper<AccessAlarm> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(AccessAlarm::getAlarmId)
+                .eq(AccessAlarm::getCameraIndexCode, deviceId)
+                .eq(AccessAlarm::getAlarmType,'2')
+                .eq(AccessAlarm::getAlarmStatus,'0')
+                .last("limit 1");
+        List<AccessAlarm> list = this.list(queryWrapper);
+        return list;
+    }
 }

+ 36 - 1
service-ids/service-ids-biz/src/main/java/com/usky/ids/service/impl/AccessEntryExitRecordServiceImpl.java

@@ -1,11 +1,23 @@
 package com.usky.ids.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.ids.domain.AccessEntryExitRecord;
 import com.usky.ids.mapper.AccessEntryExitRecordMapper;
 import com.usky.ids.service.AccessEntryExitRecordService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 车辆进出记录 服务实现类
@@ -16,5 +28,28 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AccessEntryExitRecordServiceImpl extends AbstractCrudService<AccessEntryExitRecordMapper, AccessEntryExitRecord> implements AccessEntryExitRecordService {
-
+    @Override
+    public List<Object> entryExitCount(){
+        List<Object> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        LocalDateTime now = LocalDateTime.now();
+        LocalDate today = LocalDate.now();
+        LocalDateTime startOfDay = LocalDateTime.of(today, LocalTime.MIN);
+        // 定义日期时间字符串
+        String dateTimeString = "2025-04-25 02:31:00";
+        // 定义日期时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDateTime 对象
+        LocalDateTime localDateTime = LocalDateTime.parse(dateTimeString, formatter);
+        QueryWrapper<AccessEntryExitRecord> queryWrapper = Wrappers.query();
+        queryWrapper.select("COUNT(action_direction=1 or null) as entryCount","COUNT(action_direction=2 or" +
+                " null) as exitCount")
+                .between("record_time",localDateTime,now);
+        List<Map<String,Object>> entryExitList = this.listMaps(queryWrapper);
+        map.put("entryCount", Integer.valueOf(entryExitList.get(0).get("entryCount").toString()));
+        map.put("exitCount", Integer.valueOf(entryExitList.get(0).get("exitCount").toString()));
+        map.put("iotCount", 102);
+        list.add(map);
+        return list;
+    }
 }