From d03afd190ea040b5da5f3ae91abdb65477528b15 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Thu, 24 Apr 2025 14:00:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dite/znpt/domain/AuditableEntity.java | 28 +++--- .../dite/znpt/domain/entity/CrewEntity.java | 56 ----------- .../dite/znpt/domain/entity/ImageEntity.java | 77 +++++++++++++++ .../com/dite/znpt/domain/vo/CrewListReq.java | 42 -------- .../com/dite/znpt/domain/vo/CrewResp.java | 18 ---- .../com/dite/znpt/domain/vo/ImageListReq.java | 55 +++++++++++ .../com/dite/znpt/domain/vo/ImageResp.java | 19 ++++ .../java/com/dite/znpt/mapper/CrewMapper.java | 19 ---- .../com/dite/znpt/mapper/ImageMapper.java | 19 ++++ .../com/dite/znpt/service/CrewService.java | 64 ------------ .../com/dite/znpt/service/ImageService.java | 64 ++++++++++++ .../znpt/service/impl/CrewServiceImpl.java | 99 ------------------- .../znpt/service/impl/ImageServiceImpl.java | 99 +++++++++++++++++++ core/src/main/resources/mapper/CrewMapper.xml | 39 -------- .../src/main/resources/mapper/ImageMapper.xml | 52 ++++++++++ .../znpt/web/controller/CrewController.java | 84 ---------------- 16 files changed, 402 insertions(+), 432 deletions(-) delete mode 100644 core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java create mode 100644 core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java delete mode 100644 core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java delete mode 100644 core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java create mode 100644 core/src/main/java/com/dite/znpt/domain/vo/ImageListReq.java create mode 100644 core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java delete mode 100644 core/src/main/java/com/dite/znpt/mapper/CrewMapper.java create mode 100644 core/src/main/java/com/dite/znpt/mapper/ImageMapper.java delete mode 100644 core/src/main/java/com/dite/znpt/service/CrewService.java create mode 100644 core/src/main/java/com/dite/znpt/service/ImageService.java delete mode 100644 core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java create mode 100644 core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java delete mode 100644 core/src/main/resources/mapper/CrewMapper.xml create mode 100644 core/src/main/resources/mapper/ImageMapper.xml delete mode 100644 web/src/main/java/com/dite/znpt/web/controller/CrewController.java diff --git a/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java b/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java index ffff2eb..a36c17e 100644 --- a/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java @@ -1,13 +1,16 @@ package com.dite.znpt.domain; import com.alibaba.excel.annotation.ExcelIgnore; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.List; /** @@ -21,27 +24,30 @@ import java.util.List; public class AuditableEntity implements Serializable { private static final long serialVersionUID = 141481953116476081L; -// @ApiParam(hidden = true) -// private String createBy; -// -// @ApiParam(hidden = true) -// private String updateBy; -// -// @ApiModelProperty(value = "创建时间", example = "2022-01-22", notes = "创建时间", hidden = true) -// private Date createTime; -// -// @ApiModelProperty(hidden = true) -// private Date updateTime; + @ApiParam(hidden = true) + private String createBy; + + @ApiParam(hidden = true) + private String updateBy; + + @ApiModelProperty(value = "创建时间", example = "2022-01-22", notes = "创建时间", hidden = true) + private LocalDateTime createTime; + + @ApiModelProperty(hidden = true) + private LocalDateTime updateTime; @ExcelIgnore @ApiModelProperty(value = "id集合", example = "[]", notes = "id集合") + @TableField(exist = false) private List idList; @ExcelIgnore @ApiModelProperty(value = "当前页", example = "1", notes = "0") + @TableField(exist = false) int page = 1; @ExcelIgnore @ApiModelProperty(value = "页大小", example = "10", notes = "10") + @TableField(exist = false) int pageSize = 10; } diff --git a/core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java deleted file mode 100644 index e39e575..0000000 --- a/core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.dite.znpt.domain.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.*; -import com.dite.znpt.domain.AuditableEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息表实体类 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("crew") -@ApiModel(value="CrewEntity对象", description="机组信息表") -public class CrewEntity extends AuditableEntity implements Serializable { - - private static final long serialVersionUID = -18989296759149249L; - - @ExcelProperty("机组id") - @ApiModelProperty("机组id") - @TableId(value = "crew_id", type = IdType.ASSIGN_ID) - private String crewId; - - @ExcelProperty("项目id") - @ApiModelProperty("项目id") - @TableField("project_id") - private String projectId; - - @ExcelProperty("机组名称") - @ApiModelProperty("机组名称") - @TableField("crew_name") - private String crewName; - - @ExcelProperty("机组描述") - @ApiModelProperty("机组描述") - @TableField("crew_desc") - private String crewDesc; - - @ExcelProperty("机组厂商") - @ApiModelProperty("机组厂商") - @TableField("manufacturer") - private String manufacturer; - - @ExcelProperty("机组型号") - @ApiModelProperty("机组型号") - @TableField("model") - private String model; -} - diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java new file mode 100644 index 0000000..7714a2e --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java @@ -0,0 +1,77 @@ +package com.dite.znpt.domain.entity; + +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.*; +import com.dite.znpt.domain.AuditableEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息表实体类 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("image") +@ApiModel(value="ImageEntity对象", description="图像信息表") +public class ImageEntity extends AuditableEntity implements Serializable { + + private static final long serialVersionUID = -60463872766900490L; + + @ExcelProperty("图像id") + @ApiModelProperty("图像id") + @TableId(value = "image_id", type = IdType.ASSIGN_ID) + private Long imageId; + + @ExcelProperty("部件id") + @ApiModelProperty("部件id") + @TableField("part_id") + private Long partId; + + @ExcelProperty("机组id") + @ApiModelProperty("机组id") + @TableField("turbine_id") + private Long turbineId; + + @ExcelProperty("项目id") + @ApiModelProperty("项目id") + @TableField("project") + private Long project; + + @ExcelProperty("图像名称") + @ApiModelProperty("图像名称") + @TableField("image_name") + private String imageName; + + @ExcelProperty("图像尺寸") + @ApiModelProperty("图像尺寸") + @TableField("image_size") + private String imageSize; + + @ExcelProperty("焦距") + @ApiModelProperty("焦距") + @TableField("focal_distance") + private String focalDistance; + + @ExcelProperty("拍摄时间") + @ApiModelProperty("拍摄时间") + @TableField("shooting_time") + private LocalDateTime shootingTime; + + @ExcelProperty("相机制造商") + @ApiModelProperty("相机制造商") + @TableField("camera_manufacturer") + private String cameraManufacturer; + + @ExcelProperty("相机型号") + @ApiModelProperty("相机型号") + @TableField("camera_model") + private String cameraModel; +} + diff --git a/core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java deleted file mode 100644 index 3e99c72..0000000 --- a/core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.dite.znpt.domain.vo; - -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息请求实体 - */ -@Data -@ApiModel("机组信息列表请求实体") -public class CrewListReq implements Serializable { - - private static final long serialVersionUID = 322835125942914057L; - - @ApiModelProperty("查询关键字") - private String keyword; - - @ApiModelProperty("机组信息Id") - private String crewId; - - @ApiModelProperty("项目id") - private String projectId; - - @ApiModelProperty("机组名称") - private String crewName; - - @ApiModelProperty("机组描述") - private String crewDesc; - - @ApiModelProperty("机组厂商") - private String manufacturer; - - @ApiModelProperty("机组型号") - private String model; - -} - diff --git a/core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java b/core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java deleted file mode 100644 index acd9a26..0000000 --- a/core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dite.znpt.domain.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.dite.znpt.domain.entity.CrewEntity; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息响应实体 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("机组信息响应实体") -public class CrewResp extends CrewEntity { -} - diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ImageListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ImageListReq.java new file mode 100644 index 0000000..5153dfc --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/ImageListReq.java @@ -0,0 +1,55 @@ +package com.dite.znpt.domain.vo; + +import java.time.LocalDateTime; +import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息请求实体 + */ +@Data +@ApiModel("图像信息列表请求实体") +public class ImageListReq implements Serializable { + + private static final long serialVersionUID = 734848078850759056L; + + @ApiModelProperty("查询关键字") + private String keyword; + + @ApiModelProperty("图像信息Id") + private Long imageId; + + @ApiModelProperty("部件id") + private Long partId; + + @ApiModelProperty("机组id") + private Long turbineId; + + @ApiModelProperty("项目id") + private Long project; + + @ApiModelProperty("图像名称") + private String imageName; + + @ApiModelProperty("图像尺寸") + private String imageSize; + + @ApiModelProperty("焦距") + private String focalDistance; + + @ApiModelProperty("拍摄时间") + private LocalDateTime shootingTime; + + @ApiModelProperty("相机制造商") + private String cameraManufacturer; + + @ApiModelProperty("相机型号") + private String cameraModel; + +} + diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java new file mode 100644 index 0000000..1421a4e --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java @@ -0,0 +1,19 @@ +package com.dite.znpt.domain.vo; + +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.dite.znpt.domain.entity.ImageEntity; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息响应实体 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("图像信息响应实体") +public class ImageResp extends ImageEntity { +} + diff --git a/core/src/main/java/com/dite/znpt/mapper/CrewMapper.java b/core/src/main/java/com/dite/znpt/mapper/CrewMapper.java deleted file mode 100644 index c53cf2a..0000000 --- a/core/src/main/java/com/dite/znpt/mapper/CrewMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.dite.znpt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dite.znpt.domain.entity.CrewEntity; -import com.dite.znpt.domain.vo.CrewListReq; -import com.dite.znpt.domain.vo.CrewResp; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息表数据库访问层 - */ -public interface CrewMapper extends BaseMapper { - List queryBySelective(CrewListReq crewReq); -} - diff --git a/core/src/main/java/com/dite/znpt/mapper/ImageMapper.java b/core/src/main/java/com/dite/znpt/mapper/ImageMapper.java new file mode 100644 index 0000000..d689388 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/mapper/ImageMapper.java @@ -0,0 +1,19 @@ +package com.dite.znpt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dite.znpt.domain.entity.ImageEntity; +import com.dite.znpt.domain.vo.ImageListReq; +import com.dite.znpt.domain.vo.ImageResp; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息表数据库访问层 + */ +public interface ImageMapper extends BaseMapper { + List queryBySelective(ImageListReq imageReq); +} + diff --git a/core/src/main/java/com/dite/znpt/service/CrewService.java b/core/src/main/java/com/dite/znpt/service/CrewService.java deleted file mode 100644 index 4b270f7..0000000 --- a/core/src/main/java/com/dite/znpt/service/CrewService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.dite.znpt.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.dite.znpt.domain.entity.CrewEntity; -import com.dite.znpt.domain.vo.CrewListReq; -import com.dite.znpt.domain.vo.CrewResp; - -import java.util.List; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息表服务接口 - */ -public interface CrewService extends IService { - - /** - * 功能描述：查询机组信息列表 - * - * @param crewReq 机组信息 - * @return {@link List }<{@link CrewEntity }> - * @author huise23 - * @date 2025/04/11 23:17 - **/ - List selectList(CrewListReq crewReq); - - /** - * 功能描述：查询单条机组信息 - * - * @param crewId 机组信息Id - * @return {@link CrewResp } - * @author huise23 - * @date 2025/04/11 23:17 - **/ - CrewResp selectById(String crewId); - - /** - * 功能描述：新增机组信息 - * - * @param crew 机组信息 - * @author huise23 - * @date 2025/04/11 23:17 - **/ - void saveData(CrewEntity crew); - - /** - * 功能描述：更新机组信息 - * - * @param crew 机组信息 - * @author huise23 - * @date 2025/04/11 23:17 - **/ - void updateData(CrewEntity crew); - - /** - * 功能描述：删除机组信息 - * - * @param crewId 机组信息Id - * @author huise23 - * @date 2025/04/11 23:17 - **/ - void deleteById(String crewId); -} - diff --git a/core/src/main/java/com/dite/znpt/service/ImageService.java b/core/src/main/java/com/dite/znpt/service/ImageService.java new file mode 100644 index 0000000..598be9a --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/ImageService.java @@ -0,0 +1,64 @@ +package com.dite.znpt.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dite.znpt.domain.entity.ImageEntity; +import com.dite.znpt.domain.vo.ImageListReq; +import com.dite.znpt.domain.vo.ImageResp; + +import java.util.List; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息表服务接口 + */ +public interface ImageService extends IService { + + /** + * 功能描述：查询图像信息列表 + * + * @param imageReq 图像信息 + * @return {@link List }<{@link ImageEntity }> + * @author huise23 + * @date 2025/04/24 13:44 + **/ + List selectList(ImageListReq imageReq); + + /** + * 功能描述：查询单条图像信息 + * + * @param imageId 图像信息Id + * @return {@link ImageResp } + * @author huise23 + * @date 2025/04/24 13:44 + **/ + ImageResp selectById(Long imageId); + + /** + * 功能描述：新增图像信息 + * + * @param image 图像信息 + * @author huise23 + * @date 2025/04/24 13:44 + **/ + void saveData(ImageEntity image); + + /** + * 功能描述：更新图像信息 + * + * @param image 图像信息 + * @author huise23 + * @date 2025/04/24 13:44 + **/ + void updateData(ImageEntity image); + + /** + * 功能描述：删除图像信息 + * + * @param imageId 图像信息Id + * @author huise23 + * @date 2025/04/24 13:44 + **/ + void deleteById(Long imageId); +} + diff --git a/core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java deleted file mode 100644 index efee590..0000000 --- a/core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.dite.znpt.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dite.znpt.domain.entity.CrewEntity; -import com.dite.znpt.domain.vo.CrewListReq; -import com.dite.znpt.domain.vo.CrewResp; -import com.dite.znpt.service.CrewService; -import com.dite.znpt.mapper.CrewMapper; -import org.springframework.stereotype.Service; -import cn.hutool.core.collection.CollUtil; -import lombok.RequiredArgsConstructor; -import com.dite.znpt.util.PageUtil; - -import java.util.List; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - * @Description: 机组信息表服务实现类 - */ -@Service -@RequiredArgsConstructor -public class CrewServiceImpl extends ServiceImpl implements CrewService { - - /** - * 功能描述：查询机组信息列表 - * - * @param crewReq 机组信息信息 - * @return {@link List }<{@link CrewResp }> - * @author huise23 - * @date 2025/04/11 23:17 - **/ - @Override - public List selectList(CrewListReq crewReq) { - PageUtil.startPage(); - List crewList= this.baseMapper.queryBySelective(crewReq); - crewList.forEach(resp -> { - - }); - return crewList; - } - - /** - * 功能描述：查询单条机组信息 - * - * @param crewId 机组信息Id - * @return {@link CrewResp } - * @author huise23 - * @date 2025/04/11 23:17 - **/ - @Override - public CrewResp selectById(String crewId) { - CrewListReq crewReq = new CrewListReq(); - crewReq.setCrewId(crewId); - - List list = selectList(crewReq); - return list.isEmpty() ? CollUtil.getFirst(list) : new CrewResp(); - } - - /** - * 功能描述：新增机组信息 - * - * @param crew 机组信息 - * @author huise23 - * @date 2025/04/11 23:17 - **/ - @Override - public void saveData(CrewEntity crew) { -// todo 校验 - save(crew); - } - - /** - * 功能描述：更新机组信息 - * - * @param crew 机组信息 - * @author huise23 - * @date 2025/04/11 23:17 - **/ - @Override - public void updateData(CrewEntity crew) { -// todo 校验 - updateById(crew); - } - - /** - * 功能描述：删除机组信息 - * - * @param crewId 机组信息Id - * @author huise23 - * @date 2025/04/11 23:17 - **/ - @Override - public void deleteById(String crewId) { -// todo 校验 - removeById(crewId); - } - -} diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java new file mode 100644 index 0000000..c409253 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java @@ -0,0 +1,99 @@ +package com.dite.znpt.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dite.znpt.domain.entity.ImageEntity; +import com.dite.znpt.domain.vo.ImageListReq; +import com.dite.znpt.domain.vo.ImageResp; +import com.dite.znpt.service.ImageService; +import com.dite.znpt.mapper.ImageMapper; +import org.springframework.stereotype.Service; +import cn.hutool.core.collection.CollUtil; +import lombok.RequiredArgsConstructor; +import com.dite.znpt.util.PageUtil; + +import java.util.List; + +/** + * @author huise23 + * @date 2025/04/24 13:44 + * @Description: 图像信息表服务实现类 + */ +@Service +@RequiredArgsConstructor +public class ImageServiceImpl extends ServiceImpl implements ImageService { + + /** + * 功能描述：查询图像信息列表 + * + * @param imageReq 图像信息信息 + * @return {@link List }<{@link ImageResp }> + * @author huise23 + * @date 2025/04/24 13:44 + **/ + @Override + public List selectList(ImageListReq imageReq) { + PageUtil.startPage(); + List imageList= this.baseMapper.queryBySelective(imageReq); + imageList.forEach(resp -> { + + }); + return imageList; + } + + /** + * 功能描述：查询单条图像信息 + * + * @param imageId 图像信息Id + * @return {@link ImageResp } + * @author huise23 + * @date 2025/04/24 13:44 + **/ + @Override + public ImageResp selectById(Long imageId) { + ImageListReq imageReq = new ImageListReq(); + imageReq.setImageId(imageId); + + List list = selectList(imageReq); + return list.isEmpty() ? CollUtil.getFirst(list) : new ImageResp(); + } + + /** + * 功能描述：新增图像信息 + * + * @param image 图像信息 + * @author huise23 + * @date 2025/04/24 13:44 + **/ + @Override + public void saveData(ImageEntity image) { +// todo 校验 + save(image); + } + + /** + * 功能描述：更新图像信息 + * + * @param image 图像信息 + * @author huise23 + * @date 2025/04/24 13:44 + **/ + @Override + public void updateData(ImageEntity image) { +// todo 校验 + updateById(image); + } + + /** + * 功能描述：删除图像信息 + * + * @param imageId 图像信息Id + * @author huise23 + * @date 2025/04/24 13:44 + **/ + @Override + public void deleteById(Long imageId) { +// todo 校验 + removeById(imageId); + } + +} diff --git a/core/src/main/resources/mapper/CrewMapper.xml b/core/src/main/resources/mapper/CrewMapper.xml deleted file mode 100644 index 9b14b93..0000000 --- a/core/src/main/resources/mapper/CrewMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - a.crew_id, a.project_id, a.crew_name, a.crew_desc, - a.manufacturer, a.model - - - - - diff --git a/core/src/main/resources/mapper/ImageMapper.xml b/core/src/main/resources/mapper/ImageMapper.xml new file mode 100644 index 0000000..6f39975 --- /dev/null +++ b/core/src/main/resources/mapper/ImageMapper.xml @@ -0,0 +1,52 @@ + + + + + + a.image_id, a.part_id, a.turbine_id, a.project, + a.image_name, a.image_size, a.focal_distance, a.shooting_time, + a.camera_manufacturer, a.camera_model + + + + + diff --git a/web/src/main/java/com/dite/znpt/web/controller/CrewController.java b/web/src/main/java/com/dite/znpt/web/controller/CrewController.java deleted file mode 100644 index 1c0cd48..0000000 --- a/web/src/main/java/com/dite/znpt/web/controller/CrewController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.dite.znpt.web.controller; - - -import com.dite.znpt.domain.Constants; -import com.dite.znpt.domain.vo.CrewListReq; -import com.dite.znpt.domain.vo.CrewResp; -import com.dite.znpt.domain.entity.CrewEntity; -import com.dite.znpt.service.CrewService; -import com.dite.znpt.domain.Result; -import com.dite.znpt.domain.PageResult; -import com.pig4cloud.plugin.excel.annotation.RequestExcel; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; -import com.pig4cloud.plugin.excel.vo.ErrorMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author huise23 - * @date 2025/04/11 23:17 - */ -@Api(tags = "机组信息") -@RestController -@RequestMapping("/crew") -public class CrewController { - @Resource - private CrewService crewService; - - @ApiOperation(value = "获取机组信息列表", httpMethod = "GET") - @GetMapping("/list") - public PageResult list(CrewListReq crewReq) { - return PageResult.ok(crewService.selectList(crewReq)); - } - - @ApiOperation(value = "根据机组信息Id获取详细信息", httpMethod = "GET") - @GetMapping("/{crewId}") - public Result getInfo(@PathVariable String crewId) { - return Result.ok(crewService.selectById(crewId)); - } - - @ApiOperation(value = "新增机组信息", httpMethod = "POST") - @PostMapping - public Result add(@RequestBody CrewEntity crew) { - crewService.saveData(crew); - return Result.ok(); - } - - @ApiOperation(value = "修改机组信息", httpMethod = "PUT") - @PutMapping - public Result edit(@RequestBody CrewEntity crew) { - crewService.updateData(crew); - return Result.ok(); - } - - @ApiOperation(value = "删除机组信息", httpMethod = "DELETE") - @DeleteMapping("/{crewId}") - public Result remove(@PathVariable String crewId) { - crewService.deleteById(crewId); - return Result.ok(); - } - - @ApiOperation(value = "导出机组信息", httpMethod = "GET") - @GetMapping("/export") - @ResponseExcel(name = "机组信息") - public List export(CrewListReq crewReq) { - return crewService.selectList(crewReq); - } - - @ApiOperation(value = "导入机组信息", httpMethod = "POST") - @PostMapping("/import") - public Result importData(@RequestExcel List dataList, BindingResult bindingResult) { - // JSR 303 校验通用校验获取失败的数据 - List errorMessageList = (List) bindingResult.getTarget(); - if (errorMessageList != null && !errorMessageList.isEmpty()) { - return Result.error(Constants.SERVICE_EXCEPTION, "导入失败"); - } - return Result.okM("导入"+dataList.size()+"条数据"); - } -} -