From 53765c735ef3af3e6c72006e873caf73eccbcf21 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 17 Nov 2023 14:32:25 +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 --- .../common/system/query/QueryGenerator.java | 2 +- .../BridgeProduceRecordController.java | 4 ++++ .../entity/VehiclePositionDev.java | 16 ++++++++++++---- .../mapper/VehiclePositionAlarmMapper.java | 4 ++++ .../mapper/VehiclePositionDataMapper.java | 6 +++++- .../mapper/xml/VehiclePositionDevMapper.xml | 2 +- .../impl/VehiclePositionAlarmServiceImpl.java | 7 ++++--- .../impl/VehiclePositionDataServiceImpl.java | 7 ++++--- .../impl/VehiclePositionDevServiceImpl.java | 17 ++++++++++++++--- .../application-gsx-other-env-show.properties | 2 +- 10 files changed, 50 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index 41b352e95..e673fa5af 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -134,7 +134,7 @@ public class QueryGenerator { name = origDescriptors[i].getName(); type = origDescriptors[i].getPropertyType().toString(); try { - if (judgedIsUselessField(name) || !PropertyUtils.isReadable(searchObj, name)) { + if (judgedIsUselessField(name) || !PropertyUtils.isReadable(searchObj, name) || !isExistTable(searchObj, name)) { continue; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeproduce/controller/BridgeProduceRecordController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeproduce/controller/BridgeProduceRecordController.java index 914ce3517..7b476968d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeproduce/controller/BridgeProduceRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeproduce/controller/BridgeProduceRecordController.java @@ -5,9 +5,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; +import java.time.Duration; +import java.time.temporal.ChronoUnit; import java.util.HashMap; import org.springframework.validation.annotation.Validated; +import reactor.core.publisher.Flux; import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -64,6 +67,7 @@ public class BridgeProduceRecordController { }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(bridgeProduceRecordService.queryPageList(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 20b7d3756..7c2667998 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 @@ -94,9 +94,7 @@ public class VehiclePositionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; - @TableField(exist = false) - @ApiModelProperty(value = "在线状态（0.离线 1.在线）") - private java.lang.Integer online; + /** * 当前位置-经度 */ @@ -109,5 +107,15 @@ public class VehiclePositionDev implements Serializable { @Excel(name = "当前位置-维度", width = 15) @ApiModelProperty(value = "当前位置-维度") private java.lang.Double latitude; - + /** + * 新增时间 + */ + @Excel(name = "新增时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionAlarmMapper.java index 4e55c5fb6..65c55f058 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionAlarmMapper.java @@ -9,6 +9,8 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 车辆（人员）定位-报警记录 * @author： pds @@ -19,4 +21,6 @@ import org.apache.ibatis.annotations.Param; public interface VehiclePositionAlarmMapper extends BaseMapper { IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List pageList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDataMapper.java index df435287a..4816a6857 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDataMapper.java @@ -1,14 +1,16 @@ package com.zhgd.xmgl.modules.vehicleposition.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionData; import org.apache.ibatis.annotations.Mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 车辆（人员）定位-实时数据 * @author： pds @@ -19,4 +21,6 @@ import org.apache.ibatis.annotations.Param; public interface VehiclePositionDataMapper extends BaseMapper { IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List pageList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml index db76aa470..5f145414b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml @@ -5,7 +5,7 @@ select *, wi.worker_name personName from vehicle_position_dev vpd left join worker_info wi on vpd.worker_info_id = wi.id - left join (select * + left join (select t1.* from vehicle_position_data t1 join (select max(id) id from vehicle_position_data group by dev_sn) t2 on t1.id=t2.id ) vpd2 diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionAlarmServiceImpl.java index cf99e2943..98d06e998 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionAlarmServiceImpl.java @@ -52,7 +52,7 @@ public class VehiclePositionAlarmServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.pageList(queryWrapper)); } @Override @@ -92,8 +92,9 @@ public class VehiclePositionAlarmServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, "vpd."); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionAlarm::getId)); + String alias = "vpd."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionAlarm::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java index b8cb80120..de89e316c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java @@ -46,7 +46,7 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.pageList(queryWrapper)); } @Override @@ -64,8 +64,9 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionData.class, paramMap); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionData::getId)); + String alias = "vpa."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionData.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionData::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java index 1c5d7e5a1..a4e51c655 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper; import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDevService; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,14 +48,24 @@ public class VehiclePositionDevServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionDev.class, paramMap); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionDev::getId)); + String alias = "vpd."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionDev.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionDev::getId)); + Integer online = MapUtils.getInteger(paramMap, "online"); + if (online != null) { + String dateTime = DateUtil.formatDateTime(DateUtil.offsetMinute(new Date(), -30)); + if (online == 1) { + queryWrapper.ge(alias + RefUtil.fieldNameUlc(VehiclePositionDev::getHeartbeatTime), dateTime); + } else { + queryWrapper.lt(alias + RefUtil.fieldNameUlc(VehiclePositionDev::getHeartbeatTime), dateTime); + } + } return queryWrapper; } private List dealList(List list) { for (VehiclePositionDev dev : list) { - dev.setOnline(DateUtil.between(dev.getHeartbeatTime(), new Date(), DateUnit.MINUTE) < 30 ? 1 : 0); + dev.setOnline(dev.getHeartbeatTime() != null && DateUtil.between(dev.getHeartbeatTime(), new Date(), DateUnit.MINUTE) < 30 ? 1 : 0); } return list; } diff --git a/src/main/resources/application-gsx-other-env-show.properties b/src/main/resources/application-gsx-other-env-show.properties index 07020e7e0..0deb9ae25 100644 --- a/src/main/resources/application-gsx-other-env-show.properties +++ b/src/main/resources/application-gsx-other-env-show.properties @@ -103,4 +103,4 @@ xiwon.appSecret=b6162078-6f1c-4f2c-8cd5-0873f45199b2 #吉联达的推送合作单位、班组、部门、人员的url，如：http://127.9.90.1:7123 jld_push_url= #桥梁生产记录二维码url -bridgeProduceQrCodeUrl=http://192.168.34.173:8084/#/ +bridgeProduceQrCodeUrl=http://192.168.34.173:8082/#/