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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
longbinbin 2024-12-12 16:22:07 +08:00
commit 9d22f9d8cf
76 changed files with 2400 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/ycwl/basic/controller/pc/DeviceController.java
View File

@ -1,6 +1,7 @@
package com.ycwl.basic.controller.pc; package com.ycwl.basic.controller.pc;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
@ -52,4 +53,15 @@ public class DeviceController {
public ApiResponse updateStatus(@PathVariable("id") Long id) { public ApiResponse updateStatus(@PathVariable("id") Long id) {
return deviceService.updateStatus(id); return deviceService.updateStatus(id);
} }
@GetMapping("/config/{id}")
public ApiResponse<DeviceConfigEntity> getConfig(@PathVariable("id") Long id) {
return ApiResponse.success(deviceService.getConfig(id));
}
@PostMapping("/saveConfig/{configId}")
public ApiResponse saveConfig(@PathVariable("configId") Long configId, @RequestBody DeviceConfigEntity deviceConfigEntity) {
deviceService.saveConfig(configId, deviceConfigEntity);
return ApiResponse.success(null);
}
} }

10
src/main/java/com/ycwl/basic/controller/pc/ScenicController.java
View File

@ -72,4 +72,14 @@ public class ScenicController {
return scenicService.updateConfigById(scenicConfig); return scenicService.updateConfigById(scenicConfig);
} }
@ApiOperation("查询景区配置")
@GetMapping("/config/{id}")
public ApiResponse<ScenicConfigEntity> getConfig(@PathVariable("id") Long id) {
return ApiResponse.success(scenicService.getConfig(id));
}
@PostMapping("/saveConfig/{id}")
public ApiResponse saveConfig(@PathVariable("id") Long id, @RequestBody ScenicConfigEntity config) {
scenicService.saveConfig(id, config);
return ApiResponse.success(null);
}
} }

14
src/main/java/com/ycwl/basic/controller/pc/TemplateController.java
View File

@ -1,6 +1,8 @@
package com.ycwl.basic.controller.pc; package com.ycwl.basic.controller.pc;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
@ -60,4 +62,16 @@ public class TemplateController {
public ApiResponse<Boolean> updateStatus(@RequestBody Long id) { public ApiResponse<Boolean> updateStatus(@RequestBody Long id) {
return templateService.updateStatus(id); return templateService.updateStatus(id);
} }
@GetMapping("/config/{id}")
public ApiResponse<TemplateConfigEntity> getConfig(@PathVariable("id") Long id) {
return ApiResponse.success(templateService.getConfig(id));
}
@PostMapping("/saveConfig/{configId}")
public ApiResponse saveConfig(@PathVariable("configId") Long configId, @RequestBody TemplateConfigEntity deviceConfigEntity) {
templateService.saveConfig(configId, deviceConfigEntity);
return ApiResponse.success(null);
}
} }

2
src/main/java/com/ycwl/basic/controller/task/TaskTaskController.java
View File

@ -7,6 +7,7 @@ import com.ycwl.basic.model.task.req.WorkerAuthReqVo;
import com.ycwl.basic.model.task.resp.TaskSyncRespVo; import com.ycwl.basic.model.task.resp.TaskSyncRespVo;
import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.service.task.TaskService;
import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.ApiResponse;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
@IgnoreToken @IgnoreToken
@RestController @RestController
@Api(tags = "渲染端对接接口")
@RequestMapping("/task/v1/") @RequestMapping("/task/v1/")
public class TaskTaskController { public class TaskTaskController {

269
src/main/java/com/ycwl/basic/controller/viid/ViidController.java Normal file
View File

@ -0,0 +1,269 @@
package com.ycwl.basic.controller.viid;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.mapper.pc.FaceSampleMapper;
import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.model.viid.entity.DeviceIdObject;
import com.ycwl.basic.model.viid.entity.FaceListObject;
import com.ycwl.basic.model.viid.entity.FaceObject;
import com.ycwl.basic.model.viid.entity.ResponseStatusObject;
import com.ycwl.basic.model.viid.entity.SubImageInfoObject;
import com.ycwl.basic.model.viid.entity.SubImageList;
import com.ycwl.basic.model.viid.entity.SystemTimeObject;
import com.ycwl.basic.model.viid.req.FaceUploadReq;
import com.ycwl.basic.model.viid.req.KeepaliveReq;
import com.ycwl.basic.model.viid.req.RegisterReq;
import com.ycwl.basic.model.viid.req.UnRegisterReq;
import com.ycwl.basic.model.viid.resp.SystemTimeResp;
import com.ycwl.basic.model.viid.resp.VIIDBaseResp;
import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.utils.AliFaceUtil;
import com.ycwl.basic.utils.ImageUtils;
import com.ycwl.basic.utils.IpUtils;
import com.ycwl.basic.utils.OssUtil;
import com.ycwl.basic.utils.SnowFlakeUtil;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@IgnoreToken
@RestController
@Api(tags = "摄像头对接接口")
@RequestMapping("/VIID")
@Slf4j
public class ViidController {
@Autowired
private DeviceMapper deviceMapper;
private static final String serverId = "00000000000000000001";
@Autowired
private SourceMapper sourceMapper;
// region 注册注销基础接口
/**
* 注册接口
*
* @param req 注册的信息
* @param request 请求
* @return 返回
*/
@RequestMapping(value = "/System/Register", method = RequestMethod.POST)
public VIIDBaseResp register(@RequestBody RegisterReq req, HttpServletRequest request) {
DeviceIdObject deviceIdObject = req.getRegisterObject();
log.info("注册的设备信息：{}", deviceIdObject);
// 保存设备注册时间
DeviceEntity device = deviceMapper.getByDeviceNo(deviceIdObject.getDeviceId());
if (device == null) {
device = new DeviceEntity();
device.setName("未配置设备");
device.setNo(deviceIdObject.getDeviceId());
device.setOnline(1);
}
device.setKeepaliveAt(new Date());
device.setIpAddr(IpUtils.getIpAddr(request));
if (device.getId() != null) {
deviceMapper.updateEntity(device);
} else {
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()))
);
}
/**
* 保活接口
*
* @param req 保活的设备信息
* @param request 请求
* @return 返回
*/
@RequestMapping(value = "/System/Keepalive", method = RequestMethod.POST)
public VIIDBaseResp keepalive(@RequestBody KeepaliveReq req, HttpServletRequest request) {
DeviceIdObject keepaliveObject = req.getKeepaliveObject();
log.info("对方发送的心跳的信息：{}", keepaliveObject);
String deviceId = keepaliveObject.getDeviceId();
DeviceEntity device = deviceMapper.getByDeviceNo(deviceId);
// 判断设备状态
if (device == null) {
// 不存在设备就注册
device = new DeviceEntity();
device.setName("未配置设备");
device.setNo(deviceId);
device.setOnline(1);
device.setKeepaliveAt(new Date());
device.setIpAddr(IpUtils.getIpAddr(request));
device.setId(SnowFlakeUtil.getLongId());
deviceMapper.addEntity(device);
} else {
device.setOnline(1);
device.setKeepaliveAt(new Date());
deviceMapper.updateEntity(device);
}
log.info("已经解析过的心跳信息：{}", keepaliveObject);
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(deviceId, "/VIID/System/UnRegister", "0", "注销成功", sdfTime.format(new Date()))
);
}
/**
* 注销设备
*
* @param req 参数
* @return 返回
*/
@RequestMapping(value = "/System/UnRegister", method = RequestMethod.POST)
public VIIDBaseResp unRegister(@RequestBody UnRegisterReq req) {
// 获取设备id
DeviceIdObject unRegisterObject = req.getUnRegisterObject();
String deviceId = unRegisterObject.getDeviceId();
log.info("获取的注销的请求参数：{}", unRegisterObject);
// 首先查询该设备是否存在
DeviceEntity device = deviceMapper.getByDeviceNo(deviceId);
// 判断
if (device != null) {
device.setOnline(0);
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()))
);
}
/**
* 校时接口
*
* @return 返回
*/
@RequestMapping(value = "/System/Time", method = RequestMethod.GET)
public SystemTimeResp time() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
return new SystemTimeResp(
new SystemTimeObject(serverId, "2", sdf.format(new Date()), TimeZone.getTimeZone("Asia/Shanghai").toString())
);
}
// endregion
@Autowired
private FaceSampleMapper faceSampleMapper;
@Autowired
private TaskFaceService taskFaceService;
@Autowired
private OssUtil ossUtil;
/**
* 批量新增人脸
*/
@RequestMapping(value = "/Faces", method = RequestMethod.POST)
public VIIDBaseResp faces(@RequestBody FaceUploadReq req) {
log.info("收到的人脸上报信息：{}",req);
FaceListObject faceListObject = req.getFaceListObject();
List<FaceObject> faceObject = faceListObject.getFaceObject();
String faceId = null;
// 遍历人脸列表
for (FaceObject face : faceObject) {
// 设置FaceId
faceId = face.getFaceID();
Long newFaceSampleId = SnowFlakeUtil.getLongId();
// 获取图片信息
SubImageList subImageList = face.getSubImageList();
// 判断人脸对象中的列表是否为空
String deviceID = face.getDeviceID();
DeviceEntity device = deviceMapper.getByDeviceNo(deviceID);
if (device == null) {
continue;
}
Long scenicId = device.getScenicId();
if (scenicId == null) {
continue;
}
if (ObjectUtil.isNotEmpty(subImageList) && CollUtil.isNotEmpty(subImageList.getSubImageInfoObject())) {
// 遍历每个图片对象
for (SubImageInfoObject subImage : subImageList.getSubImageInfoObject()) {
// base64转换成MultipartFIle
MultipartFile file = ImageUtils.base64ToMultipartFile(subImage.getData());
String ext = subImage.getFileFormat();
if (ext.equalsIgnoreCase("jpeg")) {
ext = "jpg";
}
// Type=11 人脸
if (subImage.getType().equals("11")) {
// 上传oss
FaceSampleEntity faceSample = new FaceSampleEntity();
faceSample.setId(newFaceSampleId);
faceSample.setScenicId(scenicId);
faceSample.setDeviceId(device.getId());
faceSample.setStatus(0);
faceSample.setCreateAt(new Date());
String url;
try {
url = ossUtil.uploadFile(file.getInputStream(), AliFaceUtil.generateEntityId(faceSample) + "." + ext);
} catch (IOException e) {
log.error("文件上传失败！", e);
continue;
}
faceSample.setFaceUrl(url);
faceSampleMapper.add(faceSample);
log.info("人脸信息入库成功！");
taskFaceService.addFaceSample(faceSample.getId());
}
// Type=14 场景图
else if (subImage.getType().equals("14")) {
SourceEntity source = new SourceEntity();
source.setId(SnowFlakeUtil.getLongId());
source.setDeviceId(device.getId());
source.setScenicId(device.getScenicId());
source.setFaceSampleId(newFaceSampleId);
source.setType(2);
// 上传oss
String url;
try {
url = ossUtil.uploadFile(file.getInputStream(), "user-photo/", newFaceSampleId + "." + ext);
} catch (IOException e) {
log.error("文件上传失败！", e);
continue;
}
source.setUrl(url);
sourceMapper.add(source);
}
}
}
log.info("设备ID：{}", deviceID);
}
SimpleDateFormat sdfTime = new SimpleDateFormat("yyyyMMddHHmmss");
return new VIIDBaseResp(
new ResponseStatusObject(faceId, "/VIID/Faces", "0", "OK", sdfTime.format(new Date()))
);
}
}

45
src/main/java/com/ycwl/basic/device/DeviceFactory.java Normal file
View File

@ -0,0 +1,45 @@
package com.ycwl.basic.device;
import com.ycwl.basic.device.checker.IDeviceStatusChecker;
import com.ycwl.basic.device.checker.impl.AliOssDeviceChecker;
import com.ycwl.basic.device.checker.impl.AlwaysOnDeviceChecker;
import com.ycwl.basic.device.enums.DeviceStoreTypeEnum;
import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.device.operator.impl.AliOssStorageOperator;
import com.ycwl.basic.device.operator.impl.LocalStorageOperator;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
public class DeviceFactory {
public static IDeviceStorageOperator getDeviceStorageOperator(DeviceEntity device, DeviceConfigEntity config) {
IDeviceStorageOperator operator = null;
if (config.getStoreType() == DeviceStoreTypeEnum.ALI_OSS.getType()) {
operator = new AliOssStorageOperator(config.getStoreConfigJson());
} else if (config.getStoreType() == DeviceStoreTypeEnum.LOCAL.getType()) {
operator = new LocalStorageOperator(config.getStoreConfigJson());
}
if (operator == null) {
return null;
}
operator.setDevice(device);
operator.setDeviceConfig(config);
return operator;
}
public static IDeviceStatusChecker getDeviceStatusChecker(DeviceEntity device, DeviceConfigEntity config) {
IDeviceStatusChecker checker = null;
if (config.getOnlineCheck() <= 0) {
checker = new AlwaysOnDeviceChecker();
} else {
if (config.getStoreType() == DeviceStoreTypeEnum.ALI_OSS.getType()) {
checker = new AliOssDeviceChecker(config.getStoreConfigJson());
}
}
if (checker == null) {
return null;
}
checker.setDevice(device);
checker.setDeviceConfig(config);
return checker;
}
}

9
src/main/java/com/ycwl/basic/device/IDeviceCommon.java Normal file
View File

@ -0,0 +1,9 @@
package com.ycwl.basic.device;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
public interface IDeviceCommon {
void setDevice(DeviceEntity device);
void setDeviceConfig(DeviceConfigEntity config);
}

7
src/main/java/com/ycwl/basic/device/checker/IDeviceStatusChecker.java Normal file
View File

@ -0,0 +1,7 @@
package com.ycwl.basic.device.checker;
import com.ycwl.basic.device.IDeviceCommon;
public interface IDeviceStatusChecker extends IDeviceCommon {
boolean checkDeviceStatus();
}

23
src/main/java/com/ycwl/basic/device/checker/helper/CommonDeviceChecker.java Normal file
View File

@ -0,0 +1,23 @@
package com.ycwl.basic.device.checker.helper;
import com.alibaba.fastjson.JSON;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import lombok.Setter;
public abstract class CommonDeviceChecker<C> {
protected C config;
@Setter
protected DeviceEntity device;
@Setter
protected DeviceConfigEntity deviceConfig;
public CommonDeviceChecker(String configJson) {
config = JSON.parseObject(configJson, getConfigClass());
}
@SuppressWarnings("unchecked")
private Class<C> getConfigClass() {
return (Class<C>) ((java.lang.reflect.ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
}
}

88
src/main/java/com/ycwl/basic/device/checker/impl/AliOssDeviceChecker.java Normal file
View File

@ -0,0 +1,88 @@
package com.ycwl.basic.device.checker.impl;
import cn.hutool.core.date.DateUtil;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.OSSException;
import com.aliyun.oss.model.ListObjectsV2Request;
import com.aliyun.oss.model.ListObjectsV2Result;
import com.aliyun.oss.model.OSSObjectSummary;
import com.ycwl.basic.device.checker.IDeviceStatusChecker;
import com.ycwl.basic.device.checker.helper.CommonDeviceChecker;
import com.ycwl.basic.device.entity.alioss.DeviceAliOssConfig;
import com.ycwl.basic.device.entity.common.FileObject;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
public class AliOssDeviceChecker extends CommonDeviceChecker<DeviceAliOssConfig> implements IDeviceStatusChecker {
public AliOssDeviceChecker(String configJson) {
super(configJson);
}
private OSS getClient() {
return new OSSClientBuilder().build(config.getEndpoint(), config.getAccessKeyId(), config.getAccessKeySecret());
}
private List<FileObject> getOssFileListByPrefix(String prefix) {
OSS ossClient = getClient();
ListObjectsV2Request listObjectsV2Request = new ListObjectsV2Request(config.getBucketName());
listObjectsV2Request.setPrefix(config.getPrefix() + prefix);
boolean isTruncated = true;
String continuationToken = null;
List<OSSObjectSummary> objectList = new ArrayList<>();
try {
while (isTruncated) {
if (continuationToken != null) {
listObjectsV2Request.setContinuationToken(continuationToken);
}
// 列举文件。
ListObjectsV2Result result = ossClient.listObjectsV2(listObjectsV2Request);
objectList.addAll(result.getObjectSummaries());
isTruncated = result.isTruncated();
continuationToken = result.getNextContinuationToken();
}
return objectList.stream().filter(item -> item.getKey().endsWith(".ts")).map(item -> {
FileObject object = new FileObject();
object.setPath(item.getKey());
object.setNeedDownload(true);
String[] splitDir = item.getKey().split("/");
String splitDate = splitDir[splitDir.length - 2];
String splitName = splitDir[splitDir.length - 1];
String[] splitExt = splitName.split("\\.", 2);
String[] splitDt = splitExt[0].split("_", 2);
String createTime = splitDt[0];
String endTime = splitDt[1];
object.setName(splitName);
object.setEndTime(DateUtil.parse(splitDate+endTime, "yyyyMMddHHmmss"));
object.setCreateTime(DateUtil.parse(splitDate+createTime, "yyyyMMddHHmmss"));
return object;
}).collect(Collectors.toList());
} catch (OSSException e) {
log.error("获取OSS文件列表失败", e);
}
return null;
}
@Override
public boolean checkDeviceStatus() {
Date now = new Date();
if (deviceConfig.getOnlineMaxInterval() == null) {
// 没有合适配置
return true;
}
Date startTime = DateUtil.offsetMinute(now, -deviceConfig.getOnlineMaxInterval());
List<FileObject> fileList = getOssFileListByPrefix(DateUtil.format(startTime, "yyyyMMdd/HHmm"));
if (fileList != null) {
return !fileList.isEmpty();
} else {
return false;
}
}
}

20
src/main/java/com/ycwl/basic/device/checker/impl/AlwaysOnDeviceChecker.java Normal file
View File

@ -0,0 +1,20 @@
package com.ycwl.basic.device.checker.impl;
import com.ycwl.basic.device.checker.IDeviceStatusChecker;
import com.ycwl.basic.device.checker.helper.CommonDeviceChecker;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import lombok.Setter;
@SuppressWarnings("LombokSetterMayBeUsed")
public class AlwaysOnDeviceChecker implements IDeviceStatusChecker {
@Setter
private DeviceEntity device;
@Setter
private DeviceConfigEntity deviceConfig;
@Override
public boolean checkDeviceStatus() {
return true;
}
}

14
src/main/java/com/ycwl/basic/device/entity/alioss/DeviceAliOssConfig.java Normal file
View File

@ -0,0 +1,14 @@
package com.ycwl.basic.device.entity.alioss;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
@Data
public class DeviceAliOssConfig {
private String accessKeyId;
private String accessKeySecret;
private String bucketName;
private String endpoint;
private String region;
private String prefix;
}

15
src/main/java/com/ycwl/basic/device/entity/common/FileObject.java Normal file
View File

@ -0,0 +1,15 @@
package com.ycwl.basic.device.entity.common;
import lombok.Data;
import java.util.Date;
@Data
public class FileObject {
private String path;
private String name;
private String url;
private boolean needDownload = false;
private Date createTime;
private Date endTime;
}

7
src/main/java/com/ycwl/basic/device/entity/local/DeviceLocalConfig.java Normal file
View File

@ -0,0 +1,7 @@
package com.ycwl.basic.device.entity.local;
import lombok.Data;
@Data
public class DeviceLocalConfig {
}

23
src/main/java/com/ycwl/basic/device/enums/DeviceStoreTypeEnum.java Normal file
View File

@ -0,0 +1,23 @@
package com.ycwl.basic.device.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum DeviceStoreTypeEnum {
ALI_OSS(1, "阿里云OSS"),
LOCAL(2, "本地文件");
private final int type;
private final String remark;
public static DeviceStoreTypeEnum getByType(int type) {
for (DeviceStoreTypeEnum e : values()) {
if (e.type == type) {
return e;
}
}
return null;
}
}

26
src/main/java/com/ycwl/basic/device/operator/IDeviceStorageOperator.java Normal file
View File

@ -0,0 +1,26 @@
package com.ycwl.basic.device.operator;
import com.ycwl.basic.device.IDeviceCommon;
import com.ycwl.basic.device.entity.common.FileObject;
import java.util.Date;
import java.util.List;
public interface IDeviceStorageOperator extends IDeviceCommon {
/**
* 获取指定时间范围内的文件列表
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
List<FileObject> getFileListByDtRange(Date startDate, Date endDate);
/**
* 删除指定日期之前的文件，不包含指定的日期当天
*
* @param date 指定日期，不包含指定日期当天
* @return
*/
boolean removeFilesBeforeDate(Date date);
}

24
src/main/java/com/ycwl/basic/device/operator/helper/CommonPieceGetter.java Normal file
View File

@ -0,0 +1,24 @@
package com.ycwl.basic.device.operator.helper;
import com.alibaba.fastjson.JSON;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import lombok.Setter;
public abstract class CommonPieceGetter<C> {
protected C config;
@Setter
private DeviceEntity device;
@Setter
private DeviceConfigEntity deviceConfig;
public CommonPieceGetter(String configJson) {
config = JSON.parseObject(configJson, getConfigClass());
}
@SuppressWarnings("unchecked")
private Class<C> getConfigClass() {
return (Class<C>) ((java.lang.reflect.ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
}
}

151
src/main/java/com/ycwl/basic/device/operator/impl/AliOssStorageOperator.java Normal file
View File

@ -0,0 +1,151 @@
package com.ycwl.basic.device.operator.impl;
import cn.hutool.core.date.DateUtil;
import com.aliyun.oss.HttpMethod;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.OSSException;
import com.aliyun.oss.model.DeleteObjectsRequest;
import com.aliyun.oss.model.ListObjectsV2Request;
import com.aliyun.oss.model.ListObjectsV2Result;
import com.aliyun.oss.model.OSSObjectSummary;
import com.ycwl.basic.device.entity.alioss.DeviceAliOssConfig;
import com.ycwl.basic.device.entity.common.FileObject;
import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.device.operator.helper.CommonPieceGetter;
import lombok.extern.slf4j.Slf4j;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
public class AliOssStorageOperator extends CommonPieceGetter<DeviceAliOssConfig> implements IDeviceStorageOperator {
public AliOssStorageOperator(String configJson) {
super(configJson);
}
private OSS getClient() {
return new OSSClientBuilder().build(config.getEndpoint(), config.getAccessKeyId(), config.getAccessKeySecret());
}
private List<OSSObjectSummary> getOssObjectListByPrefix(String prefix) {
OSS ossClient = getClient();
ListObjectsV2Request listObjectsV2Request = new ListObjectsV2Request(config.getBucketName());
listObjectsV2Request.setPrefix(config.getPrefix() + prefix);
boolean isTruncated = true;
String continuationToken = null;
List<OSSObjectSummary> objectList = new ArrayList<>();
try {
while (isTruncated) {
if (continuationToken != null) {
listObjectsV2Request.setContinuationToken(continuationToken);
}
// 列举文件。
ListObjectsV2Result result = ossClient.listObjectsV2(listObjectsV2Request);
objectList.addAll(result.getObjectSummaries());
isTruncated = result.isTruncated();
continuationToken = result.getNextContinuationToken();
}
return objectList;
} catch (OSSException e) {
log.error("获取OSS文件列表失败", e);
}
return null;
}
private List<FileObject> getOssFileListByPrefix(String prefix) {
OSS ossClient = getClient();
List<OSSObjectSummary> objectList = getOssObjectListByPrefix(prefix);
if (objectList == null) {
return null;
}
return objectList.stream().filter(item -> item.getKey().endsWith(".ts")).map(item -> {
FileObject object = new FileObject();
object.setPath(item.getKey());
URL url = ossClient.generatePresignedUrl(item.getBucketName(), item.getKey(), DateUtil.offsetHour(new Date(), 8), HttpMethod.GET);
object.setUrl(url.toString());
object.setNeedDownload(true);
String[] splitDir = item.getKey().split("/");
String splitDate = splitDir[splitDir.length - 2];
String splitName = splitDir[splitDir.length - 1];
String[] splitExt = splitName.split("\\.", 2);
String[] splitDt = splitExt[0].split("_", 2);
String createTime = splitDt[0];
String endTime = splitDt[1];
object.setName(splitName);
object.setEndTime(DateUtil.parse(splitDate+endTime, "yyyyMMddHHmmss"));
object.setCreateTime(DateUtil.parse(splitDate+createTime, "yyyyMMddHHmmss"));
return object;
}).collect(Collectors.toList());
}
private boolean removeFilesByPrefix(String prefix) {
OSS ossClient = getClient();
List<OSSObjectSummary> objectList = getOssObjectListByPrefix(prefix);
if (objectList == null) {
return false;
}
DeleteObjectsRequest request = new DeleteObjectsRequest(config.getBucketName());
request.setKeys(objectList.stream().map(OSSObjectSummary::getKey).collect(Collectors.toList()));
try {
ossClient.deleteObjects(request);
return true;
} catch (OSSException e) {
return false;
} finally {
ossClient.shutdown();
}
}
@Override
public List<FileObject> getFileListByDtRange(Date startDate, Date endDate) {
if (startDate == null || endDate == null) {
return null;
}
List<FileObject> fileList = new ArrayList<>();
if (startDate.after(endDate)) {
return fileList;
}
Calendar calendar = Calendar.getInstance();
calendar.setTime(startDate);
calendar.set(Calendar.SECOND, 0);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd/HHmm");
while (calendar.getTime().before(endDate)) {
String prefix = dateFormat.format(calendar.getTime());
List<FileObject> fileListByPrefix = getOssFileListByPrefix(prefix);
if (fileListByPrefix == null) {
return null;
}
fileList.addAll(fileListByPrefix);
calendar.add(Calendar.MINUTE, 1);
}
calendar.clear();
return fileList.stream()
.sorted(Comparator.comparing(FileObject::getCreateTime))
.filter(item -> item.getCreateTime().after(startDate))
.filter(item -> item.getCreateTime().before(endDate))
.collect(Collectors.toList());
}
@Override
public boolean removeFilesBeforeDate(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.HOUR_OF_DAY, 0);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd/");
calendar.add(Calendar.DAY_OF_MONTH, -1);
String prefix = dateFormat.format(calendar.getTime());
return removeFilesByPrefix(prefix);
}
}

26
src/main/java/com/ycwl/basic/device/operator/impl/LocalStorageOperator.java Normal file
View File

@ -0,0 +1,26 @@
package com.ycwl.basic.device.operator.impl;
import com.ycwl.basic.device.entity.common.FileObject;
import com.ycwl.basic.device.entity.local.DeviceLocalConfig;
import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.device.operator.helper.CommonPieceGetter;
import java.util.Collections;
import java.util.Date;
import java.util.List;
public class LocalStorageOperator extends CommonPieceGetter<DeviceLocalConfig> implements IDeviceStorageOperator {
public LocalStorageOperator(String configJson) {
super(configJson);
}
@Override
public List<FileObject> getFileListByDtRange(Date startDate, Date endDate) {
return Collections.emptyList();
}
@Override
public boolean removeFilesBeforeDate(Date date) {
return false;
}
}

12
src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java
View File

@ -1,6 +1,7 @@
package com.ycwl.basic.mapper.pc; package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
@ -24,7 +25,18 @@ public interface DeviceMapper {
int update(DeviceAddOrUpdateReq deviceReqQuery); int update(DeviceAddOrUpdateReq deviceReqQuery);
int updateStatus(Long id); int updateStatus(Long id);
DeviceEntity getByDeviceId(Long deviceId);
List<DeviceRespVO> listByScenicId(Long scenicId); List<DeviceRespVO> listByScenicId(Long scenicId);
ScenicDeviceCountVO deviceCountByScenicId(@Param("scenicId") Long scenicId,@Param("userId") Long userId); ScenicDeviceCountVO deviceCountByScenicId(@Param("scenicId") Long scenicId,@Param("userId") Long userId);
DeviceConfigEntity getConfigByDeviceId(Long deviceId);
int addConfig(DeviceConfigEntity deviceConfigEntity);
int updateConfig(DeviceConfigEntity deviceConfigEntity);
DeviceEntity getByDeviceNo(String deviceNo);
int updateEntity(DeviceEntity device);
int addEntity(DeviceEntity device);
} }

3
src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java
View File

@ -16,6 +16,7 @@ import java.util.List;
@Mapper @Mapper
public interface FaceMapper { public interface FaceMapper {
List<FaceRespVO> list(FaceReqQuery faceReqQuery); List<FaceRespVO> list(FaceReqQuery faceReqQuery);
List<FaceRespVO> listByScenicIdAndNotFinished(Long scenicId);
FaceRespVO getById(Long id); FaceRespVO getById(Long id);
int add(FaceEntity face); int add(FaceEntity face);
int deleteById(Long id); int deleteById(Long id);
@ -23,4 +24,6 @@ public interface FaceMapper {
int update(FaceEntity face); int update(FaceEntity face);
FaceRespVO getByMemberId(Long userId); FaceRespVO getByMemberId(Long userId);
int finishedJourney(Long faceId);
} }

2
src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java
View File

@ -21,4 +21,6 @@ public interface FaceSampleMapper {
int deleteById(Long id); int deleteById(Long id);
int deleteByIds(@Param("list") List<Long> ids); int deleteByIds(@Param("list") List<Long> ids);
int update(FaceSampleEntity faceSample); int update(FaceSampleEntity faceSample);
List<FaceSampleRespVO> listByIds(List<Long> list);
} }

3
src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java
View File

@ -30,6 +30,7 @@ public interface ScenicMapper {
int updateStatus(Long id); int updateStatus(Long id);
ScenicConfigEntity getConfig(Long scenicId);
/** /**
* 添加景区配置 * 添加景区配置
* *
@ -51,7 +52,7 @@ public interface ScenicMapper {
* *
* @param scenicId * @param scenicId
*/ */
void deleteConfigByscenicId(Long scenicId); void deleteConfigByScenicId(Long scenicId);
List<ScenicAppVO> appList(ScenicReqQuery scenicReqQuery); List<ScenicAppVO> appList(ScenicReqQuery scenicReqQuery);

6
src/main/java/com/ycwl/basic/mapper/pc/TemplateMapper.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.task.entity.TaskEntity;
import com.ycwl.basic.model.pc.task.req.TaskReqQuery; import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
import com.ycwl.basic.model.pc.task.resp.TaskRespVO; import com.ycwl.basic.model.pc.task.resp.TaskRespVO;
import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
@ -26,4 +27,9 @@ public interface TemplateMapper {
int deleteByPid(Long pid); int deleteByPid(Long pid);
int deleteByScenicId(Long scenicId); int deleteByScenicId(Long scenicId);
List<TemplateRespVO> getByPid(Long id); List<TemplateRespVO> getByPid(Long id);
TemplateConfigEntity getConfig(Long templateId);
int addConfig(TemplateConfigEntity templateConfig);
int updateConfigById(TemplateConfigEntity templateConfigEntity);
int deleteConfigByTemplateId(Long templateId);
int deleteConfigById(Long id);
} }

3
src/main/java/com/ycwl/basic/mapper/pc/VideoMapper.java
View File

@ -6,6 +6,7 @@ import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.model.pc.video.entity.VideoEntity; import com.ycwl.basic.model.pc.video.entity.VideoEntity;
import com.ycwl.basic.model.pc.video.req.VideoReqQuery; import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import lombok.NonNull;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@ -22,4 +23,6 @@ public interface VideoMapper {
int add(VideoEntity task); int add(VideoEntity task);
int deleteById(Long id); int deleteById(Long id);
int update(VideoEntity task); int update(VideoEntity task);
VideoEntity findByTaskId(@NonNull Long taskId);
} }

59
src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java Normal file
View File

@ -0,0 +1,59 @@
package com.ycwl.basic.model.pc.device.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("device_config")
public class DeviceConfigEntity {
private Long id;
/**
* 设备id
*/
private Long deviceId;
/**
* 启用时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 存储类型
*/
private Integer storeType;
/**
* 存储配置
*/
private String storeConfigJson;
/**
* 存储过期天数
*/
private Integer storeExpireDay;
/**
* 检测设备是否在线
*/
private Integer onlineCheck;
/**
* 检测设备是否在线最大间隔
*/
private Integer onlineMaxInterval;
/**
* 切割时，取人脸前多少秒的视频
*/
private BigDecimal cutPre;
/**
* 切割时，取人脸后多少秒的视频
*/
private BigDecimal cutPost;
}

11
src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@ -27,6 +28,14 @@ public class DeviceEntity {
* 设备编号 * 设备编号
*/ */
private String no; private String no;
/**
* 经度
*/
private BigDecimal longitude;
/***
* 纬度
*/
private BigDecimal latitude;
/** /**
* 是否启用，0不启用，1启用 * 是否启用，0不启用，1启用
*/ */
@ -35,6 +44,8 @@ public class DeviceEntity {
* 是否在线，0不在线，1在线 * 是否在线，0不在线，1在线
*/ */
private Integer online; private Integer online;
private String ipAddr;
private Date keepaliveAt;
private Date createAt; private Date createAt;
private Date updateAt; private Date updateAt;
} }

5
src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@ -22,6 +23,10 @@ public class DeviceRespVO {
private String name; private String name;
@ApiModelProperty("设备编号") @ApiModelProperty("设备编号")
private String no; private String no;
@ApiModelProperty("经度")
private BigDecimal longitude;
@ApiModelProperty("纬度")
private BigDecimal latitude;
@ApiModelProperty("是否启用，0不启用，1启用") @ApiModelProperty("是否启用，0不启用，1启用")
private Integer status; private Integer status;
@ApiModelProperty("是否在线，0不在线，1在线") @ApiModelProperty("是否在线，0不在线，1在线")

1
src/main/java/com/ycwl/basic/model/pc/face/entity/FaceEntity.java
View File

@ -16,6 +16,7 @@ import java.util.Date;
public class FaceEntity { public class FaceEntity {
@TableId @TableId
private Long id; private Long id;
private Long scenicId;
/** /**
* 人脸得分 * 人脸得分
*/ */

2
src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java
View File

@ -16,6 +16,8 @@ import java.util.Date;
@Data @Data
@ApiModel("人脸查询参数") @ApiModel("人脸查询参数")
public class FaceReqQuery extends BaseQueryParameterReq { public class FaceReqQuery extends BaseQueryParameterReq {
@ApiModelProperty("景区id")
private Long scenicId;
@ApiModelProperty("会员id") @ApiModelProperty("会员id")
private Long memberId; private Long memberId;
@ApiModelProperty("用户上传的人脸照片") @ApiModelProperty("用户上传的人脸照片")

1
src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
View File

@ -18,6 +18,7 @@ import java.util.Date;
@ApiModel(value = "订单查询对象") @ApiModel(value = "订单查询对象")
public class OrderReqQuery extends BaseQueryParameterReq { public class OrderReqQuery extends BaseQueryParameterReq {
private Long id; private Long id;
private Long scenicId;
private Long memberId; private Long memberId;
@ApiModelProperty("用户昵称") @ApiModelProperty("用户昵称")
private String memberNickname; private String memberNickname;

2
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java
View File

@ -102,4 +102,6 @@ public class OrderRespVO {
private Date refundAt; private Date refundAt;
@ApiModelProperty("订单明细") @ApiModelProperty("订单明细")
private List<OrderItemVO> orderItemList; private List<OrderItemVO> orderItemList;
private Long scenicId;
private String scenicName;
} }

17
src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java
View File

@ -38,4 +38,21 @@ public class ScenicConfigEntity {
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
/**
* 预约流程，1-预约，2-在线，3-全部
*/
private Integer bookRoutine;
/**
* 样本保存时间
*/
private Integer sampleStoreDay;
/**
* 视频保存时间
*/
private Integer videoStoreDay;
/**
* 最大行程时长
*/
private Integer maxJourneyHour;
} }

3
src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java
View File

@ -1,7 +1,6 @@
package com.ycwl.basic.model.pc.scenic.req; package com.ycwl.basic.model.pc.scenic.req;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -78,8 +77,6 @@ public class ScenicAddOrUpdateReq {
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime; private Date updateTime;
@ApiModelProperty("景区配置")
private ScenicConfigEntity scenicConfig;
@ApiModelProperty("景区源素材价格，元") @ApiModelProperty("景区源素材价格，元")
private BigDecimal price; private BigDecimal price;

4
src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java
View File

@ -79,13 +79,11 @@ public class ScenicRespVO {
* 状态 1启用0关闭 * 状态 1启用0关闭
*/ */
@ApiModelProperty("状态 1启用0关闭") @ApiModelProperty("状态 1启用0关闭")
private String status; private Integer status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime; private Date updateTime;
@ApiModelProperty("景区配置")
private ScenicConfigEntity scenicConfig;
@ApiModelProperty("景区源素材价格，元") @ApiModelProperty("景区源素材价格，元")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("镜头数") @ApiModelProperty("镜头数")

4
src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java
View File

@ -30,6 +30,10 @@ public class SourceEntity {
* 所属用户 * 所属用户
*/ */
private Long memberId; private Long memberId;
/**
* 人脸样本id
*/
private Long faceSampleId;
/** /**
* 原素材类型：1视频，2图像 * 原素材类型：1视频，2图像
*/ */

16
src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateConfigEntity.java Normal file
View File

@ -0,0 +1,16 @@
package com.ycwl.basic.model.pc.template.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("template_config")
public class TemplateConfigEntity {
private Long id;
private Long templateId;
private Integer isDefault;
private Date createDate;
private Integer minimalPlaceholderFill;
}

14
src/main/java/com/ycwl/basic/model/viid/entity/DeviceIdObject.java Normal file
View File

@ -0,0 +1,14 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class DeviceIdObject implements Serializable {
@JsonProperty("DeviceID")
private String deviceId;
}

12
src/main/java/com/ycwl/basic/model/viid/entity/FaceListObject.java Normal file
View File

@ -0,0 +1,12 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@Data
public class FaceListObject {
@JsonProperty("FaceObject")
private List<FaceObject> faceObject;
}

169
src/main/java/com/ycwl/basic/model/viid/entity/FaceObject.java Normal file
View File

@ -0,0 +1,169 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class FaceObject {
@JsonProperty("FaceID")
private String FaceID;
@JsonProperty("InfoKind")
private Integer InfoKind;
@JsonProperty("SourceID")
private String SourceID;
@JsonProperty("DeviceID")
private String DeviceID;
@JsonProperty("LeftTopX")
private Integer LeftTopX;
@JsonProperty("LeftTopY")
private Integer LeftTopY;
@JsonProperty("RightBtmX")
private Integer RightBtmX;
@JsonProperty("RightBtmY")
private Integer RightBtmY;
@JsonProperty("IDNumber")
private String IDNumber;
@JsonProperty("Name")
private String Name;
@JsonProperty("UsedName")
private String UsedName;
@JsonProperty("Alias")
private String Alias;
@JsonProperty("AgeUpLimit")
private Integer AgeUpLimit;
@JsonProperty("AgeLowerLimit")
private Integer AgeLowerLimit;
@JsonProperty("EthicCode")
private String EthicCode;
@JsonProperty("NationalityCode")
private String NationalityCode;
@JsonProperty("NativeCityCode")
private String NativeCityCode;
@JsonProperty("ResidenceAdminDivision")
private String ResidenceAdminDivision;
@JsonProperty("ChineseAccentCode")
private String ChineseAccentCode;
@JsonProperty("JobCategory")
private String JobCategory;
@JsonProperty("AccompanyNumber")
private Integer AccompanyNumber;
@JsonProperty("SkinColor")
private String SkinColor;
@JsonProperty("FaceStyle")
private String FaceStyle;
@JsonProperty("FacialFeature")
private String FacialFeature;
@JsonProperty("PhysicalFeature")
private String PhysicalFeature;
@JsonProperty("IsDriver")
private Integer IsDriver;
@JsonProperty("IsForeigner")
private Integer IsForeigner;
@JsonProperty("ImmigrantTypeCode")
private String ImmigrantTypeCode;
@JsonProperty("IsSuspectedTerrorist")
private Integer IsSuspectedTerrorist;
@JsonProperty("SuspectedTerroristNumber")
private String SuspectedTerroristNumber;
@JsonProperty("IsCriminalInvolved")
private Integer IsCriminalInvolved;
@JsonProperty("CriminalInvolvedSpecilisationCode")
private String CriminalInvolvedSpecilisationCode;
@JsonProperty("BodySpeciallMark")
private String BodySpeciallMark;
@JsonProperty("CrimeMethod")
private String CrimeMethod;
@JsonProperty("CrimeCharacterCode")
private String CrimeCharacterCode;
@JsonProperty("EscapedCriminalNumber")
private String EscapedCriminalNumber;
@JsonProperty("IsDetainees")
private Integer IsDetainees;
@JsonProperty("DetentionHouseCode")
private String DetentionHouseCode;
@JsonProperty("DetaineesSpecialIdentity")
private String DetaineesSpecialIdentity;
@JsonProperty("MemberTypeCode")
private String MemberTypeCode;
@JsonProperty("IsVictim")
private String IsVictim;
@JsonProperty("VictimType")
private String VictimType;
@JsonProperty("CorpseConditionCode")
private String CorpseConditionCode;
@JsonProperty("IsSuspiciousPerson")
private String IsSuspiciousPerson;
@JsonProperty("Attitude")
private String Attitude;
@JsonProperty("Similaritydegree")
private String Similaritydegree;
@JsonProperty("EyebrowStyle")
private String EyebrowStyle;
@JsonProperty("NoseStyle")
private String NoseStyle;
@JsonProperty("MustacheStyle")
private String MustacheStyle;
@JsonProperty("LipStyle")
private String LipStyle;
@JsonProperty("WrinklePouch")
private String WrinklePouch;
@JsonProperty("AcneStain")
private String AcneStain;
@JsonProperty("FreckleBirthmark")
private String FreckleBirthmark;
@JsonProperty("ScarDimple")
private String ScarDimple;
@JsonProperty("TabID")
private String TabID;
@JsonProperty("OtherFeature")
private String OtherFeature;
@JsonProperty("Maritalstatus")
private String Maritalstatus;
@JsonProperty("FamilyAddress")
private String FamilyAddress;
@JsonProperty("CollectorOrg")
private String CollectorOrg;
@JsonProperty("CollectorID")
private String CollectorID;
@JsonProperty("DeviceSNNo")
private String DeviceSNNo;
@JsonProperty("APSId")
private String APSId;
@JsonProperty("LocationMarkTime")
private String LocationMarkTime;
@JsonProperty("FaceAppearTime")
private String FaceAppearTime;
@JsonProperty("FaceDisAppearTime")
private String FaceDisAppearTime;
@JsonProperty("ShotTime")
private String ShotTime;
@JsonProperty("IDType")
private String IDType;
@JsonProperty("GenderCode")
private String GenderCode;
@JsonProperty("HairStyle")
private String HairStyle;
@JsonProperty("HairColor")
private String HairColor;
@JsonProperty("RespiratorColor")
private String RespiratorColor;
@JsonProperty("CapStyle")
private String CapStyle;
@JsonProperty("CapColor")
private String CapColor;
@JsonProperty("GlassStyle")
private String GlassStyle;
@JsonProperty("GlassColor")
private String GlassColor;
@JsonProperty("PassportType")
private String PassportType;
@JsonProperty("DetaineesIdentity")
private String DetaineesIdentity;
@JsonProperty("InjuredDegree")
private String InjuredDegree;
@JsonProperty("EntryTime")
private String EntryTime;
@JsonProperty("SubImageList")
private SubImageList subImageList;
}

21
src/main/java/com/ycwl/basic/model/viid/entity/ResponseStatusObject.java Normal file
View File

@ -0,0 +1,21 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class ResponseStatusObject {
@JsonProperty("Id")
private String id;
@JsonProperty("RequestURL")
private String requestUrl;
@JsonProperty("StatusCode")
private String statusCode;
@JsonProperty("StatusString")
private String statusString;
@JsonProperty("LocalTime")
private String localTime;
}

28
src/main/java/com/ycwl/basic/model/viid/entity/SubImageInfoObject.java Normal file
View File

@ -0,0 +1,28 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class SubImageInfoObject {
@JsonProperty("ImageID")
private String ImageID;
@JsonProperty("EventSort")
private Integer EventSort;
@JsonProperty("DeviceID")
private String DeviceID;
@JsonProperty("StoragePath")
private String StoragePath;
@JsonProperty("Type")
private String Type;
@JsonProperty("FileFormat")
private String FileFormat;
@JsonProperty("Width")
private String Width;
@JsonProperty("Height")
private String Height;
@JsonProperty("ShotTime")
private String ShotTime;
@JsonProperty("Data")
private String Data;
}

13
src/main/java/com/ycwl/basic/model/viid/entity/SubImageList.java Normal file
View File

@ -0,0 +1,13 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@Data
public class SubImageList {
@JsonProperty("SubImageInfoObject")
private List<SubImageInfoObject> subImageInfoObject;
}

18
src/main/java/com/ycwl/basic/model/viid/entity/SystemTimeObject.java Normal file
View File

@ -0,0 +1,18 @@
package com.ycwl.basic.model.viid.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class SystemTimeObject {
@JsonProperty("VIIDServerID")
private String viidServerId;
@JsonProperty("TimeMode")
private String timeMode;
@JsonProperty("LocalTime")
private String localTime;
@JsonProperty("TimeZone")
private String timezone;
}

11
src/main/java/com/ycwl/basic/model/viid/req/FaceUploadReq.java Normal file
View File

@ -0,0 +1,11 @@
package com.ycwl.basic.model.viid.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.FaceListObject;
import lombok.Data;
@Data
public class FaceUploadReq {
@JsonProperty("FaceListObject")
private FaceListObject faceListObject;
}

11
src/main/java/com/ycwl/basic/model/viid/req/KeepaliveReq.java Normal file
View File

@ -0,0 +1,11 @@
package com.ycwl.basic.model.viid.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.DeviceIdObject;
import lombok.Data;
@Data
public class KeepaliveReq {
@JsonProperty("KeepaliveObject")
private DeviceIdObject keepaliveObject;
}

11
src/main/java/com/ycwl/basic/model/viid/req/RegisterReq.java Normal file
View File

@ -0,0 +1,11 @@
package com.ycwl.basic.model.viid.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.DeviceIdObject;
import lombok.Data;
@Data
public class RegisterReq {
@JsonProperty("RegisterObject")
private DeviceIdObject registerObject;
}

12
src/main/java/com/ycwl/basic/model/viid/req/UnRegisterReq.java Normal file
View File

@ -0,0 +1,12 @@
package com.ycwl.basic.model.viid.req;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.DeviceIdObject;
import lombok.Data;
@Data
public class UnRegisterReq {
@JsonProperty("UnRegisterObject")
private DeviceIdObject unRegisterObject;
}

13
src/main/java/com/ycwl/basic/model/viid/resp/SystemTimeResp.java Normal file
View File

@ -0,0 +1,13 @@
package com.ycwl.basic.model.viid.resp;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.SystemTimeObject;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class SystemTimeResp {
@JsonProperty("SystemTimeObject")
private SystemTimeObject systemTimeObject;
}

15
src/main/java/com/ycwl/basic/model/viid/resp/VIIDBaseResp.java Normal file
View File

@ -0,0 +1,15 @@
package com.ycwl.basic.model.viid.resp;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycwl.basic.model.viid.entity.ResponseStatusObject;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class VIIDBaseResp {
@JsonProperty("ResponseStatusObject")
private ResponseStatusObject responseStatusObject;
}

19
src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.service.impl.pc;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.mapper.pc.DeviceMapper; import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
@ -65,4 +66,22 @@ public class DeviceServiceImpl implements DeviceService {
public ApiResponse updateStatus(Long id) { public ApiResponse updateStatus(Long id) {
return ApiResponse.success(deviceMapper.updateStatus(id)); return ApiResponse.success(deviceMapper.updateStatus(id));
} }
@Override
public DeviceConfigEntity getConfig(Long id) {
DeviceConfigEntity config = deviceMapper.getConfigByDeviceId(id);
if (config == null) {
config = new DeviceConfigEntity();
config.setId(SnowFlakeUtil.getLongId());
config.setDeviceId(id);
deviceMapper.addConfig(config);
}
return config;
}
@Override
public void saveConfig(Long configId, DeviceConfigEntity config) {
config.setId(configId);
deviceMapper.updateConfig(config);
}
} }

3
src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.ycwl.basic.service.pc.MenuService;
import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.SnowFlakeUtil; import com.ycwl.basic.utils.SnowFlakeUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -15,7 +16,7 @@ import java.util.List;
* @Author：longbinbin * @Author：longbinbin
* @Date：2024/12/3 10:16 * @Date：2024/12/3 10:16
*/ */
@Service
public class MenuServiceImpl implements MenuService { public class MenuServiceImpl implements MenuService {
@Autowired @Autowired

21
src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java
View File

@ -96,7 +96,7 @@ public class ScenicServiceImpl implements ScenicService {
public ApiResponse<Boolean> deleteById(Long id) { public ApiResponse<Boolean> deleteById(Long id) {
int i = scenicMapper.deleteById(id); int i = scenicMapper.deleteById(id);
if (i > 0) { if (i > 0) {
scenicMapper.deleteConfigByscenicId(id); scenicMapper.deleteConfigByScenicId(id);
scenicAccountMapper.deleteByScenicId(id); scenicAccountMapper.deleteByScenicId(id);
return ApiResponse.success(true); return ApiResponse.success(true);
}else { }else {
@ -167,6 +167,25 @@ public class ScenicServiceImpl implements ScenicService {
} }
} }
@Override
public ScenicConfigEntity getConfig(Long id) {
ScenicConfigEntity config = scenicMapper.getConfig(id);
if (config == null) {
config = new ScenicConfigEntity();
config.setId(SnowFlakeUtil.getLongId());
config.setScenicId(id);
config.setIsDefault(1);
scenicMapper.addConfig(config);
}
return config;
}
@Override
public void saveConfig(Long configId, ScenicConfigEntity config) {
config.setId(configId);
scenicMapper.updateConfigById(config);
}
private IAcsClient getClient() { private IAcsClient getClient() {
DefaultProfile profile = DefaultProfile.getProfile( DefaultProfile profile = DefaultProfile.getProfile(
faceDetectConfig.getRegion(),faceDetectConfig.getAccessKeyId(), faceDetectConfig.getAccessKeySecret()); faceDetectConfig.getRegion(),faceDetectConfig.getAccessKeyId(), faceDetectConfig.getAccessKeySecret());

19
src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.service.impl.pc;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.mapper.pc.TemplateMapper; import com.ycwl.basic.mapper.pc.TemplateMapper;
import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
@ -104,4 +105,22 @@ public class TemplateServiceImpl implements TemplateService {
return ApiResponse.fail("更新模版状态失败"); return ApiResponse.fail("更新模版状态失败");
} }
} }
@Override
public TemplateConfigEntity getConfig(Long templateId) {
TemplateConfigEntity config = templateMapper.getConfig(templateId);
if (config == null) {
config = new TemplateConfigEntity();
config.setId(SnowFlakeUtil.getLongId());
config.setTemplateId(templateId);
templateMapper.addConfig(config);
}
return config;
}
@Override
public void saveConfig(Long configId, TemplateConfigEntity config) {
config.setId(configId);
templateMapper.updateConfigById(config);
}
} }

21
src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java
View File

@ -21,9 +21,11 @@ import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.model.task.resp.AddFaceRespVo; import com.ycwl.basic.model.task.resp.AddFaceRespVo;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo; import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
import com.ycwl.basic.service.task.TaskFaceService; import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.utils.AliFaceUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -84,13 +86,12 @@ public class TaskFaceServiceImpl implements TaskFaceService {
.map(SearchFaceResponse.Data.MatchListItem.FaceItemsItem::getExtraData) .map(SearchFaceResponse.Data.MatchListItem.FaceItemsItem::getExtraData)
.map(Long::parseLong) .map(Long::parseLong)
.collect(Collectors.toList()); .collect(Collectors.toList());
faceEntity.setMatchSampleIds(StringUtils.joinWith(",", faceSampleIds)); faceEntity.setMatchSampleIds(StringUtils.join(faceSampleIds, ","));
faceMapper.update(faceEntity); faceMapper.update(faceEntity);
respVo.setSampleListIds(faceSampleIds); respVo.setSampleListIds(faceSampleIds);
respVo.setScore(matchList.get(0).getQualitieScore()); respVo.setScore(matchList.get(0).getQualitieScore());
return respVo; return respVo;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error("人脸搜索失败：{}", e.getMessage()); log.error("人脸搜索失败：{}", e.getMessage());
throw new BaseException(e.getMessage()); throw new BaseException(e.getMessage());
} }
@ -102,8 +103,7 @@ public class TaskFaceServiceImpl implements TaskFaceService {
FaceSampleRespVO faceSampleRespVO = faceSampleMapper.getById(faceSampleId); FaceSampleRespVO faceSampleRespVO = faceSampleMapper.getById(faceSampleId);
AddFaceEntityRequest request = new AddFaceEntityRequest(); AddFaceEntityRequest request = new AddFaceEntityRequest();
request.setDbName(faceSampleRespVO.getScenicId().toString()); request.setDbName(faceSampleRespVO.getScenicId().toString());
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); String entityId = AliFaceUtil.generateEntityId(faceSampleRespVO);
String entityId = faceSampleRespVO.getDeviceId().toString() + "_" + sdf.format(faceSampleRespVO.getCreateAt());
request.setEntityId(entityId); request.setEntityId(entityId);
IAcsClient client = getClient(); IAcsClient client = getClient();
try { try {
@ -136,15 +136,22 @@ public class TaskFaceServiceImpl implements TaskFaceService {
FaceSampleReqQuery query = new FaceSampleReqQuery(); FaceSampleReqQuery query = new FaceSampleReqQuery();
query.setDeviceId(scenicId); query.setDeviceId(scenicId);
faceSampleMapper.list(query); faceSampleMapper.list(query);
Date thatDay = DateUtil.offsetDay(new Date(), -3); ScenicConfigEntity scenicConfig = scenicMapper.getConfig(scenicId);
if (scenicConfig == null) {
return;
}
Integer sampleStoreDay = scenicConfig.getSampleStoreDay();
if (sampleStoreDay == null) {
sampleStoreDay = 3;
}
Date thatDay = DateUtil.offsetDay(new Date(), -sampleStoreDay);
Date dayStart = DateUtil.beginOfDay(thatDay); Date dayStart = DateUtil.beginOfDay(thatDay);
Date dayEnd = DateUtil.endOfDay(thatDay); Date dayEnd = DateUtil.endOfDay(thatDay);
query.setStartTime(dayStart); query.setStartTime(dayStart);
query.setEndTime(dayEnd); query.setEndTime(dayEnd);
IAcsClient client = getClient(); IAcsClient client = getClient();
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
faceSampleMapper.list(query).forEach(faceSampleEntity -> { faceSampleMapper.list(query).forEach(faceSampleEntity -> {
String entityId = faceSampleEntity.getDeviceId().toString() + "_" + sdf.format(faceSampleEntity.getCreateAt()); String entityId = AliFaceUtil.generateEntityId(faceSampleEntity);
DeleteFaceEntityRequest request = new DeleteFaceEntityRequest(); DeleteFaceEntityRequest request = new DeleteFaceEntityRequest();
request.setDbName(scenicId.toString()); request.setDbName(scenicId.toString());
request.setEntityId(entityId); request.setEntityId(entityId);

28
src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.ycwl.basic.mapper.pc.RenderWorkerMapper;
import com.ycwl.basic.mapper.pc.SourceMapper; import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.mapper.pc.TaskMapper; import com.ycwl.basic.mapper.pc.TaskMapper;
import com.ycwl.basic.mapper.pc.TemplateMapper; import com.ycwl.basic.mapper.pc.TemplateMapper;
import com.ycwl.basic.mapper.pc.VideoMapper;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity;
@ -16,6 +17,7 @@ import com.ycwl.basic.model.pc.task.entity.TaskEntity;
import com.ycwl.basic.model.pc.task.resp.TaskRespVO; import com.ycwl.basic.model.pc.task.resp.TaskRespVO;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.model.pc.video.entity.VideoEntity;
import com.ycwl.basic.model.task.req.ClientStatusReqVo; import com.ycwl.basic.model.task.req.ClientStatusReqVo;
import com.ycwl.basic.model.task.req.TaskReqVo; import com.ycwl.basic.model.task.req.TaskReqVo;
import com.ycwl.basic.model.task.req.WorkerAuthReqVo; import com.ycwl.basic.model.task.req.WorkerAuthReqVo;
@ -57,6 +59,8 @@ public class TaskTaskServiceImpl implements TaskService {
private SourceMapper sourceMapper; private SourceMapper sourceMapper;
@Autowired @Autowired
private OssUtil ossUtil; private OssUtil ossUtil;
@Autowired
private VideoMapper videoMapper;
private RenderWorkerEntity getWorker(@NonNull WorkerAuthReqVo req) { private RenderWorkerEntity getWorker(@NonNull WorkerAuthReqVo req) {
String accessKey = req.getAccessKey(); String accessKey = req.getAccessKey();
@ -112,9 +116,7 @@ public class TaskTaskServiceImpl implements TaskService {
} }
List<TaskRespVO> taskList = taskMapper.selectNotRunning(); List<TaskRespVO> taskList = taskMapper.selectNotRunning();
resp.setTasks(taskList); resp.setTasks(taskList);
taskList.forEach(task -> { taskList.forEach(task -> taskMapper.assignToWorker(task.getId(), worker.getId()));
taskMapper.assignToWorker(task.getId(), worker.getId());
});
// return Task // return Task
return resp; return resp;
} }
@ -131,9 +133,7 @@ public class TaskTaskServiceImpl implements TaskService {
} }
Map<String, List<SourceRespVO>> sourcesMap = Arrays.stream(faceRespVO.getMatchSampleIds().split(",")) Map<String, List<SourceRespVO>> sourcesMap = Arrays.stream(faceRespVO.getMatchSampleIds().split(","))
.map(Long::valueOf) .map(Long::valueOf)
.map(sampleId -> { .map(sampleId -> faceSampleMapper.getById(sampleId))
return faceSampleMapper.getById(sampleId);
})
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map(FaceSampleRespVO::getSourceId) .map(FaceSampleRespVO::getSourceId)
.map(sourceId -> sourceMapper.getById(sourceId)) .map(sourceId -> sourceMapper.getById(sourceId))
@ -178,6 +178,22 @@ public class TaskTaskServiceImpl implements TaskService {
taskUpdate.setStatus(1); taskUpdate.setStatus(1);
taskUpdate.setWorkerId(worker.getId()); taskUpdate.setWorkerId(worker.getId());
taskMapper.update(taskUpdate); taskMapper.update(taskUpdate);
VideoEntity video = videoMapper.findByTaskId(taskId);
if (video != null) {
video.setVideoUrl(task.getVideoUrl());
videoMapper.update(video);
} else {
video = new VideoEntity();
video.setId(SnowFlakeUtil.getLongId());
video.setScenicId(task.getScenicId());
video.setMemberId(task.getMemberId());
video.setTemplateId(task.getTemplateId());
video.setTaskId(taskId);
video.setWorkerId(worker.getId());
video.setVideoUrl(task.getVideoUrl());
video.setCreateTime(new Date());
videoMapper.add(video);
}
} }
@Override @Override

4
src/main/java/com/ycwl/basic/service/pc/DeviceService.java
View File

@ -1,6 +1,7 @@
package com.ycwl.basic.service.pc; package com.ycwl.basic.service.pc;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
@ -20,4 +21,7 @@ public interface DeviceService {
ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery); ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery);
ApiResponse deleteById(Long id); ApiResponse deleteById(Long id);
ApiResponse updateStatus(Long id); ApiResponse updateStatus(Long id);
DeviceConfigEntity getConfig(Long id);
void saveConfig(Long configId, DeviceConfigEntity config);
} }

3
src/main/java/com/ycwl/basic/service/pc/ScenicService.java
View File

@ -28,4 +28,7 @@ public interface ScenicService {
* @return * @return
*/ */
ApiResponse<Boolean> updateConfigById(ScenicConfigEntity scenicConfig); ApiResponse<Boolean> updateConfigById(ScenicConfigEntity scenicConfig);
ScenicConfigEntity getConfig(Long id);
void saveConfig(Long configId, ScenicConfigEntity config);
} }

5
src/main/java/com/ycwl/basic/service/pc/TemplateService.java
View File

@ -1,6 +1,7 @@
package com.ycwl.basic.service.pc; package com.ycwl.basic.service.pc;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
@ -21,4 +22,8 @@ public interface TemplateService {
ApiResponse<Integer> deleteById(Long id); ApiResponse<Integer> deleteById(Long id);
ApiResponse<Boolean> update(TemplateEntity template); ApiResponse<Boolean> update(TemplateEntity template);
ApiResponse<Boolean> updateStatus(Long id); ApiResponse<Boolean> updateStatus(Long id);
TemplateConfigEntity getConfig(Long templateId);
void saveConfig(Long configId, TemplateConfigEntity config);
} }

142
src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java Normal file
View File

@ -0,0 +1,142 @@
package com.ycwl.basic.task;
import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.mapper.pc.FaceMapper;
import com.ycwl.basic.mapper.pc.FaceSampleMapper;
import com.ycwl.basic.mapper.pc.ScenicMapper;
import com.ycwl.basic.mapper.pc.TemplateMapper;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.service.task.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Component
@EnableScheduling
@Slf4j
public class DynamicTaskGenerator {
@Autowired
private ScenicMapper scenicMapper;
@Autowired
private TemplateMapper templateMapper;
@Autowired
private FaceMapper faceMapper;
@Autowired
private TaskFaceService faceService;
@Autowired
private FaceSampleMapper faceSampleMapper;
@Autowired
private TaskService taskService;
@Autowired
private DeviceMapper deviceMapper;
@Scheduled(cron = "0 0 * * * ?")
public void dynamicTask() {
List<ScenicRespVO> scenicList = scenicMapper.list(new ScenicReqQuery());
for (ScenicRespVO scenic : scenicList) {
log.info("定时任务执行，当前景区：{}", scenic.getName());
ScenicConfigEntity scenicConfig = scenicMapper.getConfig(scenic.getId());
if (scenicConfig == null || scenicConfig.getBookRoutine() == 2) {
log.info("当前景区{}，未启用提前预约流程", scenic.getName());
continue;
}
log.info("当前景区{},启用了提前预约流程", scenic.getName());
TemplateReqQuery templateQuery = new TemplateReqQuery();
templateQuery.setScenicId(scenic.getId());
List<TemplateRespVO> templateList = templateMapper.list(templateQuery);
for (TemplateRespVO template : templateList) {
log.info("当前景区{}，启用了提前预约流程，模板：{}", scenic.getName(), template.getName());
if (template.getStatus() == 0) {
log.info("当前模板{}未启用，跳过", template.getName());
continue;
}
TemplateConfigEntity templateConfig = templateMapper.getConfig(template.getId());
if (templateConfig == null) {
log.info("当前模板{}未配置，跳过", template.getName());
continue;
}
if (templateConfig.getIsDefault() == 0) {
if (scenicConfig.getBookRoutine() == 1) {
log.info("当前模板{}未启用默认，且景区启用预约流程，跳过", template.getName());
continue;
}
}
Integer minimalPlaceholderFill = templateConfig.getMinimalPlaceholderFill();
List<String> placeholderList = new ArrayList<>();
if (minimalPlaceholderFill == null) {
minimalPlaceholderFill = 0;
}
List<TemplateRespVO> subTemplateList = templateMapper.getByPid(template.getId());
for (TemplateRespVO subTemplate : subTemplateList) {
if (subTemplate.getIsPlaceholder() == 1) {
placeholderList.add(subTemplate.getSourceUrl());
}
}
if (minimalPlaceholderFill == 0) {
for (TemplateRespVO subTemplate : subTemplateList) {
if (subTemplate.getIsPlaceholder() == 1) {
minimalPlaceholderFill += 1;
}
}
}
log.info("当前模板{}启用默认，最小占位素材：{}", template.getName(), minimalPlaceholderFill);
// 查找人脸样本
List<FaceRespVO> list = faceMapper.listByScenicIdAndNotFinished(scenic.getId());
for (FaceRespVO face : list) {
log.info("当前模板{}启用默认，人脸样本：{}", template.getName(), face.getFaceUrl());
if (((new Date()).getTime() - face.getCreateAt().getTime()) > scenicConfig.getMaxJourneyHour() * 3600 * 1000) {
log.info("当前人脸样本{}已超过最大游玩{}小时，自动检测人脸", face.getFaceUrl(), scenicConfig.getMaxJourneyHour());
List<String> oldMatchedSampleListIds = new ArrayList<>();
if (face.getMatchSampleIds() != null) {
oldMatchedSampleListIds = Arrays.asList(face.getMatchSampleIds().split(","));
}
SearchFaceRespVo searchFace = faceService.searchFace(scenic.getId(), face.getId());
if (oldMatchedSampleListIds.size() == searchFace.getSampleListIds().size()) {
boolean isEqual = true;
for (Long sampleId : searchFace.getSampleListIds()) {
if (!oldMatchedSampleListIds.contains(sampleId.toString())) {
isEqual = false;
break;
}
}
if (isEqual) {
log.info("当前人脸样本{}已超过最大游玩{}小时，但人脸检测结果与上次相同，跳过", face.getFaceUrl(), scenicConfig.getMaxJourneyHour());
continue;
}
}
List<FaceSampleRespVO> faceSampleList = faceSampleMapper.listByIds(searchFace.getSampleListIds());
int matchedPlaceholder = 0;
for (FaceSampleRespVO faceSample : faceSampleList) {
if (placeholderList.contains(faceSample.getDeviceId().toString())) {
matchedPlaceholder += 1;
}
}
if (matchedPlaceholder >= minimalPlaceholderFill) {
log.info("当前人脸样本{}已超过最小占位素材{}，自动创建任务", face.getFaceUrl(), minimalPlaceholderFill);
taskService.createRenderTask(scenic.getId(), template.getId(), face.getId());
faceMapper.finishedJourney(face.getId());
} else {
log.info("当前人脸样本{}未超过最小占位素材{}，未达到自动生成条件", face.getFaceUrl(), minimalPlaceholderFill);
}
}
}
}
}
}
}

35
src/main/java/com/ycwl/basic/task/FaceCleaner.java Normal file
View File

@ -0,0 +1,35 @@
package com.ycwl.basic.task;
import com.ycwl.basic.mapper.pc.FaceSampleMapper;
import com.ycwl.basic.mapper.pc.ScenicMapper;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.service.task.TaskFaceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@EnableScheduling
@Slf4j
public class FaceCleaner {
@Autowired
private ScenicMapper scenicMapper;
@Autowired
private TaskFaceService faceService;
@Scheduled(cron = "0 0 4 * * ?")
public void clean(){
ScenicReqQuery scenicQuery = new ScenicReqQuery();
List<ScenicRespVO> scenicList = scenicMapper.list(scenicQuery);
scenicList.forEach(scenic -> {
log.info("当前景区{}，开始删除人脸样本", scenic.getName());
faceService.batchDeleteFace(scenic.getId());
});
}
}

176
src/main/java/com/ycwl/basic/task/GetSpaceChinaMobileLiveSteamJob.java
View File

@ -1,176 +0,0 @@
//package com.ycwl.basic.task;
//
//
//import cn.hutool.core.util.StrUtil;
//import com.alibaba.fastjson.JSONArray;
//import com.alibaba.fastjson.JSONObject;
//import com.tu.common.redis.RedisUtils;
//import com.tu.common.utils.ChinaMobileUtil;
//import com.tu.common.utils.DateUtils;
//import com.tu.dao.TuSpaceManageDao;
//import com.tu.dto.GetLiveSteamUrlDTO;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.core.annotation.Order;
//import org.springframework.scheduling.annotation.EnableScheduling;
//import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.stereotype.Component;
//
//import javax.annotation.PostConstruct;
//import java.util.*;
//
//import static com.tu.common.utils.ChinaMobileUtil.getTokenBySend;
//import static com.tu.common.utils.ChinaMobileUtil.sendPost;
//
//@Slf4j
//@Component
//@EnableScheduling
//public class GetSpaceChinaMobileLiveSteamJob {
//
// @Autowired
// TuSpaceManageDao tuSpaceManageDao;
// @Autowired
// RedisUtils redisUtils;
// @Autowired
// ChinaMobileUtil chinaMobileUtil;
// @Value("${spring.profiles.active}")
// private String springProfile;
//
// //public static String token = null;
// private static Queue failMsgSubQueue = new LinkedList(); // 保存订阅失败的数据
//
// /**
// * 订阅消息
// */
// @PostConstruct
// public void msgSubscription() {
// new Thread(() -> {
// if (springProfile.equals("prod")) {
// List<GetLiveSteamUrlDTO> liveSteamUrl = tuSpaceManageDao.getLiveSteamUrl(null, 2);
// List<String> deviceIdList = new ArrayList<>();
// for (GetLiveSteamUrlDTO item : liveSteamUrl) {
// String deviceSn = item.getDeviceSn();
// if (deviceSn != null && !deviceSn.equals("")) {
// deviceIdList.add(deviceSn);
//
// if (deviceIdList.size() == 29) {
// // 30条数据为一组，分开订阅
// String msg = doMsgSubscription(deviceIdList);
// if (StrUtil.isBlank(msg)) {
// // 消息订阅失败,过一会儿再试试
// List<String> failDeviceIdList = new ArrayList<>();
// Collections.copy(failDeviceIdList, deviceIdList);
// failMsgSubQueue.offer(failDeviceIdList);
// }
// deviceIdList = new ArrayList<>();
// }
//
// }
// }
// doMsgSubscription(deviceIdList);
// }
// }).start();
//
// }
//
//
// /**
// * 每小时扫描订阅失败的消息
// */
// @PostConstruct
// @Scheduled(cron = "0 0 * * * *")
// public void scanQueue() {
// if (failMsgSubQueue.size() > 0) {
// Object poll = failMsgSubQueue.poll();
// if (poll != null) {
// List<String> pollList = (List<String>) poll;
// String msg = doMsgSubscription(pollList);
// if (StrUtil.isBlank(msg)) {
// // 消息订阅失败,过一会儿再试试
// List<String> failDeviceIdList = new ArrayList<>();
// Collections.copy(failDeviceIdList, pollList);
// failMsgSubQueue.offer(failDeviceIdList);
// }
// }
// }
// }
//
//
// @PostConstruct
// @Scheduled(fixedRate = 1000 * 60 * 60 * 2)
// @Order(1)
// public void getToken() {
// if (springProfile.equals("prod")) {
// String tokenBySend = getTokenBySend();
// redisUtils.set("CHINA_MOBILE_TOKEN_KEY_NEW", tokenBySend, RedisUtils.HOUR_TOW_EXPIRE);
// }
// }
//
// @Scheduled(cron = "0 */19 * * * *")
// @PostConstruct
// @Order(2)
// public void setLiveSteam() {
// new Thread(() -> {
// if (springProfile.equals("prod")) {
// List<GetLiveSteamUrlDTO> liveSteamUrl = tuSpaceManageDao.getLiveSteamUrl(null, 2);
// for (GetLiveSteamUrlDTO item : liveSteamUrl) {
// String url = getLiveSteam(item.getDeviceSn());
// if (url != null && !url.equals("")) {
// tuSpaceManageDao.updateLiveSteamUrl(item.getId(), url);
// }
// }
// }
// }).start();
// }
//
// public String getLiveSteam(String deviceId) {
// log.info("【移动】开始获取视频流" + deviceId);
// String url_hls = "https://open.andmu.cn/v3/open/api/device/hls";
// JSONObject bodyParam = new JSONObject();
// bodyParam.put("deviceId", deviceId);
// bodyParam.put("endTime", DateUtils.addDateDays(new Date(), 2).getTime());
// log.info("【移动】bodyParam->{}", bodyParam);
// String res = sendPost(url_hls, bodyParam, chinaMobileUtil.getTempToken());
// log.info("【移动】开始获取视频流结果：-》{}" + res);
// JSONObject jsonObject = JSONObject.parseObject(res);
// String m3u8Url = null;
// if (jsonObject.get("resultCode").toString().equals("000000")) {
// String data = jsonObject.get("data").toString();
// JSONObject jsonData = JSONObject.parseObject(data);
// m3u8Url = jsonData.get("m3u8Url").toString();
// }
// // token已过期
// if (jsonObject.get("resultCode").toString().equals("11504")) {
// // 删除redis的token，会重新获取
// redisUtils.delete("CHINA_MOBILE_TOKEN_KEY_NEW");
// getLiveSteam(deviceId);
// }
// return m3u8Url;
// }
//
//
// public static void main(String[] args) {
//
// //List<String> deviceIdList =new ArrayList<>(30);
// //deviceIdList.add("2");
// //deviceIdList.add("1");
// //
// //List<String> failDeviceIdList = new ArrayList<>(deviceIdList);
// //failMsgSubQueue.offer(failDeviceIdList);
// //deviceIdList = new ArrayList<>();
// //List<String> pollList = ( List<String>) failMsgSubQueue.poll();
// //for (String s : pollList) {
// // System.out.println(s);
// //}
// //System.out.println(failMsgSubQueue.poll());
// //System.out.println(failMsgSubQueue.size());
//
//
// //String s = doMsgSubscription(Arrays.asList("040312e7fc9f", "743fc2dae410"));
// //System.out.println(s);
// }
//
//
//
//}

49
src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java Normal file
View File

@ -0,0 +1,49 @@
package com.ycwl.basic.task;
import com.ycwl.basic.device.DeviceFactory;
import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
@Component
@EnableScheduling
@Slf4j
public class VideoPieceCleaner {
@Autowired
private DeviceMapper deviceMapper;
@Scheduled(cron = "0 0 0 * * ?")
public void clean() {
log.info("开始删除视频文件");
List<DeviceRespVO> deviceList = deviceMapper.list(new DeviceReqQuery());
for (DeviceRespVO device : deviceList) {
DeviceConfigEntity config = deviceMapper.getConfigByDeviceId(device.getId());
if (config == null) {
continue;
}
if (config.getStoreExpireDay() == null) {
continue;
}
if (config.getStoreExpireDay() <= 0) {
continue;
}
IDeviceStorageOperator storageOperator = DeviceFactory.getDeviceStorageOperator(null, config);
if (storageOperator == null) {
continue;
}
storageOperator.removeFilesBeforeDate(new Date(System.currentTimeMillis() - config.getStoreExpireDay() * 24 * 60 * 60 * 1000));
log.info("删除视频文件完成");
}
}
}

370
src/main/java/com/ycwl/basic/task/VideoPieceGetter.java Normal file
View File

@ -0,0 +1,370 @@
package com.ycwl.basic.task;
import cn.hutool.core.date.DateUtil;
import com.ycwl.basic.device.DeviceFactory;
import com.ycwl.basic.device.entity.common.FileObject;
import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.mapper.pc.DeviceMapper;
import com.ycwl.basic.mapper.pc.FaceSampleMapper;
import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.utils.OssUtil;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@Component
@EnableScheduling
@Slf4j
public class VideoPieceGetter {
@Autowired
private FaceSampleMapper faceSampleMapper;
@Autowired
private DeviceMapper deviceMapper;
@Autowired
private OssUtil ossUtil;
@Autowired
private SourceMapper sourceMapper;
@Data
public static class Task {
public Long deviceId;
public Long faceSampleId;
public Date createTime;
}
@Data
public static class FfmpegTask {
List<FileObject> fileList;
BigDecimal duration;
BigDecimal offsetStart;
String outputFile;
}
public static LinkedBlockingQueue<Task> queue = new LinkedBlockingQueue<>();
public static void addTask(Task task) {
queue.add(task);
}
@Scheduled(fixedDelay = 5000L)
public void doTask() {
Task task = queue.poll();
if (task == null) {
return;
}
log.info("poll task: {}", task);
FaceSampleRespVO faceSample = faceSampleMapper.getById(task.getFaceSampleId());
DeviceEntity device = deviceMapper.getByDeviceId(task.getDeviceId());
DeviceConfigEntity config = deviceMapper.getConfigByDeviceId(task.getDeviceId());
BigDecimal cutPre = BigDecimal.valueOf(5L);
BigDecimal cutPost = BigDecimal.valueOf(4L);
if (config == null) {
return;
}
// 有配置
if (config.getCutPre() != null) {
cutPre = config.getCutPre();
}
if (config.getCutPost() != null) {
cutPost = config.getCutPost();
}
IDeviceStorageOperator pieceGetter = DeviceFactory.getDeviceStorageOperator(device, config);
if (pieceGetter == null) {
return;
}
BigDecimal duration = cutPre.add(cutPost);
List<FileObject> listByDtRange = pieceGetter.getFileListByDtRange(
new Date(task.getCreateTime().getTime() - cutPre.multiply(BigDecimal.valueOf(1000)).longValue()),
new Date(task.getCreateTime().getTime() + cutPost.multiply(BigDecimal.valueOf(1000)).longValue())
);
if (listByDtRange.isEmpty()) {
queue.add(task);
return;
}
long offset = task.getCreateTime().getTime() - listByDtRange.get(0).getCreateTime().getTime();
FfmpegTask ffmpegTask = new FfmpegTask();
ffmpegTask.setFileList(listByDtRange);
ffmpegTask.setDuration(duration);
ffmpegTask.setOffsetStart(BigDecimal.valueOf(offset, 3));
File outFile = new File(faceSample.getDeviceId().toString() + "_" + faceSample.getId() + ".mp4");
ffmpegTask.setOutputFile(outFile.getAbsolutePath());
boolean result = startFfmpegTask(ffmpegTask);
if (!result) {
log.warn("视频裁切失败");
return;
}
log.info("视频裁切成功");
try {
InputStream inputStream = new FileInputStream(outFile);
String url = ossUtil.uploadFile(inputStream, "user-video-source", outFile.getName());
SourceEntity sourceEntity = new SourceEntity();
sourceEntity.setVideoUrl(url);
sourceEntity.setFaceSampleId(faceSample.getId());
sourceEntity.setScenicId(faceSample.getScenicId());
sourceEntity.setDeviceId(faceSample.getDeviceId());
sourceEntity.setType(1);
sourceMapper.add(sourceEntity);
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
}
public boolean startFfmpegTask(FfmpegTask task) {
boolean result;
if (task.getFileList().size() == 1) {
// 单个文件切割，用简单方法
result = runFfmpegForSingleFile(task);
} else {
// 多个文件切割，用速度快的
result = runFfmpegForMultipleFile1(task);
}
// 先尝试方法1
if (result) {
return true;
}
log.warn("FFMPEG简易方法失败，尝试复杂方法转码");
// 不行再尝试方法二
return runFfmpegForMultipleFile2(task);
}
private boolean runFfmpegForMultipleFile1(FfmpegTask task) {
// 多文件，方法一：先转换成ts，然后合并切割
// 步骤一：先转换成ts，并行转换
boolean notOk = task.getFileList().stream().map(file -> {
try {
if (file.isNeedDownload() || (!file.getName().endsWith(".ts"))) {
String tmpFile = file.getName() + ".ts";
boolean result = convertMp4ToTs(file, tmpFile);
// 因为是并行转换，没法保证顺序，就直接存里面
if (result) {
file.setUrl(tmpFile);
} else {
// 失败了，务必删除临时文件
(new File(tmpFile)).delete();
}
return result;
} else {
return true;
}
} catch (IOException e) {
log.warn("转码出错");
return false;
}
}).anyMatch(b -> !b);
// 转码进程中出现问题
if (notOk) {
return false;
}
// 步骤二：使用concat协议拼接裁切
boolean result;
try {
result = quickVideoCut(
"concat:" + task.getFileList().stream().map(FileObject::getUrl).collect(Collectors.joining("|")),
task.getOffsetStart(), task.getDuration(), task.getOutputFile()
);
} catch (IOException e) {
return false;
}
// 步骤三：删除临时文件
task.getFileList().stream().map(FileObject::getUrl).forEach(tmpFile -> {
File f = new File(tmpFile);
if (f.exists() && f.isFile()) {
f.delete();
}
});
return result;
}
private boolean runFfmpegForMultipleFile2(FfmpegTask task) {
// 多文件，方法二：使用计算资源编码
try {
return slowVideoCut(task.getFileList(), task.getOffsetStart(), task.getDuration(), task.getOutputFile());
} catch (IOException e) {
return false;
}
}
private boolean runFfmpegForSingleFile(FfmpegTask task) {
try {
return quickVideoCut(task.getFileList().get(0).getUrl(), task.getOffsetStart(), task.getDuration(), task.getOutputFile());
} catch (IOException e) {
return false;
}
}
/**
* 把MP4转换成可以拼接的TS文件
*
* @param file MP4文件，或ffmpeg支持的输入
* @param outFileName 输出文件路径
* @return 是否成功
* @throws IOException 奇奇怪怪的报错
*/
private boolean convertMp4ToTs(FileObject file, String outFileName) throws IOException {
List<String> ffmpegCmd = new ArrayList<>();
ffmpegCmd.add("ffmpeg");
ffmpegCmd.add("-hide_banner");
ffmpegCmd.add("-y");
ffmpegCmd.add("-i");
ffmpegCmd.add(file.getUrl());
ffmpegCmd.add("-c");
ffmpegCmd.add("copy");
ffmpegCmd.add("-bsf:v");
ffmpegCmd.add("h264_mp4toannexb");
ffmpegCmd.add("-f");
ffmpegCmd.add("mpegts");
ffmpegCmd.add(outFileName);
return handleFfmpegProcess(ffmpegCmd);
}
private boolean convertHevcToTs(FileObject file, String outFileName) throws IOException {
List<String> ffmpegCmd = new ArrayList<>();
ffmpegCmd.add("ffmpeg");
ffmpegCmd.add("-hide_banner");
ffmpegCmd.add("-y");
ffmpegCmd.add("-i");
ffmpegCmd.add(file.getUrl());
ffmpegCmd.add("-c");
ffmpegCmd.add("copy");
ffmpegCmd.add("-bsf:v");
ffmpegCmd.add("hevc_mp4toannexb");
ffmpegCmd.add("-f");
ffmpegCmd.add("mpegts");
ffmpegCmd.add(outFileName);
return handleFfmpegProcess(ffmpegCmd);
}
/**
* 快速切割，不产生转码，速度快，但可能会出现：第一帧数据不是I帧导致前面的数据无法使用
*
* @param inputFile 输入文件，ffmpeg支持的协议均可
* @param offset 离输入文件开始的偏移
* @param length 输出文件时长
* @param outputFile 输出文件名称
* @return 是否成功
* @throws IOException 奇奇怪怪的报错
*/
private boolean quickVideoCut(String inputFile, BigDecimal offset, BigDecimal length, String outputFile) throws IOException {
List<String> ffmpegCmd = new ArrayList<>();
ffmpegCmd.add("ffmpeg");
ffmpegCmd.add("-hide_banner");
ffmpegCmd.add("-y");
ffmpegCmd.add("-i");
ffmpegCmd.add(inputFile);
ffmpegCmd.add("-c:v");
ffmpegCmd.add("copy");
ffmpegCmd.add("-an");
ffmpegCmd.add("-ss");
ffmpegCmd.add(offset.toPlainString());
ffmpegCmd.add("-t");
ffmpegCmd.add(length.toPlainString());
ffmpegCmd.add("-f");
ffmpegCmd.add("mp4");
ffmpegCmd.add(outputFile);
return handleFfmpegProcess(ffmpegCmd);
}
/**
* 转码切割，兜底逻辑，速度慢，但优势：成功后转码视频绝对可用
*
* @param inputFiles 输入文件List，ffmpeg支持的协议均可
* @param offset 离输入文件开始的偏移
* @param length 输出文件时长
* @param outputFile 输出文件名称
* @return 是否成功
* @throws IOException 奇奇怪怪的报错
*/
private boolean slowVideoCut(List<FileObject> inputFiles, BigDecimal offset, BigDecimal length, String outputFile) throws IOException {
List<String> ffmpegCmd = new ArrayList<>();
ffmpegCmd.add("ffmpeg");
ffmpegCmd.add("-hide_banner");
ffmpegCmd.add("-y");
for (FileObject file : inputFiles) {
ffmpegCmd.add("-i");
ffmpegCmd.add(file.getUrl());
}
// 使用filter_complex做拼接
ffmpegCmd.add("-filter_complex");
ffmpegCmd.add(
IntStream.range(0, inputFiles.size()).mapToObj(i -> "[" + i + ":v]").collect(Collectors.joining("")) +
"concat=n=2:v=1[v]"
);
ffmpegCmd.add("-map");
ffmpegCmd.add("[v]");
ffmpegCmd.add("-preset:v");
ffmpegCmd.add("fast");
ffmpegCmd.add("-an");
// 没有使用copy，因为使用了filter_complex
ffmpegCmd.add("-ss");
ffmpegCmd.add(offset.toPlainString());
ffmpegCmd.add("-t");
ffmpegCmd.add(length.toPlainString());
ffmpegCmd.add("-f");
ffmpegCmd.add("mp4");
ffmpegCmd.add(outputFile);
return handleFfmpegProcess(ffmpegCmd);
}
/**
* 运行ffmpeg，并确认ffmpeg是否正常退出
*
* @param ffmpegCmd ffmpeg命令
* @return 是否正常退出
*/
private static boolean handleFfmpegProcess(List<String> ffmpegCmd) throws IOException {
Date _startDt = new Date();
log.info("FFMPEG执行命令：【{}】", String.join(" ", ffmpegCmd));
ProcessBuilder pb = new ProcessBuilder(ffmpegCmd);
Process ffmpegProcess = pb.start();
// 如果需要额外分析输出之类
if (log.isTraceEnabled()) {
InputStream stderr = ffmpegProcess.getErrorStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(stderr));
String line;
while ((line = reader.readLine()) != null) {
log.trace(line);
}
}
try {
// 最长1分钟
boolean exited = ffmpegProcess.waitFor(1, TimeUnit.MINUTES);
if (exited) {
int code = ffmpegProcess.exitValue();
Date _endDt = new Date();
log.info("FFMPEG执行命令结束，Code：【{}】，耗费时间：【{}ms】，命令：【{}】", code, _endDt.getTime() - _startDt.getTime(), String.join(" ", ffmpegCmd));
return 0 == code;
} else {
log.error("FFMPEG执行命令没有在1分钟内退出，命令：【{}】", String.join(" ", ffmpegCmd));
ffmpegProcess.destroy();
return false;
}
} catch (InterruptedException e) {
// TODO: 被中断了
log.warn("FFMPEG执行命令：【{}】，被中断了", String.join(" ", ffmpegCmd));
return false;
}
}
}

21
src/main/java/com/ycwl/basic/utils/AliFaceUtil.java Normal file
View File

@ -0,0 +1,21 @@
package com.ycwl.basic.utils;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import java.text.SimpleDateFormat;
public class AliFaceUtil {
private static final String DATE_FORMAT="yyyyMMddHHmmssSSS";
public static String generateEntityId(FaceSampleEntity entity) {
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
String entityId = entity.getDeviceId().toString() + "_" + sdf.format(entity.getCreateAt());
return entityId;
}
public static String generateEntityId(FaceSampleRespVO entity) {
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
String entityId = entity.getDeviceId().toString() + "_" + sdf.format(entity.getCreateAt());
return entityId;
}
}

79
src/main/java/com/ycwl/basic/utils/ImageUtils.java Normal file
View File

@ -0,0 +1,79 @@
package com.ycwl.basic.utils;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Base64;
public class ImageUtils {
public static MultipartFile base64ToMultipartFile(String base64) {
String[] baseStrs = base64.split(",");
byte[] b;
b = Base64.getDecoder().decode(baseStrs[0]);
for (int i = 0; i < b.length; ++i) {
if (b[i] < 0) {
b[i] += 256;
}
}
return new Base64DecodedMultipartFile(b, baseStrs[0]);
}
public static class Base64DecodedMultipartFile implements MultipartFile {
private final byte[] imgContent;
private final String header;
public Base64DecodedMultipartFile(byte[] imgContent, String header) {
this.imgContent = imgContent;
this.header = header.split(";")[0];
}
@Override
public String getName() {
// TODO - implementation depends on your requirements
return System.currentTimeMillis() + Math.random() + "." + header.split("/")[1];
}
@Override
public String getOriginalFilename() {
// TODO - implementation depends on your requirements
return System.currentTimeMillis() + (int) Math.random() * 10000 + "." + header.split("/")[1];
}
@Override
public String getContentType() {
// TODO - implementation depends on your requirements
return header.split(":")[0];
}
@Override
public boolean isEmpty() {
return imgContent == null || imgContent.length == 0;
}
@Override
public long getSize() {
return imgContent.length;
}
@Override
public byte[] getBytes() {
return imgContent;
}
@Override
public InputStream getInputStream() {
return new ByteArrayInputStream(imgContent);
}
@Override
public void transferTo(File dest) throws IOException, IllegalStateException {
new FileOutputStream(dest).write(imgContent);
}
}
}

175
src/main/java/com/ycwl/basic/utils/IpUtils.java Normal file
View File

@ -0,0 +1,175 @@
package com.ycwl.basic.utils;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.UnknownHostException;
/**
* 获取IP方法
*
* @author tsingeye
*/
public class IpUtils {
/**
* 获取客户端IP
*
* @param request 请求对象
* @return IP地址
*/
public static String getIpAddr(HttpServletRequest request) {
if (request == null) {
return "unknown";
}
String ip = request.getHeader("x-forwarded-for");
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Forwarded-For");
}
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Real-IP");
}
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
}
/**
* 将IPv4地址转换成字节
*
* @param text IPv4地址
* @return byte 字节
*/
public static byte[] textToNumericFormatV4(String text) {
if (text.length() == 0) {
return null;
}
byte[] bytes = new byte[4];
String[] elements = text.split("\\." , -1);
try {
long l;
int i;
switch (elements.length) {
case 1:
l = Long.parseLong(elements[0]);
if ((l < 0L) || (l > 4294967295L)) {
return null;
}
bytes[0] = (byte) (int) (l >> 24 & 0xFF);
bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
case 2:
l = Integer.parseInt(elements[0]);
if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[0] = (byte) (int) (l & 0xFF);
l = Integer.parseInt(elements[1]);
if ((l < 0L) || (l > 16777215L)) {
return null;
}
bytes[1] = (byte) (int) (l >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
case 3:
for (i = 0; i < 2; ++i) {
l = Integer.parseInt(elements[i]);
if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[i] = (byte) (int) (l & 0xFF);
}
l = Integer.parseInt(elements[2]);
if ((l < 0L) || (l > 65535L)) {
return null;
}
bytes[2] = (byte) (int) (l >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
case 4:
for (i = 0; i < 4; ++i) {
l = Integer.parseInt(elements[i]);
if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[i] = (byte) (int) (l & 0xFF);
}
break;
default:
return null;
}
} catch (NumberFormatException e) {
return null;
}
return bytes;
}
/**
* 获取IP地址
*
* @return 本地IP地址
*/
public static String getHostIp() {
try {
return InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
}
return "127.0.0.1";
}
/**
* 获取主机名
*
* @return 本地主机名
*/
public static String getHostName() {
try {
return InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
}
return "未知";
}
/**
* 从多级反向代理中获得第一个非unknown IP地址
*
* @param ip 获得的IP地址
* @return 第一个非unknown IP地址
*/
public static String getMultistageReverseProxyIp(String ip) {
// 多级反向代理检测
if (ip != null && ip.indexOf(",") > 0) {
final String[] ips = ip.trim().split(",");
for (String subIp : ips) {
if (false == isUnknown(subIp)) {
ip = subIp;
break;
}
}
}
return ip;
}
/**
* 检测给定字符串是否为未知，多用于检测HTTP请求相关
*
* @param checkString 被检测的字符串
* @return 是否未知
*/
public static boolean isUnknown(String checkString) {
return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
}
}

48
src/main/resources/mapper/pc/DeviceMapper.xml
View File

@ -4,6 +4,14 @@
<insert id="add"> <insert id="add">
insert into device(id, scenic_id, name, no, latitude, longitude) values (#{id}, #{scenicId}, #{name}, #{no}, #{latitude}, #{longitude}) insert into device(id, scenic_id, name, no, latitude, longitude) values (#{id}, #{scenicId}, #{name}, #{no}, #{latitude}, #{longitude})
</insert> </insert>
<insert id="addConfig">
insert into device_config(id, device_id, create_time)
values (#{id}, #{deviceId}, now())
</insert>
<insert id="addEntity">
insert into device(id, name, no, status, online, ip_addr, keepalive_at, create_at, update_at)
values (#{id}, #{name}, #{no}, 0, #{online}, #{ipAddr}, #{keepaliveAt}, now(), now())
</insert>
<update id="update"> <update id="update">
update device set scenic_id = #{scenicId}, name = #{name}, no = #{no}, longitude = #{longitude}, latitude = #{latitude}, update_at = now() where id = #{id} update device set scenic_id = #{scenicId}, name = #{name}, no = #{no}, longitude = #{longitude}, latitude = #{latitude}, update_at = now() where id = #{id}
</update> </update>
@ -19,11 +27,32 @@
END) END)
where id = #{id} where id = #{id}
</update> </update>
<update id="updateConfig">
update device_config
set store_type = #{storeType},
store_config_json = #{storeConfigJson},
store_expire_day = #{storeExpireDay},
online_check = #{onlineCheck},
online_max_interval = #{onlineMaxInterval},
cut_pre = #{cutPre},
cut_post = #{cutPost}
where id = #{id}
</update>
<update id="updateEntity">
update device
set name = #{name},
no = #{no},
online = #{online},
ip_addr = #{ipAddr},
keepalive_at = #{keepaliveAt},
update_at = now()
where id = #{id}
</update>
<delete id="deleteById"> <delete id="deleteById">
delete from device where id = #{id} delete from device where id = #{id}
</delete> </delete>
<select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO"> <select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
select d.id, scenic_id, d.name, no, d.status, create_at, d.update_at, s.name scenic_name select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name
from device d from device d
left join scenic s on d.scenic_id = s.id left join scenic s on d.scenic_id = s.id
<where> <where>
@ -48,7 +77,7 @@
</where> </where>
</select> </select>
<select id="getById" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO"> <select id="getById" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
select d.id, scenic_id, d.name, no, d.status, create_at, d.update_at, s.name scenic_name select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name
from device d from device d
left join scenic s on d.scenic_id = s.id left join scenic s on d.scenic_id = s.id
where d.id = #{id} where d.id = #{id}
@ -72,4 +101,19 @@
group by device_id group by device_id
)b on a.scenic_id = b.scenic_id )b on a.scenic_id = b.scenic_id
</select> </select>
<select id="getConfigByDeviceId" resultType="com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity">
select *
from device_config
where device_id = #{deviceId}
</select>
<select id="getByDeviceId" resultType="com.ycwl.basic.model.pc.device.entity.DeviceEntity">
select *
from device
where id = #{deviceId}
</select>
<select id="getByDeviceNo" resultType="com.ycwl.basic.model.pc.device.entity.DeviceEntity">
select *
from device
where no = #{deviceNo}
</select>
</mapper> </mapper>

21
src/main/resources/mapper/pc/FaceMapper.xml
View File

@ -2,12 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycwl.basic.mapper.pc.FaceMapper"> <mapper namespace="com.ycwl.basic.mapper.pc.FaceMapper">
<insert id="add"> <insert id="add">
insert into face(id, score, member_id, face_url, match_sample_ids, first_match_rate, match_result) insert into face(id, scenic_id, score, member_id, face_url, match_sample_ids, first_match_rate, match_result)
values (#{id}, #{score}, #{memberId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult}) values (#{id}, #{scenicId}, #{score}, #{memberId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult})
</insert> </insert>
<update id="update"> <update id="update">
update face update face
<set> <set>
<if test="scenicId!= null ">
scenic_id = #{scenicId},
</if>
<if test="memberId!= null "> <if test="memberId!= null ">
member_id = #{memberId}, member_id = #{memberId},
</if> </if>
@ -29,6 +32,9 @@
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
<update id="finishedJourney">
update face set finished_journey = 1 where id = #{id}
</update>
<delete id="deleteById"> <delete id="deleteById">
delete from face where id = #{id} delete from face where id = #{id}
</delete> </delete>
@ -42,7 +48,7 @@
</if> </if>
</delete> </delete>
<select id="list" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO"> <select id="list" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
select id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result select id, scenic_id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result
from face from face
<where> <where>
<if test="memberId!= null and memberId!= ''"> <if test="memberId!= null and memberId!= ''">
@ -66,13 +72,18 @@
</where> </where>
</select> </select>
<select id="getById" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO"> <select id="getById" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
select id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result select id, scenic_id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result, create_at, update_at
from face from face
where id = #{id} where id = #{id}
</select> </select>
<select id="getByMemberId" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO"> <select id="getByMemberId" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
select id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result select id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result, create_at, update_at
from face from face
where member_id = #{memberId} where member_id = #{memberId}
</select> </select>
<select id="listByScenicIdAndNotFinished" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
select id, scenic_id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result, create_at, update_at
from face
where scenic_id = #{scenicId} and finished_journey != 1
</select>
</mapper> </mapper>

19
src/main/resources/mapper/pc/FaceSampleMapper.xml
View File

@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycwl.basic.mapper.pc.FaceSampleMapper"> <mapper namespace="com.ycwl.basic.mapper.pc.FaceSampleMapper">
<insert id="add"> <insert id="add">
insert into face_sample(id, scenic_id, device_id, source_id, face_url, match_sample_ids, first_match_rate, match_result,`status`) insert into face_sample(id, scenic_id, device_id, source_id, face_url, match_sample_ids, first_match_rate, match_result,`status`, create_at)
values (#{id}, #{scenicId}, #{deviceId}, #{sourceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status}) values (#{id}, #{scenicId}, #{deviceId}, #{sourceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status},#{createAt})
</insert> </insert>
<update id="update"> <update id="update">
update face_sample update face_sample
@ -32,6 +32,10 @@
<if test="status!= null "> <if test="status!= null ">
`status` = #{status}, `status` = #{status},
</if> </if>
<if test="score!= null ">
`score` = #{score},
</if>
update_at = now(),
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
@ -81,8 +85,17 @@
</where> </where>
</select> </select>
<select id="getById" resultType="com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO"> <select id="getById" resultType="com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO">
select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, source_id, match_result,`status` select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, source_id, match_result,`status`, create_at
from face_sample from face_sample
where id = #{id} where id = #{id}
</select> </select>
<select id="listByIds" resultType="com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO">
select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, source_id, match_result,`status`
from face_sample
where id in (
<foreach collection="list" item="id" separator=",">
#{id}
</foreach>
)
</select>
</mapper> </mapper>

13
src/main/resources/mapper/pc/OrderMapper.xml
View File

@ -3,6 +3,8 @@
<mapper namespace="com.ycwl.basic.mapper.pc.OrderMapper"> <mapper namespace="com.ycwl.basic.mapper.pc.OrderMapper">
<resultMap id="PCBaseResultMap" type="com.ycwl.basic.model.pc.order.resp.OrderRespVO"> <resultMap id="PCBaseResultMap" type="com.ycwl.basic.model.pc.order.resp.OrderRespVO">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="scenic_id" property="scenicId"/>
<result column="scenic_name" property="scenicName"/>
<result column="member_id" property="memberId"/> <result column="member_id" property="memberId"/>
<result column="nickname" property="memberNickname"/> <result column="nickname" property="memberNickname"/>
<result column="real_name" property="memberRealName"/> <result column="real_name" property="memberRealName"/>
@ -120,10 +122,11 @@
delete from `order` where id = #{id} delete from `order` where id = #{id}
</delete> </delete>
<select id="list" resultMap="PCBaseResultMap"> <select id="list" resultMap="PCBaseResultMap">
select distinct o.id, o.member_id,m.nickname ,m.real_name , o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code, select distinct o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name , o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.goods_type refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at,oi.id oiId, o.goods_type, oi.goods_id
from `order` AS o from `order` AS o
left join member m on o.member_id = m.id left join member m on o.member_id = m.id
left join scenic s on o.scenic_id = s.id
left join order_item oi on o.id = oi.order_id left join order_item oi on o.id = oi.order_id
left join source sr on o.goods_type='2' and oi.goods_id = sr.id left join source sr on o.goods_type='2' and oi.goods_id = sr.id
left join video vd on o.goods_type='1' and oi.goods_id = vd.id left join video vd on o.goods_type='1' and oi.goods_id = vd.id
@ -131,6 +134,9 @@
<if test="id!= null "> <if test="id!= null ">
and o.id = #{id} and o.id = #{id}
</if> </if>
<if test="scenicId != null">
and o.scenic_id = #{scenicId}
</if>
<if test="memberNickname!= null and memberNickname!=''"> <if test="memberNickname!= null and memberNickname!=''">
and m.nickname like concat('%',#{memberNickname},'%') and m.nickname like concat('%',#{memberNickname},'%')
</if> </if>
@ -189,11 +195,12 @@
order by o.create_at desc order by o.create_at desc
</select> </select>
<select id="getById" resultMap="PCBaseResultMap"> <select id="getById" resultMap="PCBaseResultMap">
select o.id, o.member_id, o.openid, o.price, o.pay_price, o.remark, o.broker_id, o.promo_code, o.refund_reason, select o.id, o.scenic_id, s.name as scenic_name, o.member_id, o.openid, o.price, o.pay_price, o.remark, o.broker_id, o.promo_code, o.refund_reason,
o.refund_status, o.status, o.create_at, o.update_at, o.pay_at, o.cancel_at, o.refund_at, o.refund_status, o.status, o.create_at, o.update_at, o.pay_at, o.cancel_at, o.refund_at,
m.nickname , m.real_name m.nickname , m.real_name
from `order` o from `order` o
left join member m on m.id = o.member_id left join member m on m.id = o.member_id
left join scenic s on o.scenic_id = s.id
left join order_item oi on o.id = oi.order_id left join order_item oi on o.id = oi.order_id
left join template t on o.goods_type='3' and oi.goods_id = t.id left join template t on o.goods_type='3' and oi.goods_id = t.id
left join source sr on o.goods_type='2' and oi.goods_id = sr.id left join source sr on o.goods_type='2' and oi.goods_id = sr.id

40
src/main/resources/mapper/pc/ScenicMapper.xml
View File

@ -2,12 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycwl.basic.mapper.pc.ScenicMapper"> <mapper namespace="com.ycwl.basic.mapper.pc.ScenicMapper">
<insert id="add"> <insert id="add">
insert into scenic(id, `name`, introduction,cover_url, longitude, latitude, radius, province, city, area, address) insert into scenic(id, `name`, introduction, phone, cover_url, longitude, latitude, radius, province, city, area, address)
values (#{id}, #{name}, #{introduction}, #{coverUrl},#{longitude}, #{latitude}, #{radius}, #{province}, #{city}, #{area}, #{address}) values (#{id}, #{name}, #{introduction}, #{phone}, #{coverUrl},#{longitude}, #{latitude}, #{radius}, #{province}, #{city}, #{area}, #{address})
</insert> </insert>
<insert id="addConfig"> <insert id="addConfig">
insert into scenic_config(id, scenic_id, start_time, end_time, is_default) insert into scenic_config(id, scenic_id, create_time)
values (#{id}, #{scenicId}, #{startTime}, #{endTime}, #{isDefault}) values (#{id}, #{scenicId}, now())
</insert> </insert>
<update id="update"> <update id="update">
update update
@ -73,22 +73,24 @@
<if test="isDefault!=null"> <if test="isDefault!=null">
is_default=#{isDefault}, is_default=#{isDefault},
</if> </if>
book_routine=#{bookRoutine},
sample_store_day=#{sampleStoreDay},
video_store_day=#{videoStoreDay},
max_journey_hour=#{maxJourneyHour},
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteById"> <delete id="deleteById">
delete from scenic where id = #{id} delete from scenic where id = #{id}
</delete> </delete>
<delete id="deleteConfigByscenicId"> <delete id="deleteConfigByScenicId">
delete from scenic_config where scenic_id = #{scenicId} delete from scenic_config where scenic_id = #{scenicId}
</delete> </delete>
<select id="list" resultMap="scenicAndConfig"> <select id="list" resultMap="scenic">
select s.id, `name`, `phone`, introduction,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time, select s.id, `name`, `phone`, introduction,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time,
c.start_time, c.end_time,
(select scenic_account.account from scenic_account where scenic_account.scenic_id = s.id and scenic_account.is_super = 1 limit 1) as account, (select scenic_account.account from scenic_account where scenic_account.scenic_id = s.id and scenic_account.is_super = 1 limit 1) as account,
c.is_default, c.create_time createTime2,s.price s.price
from scenic s from scenic s
left join scenic_config c on s.id = c.id
<where> <where>
<if test="name!=null and name!=''"> <if test="name!=null and name!=''">
and locate(#{name},`name`) > 0 and locate(#{name},`name`) > 0
@ -113,11 +115,10 @@
</if> </if>
</where> </where>
</select> </select>
<select id="getById" resultMap="scenicAndConfig"> <select id="getById" resultMap="scenic">
select s.id, `name`, `phone`, introduction,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time, select s.id, `name`, `phone`, introduction,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time,
c.start_time, c.end_time, c.is_default, c.create_time createTime2,s.price s.price
from scenic s from scenic s
left join scenic_config c on s.id = c.id
where s.id = #{id} where s.id = #{id}
</select> </select>
<select id="appList" resultType="com.ycwl.basic.model.mobile.scenic.ScenicAppVO"> <select id="appList" resultType="com.ycwl.basic.model.mobile.scenic.ScenicAppVO">
@ -175,8 +176,13 @@
where `status` = 1 where `status` = 1
ORDER BY distance ASC ORDER BY distance ASC
</select> </select>
<select id="getConfig" resultType="com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity">
select *
from scenic_config
where scenic_id = #{scenicId}
</select>
<resultMap id="scenicAndConfig" type="com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO"> <resultMap id="scenic" type="com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO">
<id property="id" column="id"/> <id property="id" column="id"/>
<result property="name" column="name"/> <result property="name" column="name"/>
<result property="phone" column="phone"/> <result property="phone" column="phone"/>
@ -194,13 +200,5 @@
<result property="price" column="price"/> <result property="price" column="price"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<association property="scenicConfig" javaType="com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity">
<id property="id" column="c.id"/>
<result property="scenicId" column="s.id"/>
<result property="startTime" column="c.start_time"/>
<result property="endTime" column="c.end_time"/>
<result property="isDefault" column="c.is_default"/>
<result property="createTime" column="createTime2"/>
</association>
</resultMap> </resultMap>
</mapper> </mapper>

8
src/main/resources/mapper/pc/SourceMapper.xml
View File

@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycwl.basic.mapper.pc.SourceMapper"> <mapper namespace="com.ycwl.basic.mapper.pc.SourceMapper">
<insert id="add"> <insert id="add">
insert into source(id, scenic_id, device_id, member_id, url) values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}) insert into source(id, scenic_id, device_id, member_id, url, video_url, `type`, face_sample_id)
values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId})
</insert> </insert>
<update id="update"> <update id="update">
update source update source
@ -11,7 +12,10 @@
<if test="deviceId!= null">device_id = #{deviceId}, </if> <if test="deviceId!= null">device_id = #{deviceId}, </if>
<if test="memberId!= null">member_id = #{memberId}, </if> <if test="memberId!= null">member_id = #{memberId}, </if>
<if test="url!= null">url = #{url}, </if> <if test="url!= null">url = #{url}, </if>
<if test="videoUrl!= null">video_url = #{videoUrl}, </if>
<if test="isBuy!=null">is_buy = #{isBuy}, </if> <if test="isBuy!=null">is_buy = #{isBuy}, </if>
<if test="type!=null">`type` = #{type}, </if>
<if test="faceSampleId!= null">face_sample_id = #{faceSampleId}, </if>
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
@ -20,7 +24,7 @@
</delete> </delete>
<select id="list" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO"> <select id="list" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">
select so.id, scenic_id, device_id, member_id, url, so.create_time, so.update_time,sc.`name` as scenicName select so.id, scenic_id, device_id, member_id, url, so.create_time, so.update_time,sc.`name` as scenicName, so.video_url, so.`type`, so.face_sample_id
from source so from source so
left join scenic sc on sc.id = so.scenic_id left join scenic sc on sc.id = so.scenic_id
<where> <where>

3
src/main/resources/mapper/pc/TaskMapper.xml
View File

@ -10,6 +10,7 @@
<set> <set>
<if test="workerId!= null">worker_id = #{workerId}, </if> <if test="workerId!= null">worker_id = #{workerId}, </if>
<if test="memberId!= null">member_id = #{memberId}, </if> <if test="memberId!= null">member_id = #{memberId}, </if>
<if test="faceId!= null">face_id = #{faceId}, </if>
<if test="templateId!= null">template_id = #{templateId}, </if> <if test="templateId!= null">template_id = #{templateId}, </if>
<if test="scenicId!= null">scenic_id = #{scenicId}, </if> <if test="scenicId!= null">scenic_id = #{scenicId}, </if>
<if test="taskParams!= null">task_params = #{taskParams}, </if> <if test="taskParams!= null">task_params = #{taskParams}, </if>
@ -26,7 +27,7 @@
</update> </update>
<update id="assignToWorker"> <update id="assignToWorker">
update task update task
set worker_id = #{workerId} set worker_id = #{workerId}, status = 2
where id = #{taskId} where id = #{taskId}
</update> </update>
<update id="deassign"> <update id="deassign">

26
src/main/resources/mapper/pc/TemplateMapper.xml
View File

@ -5,6 +5,10 @@
insert into template(id, scenic_id, `name`, pid, is_placeholder, source_url, luts, overlays, audios, cover_url, frame_rate, speed, price) insert into template(id, scenic_id, `name`, pid, is_placeholder, source_url, luts, overlays, audios, cover_url, frame_rate, speed, price)
values (#{id}, #{scenicId}, #{name}, #{pid}, #{isPlaceholder}, #{sourceUrl}, #{luts}, #{overlays}, #{audios}, #{coverUrl}, #{frameRate}, #{speed}, #{price}) values (#{id}, #{scenicId}, #{name}, #{pid}, #{isPlaceholder}, #{sourceUrl}, #{luts}, #{overlays}, #{audios}, #{coverUrl}, #{frameRate}, #{speed}, #{price})
</insert> </insert>
<insert id="addConfig">
insert into template_config(id, template_id, create_time)
values (#{id}, #{templateId}, now())
</insert>
<update id="update"> <update id="update">
update template update template
<set> <set>
@ -35,6 +39,14 @@
END) END)
where id = #{id} where id = #{id}
</update> </update>
<update id="updateConfigById">
update template_config
<set>
<if test="isDefault!= null">is_default = #{isDefault}, </if>
<if test="minimalPlaceholderFill!= null">minimal_placeholder_fill = #{minimalPlaceholderFill}, </if>
</set>
where id = #{id}
</update>
<delete id="deleteById"> <delete id="deleteById">
delete from template where id = #{id} delete from template where id = #{id}
</delete> </delete>
@ -44,17 +56,22 @@
<delete id="deleteByScenicId"> <delete id="deleteByScenicId">
delete from template where scenic_id = #{id} delete from template where scenic_id = #{id}
</delete> </delete>
<delete id="deleteConfigByTemplateId">
delete from template_config where template_id = #{id}
</delete>
<delete id="deleteConfigById">
delete from template_config where id = #{id}
</delete>
<select id="list" resultType="com.ycwl.basic.model.pc.template.resp.TemplateRespVO"> <select id="list" resultType="com.ycwl.basic.model.pc.template.resp.TemplateRespVO">
select t.id, t.scenic_id, s.name as scenic_name, t.`name`, t.cover_url, t.status, t.create_time, t.update_time select t.id, t.scenic_id, s.name as scenic_name, t.`name`, t.cover_url, t.status, t.create_time, t.update_time
from template t left join scenic s on s.id = t.scenic_id from template t left join scenic s on s.id = t.scenic_id
<where> <where>
<if test="pid!=null" > pid = 0
pid = #{pid}
</if>
<if test="scenicId!=null" > <if test="scenicId!=null" >
and scenic_id = #{scenicId} and scenic_id = #{scenicId}
</if> </if>
<if test="name!= null">and locate(#{name},t.`name`) > 0 </if> <if test="name!= null">and locate(#{name},t.`name`) > 0 </if>
<if test="scenicId!= null">and t.scenic_id = #{scenicId} </if>
<if test="isPlaceholder!= null">and is_placeholder = #{isPlaceholder} </if> <if test="isPlaceholder!= null">and is_placeholder = #{isPlaceholder} </if>
<if test="status!= null">and t.`status` = #{status} </if> <if test="status!= null">and t.`status` = #{status} </if>
<if test="startTime!= null">and t.create_time &gt;= #{startTime} </if> <if test="startTime!= null">and t.create_time &gt;= #{startTime} </if>
@ -71,4 +88,7 @@
from template t left join scenic s on s.id = t.scenic_id from template t left join scenic s on s.id = t.scenic_id
where pid = #{id} where pid = #{id}
</select> </select>
<select id="getConfig" resultType="com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity">
select * from template_config where template_id = #{templateId}
</select>
</mapper> </mapper>

3
src/main/resources/mapper/pc/VideoMapper.xml
View File

@ -49,4 +49,7 @@
left join template t on v.template_id = t.id left join template t on v.template_id = t.id
where v.id = #{id} where v.id = #{id}
</select> </select>
<select id="findByTaskId" resultType="com.ycwl.basic.model.pc.video.entity.VideoEntity">
select * from video where task_id = #{taskId} limit 1
</select>
</mapper> </mapper>