Browse Source

提交

master
袁强 3 months ago
parent
commit
d9ecee1ebe
  1. 2
      dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java
  2. 1
      dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
  3. 4
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java
  4. 2
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java
  5. 13
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java

2
dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java

@ -64,6 +64,6 @@ public class MediaFileDTO {
private Double relativeAltitude; private Double relativeAltitude;
private String jobId; private String jobId;
private Integer fileIndex;
private String url; private String url;
} }

1
dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java

@ -221,6 +221,7 @@ public class FileServiceImpl implements IFileService {
.objectKey(entity.getObjectKey()) .objectKey(entity.getObjectKey())
.tinnyFingerprint(entity.getTinnyFingerprint()) .tinnyFingerprint(entity.getTinnyFingerprint())
.payload(entity.getPayload()) .payload(entity.getPayload())
.fileIndex(entity.getFileIndex())
.createTime(entity.getCreateTime()) .createTime(entity.getCreateTime())
.drone(entity.getDrone()) .drone(entity.getDrone())
.lat(entity.getLat()) .lat(entity.getLat())

4
dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java

@ -189,7 +189,7 @@ public class AiCompareController extends BaseController {
* 提交 * 提交
*/ */
@PostMapping("/commit") @PostMapping("/commit")
public R<Boolean> commitAlert(@RequestBody List<Map<String,Object>> alertList) { public R<Boolean> commitAlert(@RequestBody Map<String,Object>compareMap) {
return R.ok(aiCompareService.commitAlert(alertList)); return R.ok(aiCompareService.commitAlert(compareMap));
} }
} }

2
dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java

@ -33,5 +33,5 @@ public interface IAiCompareService {
List<RemoteBusinessAlertVo> alertList(String jobId); List<RemoteBusinessAlertVo> alertList(String jobId);
Boolean delAlertList(List<Long>ids); Boolean delAlertList(List<Long>ids);
Boolean commitAlert(List<Map<String, Object>> alertList); Boolean commitAlert(Map<String, Object> compareMap);
} }

13
dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java

@ -247,11 +247,14 @@ public class AiCompareServiceImpl implements IAiCompareService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public Boolean commitAlert(List<Map<String, Object>> alertList) { public Boolean commitAlert(Map<String,Object>compareMap) {
Long compareId = Convert.toLong(compareMap.get("compareId"));
List<Map<String, Object>>alertList = (List<Map<String, Object>>)compareMap.get("commitAlert");
if (ObjectUtil.isEmpty(alertList)) { if (ObjectUtil.isEmpty(alertList)) {
throw new ServiceException("预警信息为空!"); throw new ServiceException("预警信息为空!");
} }
List<RemoteStartProcess> startProcessList = alertList.stream().map(map -> { List<RemoteStartProcess> startProcessList = alertList.stream().map(map -> {
String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString()); String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString());
RemoteStartProcess remoteStartProcess = new RemoteStartProcess(); RemoteStartProcess remoteStartProcess = new RemoteStartProcess();
@ -259,10 +262,12 @@ public class AiCompareServiceImpl implements IAiCompareService {
remoteStartProcess.setFlowCode(flowCode); remoteStartProcess.setFlowCode(flowCode);
return remoteStartProcess; return remoteStartProcess;
}).toList(); }).toList();
//更新部门信息 //更新部门信息
businessAlertService.batchUpdateDept(alertList); businessAlertService.batchUpdateDept(alertList);
AiCompareEntity aiCompareEntity=new AiCompareEntity();
aiCompareEntity.setId(compareId);
aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_4);
aiCompareMapper.updateById(aiCompareEntity);
return remoteWorkflowService.startWorkFlowBatch(startProcessList); return remoteWorkflowService.startWorkFlowBatch(startProcessList);
} }

Loading…
Cancel
Save