bug修复

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

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<IPage<BridgeProduceRecord>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+
 		return Result.success(bridgeProduceRecordService.queryPageList(paramMap));
 	}
 

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

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<VehiclePositionAlarm> {
 
     IPage<VehiclePositionAlarm> pageList(Page<VehiclePositionAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<VehiclePositionAlarm> queryWrapper);
+
+    List<VehiclePositionAlarm> pageList(@Param(Constants.WRAPPER) QueryWrapper<VehiclePositionAlarm> queryWrapper);
 }

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<VehiclePositionData> {
 
     IPage<VehiclePositionData> pageList(Page<VehiclePositionData> page, @Param(Constants.WRAPPER) QueryWrapper<VehiclePositionData> queryWrapper);
+
+    List<VehiclePositionData> pageList(@Param(Constants.WRAPPER) QueryWrapper<VehiclePositionData> queryWrapper);
 }

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

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

@@ -52,7 +52,7 @@ public class VehiclePositionAlarmServiceImpl extends ServiceImpl<VehiclePosition
     @Override
     public List<VehiclePositionAlarm> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<VehiclePositionAlarm> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.pageList(queryWrapper));
     }
 
     @Override
@@ -92,8 +92,9 @@ public class VehiclePositionAlarmServiceImpl extends ServiceImpl<VehiclePosition
     }
 
     private QueryWrapper<VehiclePositionAlarm> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<VehiclePositionAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, "vpd.");
+        String alias = "vpd.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionAlarm::getId));
+        QueryWrapper<VehiclePositionAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionAlarm.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionAlarm::getId));
         return queryWrapper;
     }
 

src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java

@@ -46,7 +46,7 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl<VehiclePositionD
     @Override
     public List<VehiclePositionData> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<VehiclePositionData> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.pageList(queryWrapper));
     }
 
     @Override
@@ -64,8 +64,9 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl<VehiclePositionD
     }
 
     private QueryWrapper<VehiclePositionData> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<VehiclePositionData> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionData.class, paramMap);
+        String alias = "vpa.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionData::getId));
+        QueryWrapper<VehiclePositionData> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionData.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(VehiclePositionData::getId));
         return queryWrapper;
     }
 

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<VehiclePositionDe
     }
 
     private QueryWrapper<VehiclePositionDev> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<VehiclePositionDev> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionDev.class, paramMap);
+        String alias = "vpd.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(VehiclePositionDev::getId));
+        QueryWrapper<VehiclePositionDev> 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<VehiclePositionDev> dealList(List<VehiclePositionDev> 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;
     }

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/#/