Merge branch 'import' of http://gitlab.91isoft.com:90/wangcong/entrance_api- into import

src/main/java/org/rcisoft/sys/attendance/schedule/AttendanceSyncSchedule.java

@@ -31,7 +31,7 @@ public class AttendanceSyncSchedule {
 
     //    每隔5秒执行一次
 //    @Scheduled(cron = "0 */10 * * * ?")
-    @Scheduled(cron = "*/5 * * * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void execute() {
         Attendance attendance = new Attendance();
         // 查询昨日所有考勤

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

@@ -3,7 +3,6 @@ package org.rcisoft.sys.visit.controller;
 
 /*固定导入*/
 
-import cn.hutool.poi.excel.ExcelUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -71,7 +70,7 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
         int userId = Integer.parseInt(tempUserId);
         //添加条件添加用户id
         visitInfomation.setUserId(userId);
-        CyPersistModel data = visitInfomationServiceImpl.persist(visitInfomation);
+        CyPersistModel data = visitInfomationServiceImpl.persistWX(visitInfomation);
         return CyResultGenUtil.builder(data,
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,

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

@@ -13,18 +13,14 @@ import org.rcisoft.sys.visit.service.VisitUserService;
 import org.springframework.validation.BindingResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import org.rcisoft.core.result.CyResult;
 import org.rcisoft.core.util.CyResultGenUtil;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.constant.CyMessCons;
 import org.rcisoft.core.controller.CyPaginationController;
 import org.rcisoft.core.model.CyGridModel;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-
-
 import java.util.List;
 
 /**
@@ -49,6 +45,7 @@ public class VisitUserController extends CyPaginationController<VisitUser> {
             CyMessCons.MESSAGE_ALERT_ERROR,
         visitUser);
     }
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:itUser:delete')")
     @CyOpeLogAnno(title = "system-邀访访客信息表管理-删除邀访访客信息表", businessType = CyLogTypeEnum.DELETE)
     @ApiOperation(value="逻辑删除邀访访客信息表", notes="逻辑删除邀访访客信息表")
@@ -62,6 +59,7 @@ public class VisitUserController extends CyPaginationController<VisitUser> {
             CyMessCons.MESSAGE_ALERT_ERROR,
         businessId);
     }
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:itUser:delete')")
     @CyOpeLogAnno(title = "system-邀访访客信息表管理-删除邀访访客信息表", businessType = CyLogTypeEnum.DELETE)
     @ApiOperation(value="删除邀访访客信息表", notes="删除邀访访客信息表")

src/main/java/org/rcisoft/sys/visit/service/VisitInfomationService.java

@@ -105,4 +105,6 @@ public interface VisitInfomationService {
     List<VisitInfoMation> findByUser(VisitUser visitUser);
 
     int download(String fileName, HttpServletResponse response) throws Exception;
+
+    CyPersistModel persistWX(VisitInfoMation visitInfomation);
 }

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -144,7 +144,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             sysUser.setPhone(u.getVisitPhone());
             sysUser.setUsername(u.getVisitPhone());
             sysUser.setNormal();
-            List<SysUser> sysUserList = sysUserRepositorys.querySysUsers(sysUser);
+            List<SysUser> sysUserList = sysUserRepositorys.querySysUsersByPhone(u.getVisitPhone());
             // 不存在新增
             if (CollectionUtils.isEmpty(sysUserList)) {
                 sysUser.setPersonId(UUID.randomUUID().toString());
@@ -160,8 +160,10 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                     if (sysUserList.get(0).getBlacklistFlag().toString().equals("1")) {
                         throw new CyServiceException(500, "不能邀请黑名单内的访客!");
                     }
-                    sysUser.setBusinessId(sysUserList.get(0).getBusinessId());
-                    sysUserRepositorys.updateSysUser(sysUser);
+                    if (!sysUserList.get(0).getName().equals(u.getUserName())) {
+                        sysUserList.get(0).setName(u.getUserName());
+                        sysUserRepositorys.updateSysUser(sysUserList.get(0));
+                    }
                     u.setPersonId(sysUserList.get(0).getPersonId());
                     u.setUserId(sysUserList.get(0).getBusinessId());
                 }
@@ -813,6 +815,38 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         return 1;
     }
 
+    @Override
+    public CyPersistModel persistWX(VisitInfoMation visitInfomation) {
+        visitInfomation.setNormal();
+        String[] regions = visitInfomation.getVisitRegions();
+        String region = "";
+        if (regions != null) {
+            for (String r : regions) {
+                region = region + r + ',';
+            }
+            if (region.length() > 0) {
+                region = region.substring(0, region.length() - 1);
+                visitInfomation.setVisitRegion(region);
+            }
+        }
+        String[] regionCodes = visitInfomation.getVisitRegionCodes();
+        String regionCode = "";
+        if (regionCodes != null) {
+            for (String code : regionCodes) {
+                regionCode = regionCode + code + ",";
+            }
+            if (regionCode.length() > 0) {
+                regionCode = regionCode.substring(0, regionCode.length() - 1);
+                visitInfomation.setVisitRegionCode(regionCode);
+            }
+        }
+        visitInfomation.setItemId(UUID.randomUUID().toString());
+        int line = baseMapper.insert(visitInfomation);
+        log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
+                visitInfomation.getBusinessId() + "的邀访信息");
+        return new CyPersistModel(line);
+    }
+
 
     void errorText(String error, ImportVistInfoDTO importVistInfoDTO, List<Map<Integer, List<String>>> maps, String fileName) {
         List<String> strings = new ArrayList<String>();

src/main/java/org/rcisoft/sys/visit/service/impl/VisitUserServiceImpl.java

@@ -2,19 +2,16 @@ package org.rcisoft.sys.visit.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.common.component.CyGlobal;
-import org.rcisoft.core.component.CyDownErrorTxtComp;
 import org.rcisoft.core.exception.CyServiceException;
 import org.rcisoft.core.result.enums.CyResSvcExcEnum;
 import org.rcisoft.core.util.CyCompareToolUtils;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.integration.jieLink.dto.JieLinkDoorRecordDto;
-import org.rcisoft.integration.jieLink.dto.JieLinkPersonDto;
 import org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys;
 import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
 import org.rcisoft.sys.sysuser.entity.SysDictData;
@@ -29,8 +26,6 @@ import org.rcisoft.sys.visit.dto.*;
 import org.rcisoft.sys.visit.entity.VisitInfoMation;
 import org.rcisoft.sys.visit.entity.VisitUser;
 import org.rcisoft.sys.visit.service.VisitUserService;
-
-import org.rcisoft.sys.wbac.user.dto.ErrorDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -39,16 +34,13 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -85,6 +77,36 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel persist(VisitUser visitUser) {
+        // 根据手机号判断是否存在用户
+        SysUser sysUser = new SysUser();
+        sysUser.setName(visitUser.getUserName());
+        sysUser.setPhone(visitUser.getVisitPhone());
+        sysUser.setUsername(visitUser.getVisitPhone());
+        sysUser.setNormal();
+        List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(visitUser.getVisitPhone());
+        if (userList.size() == 0) {
+            sysUser.setPersonId(UUID.randomUUID().toString());
+            sysUserRepositorys.insert(sysUser);
+            visitUser.setPersonId(sysUser.getPersonId());
+            visitUser.setUserId(sysUser.getBusinessId());
+        } else {
+            // 判断存在的用户是否员工，员工报错
+            for (SysUser u : userList) {
+                if (u.getUserType().equals("0"))
+                    throw new CyServiceException(500, u.getPhone() + "已被员工绑定,不能成为访客。");
+                if (u.getBlacklistFlag().toString().equals("1")) {
+                    throw new CyServiceException(500, "您已被加入黑名单!");
+                }
+                if (!u.getName().equals(sysUser.getName())) {
+                    u.setName(sysUser.getName());
+                    sysUserRepositorys.updateSysUser(u);
+                }
+                visitUser.setPersonId(u.getPersonId());
+                visitUser.setUserId(u.getBusinessId());
+                break;
+            }
+        }
+        visitUser.setNormal();
         //增加操作
         int line = baseMapper.insert(visitUser);
         log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -302,6 +302,7 @@
         where 1 = 1
           and vi.visit_date = CURDATE()
           and vi.user_id = #{userId}
+          and vi.del_flag = '0'
           and visit_real_time <= current_timestamp
         ORDER BY visit_real_time DESC
     </select>
@@ -323,6 +324,7 @@
         where 1 = 1
           and vi.visit_date = CURDATE()
           and vi.user_id = #{userId}
+          and vi.del_flag = '0'
           and visit_real_time >= current_timestamp
         ORDER BY visit_real_time
     </select>