|
@@ -243,7 +243,6 @@ public class OrTeachingJobService {
|
|
|
* @return
|
|
|
**/
|
|
|
// @Scheduled(fixedDelay = 30000)
|
|
|
- @Scheduled(fixedDelay = 30000)
|
|
|
public void synchronousDoorOpeningAndClosingRecords(){
|
|
|
try {
|
|
|
List<DoorRecordDTO> allRecords = fetchAllDoorRecords();
|
|
@@ -257,7 +256,7 @@ public class OrTeachingJobService {
|
|
|
appIsin.setUpdateTime(DateUtils.str2Date(data.getGmtCreate(), new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")));
|
|
|
appIsin.setIsinStatus(1);
|
|
|
appIsin.setUseImage(data.getPortraitUrl());
|
|
|
- appIsin.setOriginId(data.getPortraitUrl());
|
|
|
+ appIsin.setOriginId(data.getOriginId());
|
|
|
appIsinMapper.updateById(appIsin);
|
|
|
AppOrderProInfo orderProInfo = appOrderProInfoMapper.selectById(appIsin.getOrderProInfoId());
|
|
|
orderProInfo.setOrderStatus(2);
|
|
@@ -343,7 +342,6 @@ public class OrTeachingJobService {
|
|
|
*/
|
|
|
private List<ExtractedData> extractRequiredData(List<DoorRecordDTO> records) {
|
|
|
List<ExtractedData> result = new ArrayList<>();
|
|
|
-
|
|
|
if (records != null && !records.isEmpty()) {
|
|
|
result = records.stream()
|
|
|
.filter(record -> "ACE-5-75".equals(record.getSecMsgCode()))
|
|
@@ -351,8 +349,9 @@ public class OrTeachingJobService {
|
|
|
record.getEmployeeNo(),
|
|
|
record.getAuthResultMsg(),
|
|
|
record.getGmtCreate(),
|
|
|
- record.getOriginId(),
|
|
|
- record.getPortraitUrl() // 可能为null,不影响
|
|
|
+ record.getPortraitUrl(),
|
|
|
+ record.getSecMsgCode(),
|
|
|
+ record.getOriginId()
|
|
|
))
|
|
|
.filter(data -> data.getEmployeeNo() != null) // 可选:排除无效数据
|
|
|
.collect(Collectors.toList());
|
|
@@ -393,6 +392,7 @@ public class OrTeachingJobService {
|
|
|
private String authResultMsg;
|
|
|
private String gmtCreate;
|
|
|
private String portraitUrl;
|
|
|
+ private String secMsgCode;
|
|
|
private String originId;
|
|
|
}
|
|
|
}
|