From 3457576f58714995a837994a8b44a2b53e5ee0d9 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 23 Nov 2023 10:19:21 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VehiclePositionAlarmController.java | 4 +-- .../VehiclePositionDataController.java | 4 +++ .../entity/VehiclePositionDev.java | 28 +++++++++++-------- .../service/IVehiclePositionAlarmService.java | 2 ++ .../impl/VehiclePositionAlarmServiceImpl.java | 13 +++++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 2 ++ .../zhgd/xmgl/task/EnvironmentDevTask.java | 2 ++ 7 files changed, 41 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java index f55d17c8f..068e24f97 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java @@ -88,8 +88,8 @@ public class VehiclePositionAlarmController { @ApiOperation(value = "添加车辆（人员）定位-报警记录信息", notes = "添加车辆（人员）定位-报警记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody VehiclePositionAlarm vehiclePositionAlarm) { - vehiclePositionAlarm.setId(null); - vehiclePositionAlarmService.save(vehiclePositionAlarm); + log.info("添加车辆（人员）定位-报警记录信息:{}", JSON.toJSONString(vehiclePositionAlarm)); + vehiclePositionAlarmService.add(vehiclePositionAlarm); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java index 920c2142a..578b0c9d2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java @@ -68,6 +68,10 @@ public class VehiclePositionDataController { * @return */ @ApiOperation(value = "列表查询车辆（人员）定位-实时数据信息", notes = "列表查询车辆（人员）定位-实时数据信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "createTime_begin", value = "时间开始", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "createTime_end", value = "时间结束", paramType = "query", required = false, dataType = "String"), + }) @GetMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { return Result.success(vehiclePositionDataService.queryList(paramMap)); diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java index 7c2667998..d49b5392a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java @@ -95,18 +95,6 @@ public class VehiclePositionDev implements Serializable { @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; - /** - * 当前位置-经度 - */ - @Excel(name = "当前位置-经度", width = 15) - @ApiModelProperty(value = "当前位置-经度") - private java.lang.Double longitude; - /** - * 当前位置-维度 - */ - @Excel(name = "当前位置-维度", width = 15) - @ApiModelProperty(value = "当前位置-维度") - private java.lang.Double latitude; /** * 新增时间 */ @@ -115,7 +103,23 @@ public class VehiclePositionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "新增时间") private java.util.Date addTime; + @TableField(exist = false) @ApiModelProperty(value = "在线状态（0.离线 1.在线）") private java.lang.Integer online; + + /** + * 当前位置-经度 + */ + @Excel(name = "当前位置-经度", width = 15) + @ApiModelProperty(value = "当前位置-经度") + @TableField(exist = false) + private java.lang.Double longitude; + /** + * 当前位置-维度 + */ + @Excel(name = "当前位置-维度", width = 15) + @ApiModelProperty(value = "当前位置-维度") + @TableField(exist = false) + private java.lang.Double latitude; } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java index ee5323922..5bea329e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java @@ -28,4 +28,6 @@ public interface IVehiclePositionAlarmService extends IService() + .eq(VehiclePositionDev::getDevSn, vehiclePositionAlarm.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备不存在"); + } + vehiclePositionAlarm.setProjectSn(dev.getProjectSn()); + vehiclePositionAlarm.setId(null); + save(vehiclePositionAlarm); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { String alias = "vpd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, alias); diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 874dbaeac..477230513 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -247,6 +247,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/bridgeProduceRecord/page").permitAll() .antMatchers("/xmgl/bridgeProduceRecord/list").permitAll() .antMatchers("/xmgl/bridgeProduceRecord/add").permitAll() + .antMatchers("/xmgl/vehiclePositionData/add").permitAll() + .antMatchers("/xmgl/vehiclePositionAlarm/add").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and() diff --git a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java index 8b939b89e..5edcbe279 100644 --- a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java +++ b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java @@ -44,6 +44,7 @@ import java.util.stream.Collectors; **/ @Slf4j @Component +@RestController public class EnvironmentDevTask { @Autowired private EnvironmentDevMapper environmentDevMapper; @@ -136,6 +137,7 @@ public class EnvironmentDevTask { */ @SchedulerLock(name = "getEnvironmentDustData", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3) @Scheduled(cron = "0 0/5 * * * ?") + @GetMapping("1122") public void getEnvironmentDustData() { log.info("获取扬尘数据(携稳)开始任务"); List projects = projectMapper.selectList(new LambdaQueryWrapper()