From d0f665a83a1be237cd675a63ba0cef08bf31aad0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 10:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 28 ++++++++++++-
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java | 55 +++++++++++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 9 ++++
3 files changed, 89 insertions(+), 3 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
new file mode 100644
index 0000000..07abaf7
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java
@@ -0,0 +1,55 @@
+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 org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("闂ㄧ鏈夋晥鏈熸壒閲忓鐞�")
+public class LaborEmpowerDTO {
+
+ @ApiModelProperty(value = "鏂囦欢")
+ private MultipartFile file;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+
+
+ @ApiModelProperty(value = "涓嬪彂鏂瑰紡")
+ private Integer sendType;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊")
+ private String deviceRole;
+
+ @ApiModelProperty(value = "闂ㄧid")
+ private List<String> deviceIds;
+
+ @Data
+ @ApiModel("鍔冲姟浜哄憳淇℃伅")
+ public static class LaborMemberEmpower{
+
+ @ApiModelProperty(value = "濮撳悕")
+ @ExcelColumn(name="濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ @ExcelColumn(name="韬唤璇佸彿")
+ private String idcardNo;
+
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index b84b44a..eafa71a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
@@ -123,4 +124,12 @@
* @return long
*/
long count(Member member);
+
+
+ /**
+ * 瀵煎叆鍔冲姟浜哄憳闂ㄧ淇℃伅
+ * @param laborEmpowerDTO
+ * @return
+ */
+ void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 7bb37f3..8dca011 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -3,7 +3,8 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import cn.hutool.core.util.PhoneUtil;
+import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -11,6 +12,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.MemberMapper;
@@ -26,13 +28,12 @@
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.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -66,6 +67,9 @@
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if (PhoneUtil.isPhone(member.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+ }
if (IdcardUtil.isValidCard(member.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
@@ -349,4 +353,22 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectCount(wrapper);
}
+
+ @Override
+ public void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO) {
+ try {
+ ExcelImporter ie = new ExcelImporter(laborEmpowerDTO.getFile(),0,0);
+
+ List<LaborEmpowerDTO.LaborMemberEmpower> dataList = ie.getDataList(LaborEmpowerDTO.LaborMemberEmpower.class,null);
+
+ if (CollectionUtils.isEmpty(dataList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂囦欢鏃犳暟鎹褰�");
+ }
+
+ } catch (Exception e) {
+
+ }
+//
+
+ }
}
--
Gitblit v1.9.3