Commit e81ef1b3 authored by zhangyanduan's avatar zhangyanduan

fix:修复推送时间判断错误的逻辑并且重新修改数据写入接口,不再调用默认的保存接口,更换为自己的保存接口

parent 205c7f70
......@@ -1034,20 +1034,21 @@ public class JieLinkServiceImpl implements IJieLinkService {
record.setCardType(recordDto.getCardType() + "");
record.setCardNo(recordDto.getCardNo());
if (StringUtils.isNotBlank(recordDto.getCrossTime())) {
DateTime crossTime = DateUtil.parse(recordDto.getCrossTime(), "yyyy-MM-dd HH:mm:ss");
record.setCrossTime(crossTime.toJdkDate());
} else {
//触发时间无了
result.setCode("ILLEGAL_ARGUMENT");
result.setMsg("闸机触发时间丢失,请检查参数");
return result;
} else {
DateTime crossTime = DateUtil.parse(recordDto.getCrossTime(), "yyyy-MM-dd HH:mm:ss");
record.setCrossTime(crossTime.toJdkDate());
}
record.setRecordType(recordDto.getRecordType() + "");
record.setEventType(recordDto.getEventType() + "");
record.setFlag("0");
record.setDelFlag("0");
record.setCreateBy(null);
doorRecordService.persist(record);
doorRecordService.saveRecordData(record);
return result;
}
......
......@@ -17,6 +17,7 @@ import java.util.List;
@Mapper
public interface DoorRecordRepository extends CyBaseMapper<DoorRecord> {
void saveRecordData(DoorRecord recordData);
List<DoorRecord> queryDoorRecords(@Param("entity") DoorRecord doorRecord);
......
......@@ -71,4 +71,6 @@ public interface DoorRecordService {
*/
List<DoorRecord> export(DoorRecord doorRecord);
void saveRecordData(DoorRecord data);
}
......@@ -237,4 +237,9 @@ public class DoorRecordServiceImpl extends ServiceImpl<DoorRecordRepository, Doo
return doorRecordList;
}
@Override
public void saveRecordData(DoorRecord data) {
baseMapper.saveRecordData(data);
}
}
......@@ -29,6 +29,48 @@
<result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
</resultMap>
<insert id="saveRecordData" parameterType="org.rcisoft.sys.sysuser.entity.DoorRecord" useGeneratedKeys="false">
insert into door_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id ,</if>
<if test="userId != null">user_id ,</if>
<if test="personId != null">person_id ,</if>
<if test="mobile != null">mobile ,</if>
<if test="tenementType != null">tenement_type ,</if>
<if test="remark != null">remark ,</if>
<if test="deviceId != null">device_id ,</if>
<if test="deviceName != null">device_name ,</if>
<if test="deviceType != null">device_type ,</if>
<if test="cardType != null">card_type ,</if>
<if test="cardNo != null">card_no ,</if>
<if test="crossTime != null">cross_time ,</if>
<if test="recordType != null">record_type ,</if>
<if test="eventType != null">event_type ,</if>
<if test="flag != null">flag ,</if>
<if test="delFlag != null">del_flag ,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId} ,</if>
<if test="userId != null">#{userId} ,</if>
<if test="personId != null">#{personId} ,</if>
<if test="mobile != null">#{mobile} ,</if>
<if test="tenementType != null">#{tenementType} ,</if>
<if test="remark != null">#{remark} ,</if>
<if test="deviceId != null">#{deviceId} ,</if>
<if test="deviceName != null">#{deviceName} ,</if>
<if test="deviceType != null">#{deviceType} ,</if>
<if test="cardType != null">#{cardType} ,</if>
<if test="cardNo != null">#{cardNo} ,</if>
<if test="crossTime != null">#{crossTime} ,</if>
<if test="recordType != null">#{recordType} ,</if>
<if test="eventType != null">#{eventType} ,</if>
<if test="flag != null">#{flag} ,</if>
<if test="delFlag != null">#{delFlag} ,</if>
</trim>
</insert>
<!--<cache type="${corePackag!}.util.RedisCache"/>-->
<select id="queryDoorRecords" resultMap="BaseResultMap">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment