From bd17c68a18d6f72ca87acbf2323c13ad86832283 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 17 Jul 2025 17:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/filter/AuthFilter.java | 7 +- .../inter/VscInterApplication.java | 14 ++-- .../inter/controller/BdController.java | 9 +++ .../inter/mapper/BdMapper.java | 12 ++++ .../inter/service/BdServiceImpl.java | 30 ++++++++- .../inter/vo/UserCarAccessVo.java | 50 ++++++++++++++ .../src/main/resources/mapper/BdMapper.xml | 14 +++- .../service/impl/DeviceOfBdServiceImpl.java | 8 +-- .../service/impl/ConstructionQualityImpl.java | 65 ++++++++++--------- 9 files changed, 160 insertions(+), 49 deletions(-) create mode 100644 securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/UserCarAccessVo.java diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java index dc5a5d5..f8c5e66 100644 --- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java +++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java @@ -51,9 +51,12 @@ public class AuthFilter implements GlobalFilter, Ordered public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest.Builder mutate = request.mutate(); - String url = request.getURI().getPath(); - if(url.equals("/auth/sgccLogin")){ + if("/auth/sgccLogin".equals(url)){ + return chain.filter(exchange); + } + + if("/inter/dataCenter/inter/devInfo".equals(url)){ return chain.filter(exchange); } diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/VscInterApplication.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/VscInterApplication.java index 44894fa..ed5184a 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/VscInterApplication.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/VscInterApplication.java @@ -48,13 +48,13 @@ public class VscInterApplication implements CommandLineRunner { //第三方sdk初始化 //海康sdk初始化 - AlarmUtil util = new AlarmUtil(); - int row = util.initDevice(); - if (row == 1) { - log.info("初始化失败"); - } - newService.loginDoor(); - init(); +// AlarmUtil util = new AlarmUtil(); +// int row = util.initDevice(); +// if (row == 1) { +// log.info("初始化失败"); +// } +// newService.loginDoor(); +// init(); // newService.loginDVR();//初始化DVR }catch (Exception e){ log.info("初始化失败"); diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java index fbffab2..3c8845b 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java @@ -195,6 +195,15 @@ public class BdController { return AjaxResult.success(0); } + @PostMapping("addCarUserAccess") + public AjaxResult addCarUserAccess(@RequestBody UserCarAccessVo param){ + try{ + return service.addCarUserAccess(param); + }catch (Exception e){ + log.error(e.toString(),e); + } + return AjaxResult.success(0); + } } diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java index df538bb..64db4e4 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/mapper/BdMapper.java @@ -151,4 +151,16 @@ public interface BdMapper { * @return */ int addSource(FileExportVo vo); + + /** + * 人车管理 + * @param param + */ + void addUserAccess(UserCarAccessVo param); + + /** + * 车辆出入记录 + * @param param + */ + void addCarAccess(UserCarAccessVo param); } diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java index 6c4d871..366fb28 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java @@ -162,8 +162,8 @@ public class BdServiceImpl { param.setDevCode(param.getDeviceId()); String bidCode=mapper.getBidCodeByBd(param); param.setBidCode(bidCode); - String type=param.getEventCode().replaceAll("Alarm","").trim(); - param.setType(type); +// String type=param.getEventCode().replaceAll("Alarm","").trim(); +// param.setType(type); WarnInfoVo vo=mapper.getDeviceInfo(param); param.setDeviceId(vo.getDeviceId()); param.setAttributeId(vo.getAttributeId()); @@ -239,7 +239,7 @@ public class BdServiceImpl { } }); if(StringHelper.isEmpty(msg.get())){ - return AjaxResult.success(msg.get()); + return AjaxResult.success(msg.get()); } }catch (Exception e){ @@ -328,4 +328,28 @@ public class BdServiceImpl { return null; } + + /** + * 新增人车出入管理 + * @param param + * @return + */ + public AjaxResult addCarUserAccess(UserCarAccessVo param) { + try{ + String id=IdUtils.getuid(); + param.setId(id); + String dataType=param.getDataType(); + if("1".equals(dataType)){ + mapper.addUserAccess(param); + }else{ + mapper.addCarAccess(param); + } + + return AjaxResult.success("新增成功"); + }catch (Exception e){ + log.error(e.toString(),e); + } + + return AjaxResult.error("新增失败"); + } } diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/UserCarAccessVo.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/UserCarAccessVo.java new file mode 100644 index 0000000..1f65f8a --- /dev/null +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/UserCarAccessVo.java @@ -0,0 +1,50 @@ +package com.securitycontrol.inter.vo; + +import lombok.Data; + +/** + * 人员车辆表 + * @author 黑子 + */ +@Data +public class UserCarAccessVo { + /** + * 1 人2车 + */ + private String dataType; + + private String id; + /** + * 车辆id + */ + private String carId; + /** + * 车牌号 + */ + private String carNum; + /** + * 进出时间 + */ + private String accessTime; + /** + * 进出类型 + */ + private int accessType; + /** + * 用回答 + */ + private String userId; + /** + * 身份证号码 + */ + private String idNumber; + /** + * 手机号 + */ + private String phone; + + private String userName; + + + +} diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml index 98a0d4d..1a174bf 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml +++ b/securitycontrol-model/securitycontrol-Interface/src/main/resources/mapper/BdMapper.xml @@ -124,7 +124,7 @@ @@ -140,4 +140,16 @@ value ( #{id},#{fileType},#{fileId},#{suffix},#{fileName}, #{sourceId},#{sourceType},0,now()) + + + insert into tb_user_access( + id, id_number, user_id, access_time, access_type, user_name, user_phone + )values (#{id},#{idNumber},#{userId},#{accessTime},#{accessType},#{userName},#{phone}) + + + insert into tb_car_access( + id, car_id,car_num,accesss_time,access_type) values ( + #{id}, #{carId},#{carNum},#{accessTime},#{accessType} + ) + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java index 4ab4b2a..9312548 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java @@ -145,10 +145,10 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService { if (StringUtils.isNotBlank(validResult)) { return AjaxResult.error(validResult); } - int result = mapper.isDeviceCodeExist(vo); - if (result > 0) { - return AjaxResult.error("设备编码不能重复"); - } +// int result = mapper.isDeviceCodeExist(vo); +// if (result > 0) { +// return AjaxResult.error("设备编码不能重复"); +// } if (StringUtils.isEmpty(vo.getDeviceId())) { String deviceId = IdUtils.getuid(); vo.setDeviceId(deviceId); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java index b5cbd79..e63e973 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java @@ -139,15 +139,16 @@ public class ConstructionQualityImpl implements ConstructionQualityService { System.err.println(currentYearMonth); } + @Override public List getDetectionRecord(ConstructionQualityDto dto) { List list = new ArrayList<>(); - YearMonth currentYearMonth = YearMonth.of(2025,12); + YearMonth currentYearMonth = YearMonth.of(2025,3); YearMonth[] lastTwelveMonths = new YearMonth[12]; for (int i = 0; i < NUM_MONTHS_IN_YEAR; i++) { lastTwelveMonths[i] = currentYearMonth.minusMonths(11 - i); } - if("1512P017007Y010".equals(dto.getBidCode())){ + // if("1512P017007Y010".equals(dto.getBidCode())){ for (YearMonth lastTwelveMonth : lastTwelveMonths) { dto.setMonth(String.valueOf(lastTwelveMonth)); List byMonth = mapper.getByMonth(dto); @@ -162,36 +163,36 @@ public class ConstructionQualityImpl implements ConstructionQualityService { } } - }else{ - for (YearMonth lastTwelveMonth : lastTwelveMonths) { - if(String.valueOf(lastTwelveMonth).contains("2025-01")){ - ConstructionQualityVo emptyData = new ConstructionQualityVo(); - emptyData.setDetectionNumber(String.valueOf(56)); - emptyData.setQualificationNumber(String.valueOf(54)); - emptyData.setMonth(String.valueOf(lastTwelveMonth)); - list.add(emptyData); - }else if(String.valueOf(lastTwelveMonth).contains("2025-02")){ - ConstructionQualityVo emptyData = new ConstructionQualityVo(); - emptyData.setDetectionNumber(String.valueOf(38)); - emptyData.setQualificationNumber(String.valueOf(38)); - emptyData.setMonth(String.valueOf(lastTwelveMonth)); - list.add(emptyData); - }else if(String.valueOf(lastTwelveMonth).contains("2025-03")){ - ConstructionQualityVo emptyData = new ConstructionQualityVo(); - emptyData.setDetectionNumber(String.valueOf(49)); - emptyData.setQualificationNumber(String.valueOf(47)); - emptyData.setMonth(String.valueOf(lastTwelveMonth)); - list.add(emptyData); - }else { - ConstructionQualityVo emptyData = new ConstructionQualityVo(); - emptyData.setDetectionNumber(String.valueOf(0)); - emptyData.setQualificationNumber(String.valueOf(0)); - emptyData.setMonth(String.valueOf(lastTwelveMonth)); - list.add(emptyData); - } - } - - } +// }else{ +// for (YearMonth lastTwelveMonth : lastTwelveMonths) { +// if(String.valueOf(lastTwelveMonth).contains("2025-01")){ +// ConstructionQualityVo emptyData = new ConstructionQualityVo(); +// emptyData.setDetectionNumber(String.valueOf(56)); +// emptyData.setQualificationNumber(String.valueOf(54)); +// emptyData.setMonth(String.valueOf(lastTwelveMonth)); +// list.add(emptyData); +// }else if(String.valueOf(lastTwelveMonth).contains("2025-02")){ +// ConstructionQualityVo emptyData = new ConstructionQualityVo(); +// emptyData.setDetectionNumber(String.valueOf(38)); +// emptyData.setQualificationNumber(String.valueOf(38)); +// emptyData.setMonth(String.valueOf(lastTwelveMonth)); +// list.add(emptyData); +// }else if(String.valueOf(lastTwelveMonth).contains("2025-03")){ +// ConstructionQualityVo emptyData = new ConstructionQualityVo(); +// emptyData.setDetectionNumber(String.valueOf(49)); +// emptyData.setQualificationNumber(String.valueOf(47)); +// emptyData.setMonth(String.valueOf(lastTwelveMonth)); +// list.add(emptyData); +// }else { +// ConstructionQualityVo emptyData = new ConstructionQualityVo(); +// emptyData.setDetectionNumber(String.valueOf(0)); +// emptyData.setQualificationNumber(String.valueOf(0)); +// emptyData.setMonth(String.valueOf(lastTwelveMonth)); +// list.add(emptyData); +// } +// } +// +// } return list; }