From 65b4101c151b763c5f61751b94e4eb5dd4c1c4b3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:28 +0800
Subject: [PATCH] #时间统计，列表查询 题目模块
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitEventQuery.java | 41 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java | 14 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java | 12 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java | 134 ++++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 176 ++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java | 1
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java | 11
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java | 12 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 17
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 60 +++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/ProblemDTO.java | 35 +++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java | 17 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 68 ++++++
15 files changed, 588 insertions(+), 20 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java
index 07abaf7..8f44542 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java
@@ -25,7 +25,6 @@
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private Date endTime;
-
@ApiModelProperty(value = "涓嬪彂鏂瑰紡")
private Integer sendType;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitEventQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitEventQuery.java
new file mode 100644
index 0000000..63cc496
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitEventQuery.java
@@ -0,0 +1,41 @@
+package com.doumee.dao.admin.request;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("璁垮/杞﹁締 鏌ヨ")
+public class VisitEventQuery {
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private String memberType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+ @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
new file mode 100644
index 0000000..6300986
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
@@ -0,0 +1,176 @@
+package com.doumee.dao.admin.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃")
+public class CarEventDTO {
+
+ @ApiModelProperty(value = "涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
+ private String timeout;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ private String srcParentIndex;
+
+ @ApiModelProperty(value = "鏄惁榛戝悕鍗曟爣璇嗭紙1-榛戝悕鍗� 0-闈為粦鍚嶅崟锛�")
+ private String alarmCar;
+
+ @ApiModelProperty(value = "杞﹁締灞炴�у悕绉�")
+ private String carAttributeName;
+
+ @ApiModelProperty(value = "鍗″彿")
+ private String cardNo;
+ /**鍏宠仈浜哄憳淇℃伅**/
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String personPhone;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private String personType;
+
+ @ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
+ private String personIdcardDecode;
+
+ @ApiModelProperty(value = "浜哄憳缁勭粐鍏徃")
+ private String personCompanyName;
+
+ @ApiModelProperty(value = "濮撳悕")
+ private String personName;
+
+ @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢2:涓婁紶鍥剧墖3:鍏ュ満4:鍑哄満5:杞︾墝鐭6:鍥剧墖閲嶄紶")
+ private Integer eventCmd;
+
+ @ApiModelProperty(value = "浜嬩欢缂栧彿")
+ private String eventIndex;
+
+ @ApiModelProperty(value = "鍑哄叆鍙ｇ紪鍙�")
+ private String gateIndex;
+
+ @ApiModelProperty(value = "鍑哄叆鍙ｅ悕绉�")
+ private String gateName;
+
+ @ApiModelProperty(value = "鏀捐鏉冮檺")
+ private Integer releaseAuth;
+
+ @ApiModelProperty(value = "鏀捐鍘熷洜")
+ private Integer releaseReason;
+
+ @ApiModelProperty(value = "鏀捐缁撴灉")
+ private Integer releaseResult;
+
+ @ApiModelProperty(value = "鏂颁綋绯绘斁琛岀粨鏋�")
+ private Integer releaseResultEx;
+
+ @ApiModelProperty(value = "鏀捐鏂瑰紡")
+ private Integer releaseWay;
+
+ @ApiModelProperty(value = "杩涘嚭鍦虹被鍨嬶紝0锛氳繘鍦猴紝1锛氬嚭鍦�")
+ private Integer inoutType;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String plateNos;
+
+ @ApiModelProperty(value = "杞﹁締涓诲搧鐗�")
+ private Integer mainLogo;
+
+ @ApiModelProperty(value = "鍋滆溅搴撶紪鍙�")
+ private String parkIndex;
+
+ @ApiModelProperty(value = "鍋滆溅搴撳悕绉�")
+ private String parkName;
+
+ @ApiModelProperty(value = "杞︾墝棰滆壊")
+ private String plateColor;
+
+ @ApiModelProperty(value = "杞︾墝缃俊搴�")
+ private BigDecimal plateBelieve;
+
+ @ApiModelProperty(value = "杞︾墝绫诲瀷")
+ private Integer plateType;
+
+ @ApiModelProperty(value = "杞﹂亾缂栧彿")
+ private String roadwayIndex;
+
+ @ApiModelProperty(value = "杞﹂亾鍚嶇О")
+ private String roadwayName;
+
+ @ApiModelProperty(value = "杞﹂亾绫诲瀷 1锛氬叆鍦鸿溅閬� 2锛氬嚭鍦轰笉鏀惰垂杞﹂亾 3锛氬嚭鍦虹即璐硅溅閬� 4锛氫腑澶即璐硅溅閬�")
+ private Integer roadwayType;
+
+ @ApiModelProperty(value = "杞﹁締瀛愬搧鐗�")
+ private Integer subLogo;
+
+ @ApiModelProperty(value = "瀛愬搧鐗屽勾娆�")
+ private Integer subModel;
+
+ @ApiModelProperty(value = "鏃堕棿 ISO鏍煎紡")
+ private String timestr;
+
+ @ApiModelProperty(value = "杞﹁締灞炴��")
+ private Integer vehicleClass;
+
+ @ApiModelProperty(value = "杞﹁締棰滆壊")
+ private Integer vehicleColor;
+
+ @ApiModelProperty(value = "杞﹁締绫诲瀷")
+ private Integer vehicleType;
+
+ @ApiModelProperty(value = "杞﹁締鍥剧墖")
+ private String vehiclePicUrl;
+
+ @ApiModelProperty(value = "杞︾墝鍥剧墖")
+ private String platePicUrl;
+
+ @ApiModelProperty(value = "鍥剧墖鏈嶅姟鍣ㄧ紪鍙�")
+ private String svrIndex;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/ProblemDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/ProblemDTO.java
new file mode 100644
index 0000000..d96376d
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/ProblemDTO.java
@@ -0,0 +1,35 @@
+package com.doumee.dao.admin.response;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("璇曢淇℃伅琛�")
+public class ProblemDTO {
+
+
+ @ApiModelProperty(value = "棰樼洰")
+ private String title;
+
+ @ApiModelProperty(value = "閫夐」闆嗗悎")
+ private String options;
+
+ @ApiModelProperty(value = "姝ｇ‘绛旀")
+ private String answer;
+
+ @ApiModelProperty(value = "鎺掑簭鐮�")
+ private Integer sortnu;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� ")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍒嗗��")
+ private BigDecimal score;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
new file mode 100644
index 0000000..0f7183f
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
@@ -0,0 +1,134 @@
+package com.doumee.dao.admin.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("璁垮浜嬩欢鎺ㄩ�佽褰曡〃")
+public class VisitEventDTO {
+
+ @ApiModelProperty(value = "涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
+ private String timeout;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ private String srcParentIndex;
+
+ @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
+ private String visitorId;
+
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String personPhone;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private String personType;
+
+ @ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
+ private String personIdcardDecode;
+
+ @ApiModelProperty(value = "浜哄憳缁勭粐鍏徃")
+ private String personCompanyName;
+
+
+ @ApiModelProperty(value = "濮撳悕")
+ private String personName;
+
+ @ApiModelProperty(value = "鎬у埆 1-鐢�2-濂�")
+ private Integer sex;
+
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 111韬唤璇�")
+ private String idType;
+
+ @ApiModelProperty(value = "璇佷欢鍙� ")
+ private String idNo;
+
+ @ApiModelProperty(value = "琚闂汉濮撳悕")
+ private String beVisitedPersonName;
+
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁�")
+ private String beVisitedPersonOrg;
+
+ @ApiModelProperty(value = "鏉ヨ鍗曚綅")
+ private String visitorWorkUint;
+
+ @ApiModelProperty(value = "璁垮楠岃瘉鐮�")
+ private String visitorCode;
+
+ @ApiModelProperty(value = "鏉ヨ浜嬬敱")
+ private String purpose;
+
+ @ApiModelProperty(value = "璇佷欢绛惧彂鏈哄叧")
+ private String signOrg;
+
+ @ApiModelProperty(value = "绂诲紑鏃堕棿")
+ private String startTime;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ private String endTime;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+
+ @ApiModelProperty(value = "鐓х墖uri")
+ private String photoUrl;
+
+ @ApiModelProperty(value = "鎶撴媿鍥緐ri")
+ private String captureUrl;
+
+ @ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ private String svrIndexCode;
+
+ @ApiModelProperty(value = "琚闂汉id")
+ private String beVisitedPersonId;
+
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
+ private String beVisitedPersonOrgId;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
new file mode 100644
index 0000000..3bb3ab6
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.CarEvent;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface CarEventJoinMapper extends MPJJoinMapper<CarEvent> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
new file mode 100644
index 0000000..656b676
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.VisitEvent;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface VisitEventJoinMapper extends MPJJoinMapper<VisitEvent> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 07d5852..c4d307b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +31,11 @@
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String creatorName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
index 73284d4..070ea84 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
import java.util.List;
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param carEvent 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -77,7 +79,7 @@
* @return List<CarEvent>
*/
List<CarEvent> findList(CarEvent carEvent);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -93,4 +95,12 @@
* @return long
*/
long count(CarEvent carEvent);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<CarEvent>
+ */
+ PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
index 6748d7b..57bf207 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
@@ -14,7 +14,7 @@
/**
* 鍒涘缓
- *
+ *
* @param problems 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +78,7 @@
* @return List<Problems>
*/
List<Problems> findList(Problems problems);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +94,11 @@
* @return long
*/
long count(Problems problems);
+
+ /**
+ * 鑾峰彇涓嶅悓鐢ㄦ埛绫诲瀷鐨勯鐩�
+ * @param useType
+ * @return
+ */
+ List<Problems> findListByUseType(Integer useType);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
index 9d7c56c..b5e283b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.model.VisitEvent;
import java.util.List;
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param visitEvent 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +80,7 @@
* @return List<VisitEvent>
*/
List<VisitEvent> findList(VisitEvent visitEvent);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +96,15 @@
* @return long
*/
long count(VisitEvent visitEvent);
+
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<VisitEvent>
+ */
+ PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap);
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 5121dd3..4412954 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -1,15 +1,23 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.CarEventMapper;
-import com.doumee.dao.business.model.CarEvent;
+import com.doumee.dao.business.join.CarEventJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +34,9 @@
@Autowired
private CarEventMapper carEventMapper;
+
+ @Autowired
+ private CarEventJoinMapper carEventJoinMapper;
@Override
public Integer create(CarEvent carEvent) {
@@ -83,7 +94,7 @@
QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
return carEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CarEvent> findPage(PageWrap<CarEvent> pageWrap) {
IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -250,4 +261,49 @@
QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
return carEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) {
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ queryWrapper.leftJoin(Cars.class,Cars::getCode,CarEvent::getPlateNos)
+ .leftJoin(Member.class,Member::getId,Cars::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(CarEvent.class)
+ .selectAs(Member::getType,CarEventDTO::getPersonType)
+ .selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
+ .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
+ .selectAs(Member::getName,CarEventDTO::getPersonName)
+ .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
+ CarEvent::getCardNo,
+ pageWrap.getModel().getCarNo())
+ .like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b || hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
+ Member::getType,
+ pageWrap.getModel().getMemberType())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
+ CarEvent::getSrcType,
+ pageWrap.getModel().getSrcType());
+ IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
+
+ return PageData.from(carEventDTOIPage);
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index a136eea..7c6bcb5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -320,10 +320,10 @@
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
DeviceEvent::getCreateDate,
Utils.Date.getStart(pageWrap.getModel().getStartTime()))
- .le(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
DeviceEvent::getCreateDate,
Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
-
+ queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
return PageData.from(deviceEventDTOIPage);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index f039e1e..532bac6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -83,7 +83,7 @@
QueryWrapper<Problems> wrapper = new QueryWrapper<>(problems);
return problemsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Problems> findPage(PageWrap<Problems> pageWrap) {
IPage<Problems> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -133,13 +133,8 @@
if (pageWrap.getModel().getUseType() != null) {
queryWrapper.lambda().eq(Problems::getUseType, pageWrap.getModel().getUseType());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(Problems::getCreateDate);
+ queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
return PageData.from(problemsMapper.selectPage(page, queryWrapper));
}
@@ -148,4 +143,10 @@
QueryWrapper<Problems> wrapper = new QueryWrapper<>(problems);
return problemsMapper.selectCount(wrapper);
}
+
+ @Override
+ public List<Problems> findListByUseType(Integer useType) {
+
+ return null;
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index b9fba31..3463258 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -1,20 +1,32 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
+import com.doumee.dao.business.join.VisitEventJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
@@ -26,6 +38,9 @@
@Autowired
private VisitEventMapper visitEventMapper;
+
+ @Autowired
+ private VisitEventJoinMapper visitEventJoinMapper;
@Override
public Integer create(VisitEvent visitEvent) {
@@ -83,7 +98,7 @@
QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
return visitEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<VisitEvent> findPage(PageWrap<VisitEvent> pageWrap) {
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -211,4 +226,55 @@
QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
return visitEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap) {
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(VisitEvent.class)
+ .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
+ .selectAs(Member::getType,VisitEventDTO::getPersonType)
+ .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
+ .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
+
+ queryWrapper.like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b ||hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
+ VisitEvent::getSrcType,
+ pageWrap.getModel().getSrcType())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ VisitEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ VisitEvent::getHappenTime,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ VisitEvent::getHappenTime,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ queryWrapper.orderByDesc(VisitEvent::getHappenTime);
+ IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
+ return PageData.from(visitEventDTOIPage);
+ }
+
+
}
--
Gitblit v1.9.3