Browse Source

提交:比对、自动飞行

pull/1/head
袁强 3 months ago
parent
commit
f6d388271f
  1. 6
      dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java
  2. 2
      dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java
  3. 18
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java
  4. 2
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java
  5. 8
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java
  6. 7
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java
  7. 27
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzEntity.java
  8. 10
      dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java
  9. 6
      dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java
  10. 34
      dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java
  11. 20
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java
  12. 10
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java
  13. 10
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareQueueMapper.java
  14. 1
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
  15. 83
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java
  16. 60
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareQueueDTO.java
  17. 64
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java
  18. 64
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareQueueEntity.java
  19. 8
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareQueueService.java
  20. 8
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java
  21. 14
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java
  22. 15
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java
  23. 6
      dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml

6
dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java

@ -58,7 +58,7 @@ public class DeviceQrtzController extends BaseController {
* */ * */
@SaCheckPermission("devict:qrtz:list") @SaCheckPermission("devict:qrtz:list")
@GetMapping(value = "/listFileExecDate") @GetMapping(value = "/listFileExecDate")
public R<Map<Date, List<DeviceQrtzFileEntity>>> listFileExecDate(String qrtzId) { public R<Map<Date, List<DeviceQrtzFileEntity>>> listFileExecDate(Long qrtzId) {
List<DeviceQrtzFileEntity> waylineDeviceQrtzFiles = deviceQrtzService.manageDeviceQrtzFileByQrtzId(qrtzId); List<DeviceQrtzFileEntity> waylineDeviceQrtzFiles = deviceQrtzService.manageDeviceQrtzFileByQrtzId(qrtzId);
Map<Date, List<DeviceQrtzFileEntity>> listMap = waylineDeviceQrtzFiles.stream().filter(f-> ObjectUtil.isNotEmpty(f.getExecDate())).collect(Collectors.groupingBy(DeviceQrtzFileEntity::getExecDate)); Map<Date, List<DeviceQrtzFileEntity>> listMap = waylineDeviceQrtzFiles.stream().filter(f-> ObjectUtil.isNotEmpty(f.getExecDate())).collect(Collectors.groupingBy(DeviceQrtzFileEntity::getExecDate));
return R.ok(listMap); return R.ok(listMap);
@ -94,8 +94,8 @@ public class DeviceQrtzController extends BaseController {
@Log(title = "自动飞行新增", businessType = BusinessType.INSERT) @Log(title = "自动飞行新增", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceQrtzEntity entity) { public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceQrtzDTO deviceQrtzDTO) {
return toAjax(deviceQrtzService.updateByBo(entity)); return toAjax(deviceQrtzService.add(deviceQrtzDTO));
} }
/** /**

2
dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java

@ -22,7 +22,7 @@ public interface IDeviceQrtzMapper extends BaseMapper<DeviceQrtzEntity> {
IPage<DeviceQrtzEntity> listManageDeviceQrtz(Page page, @Param("condition") DeviceQrtzDTO deviceQrtzDTO); IPage<DeviceQrtzEntity> listManageDeviceQrtz(Page page, @Param("condition") DeviceQrtzDTO deviceQrtzDTO);
List<DeviceQrtzEntity> listManageDeviceQrtz( @Param("condition") DeviceQrtzDTO deviceQrtzDTO); List<DeviceQrtzEntity> listManageDeviceQrtz( @Param("condition") DeviceQrtzDTO deviceQrtzDTO);
List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(@Param("qrtzId") String qrtzId); List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(@Param("qrtzId") Long qrtzId);

18
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java

@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity;
import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity;
@ -29,22 +30,19 @@ public class DeviceQrtzDTO {
/** /**
* id * id
*/ */
@NotNull(message = "id不能为空", groups = { EditGroup.class })
@TableId(type = IdType.AUTO)
private Long id; private Long id;
/** /**
* sn * sn
*/ */
private String deviceSn; private String deviceSn;
/**
* deviceId
*/
private String deviceId;
/** /**
* 飞行计划名称 * 飞行计划名称
*/ */
private String name; private String name;
/** /**
@ -90,4 +88,12 @@ public class DeviceQrtzDTO {
* 删除 0 正常 1已删除 * 删除 0 正常 1已删除
*/ */
private Integer delFlag; private Integer delFlag;
private String startDate;
private String endDate;
private String deptName;
private List<Long>deptIds;
} }

2
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java

@ -22,7 +22,7 @@ public class DeviceQrtzDateDTO {
/** /**
* ID * ID
*/ */
@TableId(type = IdType.AUTO)
private String id; private String id;
/**任务id*/ /**任务id*/

8
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java

@ -22,7 +22,7 @@ public class DeviceQrtzFileDTO {
/** /**
* ID * ID
*/ */
@TableId(type = IdType.AUTO)
private String id; private String id;
private String qrtzId; private String qrtzId;
@ -45,9 +45,15 @@ public class DeviceQrtzFileDTO {
private String fileStr; private String fileStr;
/**
* 飞行时间
*/
private Date flightDate; private Date flightDate;
/**
* 执行时间
*/
private Date execDate; private Date execDate;

7
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java

@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
@ -32,16 +35,18 @@ public class DeviceQrtzDateEntity implements Serializable {
private Long id; private Long id;
/**任务id*/ /**任务id*/
private String qrtzId; private Long qrtzId;
/** /**
* 开始时间 * 开始时间
*/ */
@NotNull(message = "开始时间", groups = { AddGroup.class, EditGroup.class })
private String startDate; private String startDate;
/** /**
* 结束时间 * 结束时间
*/ */
@NotNull(message = "结束时间", groups = { AddGroup.class, EditGroup.class })
private String endDate; private String endDate;

27
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzEntity.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*; import lombok.*;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
@ -25,12 +26,12 @@ import java.util.List;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class DeviceQrtzEntity implements Serializable { public class DeviceQrtzEntity extends BaseEntity {
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private String id; private Long id;
private String deviceId;
private String name; private String name;
@ -51,27 +52,15 @@ public class DeviceQrtzEntity implements Serializable {
/** /**
* 创建人 * 部门名称 */
*/
private String createBy;
/** private String deptName;
* 创建时间
*/
private Date createTime;
/** /**
* 更新人 * 用户名称 */
*/
private String updateBy;
/**
* 更新时间
*/
private Date updateTime;
private String nickName;
/** /**
* 删除 0 正常 1已删除 * 删除 0 正常 1已删除
*/ */

10
dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java

@ -29,8 +29,8 @@ public class DeviceQrtzFileEntity implements Serializable {
* ID * ID
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private String id; private Long id;
private String qrtzId; private Long qrtzId;
private String fileId; private String fileId;
@ -47,9 +47,15 @@ public class DeviceQrtzFileEntity implements Serializable {
/**
* 飞行时间
*/
private Date flightDate; private Date flightDate;
/**
* 执行时间
*/
private Date execDate; private Date execDate;

6
dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java

@ -36,13 +36,13 @@ public interface IDeviceQrtzService {
boolean deleteManageDeviceQrtz(DeviceQrtzDTO deviceQrtzDTO); boolean deleteManageDeviceQrtz(DeviceQrtzDTO deviceQrtzDTO);
List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(String qrtzId); List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(Long qrtzId);
boolean copy(String deviceSn,String starDate,String endDate); boolean copy(String deviceSn,String starDate,String endDate);
boolean deleteManageDeviceQrtzFile(String id); boolean deleteManageDeviceQrtzFile(Long id);
void jobWayline(DeviceDTO deviceDTO); void jobWayline(DeviceDTO deviceDTO);
Boolean updateByBo(DeviceQrtzEntity entity); Boolean updateByBo(DeviceQrtzEntity entity);
Boolean add(DeviceQrtzEntity entity); Boolean add( DeviceQrtzDTO deviceQrtzDTO);
Boolean deleteIds(Collection<Long> ids); Boolean deleteIds(Collection<Long> ids);
} }

34
dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@ -4,10 +4,12 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.sample.manage.mapper.IDeviceMapper; import org.dromara.sample.manage.mapper.IDeviceMapper;
import org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper; import org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper;
import org.dromara.sample.manage.mapper.IDeviceQrtzFileMapper;
import org.dromara.sample.manage.mapper.IDeviceQrtzMapper; import org.dromara.sample.manage.mapper.IDeviceQrtzMapper;
import org.dromara.sample.manage.model.dto.DeviceDTO; import org.dromara.sample.manage.model.dto.DeviceDTO;
import org.dromara.sample.manage.model.dto.DeviceQrtzDTO; import org.dromara.sample.manage.model.dto.DeviceQrtzDTO;
@ -26,6 +28,7 @@ import org.springframework.util.CollectionUtils;
import java.text.ParseException; import java.text.ParseException;
import java.util.Collection; import java.util.Collection;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -40,7 +43,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
@Autowired @Autowired
private IDeviceQrtzDateMapper deviceQrtzDateMapper; private IDeviceQrtzDateMapper deviceQrtzDateMapper;
@Autowired @Autowired
private IDeviceService deviceService; private IDeviceQrtzFileMapper deviceQrtzFileMapper;
@Autowired @Autowired
private IDeviceQrtzDateService deviceQrtzDateService; private IDeviceQrtzDateService deviceQrtzDateService;
@ -90,8 +93,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
} }
@Override @Override
public List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(String qrtzId) { public List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(Long qrtzId) {
return deviceQrtzMapper.manageDeviceQrtzFileByQrtzId(qrtzId); return deviceQrtzFileMapper.selectList(new QueryWrapper<DeviceQrtzFileEntity>().eq("qrtz_id", qrtzId));
} }
@Override @Override
@ -100,8 +103,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
} }
@Override @Override
public boolean deleteManageDeviceQrtzFile(String id) { public boolean deleteManageDeviceQrtzFile(Long id) {
return false; return deviceQrtzMapper.deleteById(id)>0;
} }
@Override @Override
@ -122,15 +125,24 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
} }
@Override @Override
public Boolean add(DeviceQrtzEntity entity) { public Boolean add( DeviceQrtzDTO deviceQrtzDTO) {
int insert = deviceQrtzMapper.insert(entity);
if(!CollectionUtils.isEmpty(entity.getDeviceQrtzDates())){ if(!CollectionUtils.isEmpty(deviceQrtzDTO.getDeviceQrtzDates())){
entity.getDeviceQrtzDates().forEach(e->{ deviceQrtzDTO.getDeviceQrtzDates().forEach(e->{
e.setQrtzId(entity.getId()); e.setQrtzId(deviceQrtzDTO.getId());
deviceQrtzDateMapper.insert(e); deviceQrtzDateMapper.insert(e);
}); });
} }
return insert>0; DeviceQrtzEntity entity = new DeviceQrtzEntity();
entity.setDeviceSn(deviceQrtzDTO.getDeviceSn());
entity.setName(deviceQrtzDTO.getName());
LoginUser loginUser = LoginHelper.getLoginUser();
entity.setCreateBy(loginUser.getUserId());
entity.setCreateTime(new Date());
entity.setNickName(loginUser.getNickname());
entity.setCreateDept(loginUser.getDeptId());
entity.setDeptName(loginUser.getDeptName());
return deviceQrtzMapper.insert(entity)>0;
} }
@Override @Override

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

@ -0,0 +1,20 @@
package org.dromara.sample.wayline.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.web.core.BaseController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @auther yq
* @data 2025/3/21
*/
@RestController
@RequestMapping("/ai/compare")
@Validated
@Tag(name="算法比对模块")
public class AiCompareController extends BaseController {
}

10
dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java

@ -0,0 +1,10 @@
package org.dromara.sample.wayline.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.dromara.sample.wayline.model.entity.AiCompareEntity;
/**
* @auther yq
* @data 2025/3/21
*/
public interface IAiCompareMapper extends BaseMapper<AiCompareEntity> {
}

10
dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareQueueMapper.java

@ -0,0 +1,10 @@
package org.dromara.sample.wayline.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.dromara.sample.wayline.model.entity.AiCompareQueueEntity;
/**
* @auther yq
* @data 2025/3/21
*/
public interface IAiCompareQueueMapper extends BaseMapper<AiCompareQueueEntity> {
}

1
dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java

@ -1,7 +1,6 @@
package org.dromara.sample.wayline.mapper; package org.dromara.sample.wayline.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.sample.wayline.model.entity.WaylineFileEntity; import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
/** /**

83
dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java

@ -0,0 +1,83 @@
package org.dromara.sample.wayline.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.util.HashMap;
import java.util.Map;
/**
* @auther yq
* @data 2025/3/21
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AiCompareDTO {
private Long id;
/**
* 0:是否比对 1算法比对中 2人工查看 3可提交预警 4完成对比
* */
private String status;
/**
* 模板id
* */
@NotNull(message = "开始时间", groups = { AddGroup.class, EditGroup.class })
private Long templateId;
/**
* 算法数量
* */
private Integer illegalNum;
/**
* 总数量
* */
private Integer totalNum;
/**
*部门名称
* */
private String deptName;
/**
* 任务名称
* */
@NotNull(message = "任务名称", groups = { AddGroup.class, EditGroup.class })
private String jobName;
/**
* 任务id
* */
@NotNull(message = "任务id", groups = { AddGroup.class, EditGroup.class })
private String jobId;
/**
* 搜索值
*/
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/**
* 请求参数
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
}

60
dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareQueueDTO.java

@ -0,0 +1,60 @@
package org.dromara.sample.wayline.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @auther yq
* @data 2025/3/21
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AiCompareQueueDTO {
private Long id;
/**
* 航线id 对应wayline_id 字段
* */
private String fileId;
/**
* 航线名称
* */
private String fileName;
/**
* 任务id
* */
private Integer jobId;
/**
*任务名称
* */
private String jobName;
/**
*图片数量
* */
private Integer pictureNumber;
/**
*创建时间
* */
private Date createTime;
/**
*队列类型 0未比对 1比对
* */
private Byte queueType;
}

64
dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java

@ -0,0 +1,64 @@
package org.dromara.sample.wayline.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.dromara.common.mybatis.core.domain.BaseEntity;
/**
* @auther yq
* @data 2025/3/21
*/
@Data
@TableName("ai_compare")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AiCompareEntity extends BaseEntity {
@TableId(type = IdType.AUTO)
private Long id;
/**
* 0:是否比对 1算法比对中 2人工查看 3可提交预警 4完成对比
* */
private String status;
/**
* 模板id
* */
private Long templateId;
/**
* 算法数量
* */
private Integer illegalNum;
/**
* 总数量
* */
private Integer totalNum;
/**
*部门名称
* */
private String deptName;
/**
* 任务名称
* */
private String jobName;
/**
* 任务id
* */
private String jobId;
}

64
dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareQueueEntity.java

@ -0,0 +1,64 @@
package org.dromara.sample.wayline.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Builder;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* @auther yq
* @data 2025/3/21
*/
@Data
@TableName("ai_compare_queue")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AiCompareQueueEntity implements Serializable {
@TableId(type = IdType.AUTO)
private Long id;
/**
* 航线id 对应wayline_id 字段
* */
private String fileId;
/**
* 航线名称
* */
private String fileName;
/**
* 任务id
* */
private Integer jobId;
/**
*任务名称
* */
private String jobName;
/**
*图片数量
* */
private Integer pictureNumber;
/**
*创建时间
* */
private Date createTime;
/**
*队列类型 0未比对 1比对
* */
private Byte queueType;
}

8
dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareQueueService.java

@ -0,0 +1,8 @@
package org.dromara.sample.wayline.service;
/**
* @auther yq
* @data 2025/3/21
*/
public interface IAiCompareQueueService {
}

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

@ -0,0 +1,8 @@
package org.dromara.sample.wayline.service;
/**
* @auther yq
* @data 2025/3/21
*/
public interface IAiCompareService {
}

14
dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java

@ -0,0 +1,14 @@
package org.dromara.sample.wayline.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sample.wayline.service.IAiCompareQueueService;
import org.springframework.stereotype.Service;
/**
* @auther yq
* @data 2025/3/21
*/
@Service
@Slf4j
public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
}

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

@ -0,0 +1,15 @@
package org.dromara.sample.wayline.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sample.wayline.service.IAiCompareService;
import org.springframework.stereotype.Service;
/**
* @auther yq
* @data 2025/3/21
*/
@Service
@Slf4j
public class AiCompareServiceImpl implements IAiCompareService {
}

6
dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml

@ -17,8 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="listManageDeviceQrtz" resultType="org.dromara.sample.manage.model.entity.DeviceQrtzEntity"> <select id="listManageDeviceQrtz" resultType="org.dromara.sample.manage.model.entity.DeviceQrtzEntity">
SELECT wdq.*,wd.device_sn FROM manage_device_qrtz wdq SELECT wdq.* FROM manage_device_qrtz wdq
LEFT JOIN manage_device wd ON wdq.device_id = wd.id LEFT JOIN manage_device wd ON wdq.device_sn = wd.device_sn
WHERE wdq.del_flag = 0 WHERE wdq.del_flag = 0
<if test="condition.name != null and condition.name != ''"> <if test="condition.name != null and condition.name != ''">
AND wdq.name like concat(concat('%',#{condition.name}),'%') AND wdq.name like concat(concat('%',#{condition.name}),'%')
@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="calendarList" resultType="java.util.Map"></select> <select id="calendarList" resultType="java.util.Map"></select>
<select id="manageDeviceQrtzFileByQrtzId" <select id="manageDeviceQrtzFileByQrtzId"
resultType="org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity"> resultType="org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity">
select dqf.* ,f.file_number from manage_device_qrtz_file dqf inner join wayline_file f on f.id=dqf.file_id where dqf.qrtz_id=#{qrtzId} select dqf.* from manage_device_qrtz_file dqf where dqf.qrtz_id=#{qrtzId}
ORDER BY dqf.sort ORDER BY dqf.sort
</select> </select>
</mapper> </mapper>

Loading…
Cancel
Save