From 1293d3dba10c4e291dfbce4c936f952875557edb Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 18:40:49 +0800
Subject: [PATCH] 配置信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/CarEventVo.java | 51 +++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java | 9 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 112 ++++++++++++++++++++++++++----------
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 2
4 files changed, 141 insertions(+), 33 deletions(-)
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
index a797d66..9017d71 100644
--- 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
@@ -78,7 +78,7 @@
private String personPhone;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
- private String personType;
+ private Integer personType;
@ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
private String personIdcardDecode;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/CarEventVo.java b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/CarEventVo.java
new file mode 100644
index 0000000..61dbafe
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/CarEventVo.java
@@ -0,0 +1,51 @@
+package com.doumee.dao.system.vo;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("杞﹁締浜嬩欢瑙嗗浘")
+public class CarEventVo {
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�")
+ private String plateNos;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ @ExcelColumn(name="褰掑睘鐢ㄦ埛绫诲瀷")
+ private String typeName;
+
+ @ApiModelProperty(value = "濮撳悕")
+ @ExcelColumn(name="濮撳悕")
+ private String personName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�")
+ private String personPhone;
+
+ @ApiModelProperty(value = "浜哄憳缁勭粐鍏徃")
+ @ExcelColumn(name="鍏徃/閮ㄩ棬")
+ private String personCompanyName;
+
+ @ApiModelProperty(value = "鍋滆溅搴撳悕绉�")
+ @ExcelColumn(name="鍋滆溅搴撳悕绉�")
+ private String parkName;
+
+ @ApiModelProperty(value = "鍑哄叆鍙ｅ悕绉�")
+ @ExcelColumn(name="鍑哄叆鍙ｅ悕绉�")
+ private String gateName;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private String eventTypeName;
+
+ @ApiModelProperty(value = "杩涘嚭鍦虹被鍨嬶紝0锛氳繘鍦猴紝1锛氬嚭鍦� ", example = "1")
+ @ExcelColumn(name="鍑哄叆绫诲瀷")
+ private Integer inoutType;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鏃堕棿")
+ private String happenTime;
+}
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 fdeb761..ff4f9c6 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
@@ -5,6 +5,8 @@
import com.doumee.dao.admin.request.VisitEventQuery;
import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
+import com.doumee.dao.system.vo.CarEventVo;
+
import java.util.List;
/**
@@ -103,4 +105,11 @@
* @return PageData<CarEvent>
*/
PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap);
+
+ /**
+ * 瀵煎嚭
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<CarEventVo>
+ */
+ List<CarEventVo> findPageExcel(PageWrap<CarEvent> 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 f5e4fb8..12f16d6 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
@@ -17,6 +17,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.vo.CarEventVo;
import com.doumee.service.business.CarEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -275,6 +276,55 @@
@Override
public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) {
+ IPage<CarEventDTO> carEventDTOIPage = getDataInfo(pageWrap);
+ if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
+ carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
+ }
+ return PageData.from(carEventDTOIPage);
+ }
+
+
+ public List<CarEventVo> findPageExcel(PageWrap<CarEvent> pageWrap) {
+ IPage<CarEventDTO> carEventExcel= getDataInfo(pageWrap);
+ List<CarEventVo> newDataList = new ArrayList<>();
+ if(null != carEventExcel && carEventExcel.getRecords().size() > 0) {
+ carEventExcel.getRecords().stream().forEach(obj->{
+ CarEventVo vo = new CarEventVo();
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
+ vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+ vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
+ vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
+ }else{
+ vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
+ }
+ if(null != obj.getPersonType()) {
+ if(Constants.ZERO == obj.getPersonType()){
+ vo.setTypeName(Constants.Status.LW_FK.getDes());
+ }else if(Constants.ONE == obj.getPersonType()) {
+ vo.setTypeName(Constants.Status.PT_FK.getDes());
+ }else {
+ vo.setTypeName(Constants.Status.NB_FK.getDes());
+ }
+ }else {
+ vo.setTypeName("");
+ }
+ vo.setPlateNos(obj.getPlateNos());
+ vo.setPersonName(obj.getPersonName());
+ vo.setPersonPhone(obj.getPersonPhone());
+ vo.setPersonCompanyName(obj.getPersonCompanyName());
+ vo.setParkName(obj.getParkName());
+ vo.setGateName(obj.getGateName());
+ vo.setInoutType(obj.getInoutType());
+ vo.setHappenTime(obj.getHappenTime());
+ newDataList.add(vo);
+ });
+ }
+ return newDataList;
+ }
+
+ private IPage<CarEventDTO> getDataInfo(PageWrap<CarEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -287,41 +337,38 @@
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);
+ .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);
+ .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().getPlateNos()),
- CarEvent::getPlateNos,
- pageWrap.getModel().getPlateNos())
- .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(Objects.nonNull(pageWrap.getModel().getEventType()),
- CarEvent::getEventType,
- pageWrap.getModel().getEventType())
- .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
+ CarEvent::getPlateNos,
+ pageWrap.getModel().getPlateNos())
+ .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(Objects.nonNull(pageWrap.getModel().getEventType()),
+ CarEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
- if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
- carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
- }
- return PageData.from(carEventDTOIPage);
+ return carEventDTOIPage;
}
private List<CarEventDTO> newCarEventDTO(List<CarEventDTO> newCarEventDTOList) {
@@ -346,4 +393,5 @@
});
return newDataList;
}
+
}
--
Gitblit v1.9.3