admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-11-23 10:19:21 +08:00
parent d3f21f0627
commit 3457576f58
7 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java
View File

@ -88,8 +88,8 @@ public class VehiclePositionAlarmController {
@ApiOperation(value = "添加车辆（人员）定位-报警记录信息", notes = "添加车辆（人员）定位-报警记录信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<VehiclePositionAlarm> add(@RequestBody VehiclePositionAlarm vehiclePositionAlarm) {
vehiclePositionAlarm.setId(null);
vehiclePositionAlarmService.save(vehiclePositionAlarm);
log.info("添加车辆（人员）定位-报警记录信息:{}", JSON.toJSONString(vehiclePositionAlarm));
vehiclePositionAlarmService.add(vehiclePositionAlarm);
return Result.ok();
}

4
src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java
View File

@ -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<List<VehiclePositionData>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(vehiclePositionDataService.queryList(paramMap));

28
src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java
View File

@ -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;
}

2
src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java
View File

@ -28,4 +28,6 @@ public interface IVehiclePositionAlarmService extends IService<VehiclePositionAl
* @param dev
*/
void checkClimbOverAlarm(VehiclePositionData vehiclePositionData, VehiclePositionDev dev);
void add(VehiclePositionAlarm vehiclePositionAlarm);
}

13
src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionAlarmServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionAlarm;
import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionData;
@ -91,6 +92,18 @@ public class VehiclePositionAlarmServiceImpl extends ServiceImpl<VehiclePosition
}
@Override
public void add(VehiclePositionAlarm vehiclePositionAlarm) {
VehiclePositionDev dev = vehiclePositionDevMapper.selectOne(new LambdaQueryWrapper<VehiclePositionDev>()
.eq(VehiclePositionDev::getDevSn, vehiclePositionAlarm.getDevSn()));
if (dev == null) {
throw new OpenAlertException("设备不存在");
}
vehiclePositionAlarm.setProjectSn(dev.getProjectSn());
vehiclePositionAlarm.setId(null);
save(vehiclePositionAlarm);
}
private QueryWrapper<VehiclePositionAlarm> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "vpd.";
QueryWrapper<VehiclePositionAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, alias);

2
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -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()

2
src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java
View File

@ -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<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()