From f6d388271f2b235d17c8456874549bc4420ae3dc Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 21 Mar 2025 18:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A8=E9=A3=9E=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceQrtzController.java | 6 +- .../manage/mapper/IDeviceQrtzMapper.java | 2 +- .../manage/model/dto/DeviceQrtzDTO.java | 18 ++-- .../manage/model/dto/DeviceQrtzDateDTO.java | 2 +- .../manage/model/dto/DeviceQrtzFileDTO.java | 8 +- .../model/entity/DeviceQrtzDateEntity.java | 7 +- .../manage/model/entity/DeviceQrtzEntity.java | 27 ++---- .../model/entity/DeviceQrtzFileEntity.java | 10 ++- .../manage/service/IDeviceQrtzService.java | 6 +- .../service/impl/DeviceQrtzServiceImpl.java | 34 +++++--- .../controller/AiCompareController.java | 20 +++++ .../wayline/mapper/IAiCompareMapper.java | 10 +++ .../wayline/mapper/IAiCompareQueueMapper.java | 10 +++ .../wayline/mapper/IWaylineFileMapper.java | 1 - .../wayline/model/dto/AiCompareDTO.java | 83 +++++++++++++++++++ .../wayline/model/dto/AiCompareQueueDTO.java | 60 ++++++++++++++ .../wayline/model/entity/AiCompareEntity.java | 64 ++++++++++++++ .../model/entity/AiCompareQueueEntity.java | 64 ++++++++++++++ .../service/IAiCompareQueueService.java | 8 ++ .../wayline/service/IAiCompareService.java | 8 ++ .../impl/AiCompareQueueServiceImpl.java | 14 ++++ .../service/impl/AiCompareServiceImpl.java | 15 ++++ .../resources/mapper/DeviceQrtzMapper.xml | 8 +- 23 files changed, 432 insertions(+), 53 deletions(-) create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareQueueMapper.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareQueueDTO.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareQueueEntity.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareQueueService.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java index 5f7bf36..63ea876 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java +++ b/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") @GetMapping(value = "/listFileExecDate") - public R>> listFileExecDate(String qrtzId) { + public R>> listFileExecDate(Long qrtzId) { List waylineDeviceQrtzFiles = deviceQrtzService.manageDeviceQrtzFileByQrtzId(qrtzId); Map> listMap = waylineDeviceQrtzFiles.stream().filter(f-> ObjectUtil.isNotEmpty(f.getExecDate())).collect(Collectors.groupingBy(DeviceQrtzFileEntity::getExecDate)); return R.ok(listMap); @@ -94,8 +94,8 @@ public class DeviceQrtzController extends BaseController { @Log(title = "自动飞行新增", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody DeviceQrtzEntity entity) { - return toAjax(deviceQrtzService.updateByBo(entity)); + public R add(@Validated(AddGroup.class) @RequestBody DeviceQrtzDTO deviceQrtzDTO) { + return toAjax(deviceQrtzService.add(deviceQrtzDTO)); } /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java index 5a09fd7..de7b211 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceQrtzMapper.java @@ -22,7 +22,7 @@ public interface IDeviceQrtzMapper extends BaseMapper { IPage listManageDeviceQrtz(Page page, @Param("condition") DeviceQrtzDTO deviceQrtzDTO); List listManageDeviceQrtz( @Param("condition") DeviceQrtzDTO deviceQrtzDTO); - List manageDeviceQrtzFileByQrtzId(@Param("qrtzId") String qrtzId); + List manageDeviceQrtzFileByQrtzId(@Param("qrtzId") Long qrtzId); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java index ac17929..8b7f833 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java +++ b/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.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; @@ -29,22 +30,19 @@ public class DeviceQrtzDTO { /** * id */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) - @TableId(type = IdType.AUTO) + private Long id; /** * sn */ + private String deviceSn; - /** - * deviceId - */ - private String deviceId; /** * 飞行计划名称 */ + private String name; /** @@ -90,4 +88,12 @@ public class DeviceQrtzDTO { * 删除 0 正常 1已删除 */ private Integer delFlag; + + private String startDate; + + private String endDate; + + private String deptName; + + private ListdeptIds; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java index 1d393c5..48681f2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDateDTO.java @@ -22,7 +22,7 @@ public class DeviceQrtzDateDTO { /** * ID */ - @TableId(type = IdType.AUTO) + private String id; /**任务id*/ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java index 9709e34..0033b2c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzFileDTO.java @@ -22,7 +22,7 @@ public class DeviceQrtzFileDTO { /** * ID */ - @TableId(type = IdType.AUTO) + private String id; private String qrtzId; @@ -45,9 +45,15 @@ public class DeviceQrtzFileDTO { private String fileStr; + /** + * 飞行时间 + */ private Date flightDate; + /** + * 执行时间 + */ private Date execDate; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java index 03c677c..fc6dbe1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzDateEntity.java +++ b/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.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +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 org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -32,16 +35,18 @@ public class DeviceQrtzDateEntity implements Serializable { private Long id; /**任务id*/ - private String qrtzId; + private Long qrtzId; /** * 开始时间 */ + @NotNull(message = "开始时间", groups = { AddGroup.class, EditGroup.class }) private String startDate; /** * 结束时间 */ + @NotNull(message = "结束时间", groups = { AddGroup.class, EditGroup.class }) private String endDate; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzEntity.java index dc2e6c4..18fe58a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzEntity.java +++ b/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.TableName; import lombok.*; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serializable; @@ -25,12 +26,12 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class DeviceQrtzEntity implements Serializable { +public class DeviceQrtzEntity extends BaseEntity { @TableId(type = IdType.AUTO) - private String id; + private Long id; + - private String deviceId; 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已删除 */ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java index 8b57218..0badac3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java @@ -29,8 +29,8 @@ public class DeviceQrtzFileEntity implements Serializable { * ID */ @TableId(type = IdType.AUTO) - private String id; - private String qrtzId; + private Long id; + private Long qrtzId; private String fileId; @@ -47,9 +47,15 @@ public class DeviceQrtzFileEntity implements Serializable { + /** + * 飞行时间 + */ private Date flightDate; + /** + * 执行时间 + */ private Date execDate; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java index 87a5108..2631adb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java @@ -36,13 +36,13 @@ public interface IDeviceQrtzService { boolean deleteManageDeviceQrtz(DeviceQrtzDTO deviceQrtzDTO); - List manageDeviceQrtzFileByQrtzId(String qrtzId); + List manageDeviceQrtzFileByQrtzId(Long qrtzId); boolean copy(String deviceSn,String starDate,String endDate); - boolean deleteManageDeviceQrtzFile(String id); + boolean deleteManageDeviceQrtzFile(Long id); void jobWayline(DeviceDTO deviceDTO); Boolean updateByBo(DeviceQrtzEntity entity); - Boolean add(DeviceQrtzEntity entity); + Boolean add( DeviceQrtzDTO deviceQrtzDTO); Boolean deleteIds(Collection ids); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 50f0d3d..a62fa5f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/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.metadata.IPage; 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.satoken.utils.LoginHelper; import org.dromara.sample.manage.mapper.IDeviceMapper; 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.model.dto.DeviceDTO; import org.dromara.sample.manage.model.dto.DeviceQrtzDTO; @@ -26,6 +28,7 @@ import org.springframework.util.CollectionUtils; import java.text.ParseException; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Map; @@ -40,7 +43,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { @Autowired private IDeviceQrtzDateMapper deviceQrtzDateMapper; @Autowired - private IDeviceService deviceService; + private IDeviceQrtzFileMapper deviceQrtzFileMapper; @Autowired private IDeviceQrtzDateService deviceQrtzDateService; @@ -90,8 +93,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { } @Override - public List manageDeviceQrtzFileByQrtzId(String qrtzId) { - return deviceQrtzMapper.manageDeviceQrtzFileByQrtzId(qrtzId); + public List manageDeviceQrtzFileByQrtzId(Long qrtzId) { + return deviceQrtzFileMapper.selectList(new QueryWrapper().eq("qrtz_id", qrtzId)); } @Override @@ -100,8 +103,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { } @Override - public boolean deleteManageDeviceQrtzFile(String id) { - return false; + public boolean deleteManageDeviceQrtzFile(Long id) { + return deviceQrtzMapper.deleteById(id)>0; } @Override @@ -122,15 +125,24 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { } @Override - public Boolean add(DeviceQrtzEntity entity) { - int insert = deviceQrtzMapper.insert(entity); - if(!CollectionUtils.isEmpty(entity.getDeviceQrtzDates())){ - entity.getDeviceQrtzDates().forEach(e->{ - e.setQrtzId(entity.getId()); + public Boolean add( DeviceQrtzDTO deviceQrtzDTO) { + + if(!CollectionUtils.isEmpty(deviceQrtzDTO.getDeviceQrtzDates())){ + deviceQrtzDTO.getDeviceQrtzDates().forEach(e->{ + e.setQrtzId(deviceQrtzDTO.getId()); 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 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java new file mode 100644 index 0000000..ccc9667 --- /dev/null +++ b/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 { + + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java new file mode 100644 index 0000000..2f48e28 --- /dev/null +++ b/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 { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareQueueMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareQueueMapper.java new file mode 100644 index 0000000..0febb94 --- /dev/null +++ b/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 { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java index d8300ae..9562c24 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java @@ -1,7 +1,6 @@ package org.dromara.sample.wayline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.sample.wayline.model.entity.WaylineFileEntity; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java new file mode 100644 index 0000000..b3a72be --- /dev/null +++ b/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 params = new HashMap<>(); + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareQueueDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareQueueDTO.java new file mode 100644 index 0000000..21d2e38 --- /dev/null +++ b/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; +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java new file mode 100644 index 0000000..e4e235c --- /dev/null +++ b/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; + + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareQueueEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareQueueEntity.java new file mode 100644 index 0000000..f154460 --- /dev/null +++ b/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; + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareQueueService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareQueueService.java new file mode 100644 index 0000000..d9c4152 --- /dev/null +++ b/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 { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java new file mode 100644 index 0000000..2dd2a5c --- /dev/null +++ b/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 { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java new file mode 100644 index 0000000..030c1eb --- /dev/null +++ b/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 { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java new file mode 100644 index 0000000..03451ea --- /dev/null +++ b/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 { + +} diff --git a/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml b/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml index 7b61437..84d33a5 100644 --- a/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml +++ b/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml @@ -17,8 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"