代码优化

src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java

@@ -62,32 +62,18 @@ public class WeighBookVehicleInfoController {
      * @param weighBookVehicleInfo
      * @param pageNo
      * @param pageSize
-	 * @param lastAdddatetime      现场上次拉取的时间
      * @param req
      * @return
      */
     @ApiOperation(value = " 分页列表查询过磅预约车辆信息信息", notes = "分页列表查询过磅预约车辆信息信息", httpMethod = "GET")
     @GetMapping(value = "/list")
-	public Result<IPage<WeighBookVehicleInfo>> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String lastAdddatetime, HttpServletRequest req) {
+    public Result<IPage<WeighBookVehicleInfo>> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-		Result<IPage<WeighBookVehicleInfo>> result = new Result<IPage<WeighBookVehicleInfo>>();
+        return weighBookVehicleInfoService.queryPageList(weighBookVehicleInfo, pageNo, pageSize, req);
-		LambdaQueryWrapper<WeighBookVehicleInfo> queryWrapper = new LambdaQueryWrapper<WeighBookVehicleInfo>()
-				.eq(StringUtils.isNotBlank(weighBookVehicleInfo.getProjectSn()),WeighBookVehicleInfo::getProjectSn,weighBookVehicleInfo.getProjectSn())
-				.like(StringUtils.isNotBlank(weighBookVehicleInfo.getSpecifications()),WeighBookVehicleInfo::getSpecifications,weighBookVehicleInfo.getSpecifications())
-				.like(StringUtils.isNotBlank(weighBookVehicleInfo.getGoodsName()),WeighBookVehicleInfo::getGoodsName,weighBookVehicleInfo.getGoodsName())
-				.like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()),WeighBookVehicleInfo::getLicensePlate,weighBookVehicleInfo.getLicensePlate());
-		if (StringUtils.isNotBlank(lastAdddatetime)) {
-			DateTime dateTime = DateUtil.parse(lastAdddatetime);
-			queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime);
-		}
-		Page<WeighBookVehicleInfo> page = new Page<WeighBookVehicleInfo>(pageNo, pageSize);
-		IPage<WeighBookVehicleInfo> pageList = weighBookVehicleInfoService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
     }
 
     /**
      * 添加
+     *
      * @param weighBookVehicleInfo
      * @return
      */
@@ -108,6 +94,7 @@ public class WeighBookVehicleInfoController {
 
     /**
      * 编辑
+     *
      * @param weighBookVehicleInfo
      * @return
      */
@@ -153,6 +140,7 @@ public class WeighBookVehicleInfoController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
@@ -172,6 +160,7 @@ public class WeighBookVehicleInfoController {
 
     /**
      * 通过id查询
+     *
      * @param id
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java

@@ -1,41 +1,37 @@
 package com.zhgd.xmgl.modules.weight.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.swagger.annotations.ApiImplicitParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.oConvertUtils;
 import com.zhgd.xmgl.modules.weight.entity.WeighInfo;
 import com.zhgd.xmgl.modules.weight.service.IWeighInfoService;
-
+import io.swagger.annotations.Api;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.ApiImplicitParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Title: Controller
@@ -54,6 +50,7 @@ public class WeighInfoController {
 
     /**
      * 分页列表查询
+     *
      * @param weighInfo
      * @param pageNo
      * @param pageSize
@@ -70,7 +67,8 @@ public class WeighInfoController {
     }
 
     /**
-	  *   添加
+     * 现场端添加称重记录表信息
+     *
      * @param weighInfo
      * @return
      */
@@ -91,6 +89,7 @@ public class WeighInfoController {
 
     /**
      * 编辑
+     *
      * @param weighInfo
      * @return
      */
@@ -111,6 +110,7 @@ public class WeighInfoController {
 
     /**
      * 通过id删除
+     *
      * @param id
      * @return
      */
@@ -135,6 +135,7 @@ public class WeighInfoController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
@@ -154,6 +155,7 @@ public class WeighInfoController {
 
     /**
      * 通过id查询
+     *
      * @param id
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighPicController.java

@@ -83,7 +83,7 @@ public class WeighPicController {
 	}
 
 	/**
-	 * 添加
+	 * 现场端添加称重图片信息
 	 *
 	 * @param weighPic
 	 * @return

src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java

@@ -1,16 +1,18 @@
 package com.zhgd.xmgl.modules.weight.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
 /**
  * @Description: 过磅预约车辆信息
  * @author： pds
@@ -23,58 +25,93 @@ import io.swagger.annotations.ApiModelProperty;
 public class WeighBookVehicleInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键id*/
+    /**
+     * 主键id
+     */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
     private java.lang.Long id;
-	/**车牌号码*/
+    /**
+     * 车牌号码
+     */
     @Excel(name = "车牌号码", width = 15)
     @ApiModelProperty(value = "车牌号码")
     private java.lang.String licensePlate;
-	/**发货单位*/
+    /**
+     * 发货单位
+     */
     @Excel(name = "发货单位", width = 15)
     @ApiModelProperty(value = "发货单位")
     private java.lang.String forwardingUnit;
-	/**收货单位*/
+    /**
+     * 收货单位
+     */
     @Excel(name = "收货单位", width = 15)
     @ApiModelProperty(value = "收货单位")
     private java.lang.String receivingUnit;
-	/**货名*/
+    /**
+     * 货名
+     */
     @Excel(name = "货名", width = 15)
     @ApiModelProperty(value = "货名")
     private java.lang.String goodsName;
-	/**规格*/
+    /**
+     * 规格
+     */
     @Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
     private java.lang.String specifications;
-	/**备注*/
+    /**
+     * 备注
+     */
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String reserve;
-	/**过磅类型*/
+    /**
+     * 过磅类型
+     */
     @Excel(name = "过磅类型", width = 15)
     @ApiModelProperty(value = "过磅类型")
     private java.lang.Integer weighingType;
-	/**录入时间*/
+    /**
+     * 录入时间
+     */
     @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 addDateTime;
-	/**创建时间*/
+    /**
+     * 创建时间
+     */
     @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 createTime;
-	/**更新时间*/
+    /**
+     * 更新时间
+     */
     @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 updateTime;
-	/**所属项目SN*/
+    /**
+     * 所属项目SN
+     */
     @Excel(name = "所属项目SN", width = 15)
     @ApiModelProperty(value = "所属项目SN")
     private java.lang.String projectSn;
+    /**
+     * 现场上次拉取的时间
+     */
+    @TableField(exist = false)
+    private String lastAddTime;
+    /**
+     * 上次查询的id（查询这个id数据之后的数据（不返回这条id数据））
+     */
+    @TableField(exist = false)
+    private Long lastQueryId;
+
 }

src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighBookVehicleInfoService.java

@@ -1,8 +1,12 @@
 package com.zhgd.xmgl.modules.weight.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 过磅预约车辆信息
  * @author： pds
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IWeighBookVehicleInfoService extends IService<WeighBookVehicleInfo> {
 
+    Result<IPage<WeighBookVehicleInfo>> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }

src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java

@@ -1,11 +1,19 @@
 package com.zhgd.xmgl.modules.weight.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.api.vo.Result;
 import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo;
 import com.zhgd.xmgl.modules.weight.mapper.WeighBookVehicleInfoMapper;
 import com.zhgd.xmgl.modules.weight.service.IWeighBookVehicleInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Description: 过磅预约车辆信息
@@ -16,4 +24,28 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class WeighBookVehicleInfoServiceImpl extends ServiceImpl<WeighBookVehicleInfoMapper, WeighBookVehicleInfo> implements IWeighBookVehicleInfoService {
 
+    @Override
+    public Result queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        if (StringUtils.isBlank(weighBookVehicleInfo.getProjectSn())) {
+            return Result.error("projectSn不能为空");
+        }
+        String lastAdddatetime = weighBookVehicleInfo.getLastAddTime();
+        Long lastQueryId = weighBookVehicleInfo.getLastQueryId();
+        Result<IPage<WeighBookVehicleInfo>> result = new Result<IPage<WeighBookVehicleInfo>>();
+        LambdaQueryWrapper<WeighBookVehicleInfo> queryWrapper = new LambdaQueryWrapper<WeighBookVehicleInfo>()
+                .eq(StringUtils.isNotBlank(weighBookVehicleInfo.getProjectSn()), WeighBookVehicleInfo::getProjectSn, weighBookVehicleInfo.getProjectSn())
+                .like(StringUtils.isNotBlank(weighBookVehicleInfo.getSpecifications()), WeighBookVehicleInfo::getSpecifications, weighBookVehicleInfo.getSpecifications())
+                .like(StringUtils.isNotBlank(weighBookVehicleInfo.getGoodsName()), WeighBookVehicleInfo::getGoodsName, weighBookVehicleInfo.getGoodsName())
+                .like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()), WeighBookVehicleInfo::getLicensePlate, weighBookVehicleInfo.getLicensePlate())
+                .gt(lastQueryId != null, WeighBookVehicleInfo::getId, lastQueryId);
+        if (StringUtils.isNotBlank(lastAdddatetime)) {
+            DateTime dateTime = DateUtil.parse(lastAdddatetime);
+            queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime);
+        }
+        Page<WeighBookVehicleInfo> page = new Page<WeighBookVehicleInfo>(pageNo, pageSize);
+        IPage<WeighBookVehicleInfo> pageList = page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 }