diff --git a/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java index 7d06d01..87ef106 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java @@ -1,12 +1,11 @@ package com.dite.znpt.domain.vo; -import java.io.Serializable; -import java.math.BigDecimal; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @author huise23 * @date 2025/04/11 23:17 @@ -27,6 +26,9 @@ public class DefectListReq implements Serializable { @ApiModelProperty("机组id") private String turbineId; + @ApiModelProperty("部件id") + private String partId; + @ApiModelProperty("缺陷类型,枚举:DefectTypeEnum") private String defectType; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/DefectListResp.java b/core/src/main/java/com/dite/znpt/domain/vo/DefectListResp.java index cabef9b..3dc0e60 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/DefectListResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/DefectListResp.java @@ -1,5 +1,6 @@ package com.dite.znpt.domain.vo; +import com.dite.znpt.domain.bo.Detection; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,4 +33,10 @@ public class DefectListResp implements Serializable { @ApiModelProperty("说明") private String description; + + @ApiModelProperty("标注信息") + private String labelInfo; + + @ApiModelProperty("标注信息") + private Detection markInfo; } diff --git a/core/src/main/java/com/dite/znpt/mapper/DefectMapper.java b/core/src/main/java/com/dite/znpt/mapper/DefectMapper.java index 4a9e2c9..d1ddb14 100644 --- a/core/src/main/java/com/dite/znpt/mapper/DefectMapper.java +++ b/core/src/main/java/com/dite/znpt/mapper/DefectMapper.java @@ -3,8 +3,8 @@ package com.dite.znpt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dite.znpt.domain.entity.DefectEntity; import com.dite.znpt.domain.vo.DefectListReq; +import com.dite.znpt.domain.vo.DefectListResp; import com.dite.znpt.domain.vo.DefectResp; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * @Description: 缺陷记录表数据库访问层 */ public interface DefectMapper extends BaseMapper { - List queryBySelective(DefectListReq defectReq); + List queryBySelective(DefectListReq defectReq); DefectResp detail(String defectId); } diff --git a/core/src/main/java/com/dite/znpt/service/DefectService.java b/core/src/main/java/com/dite/znpt/service/DefectService.java index 4796f8c..c2e9eef 100644 --- a/core/src/main/java/com/dite/znpt/service/DefectService.java +++ b/core/src/main/java/com/dite/znpt/service/DefectService.java @@ -21,9 +21,9 @@ public interface DefectService extends IService { * @author huise23 * @date 2025/04/11 23:17 **/ - List page(DefectListReq req); + List page(DefectListReq req); - List list(DefectListReq req); + List list(DefectListReq req); /** * 功能描述:查询单条缺陷记录 diff --git a/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java index c30661b..a68dbd6 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java @@ -58,9 +58,9 @@ public class DefectServiceImpl extends ServiceImpl i * @date 2025/04/11 23:17 **/ @Override - public List page(DefectListReq req) { + public List page(DefectListReq req) { PageUtil.startPage(); - List list = this.list(req); + List list = this.list(req); list.forEach(defect -> { defect.setMarkInfo(JSONUtil.toBean(defect.getLabelInfo(), Detection.class)); }); @@ -68,8 +68,8 @@ public class DefectServiceImpl extends ServiceImpl i } @Override - public List list(DefectListReq req) { - List defectList= this.baseMapper.queryBySelective(req); + public List list(DefectListReq req) { + List defectList= this.baseMapper.queryBySelective(req); defectList.forEach(defect -> { defect.setMarkInfo(JSONUtil.toBean(defect.getLabelInfo(), Detection.class)); }); diff --git a/core/src/main/resources/mapper/DefectMapper.xml b/core/src/main/resources/mapper/DefectMapper.xml index 8aaf74b..36ca53a 100644 --- a/core/src/main/resources/mapper/DefectMapper.xml +++ b/core/src/main/resources/mapper/DefectMapper.xml @@ -11,12 +11,12 @@ LEFT JOIN image_collect ic ON ic.collect_id = i.collect_id LEFT JOIN part p ON i.part_id = p.part_id - -# AND (d.defect_name LIKE concat('%', #{keyword,jdbcType=VARCHAR}, '%') OR d.defect_code LIKE concat('%', #{keyword,jdbcType=VARCHAR}, '%')) - AND p.turbine_id = #{turbineId} + + AND i.part_id = #{partId} + AND d.defect_type = #{defectType} diff --git a/web/src/main/java/com/dite/znpt/web/controller/DefectController.java b/web/src/main/java/com/dite/znpt/web/controller/DefectController.java index 5634ea3..91e1f88 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/DefectController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/DefectController.java @@ -3,10 +3,7 @@ package com.dite.znpt.web.controller; import com.dite.znpt.domain.PageResult; import com.dite.znpt.domain.Result; -import com.dite.znpt.domain.vo.DefectListReq; -import com.dite.znpt.domain.vo.DefectMarkReq; -import com.dite.znpt.domain.vo.DefectReq; -import com.dite.znpt.domain.vo.DefectResp; +import com.dite.znpt.domain.vo.*; import com.dite.znpt.service.DefectService; import com.dite.znpt.util.ValidationGroup; import io.swagger.annotations.Api; @@ -30,13 +27,13 @@ public class DefectController { @ApiOperation(value = "分页查询缺陷记录列表", httpMethod = "GET") @GetMapping("/page") - public PageResult page(DefectListReq req) { + public PageResult page(DefectListReq req) { return PageResult.ok(defectService.page(req)); } @ApiOperation(value = "查询缺陷记录列表", httpMethod = "GET") @GetMapping("/list") - public Result> list(DefectListReq req) { + public Result> list(DefectListReq req) { return Result.ok(defectService.list(req)); }