修改邀访导入

src/main/java/org/rcisoft/sys/ossinfo/util/OssINfoUtil.java

@@ -27,7 +27,7 @@ public class OssINfoUtil {
         SEPARATOR = File.separator;
     }
 
-    @Value("${global.base_upload_location}")
+    @Value("${global.path.base_upload_location}")
     private String baseUploadLocation;
 
     public OssInfo filePath(MultipartFile multipartFile, String temp) {

src/main/java/org/rcisoft/sys/sysuser/util/CheckUtil.java

 package org.rcisoft.sys.sysuser.util;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.core.constant.CySysCons;
+import org.rcisoft.core.exception.CyServiceException;
 import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.rcisoft.sys.visit.dto.ExportVisitInfoDto;
 import org.rcisoft.sys.visit.dto.ExportVisitUserDTO;
+import org.rcisoft.sys.visit.dto.VisitInformationErrorDTO;
 import org.rcisoft.sys.wbac.user.dto.ErrorDTO;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @ConditionalOnProperty(prefix = "cy.model", name = "permission", havingValue = CySysCons.WORK_BASE)
@@ -79,23 +88,23 @@ public class CheckUtil {
         return errorDTO;
     }
 
-    public static ErrorDTO infoNotNull(ExportVisitInfoDto visitInfoDto, int index) {
-        ErrorDTO errorDTO = new ErrorDTO();
-        Map<Integer, List<String>> notTrues = new HashMap<>();
+    public static VisitInformationErrorDTO infoNotNull(ExportVisitInfoDto visitInfoDto) {
+        VisitInformationErrorDTO errorDTO = new VisitInformationErrorDTO();
         List<String> notTrue = new ArrayList<>();
-        errorDTO.setSuccess(0);
         if (StringUtils.isEmpty(visitInfoDto.getUserName()))
-            notTrue.add("发起人姓名不能为空");
+            notTrue.add("邀请人姓名不能为空");
         if (StringUtils.isEmpty(visitInfoDto.getPhone()))
-            notTrue.add("发起人手机号不能为空");
+            notTrue.add("邀请人手机号不能为空");
         if (StringUtils.isEmpty(visitInfoDto.getVisitReason()))
             notTrue.add("访问事由不能为空");
         if (StringUtils.isEmpty(visitInfoDto.getVisitRegion()))
             notTrue.add("访问区域不能为空");
-        if (ObjectUtil.isEmpty(visitInfoDto.getVisitDate()))
-            notTrue.add("访问日期不能为空");
-        if (StringUtils.isEmpty(visitInfoDto.getVisitTime()))
-            notTrue.add("访问时间不能为空");
+        if (!isValid(visitInfoDto.getVisitDate(),DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA))) {
+            notTrue.add("访问日期为空或不符合规范");
+        }
+        if (!isValid(visitInfoDto.getVisitTime(),DateTimeFormatter.ofPattern("HH:mm", Locale.CHINA))) {
+            notTrue.add("访问时间为空或不符合规范");
+        }
         if (StringUtils.isEmpty(visitInfoDto.getVisitName()))
             notTrue.add("访客姓名不能为空");
         if (StringUtils.isEmpty(visitInfoDto.getVisitPhone()))
@@ -112,11 +121,22 @@ public class CheckUtil {
         if (matchList.size() < phone.size())
             notTrue.add("访客手机号不符合规范");
         if (notTrue.size() > 0) {
-            errorDTO.setSuccess(1);
-            notTrues.put(index, notTrue);
-            errorDTO.setMap(notTrues);
+            BeanUtil.copyProperties(visitInfoDto, errorDTO);
+            errorDTO.setError(notTrue.stream().collect(Collectors.joining(",")));
+            return errorDTO;
         }
-        return errorDTO;
+        return null;
+    }
+
+    public static boolean isValid(String dateStr, DateTimeFormatter dateFormatter) {
+        if(StringUtils.isEmpty(dateStr))
+            return false;
+        try {
+            dateFormatter.parse(dateStr);
+        } catch (DateTimeParseException e) {
+            return false;
+        }
+        return true;
     }
 
     public static ErrorDTO visvitNotNull(ExportVisitUserDTO sysUser, int index) {

src/main/java/org/rcisoft/sys/visit/controller/VisitInfomationController.java

@@ -13,7 +13,6 @@ import org.rcisoft.core.jwt.util.CyJwtUtil;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyUserUtil;
-import org.rcisoft.sys.visit.dto.VisitInformationErrorDTO;
 import org.rcisoft.sys.visit.entity.VisitInfoMation;
 import org.rcisoft.sys.visit.service.VisitInfomationService;
 import org.springframework.validation.BindingResult;

src/main/java/org/rcisoft/sys/visit/dto/ExportVisitInfoDto.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
+
 @Data
 public class ExportVisitInfoDto {
 

src/main/java/org/rcisoft/sys/visit/dto/ExportVisitInfomation.java

-package org.rcisoft.sys.visit.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-public class ExportVisitInfomation {
-    /**
-     * @desc 邀请人id(员工id)
-     * @column user_id
-     * @default
-     */
-    @Excel(name = "邀请人id(员工id)", orderNum = "0", width = 20)
-    private Integer userId;
-
-    /**
-     * @desc 发起人姓名
-     * @column user_name
-     * @default
-     */
-    @Excel(name = "邀请人姓名", orderNum = "1", width = 20)
-    private String userName;
-
-    /**
-     * @desc 发起人所属部门
-     * @column dept_name
-     * @default
-     */
-    @Excel(name = "邀请人所属部门", orderNum = "2", width = 20)
-    private String deptName;
-
-    /**
-     * @desc 发起人职务
-     * @column post_name
-     * @default
-     */
-    @Excel(name = "邀请人职务", orderNum = "3", width = 20)
-    private String postName;
-
-    /**
-     * @desc 访问事由
-     * @column visit_reason
-     * @default
-     */
-    @Excel(name = "访问事由", orderNum = "4", width = 20)
-    private String visitReason;
-
-    /**
-     * @desc 其他访问事由
-     * @column visit_reason_other
-     * @default
-     */
-    @Excel(name = "其他访问事由", orderNum = "4", width = 20)
-    private String visitReasonOther;
-
-    /**
-     * @desc 访问区域
-     * @column visit_region
-     * @default
-     */
-    @Excel(name = "访问区域", orderNum = "5", width = 20)
-    private String visitRegion;
-
-    /**
-     * @desc 访问日期
-     * @column visit_date
-     * @default
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "访问日期", orderNum = "6", width = 20,exportFormat = "yyyy-MM-dd")
-    private Date visitDate;
-
-    /**
-     * @desc 访问时间
-     * @column visit_time
-     * @default
-     */
-    @Excel(name = "访问时间", orderNum = "7", width = 20)
-    private String visitTime;
-}

src/main/java/org/rcisoft/sys/visit/dto/VisitInformationErrorDTO.java

 package org.rcisoft.sys.visit.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import org.rcisoft.sys.visit.dto.ExportVisitInfoDto;
-import org.rcisoft.sys.visit.entity.VisitInfoMation;
 
 
 public class VisitInformationErrorDTO extends ExportVisitInfoDto {
-    @Excel(name = "错误提示", orderNum = "8", width = 40)
+    @Excel(name = "错误提示", orderNum = "9", width = 40)
     private String error;
 
     public String getError() {