Merge remote-tracking branch 'origin/import' into import

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -445,7 +445,7 @@ public class JieLinkServiceImpl  implements IJieLinkService {
         Date visitRealTime = infoMation.getVisitRealTime();
         SysDictData queryDicData = new SysDictData();
         queryDicData.setDictType("timeThreshold");
-        queryDicData.setFlag("1");
+        queryDicData.setDelFlag("0");
         queryDicData.setFlag("1");
         List<SysDictData> dictDataList = dictDataRepositorys.querySysDictDatas(queryDicData);
         JSONObject timeObj = new JSONObject();

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

 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;
@@ -9,7 +13,11 @@ 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;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.rcisoft.sys.sysuser.service.impl.SysUserServiceImpl;
 import org.rcisoft.sys.sysuser.util.CheckUtil;
@@ -56,7 +64,7 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
     @Autowired
     private SysUserRepositorys sysUserRepositorys;
     @Autowired
-    private CyDownErrorTxtComp errorTxt;
+    private SysDictDataRepositorys dictDataRepositorys;
     @Autowired
     private SysUserServiceImpl sysUserService;
 
@@ -293,7 +301,35 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
 
     @Async
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
-    public void updateTest(){
+    public void updateTest(JieLinkDoorRecordDto recodeDto) {
+        // 根据personId 查询用户信息
+        SysUser sysUserData = sysUserService.getUserDataByPersonId(recodeDto.getPerson().getPersonId());
+        if (sysUserData.getUserType().equals("1")) {
+            // 查询当前访问时间阈值
+            SysDictData queryDicData = new SysDictData();
+            queryDicData.setDictType("timeThreshold");
+            queryDicData.setDelFlag("0");
+            queryDicData.setFlag("1");
+            List<SysDictData> dictDataList = dictDataRepositorys.querySysDictDatas(queryDicData);
+            String beginTime = "";
+            String endTime = "";
+            for (SysDictData dicData : dictDataList) {
+                String dictValue = dicData.getDictValue();
+                //此处可能会有类型转换报错的BUG
+                int factor = Integer.parseInt(dictValue);
+                String dictLabel = dicData.getDictLabel();
+                DateTime crossTime = DateUtil.parse(recodeDto.getCrossTime(), "yyyy-MM-dd HH:mm:ss");
+                if (StringUtils.equals("advance", dictLabel)) {
+                    Date startTime = new Date(crossTime.getTime() - (factor * 60 * 1000));
+                    beginTime = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss");
+                } else if (StringUtils.equals("late", dictLabel)) {
+                    Date startTime = new Date(crossTime.getTime() + (factor * 60 * 1000));
+                    endTime = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss");
+                }
+            }
+            // 如果开始时间和结束时间都不为空，查询这段时间内的邀访记录
+            // 此处如果数据字典进行变化，可能查不到对应的邀访记录
 
         }
+    }
 }