q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

逻辑

Browse Source
This commit is contained in:
Jerry Yan
2024-12-30 20:47:34 +08:00
parent 2031b77f12
commit cfd48861d5
17 changed files with 134 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/ycwl/basic/controller/viid/ViidController.java
View File

@ -32,6 +32,7 @@ import com.ycwl.basic.utils.IpUtils;
import com.ycwl.basic.utils.SnowFlakeUtil;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -40,6 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@ -86,7 +88,6 @@ public class ViidController {
device.setId(SnowFlakeUtil.getLongId());
deviceMapper.addEntity(device);
}
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(serverId, "/VIID/System/Register", "0", "注册成功", sdfTime.format(new Date()))
);
@ -125,7 +126,6 @@ public class ViidController {
}
log.info("已经解析过的心跳信息：{}", keepaliveObject);
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(deviceId, "/VIID/System/UnRegister", "0", "注销成功", sdfTime.format(new Date()))
);
@ -152,7 +152,6 @@ public class ViidController {
device.setKeepaliveAt(new Date());
int update = deviceMapper.updateEntity(device);
}
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(deviceId, "/VIID/System/UnRegister", "0", "注销成功", sdfTime.format(new Date()))
);
@ -178,6 +177,7 @@ public class ViidController {
@Autowired
private TaskFaceService taskFaceService;
private final SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
/**
@ -202,6 +202,14 @@ public class ViidController {
if (device == null) {
continue;
}
Date shotTime = new Date();
if (StringUtils.isNotBlank(face.getShotTime())) {
try {
shotTime = sdfTime.parse(face.getShotTime());
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
Long scenicId = device.getScenicId();
if (scenicId == null) {
continue;
@ -229,7 +237,7 @@ public class ViidController {
faceSample.setScenicId(scenicId);
faceSample.setDeviceId(device.getId());
faceSample.setStatus(0);
faceSample.setCreateAt(new Date());
faceSample.setCreateAt(shotTime);
String url = adapter.uploadFile(file, "user-face", UUID.randomUUID() + "." + ext);
faceSample.setFaceUrl(url);
faceSampleMapper.add(faceSample);
@ -245,6 +253,7 @@ public class ViidController {
source.setDeviceId(device.getId());
source.setScenicId(device.getScenicId());
source.setFaceSampleId(newFaceSampleId);
source.setCreateTime(shotTime);
source.setType(2);
// 上传oss
String url = adapter.uploadFile(file, "user-photo", UUID.randomUUID() + "." + ext);
@ -257,7 +266,6 @@ public class ViidController {
log.info("设备ID：{}", deviceID);
}
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(faceId, "/VIID/Faces", "0", "OK", sdfTime.format(new Date()))
);