cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

缺陷查询增加部件id

This commit is contained in:
cuizhibin 2025-07-12 22:14:00 +08:00
parent 1143ea4c18
commit 817791b6e1
7 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java
View File

@ -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;

7
core/src/main/java/com/dite/znpt/domain/vo/DefectListResp.java
View File

@ -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;
}

4
core/src/main/java/com/dite/znpt/mapper/DefectMapper.java
View File

@ -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<DefectEntity> {
List<DefectResp> queryBySelective(DefectListReq defectReq);
List<DefectListResp> queryBySelective(DefectListReq defectReq);
DefectResp detail(String defectId);
}

4
core/src/main/java/com/dite/znpt/service/DefectService.java
View File

@ -21,9 +21,9 @@ public interface DefectService extends IService<DefectEntity> {
* @author huise23
* @date 2025/04/11 23:17
**/
List<DefectResp> page(DefectListReq req);
List<DefectListResp> page(DefectListReq req);
List<DefectResp> list(DefectListReq req);
List<DefectListResp> list(DefectListReq req);
/**
* 功能描述：查询单条缺陷记录

8
core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java
View File

@ -58,9 +58,9 @@ public class DefectServiceImpl extends ServiceImpl<DefectMapper, DefectEntity> i
* @date 2025/04/11 23:17
**/
@Override
public List<DefectResp> page(DefectListReq req) {
public List<DefectListResp> page(DefectListReq req) {
PageUtil.startPage();
List<DefectResp> list = this.list(req);
List<DefectListResp> list = this.list(req);
list.forEach(defect -> {
defect.setMarkInfo(JSONUtil.toBean(defect.getLabelInfo(), Detection.class));
});
@ -68,8 +68,8 @@ public class DefectServiceImpl extends ServiceImpl<DefectMapper, DefectEntity> i
}
@Override
public List<DefectResp> list(DefectListReq req) {
List<DefectResp> defectList= this.baseMapper.queryBySelective(req);
public List<DefectListResp> list(DefectListReq req) {
List<DefectListResp> defectList= this.baseMapper.queryBySelective(req);
defectList.forEach(defect -> {
defect.setMarkInfo(JSONUtil.toBean(defect.getLabelInfo(), Detection.class));
});

6
core/src/main/resources/mapper/DefectMapper.xml
View File

@ -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
<where>
<if test="keyword != null and keyword != ''">
# AND (d.defect_name LIKE concat('%', #{keyword,jdbcType=VARCHAR}, '%') OR d.defect_code LIKE concat('%', #{keyword,jdbcType=VARCHAR}, '%'))
</if>
<if test="turbineId != null and turbineId != ''">
AND p.turbine_id = #{turbineId}
</if>
<if test="partId != null and partId != ''">
AND i.part_id = #{partId}
</if>
<if test="defectType != null and defectType != ''">
AND d.defect_type = #{defectType}
</if>

9
web/src/main/java/com/dite/znpt/web/controller/DefectController.java
View File

@ -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<DefectResp> page(DefectListReq req) {
public PageResult<DefectListResp> page(DefectListReq req) {
return PageResult.ok(defectService.page(req));
}
@ApiOperation(value = "查询缺陷记录列表", httpMethod = "GET")
@GetMapping("/list")
public Result<List<DefectResp>> list(DefectListReq req) {
public Result<List<DefectListResp>> list(DefectListReq req) {
return Result.ok(defectService.list(req));
}