wangtuohang@126.com 2 сар өмнө
parent
commit
b3c687bade

+ 5 - 0
src/main/java/org/springblade/common/controller/ParamsConvert.java

@@ -535,6 +535,11 @@ public class ParamsConvert {
 			jsonObject.putAll(params);
 			XlfkEntity xlfkEntity = jsonObject.toJavaObject(XlfkEntity.class);
 			return method.invoke(proxyObject, xlfkEntity);
+		} else if (className.equals("xlfkController") && method.getName().equals("page")) {
+			Query query = new Query();
+			query.setSize(Integer.valueOf(params.get("size").toString()));
+			query.setCurrent(Integer.valueOf(params.get("current").toString()));
+			return method.invoke(proxyObject, params, query);
 		}
 		return null;
 	}

+ 19 - 6
src/main/java/org/springblade/modules/xlfk/pojo/entity/XlfkEntity.java

@@ -1,11 +1,10 @@
 package org.springblade.modules.xlfk.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 巡逻防控 实体类
@@ -32,16 +31,30 @@ public class XlfkEntity extends BaseEntity {
 	 * 巡逻开始时间
 	 */
 	@ApiModelProperty(value = "巡逻开始时间")
-	private LocalDateTime startTime;
+	private String startTime;
 	/**
 	 * 巡逻结束时间
 	 */
 	@ApiModelProperty(value = "巡逻结束时间")
-	private LocalDateTime endTime;
+	private String endTime;
 	/**
 	 * 巡逻照片
 	 */
 	@ApiModelProperty(value = "巡逻照片")
 	private String zp;
-
+	/**
+	 * 起点地址
+	 */
+	@ApiModelProperty(value = "起点地址")
+	private String qddz;
+	/**
+	 * 终点地址
+	 */
+	@ApiModelProperty(value = "终点地址")
+	private String zddz;
+	/**
+	 * 巡逻面积
+	 */
+	@ApiModelProperty(value = "巡逻面积")
+	private String xlmj;
 }

+ 1 - 1
src/main/resources/application.yml

@@ -128,7 +128,7 @@ flowable:
 
 #报表配置
 report:
-  enabled: true
+  enabled: false
   database:
     provider:
       prefix: blade-