调整通行管理部分

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

@@ -945,11 +945,11 @@ public class JieLinkServiceImpl implements IJieLinkService {
         JieLinkResultDto result = new JieLinkResultDto();
         JieLinkPersonDto person = recordDto.getPerson();
         SysUser sysUserData = null;
-        if (person != null) {//
+        if (person != null) {
             String personId = person.getPersonId();
             if (StringUtils.isNotBlank(personId)) {
                 sysUserData = sysUserService.getUserDataByPersonId(personId);
-                if (sysUserData == null) {
+               /* if (sysUserData == null) {
                     // //将用户添加到SYS_USER表
                     // sysUserData = new SysUser();
                     // sysUserData.setPersonId(personId);//对应ID
@@ -971,7 +971,7 @@ public class JieLinkServiceImpl implements IJieLinkService {
                     // sysUserService.persist(sysUserData);
                     // //此处还需要查询一次用户的ID
                     // sysUserData = sysUserService.getUserDataByPersonId(personId);
-                }
+                }*/
             } else {
                 //访客ID无了
                 result.setCode("ILLEGAL_ARGUMENT");
@@ -1030,7 +1030,7 @@ public class JieLinkServiceImpl implements IJieLinkService {
         record.setDeviceId(device.getDeviceGuid());//需要根据设备补全
         record.setDeviceName(device.getDeviceName());//需要根据设备补全
         //TODO 此处字段需要后续修改，需要根据业务调整
-        record.setDeviceType(device.getDeviceType() + "");//需要根据设备不全
+        record.setDeviceType(devices.getDeviceType() + "");//需要根据设备不全
         record.setCardType(recordDto.getCardType() + "");
         record.setCardNo(recordDto.getCardNo());
         if (StringUtils.isNotBlank(recordDto.getCrossTime())) {
@@ -1045,9 +1045,11 @@ public class JieLinkServiceImpl implements IJieLinkService {
         }
         record.setRecordType(recordDto.getRecordType() + "");
         record.setEventType(recordDto.getEventType() + "");
-        record.setFlag("0");
+        record.setFlag("1");
         record.setDelFlag("0");
         record.setCreateBy(null);
+        record.setCreateDate(new Date());
+        record.setUpdateDate(record.getCreateDate());
         doorRecordService.saveRecordData(record);
         result.setCode("0");
         result.setMsg("");

src/main/java/org/rcisoft/sys/sysuser/dao/DoorRecordRepository.java

@@ -9,6 +9,7 @@ import org.rcisoft.core.model.CyPageInfo;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@ public interface DoorRecordRepository extends CyBaseMapper<DoorRecord> {
     IPage<DoorRecord> queryDoorRecordsPaged(CyPageInfo cyPageInfo, @Param("entity") DoorRecord doorRecord);
 
     //单个查询
-    DoorRecord queryDoorRecordById(String recordId);
+    DoorRecord queryDoorRecordById(@Param("recordId")String recordId, @Param("crossTime")Date crossTime);
 
     int updateDoorRecordById(DoorRecord doorRecord);
 

src/main/java/org/rcisoft/sys/sysuser/service/impl/DoorRecordServiceImpl.java

@@ -113,21 +113,23 @@ public class DoorRecordServiceImpl extends ServiceImpl<DoorRecordRepository, Doo
     @Override
     public DoorRecord findById(DoorRecord doorRecord) {
         //TODO 需要重写
-        DoorRecord doorRecord1 = baseMapper.queryDoorRecordById(doorRecord.getRecordId());
-        //获取登记时间
-        Date createDate = doorRecord1.getCreateDate();
-        //截取登记日期
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-        doorRecord1.setDate(sf.format(createDate));
-        //截取登记时间
-        SimpleDateFormat sf2 = new SimpleDateFormat("HH:mm");
-        doorRecord1.setTime(sf2.format(createDate));
-        //获取登记方式id
-        String cardType = doorRecord1.getCardType();
-        //获取登记方式中文
-        SysDictData sysDictData = sysDictDataRepositorys.queryDataByCardType(cardType);
-        if (sysDictData != null) {
-            doorRecord1.setCardTypeLabel(sysDictData.getDictLabel());
+        DoorRecord doorRecord1 = baseMapper.queryDoorRecordById(doorRecord.getRecordId(), doorRecord.getCrossTime());
+        if (doorRecord1 != null) {
+            //获取登记时间
+            Date createDate = doorRecord1.getCreateDate();
+            //截取登记日期
+            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+            doorRecord1.setDate(sf.format(createDate));
+            //截取登记时间
+            SimpleDateFormat sf2 = new SimpleDateFormat("HH:mm");
+            doorRecord1.setTime(sf2.format(createDate));
+            //获取登记方式id
+            String cardType = doorRecord1.getCardType();
+            //获取登记方式中文
+            SysDictData sysDictData = sysDictDataRepositorys.queryDataByCardType(cardType);
+            if (sysDictData != null) {
+                doorRecord1.setCardTypeLabel(sysDictData.getDictLabel());
+            }
         }
         return doorRecord1;
     }

src/main/resources/mapper/DoorRecordMapper.xml

@@ -105,7 +105,7 @@
     <select id="queryDoorRecordsPaged" resultMap="BaseResultMap">
         SELECT
         dr.record_id,su.name,su.business_id,dr.tenement_type,dr.cross_time,dr.create_date,dr.device_id,dr.device_type,dr.device_name,dr.card_type,dr.record_type,dr.card_type_label,dr.abnormal
-        FROM door_record_2022 dr
+        FROM door_record dr
         LEFT JOIN sys_user su ON dr.user_id = su.business_id
         WHERE dr.del_flag = 0
         <if test="entity.deviceType !=null and entity.deviceType != '' ">
@@ -177,7 +177,7 @@
                dr.record_type,
                dr.card_type_label,
                dr.abnormal
-        FROM door_record_2022 dr
+        FROM door_record dr
                  left JOIN sys_user su ON dr.user_id = su.business_id
         WHERE dr.del_flag = 0
           and record_id = #{recordId}