From ffce8c212b37e21dc6645adfe560d403c61730e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 2 Apr 2025 18:10:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(repository):=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=84=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3-=20=E9=87=8D=E6=9E=84=20De?= =?UTF-8?q?viceComponentQuery=20=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=20com?= =?UTF-8?q?ponentSort=20=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=8E=92=E5=BA=8F=20-=20=E6=9B=B4=E6=96=B0=20DeviceCo?= =?UTF-8?q?mponentMapper=20=E6=8E=A5=E5=8F=A3=E5=92=8C=20XML=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=AE=9E=E7=8E=B0=E6=8C=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9F=A5=E8=AF=A2=20-=20=E5=9C=A8=20FileUplo?= =?UTF-8?q?adRecordMapper=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20getFileTypes=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=20-=20=E5=9C=A8=20FileUplo?= =?UTF-8?q?adRecordServiceImpl=20=E5=92=8C=20IFileUploadRecordService=20?= =?UTF-8?q?=E4=B8=AD=E5=AE=9E=E7=8E=B0=20getFileTypes=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20-=20=E5=9C=A8=20FileController=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20getFileTypes=20=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceComponentController.java | 8 +++--- .../admin/controller/FileController.java | 10 +++++++ .../pojo/query/DeviceComponentQuery.java | 13 --------- .../pojo/query/DeviceComponentQuery.java | 18 ++++++++++++ .../mapper/DeviceComponentMapper.java | 5 ++-- .../mapper/FileUploadRecordMapper.java | 3 ++ .../service/IDeviceComponentService.java | 7 ++--- .../service/IFileUploadRecordService.java | 4 +++ .../impl/DeviceComponentServiceImpl.java | 7 ++--- .../impl/FileUploadRecordServiceImpl.java | 6 ++++ .../mapper/DeviceComponentMapper.xml | 28 ++++++++++++------- .../mapper/FileUploadRecordMapper.xml | 3 ++ 12 files changed, 75 insertions(+), 37 deletions(-) delete mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/DeviceComponentQuery.java diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java index eac6c8d7..47305a84 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java @@ -10,15 +10,15 @@ import com.google.common.collect.Sets; import com.nflg.mobilebroken.admin.annotation.ApiMark; import com.nflg.mobilebroken.admin.pojo.dto.DeviceComponentDTO; import com.nflg.mobilebroken.admin.pojo.dto.DeviceComponentDetailDTO; -import com.nflg.mobilebroken.admin.pojo.query.DeviceComponentQuery; -import com.nflg.mobilebroken.common.pojo.dto.DevComponentImportExcel; -import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO; -import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentVO; import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.exception.NflgException; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.dto.DevComponentExcel; +import com.nflg.mobilebroken.common.pojo.dto.DevComponentImportExcel; +import com.nflg.mobilebroken.common.pojo.query.DeviceComponentQuery; +import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO; +import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentVO; import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.EecExcelUtil; import com.nflg.mobilebroken.common.util.VUtils; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/FileController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/FileController.java index 9a72cebc..03201d01 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/FileController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/FileController.java @@ -150,4 +150,14 @@ public class FileController extends ControllerBase { fileUploadRecordService.removeBatchByIds(ids); return ApiResult.success(); } + + /** + * 获取文件类型列表 + * @return 文件类型列表 + */ + @PostMapping("getFileTypes") + @ApiMark(moduleName = "文件管理", apiName = "获取文件类型列表") + public ApiResult> getFileTypes(){ + return ApiResult.success(fileUploadRecordService.getFileTypes()); + } } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java deleted file mode 100644 index a2f024cc..00000000 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.nflg.mobilebroken.admin.pojo.query; - -import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = false) -@Data -public class DeviceComponentQuery extends PageBaseQuery { - private String modelNo; - - private String component; -} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/DeviceComponentQuery.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/DeviceComponentQuery.java new file mode 100644 index 00000000..b858b892 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/DeviceComponentQuery.java @@ -0,0 +1,18 @@ +package com.nflg.mobilebroken.common.pojo.query; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = false) +@Data +public class DeviceComponentQuery extends PageBaseQuery{ + + private String modelNo; + + private String component; + + /** + * 组件排序，true:有组件在前，false:无组件在前，null:按id倒序 + */ + private Boolean componentSort; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java index fd6f327d..87cfb752 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java @@ -1,11 +1,12 @@ package com.nflg.mobilebroken.repository.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.common.pojo.dto.DevComponentExcel; +import com.nflg.mobilebroken.common.pojo.query.DeviceComponentQuery; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentVO; import com.nflg.mobilebroken.repository.entity.DeviceComponent; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,7 +27,7 @@ public interface DeviceComponentMapper extends BaseMapper { * @param query * @return */ - Page selectListByPage(@Param("page") Page page, @Param("query") PageBaseQuery query); + Page selectListByPage(@Param("page") Page page, @Param("query") DeviceComponentQuery query); List getExportData(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java index d43bda9c..bd083f71 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java @@ -3,6 +3,8 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.mobilebroken.repository.entity.FileUploadRecord; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +15,5 @@ import com.nflg.mobilebroken.repository.entity.FileUploadRecord; */ public interface FileUploadRecordMapper extends BaseMapper { + List getFileTypes(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java index 4e395f96..fe77d671 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java @@ -1,14 +1,13 @@ package com.nflg.mobilebroken.repository.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.dto.DevComponentExcel; -import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import com.nflg.mobilebroken.common.pojo.query.DeviceComponentQuery; import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentVO; import com.nflg.mobilebroken.repository.entity.DeviceComponent; -import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -27,7 +26,7 @@ public interface IDeviceComponentService extends IService { * @param query * @return */ - Page selectListByPage(@Param("query") PageBaseQuery query); + Page selectListByPage(@Param("query") DeviceComponentQuery query); DeviceComponent saveComponent(DeviceComponent component); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java index d53fcee3..5062a3c6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java @@ -6,6 +6,8 @@ import com.nflg.mobilebroken.common.pojo.request.FileSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.FileVO; import com.nflg.mobilebroken.repository.entity.FileUploadRecord; +import java.util.List; + /** *

* 服务类 @@ -17,4 +19,6 @@ import com.nflg.mobilebroken.repository.entity.FileUploadRecord; public interface IFileUploadRecordService extends IService { PageData search(FileSearchRequest request); + + List getFileTypes(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java index 379af9b5..2681af94 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java @@ -1,13 +1,13 @@ package com.nflg.mobilebroken.repository.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.dto.DevComponentExcel; -import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import com.nflg.mobilebroken.common.pojo.query.DeviceComponentQuery; import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentVO; import com.nflg.mobilebroken.repository.entity.DeviceComponent; import com.nflg.mobilebroken.repository.mapper.DeviceComponentMapper; import com.nflg.mobilebroken.repository.service.IDeviceComponentService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; @@ -27,11 +27,10 @@ public class DeviceComponentServiceImpl extends ServiceImpl selectListByPage(@Param("query") PageBaseQuery query){ + public Page selectListByPage(@Param("query") DeviceComponentQuery query){ return this.getBaseMapper().selectListByPage(new Page<>(query.getPage(),query.getPageSize()) ,query); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java index d987aafc..4c978982 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java @@ -13,6 +13,7 @@ import com.nflg.mobilebroken.repository.service.IFileUploadRecordService; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.util.List; import java.util.Objects; /** @@ -46,4 +47,9 @@ public class FileUploadRecordServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); return PageUtil.convert(datas, d -> Convert.convert(FileVO.class, d)); } + + @Override + public List getFileTypes() { + return baseMapper.getFileTypes(); + } } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml index ee283720..e51d2965 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml @@ -2,17 +2,25 @@ - - - and model_no=#{query.modelNo} - - - and component like concat('%',#{query.component} ,"%") - - + select distinct file_type from file_upload_record +