From c3a9f4a3653f243630cc7e9366a295900255cef1 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Thu, 3 Jul 2025 14:07:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?app=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppFileController.java | 8 +++--- .../fuyuanshen/app/domain/dto/AppFileDto.java | 5 ++++ .../fuyuanshen/app/domain/vo/AppFileVo.java | 3 ++- .../app/service/AppFileService.java | 26 +++++++++++++++---- .../fuyuanshen/app/mapper/AppFileMapper.java | 17 ++++++++++++ .../app/service/IAppFileService.java | 11 ++++++++ .../app/service/impl/AppFileServiceImpl.java | 14 ++++++++++ .../resources/mapper/app/AppFileMapper.xml | 7 +++++ 8 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java create mode 100644 fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java index dd19f59..b66edae 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java @@ -28,7 +28,7 @@ public class AppFileController extends BaseController { */ @GetMapping("/list") public List list(AppFileDto bo) { - return null; + return appFileService.list(bo); } /** @@ -36,7 +36,7 @@ public class AppFileController extends BaseController { */ @PostMapping("/add") public R add(@RequestBody AppFileDto bo) { - return null; + return appFileService.add(bo); } /** @@ -44,7 +44,7 @@ public class AppFileController extends BaseController { */ @PostMapping("/edit") public R edit(@RequestBody AppFileDto bo) { - return null; + return appFileService.edit(bo); } /** @@ -52,6 +52,6 @@ public class AppFileController extends BaseController { */ @DeleteMapping("/delete") public R delete(AppFileDto bo) { - return null; + return appFileService.delete(bo); } } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java index dc5d8ce..ec920ab 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java @@ -5,4 +5,9 @@ import lombok.Data; @Data public class AppFileDto { + /** + * 文件类型 1:操作说明 2:产品参数 + */ + private String type; + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java index a94106e..e36a36e 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java @@ -4,5 +4,6 @@ import lombok.Data; @Data public class AppFileVo { - + private Long fileId; + private String fileName; } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java index 2cdbb4a..bf76d3e 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java @@ -1,13 +1,14 @@ package com.fuyuanshen.app.service; -import com.fuyuanshen.app.domain.bo.AppUserBo; -import com.fuyuanshen.app.domain.vo.DeviceVo; -import com.fuyuanshen.common.mybatis.core.page.PageQuery; -import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.app.domain.dto.AppFileDto; +import com.fuyuanshen.app.domain.vo.AppFileVo; +import com.fuyuanshen.common.core.domain.R; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + /** * 登录校验方法 * @@ -18,8 +19,23 @@ import org.springframework.stereotype.Service; @Service public class AppFileService { + private final IAppFileService appFileService; + + public List list(AppFileDto bo) { - public TableDataInfo queryPageList(AppUserBo bo, PageQuery pageQuery) { return null; } + public R add(AppFileDto bo) { + return R.ok(); + } + + public R edit(AppFileDto bo) { + return R.ok(); + } + + + + public R delete(AppFileDto bo) { + return R.ok(); + } } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java new file mode 100644 index 0000000..ba3d871 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java @@ -0,0 +1,17 @@ +package com.fuyuanshen.app.mapper; + +import com.fuyuanshen.app.domain.AppOperationVideo; +import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Mapper; + +/** + * 操作视频Mapper接口 + * + * @author Lion Li + * @date 2025-07-02 + */ +@Mapper +public interface AppFileMapper { + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java new file mode 100644 index 0000000..d15b2e1 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java @@ -0,0 +1,11 @@ +package com.fuyuanshen.app.service; + +/** + * APP文件管理 业务层 + * + * @author Lion Li + * @date 2025-07-02 + */ +public interface IAppFileService { + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java new file mode 100644 index 0000000..afa4bbd --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.app.service.impl; + +import com.fuyuanshen.app.service.IAppFileService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +@Slf4j +@RequiredArgsConstructor +@Service +public class AppFileServiceImpl implements IAppFileService { + +} diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml new file mode 100644 index 0000000..51b35a9 --- /dev/null +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml @@ -0,0 +1,7 @@ + + + + + From f2a6f16cdd5dfb316ad733d2fe460d3fc630afd5 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Fri, 4 Jul 2025 15:10:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E5=92=8C=E4=BA=A7=E5=93=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppFileController.java | 27 ++-- .../fuyuanshen/app/domain/dto/AppFileDto.java | 12 +- .../fuyuanshen/app/domain/vo/AppFileVo.java | 9 -- .../app/service/AppFileService.java | 53 +++++-- .../controller/AppBusinessFileController.java | 105 +++++++++++++ .../app/domain/AppBusinessFile.java | 51 +++++++ .../app/domain/bo/AppBusinessFileBo.java | 52 +++++++ .../app/domain/vo/AppBusinessFileVo.java | 62 ++++++++ .../fuyuanshen/app/domain/vo/AppFileVo.java | 21 +++ .../app/mapper/AppBusinessFileMapper.java | 20 +++ .../fuyuanshen/app/mapper/AppFileMapper.java | 17 --- .../app/service/IAppBusinessFileService.java | 72 +++++++++ .../app/service/IAppFileService.java | 11 -- .../impl/AppBusinessFileServiceImpl.java | 142 ++++++++++++++++++ .../app/service/impl/AppFileServiceImpl.java | 14 -- .../mapper/app/AppBusinessFileMapper.xml | 21 +++ .../resources/mapper/app/AppFileMapper.xml | 7 - 17 files changed, 608 insertions(+), 88 deletions(-) delete mode 100644 fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java delete mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java delete mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java create mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java delete mode 100644 fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java create mode 100644 fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml delete mode 100644 fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java index b66edae..acf52d3 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java @@ -1,5 +1,6 @@ package com.fuyuanshen.app.controller; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; import com.fuyuanshen.app.domain.dto.AppFileDto; import com.fuyuanshen.app.domain.vo.AppFileVo; import com.fuyuanshen.app.service.AppFileService; @@ -27,31 +28,27 @@ public class AppFileController extends BaseController { * 查询文件列表 */ @GetMapping("/list") - public List list(AppFileDto bo) { - return appFileService.list(bo); + public R> list(AppBusinessFileBo bo) { + return R.ok(appFileService.list(bo)); } /** - * 文件添加 + * 上传文件 */ - @PostMapping("/add") - public R add(@RequestBody AppFileDto bo) { - return appFileService.add(bo); + @PostMapping("/upload") + public R upload(@Validated @ModelAttribute AppFileDto bo) { + return toAjax(appFileService.add(bo)); } - /** - * 文件编辑 - */ - @PostMapping("/edit") - public R edit(@RequestBody AppFileDto bo) { - return appFileService.edit(bo); - } /** * 文件删除 */ @DeleteMapping("/delete") - public R delete(AppFileDto bo) { - return appFileService.delete(bo); + public R delete(Long[] ids) { + if(ids == null || ids.length == 0){ + return R.fail("请选择要删除的文件"); + } + return toAjax(appFileService.delete(ids)); } } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java index ec920ab..9eafe36 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java @@ -1,13 +1,21 @@ package com.fuyuanshen.app.domain.dto; import lombok.Data; +import org.springframework.web.multipart.MultipartFile; @Data public class AppFileDto { + private Long deviceId; + /** - * 文件类型 1:操作说明 2:产品参数 + * 文件类型(1:操作说明,2:产品参数) */ - private String type; + private Long fileType; + + /** + * 文件 + */ + private MultipartFile file; } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java deleted file mode 100644 index e36a36e..0000000 --- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.fuyuanshen.app.domain.vo; - -import lombok.Data; - -@Data -public class AppFileVo { - private Long fileId; - private String fileName; -} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java index bf76d3e..3fbd0eb 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java @@ -1,8 +1,14 @@ package com.fuyuanshen.app.service; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; import com.fuyuanshen.app.domain.dto.AppFileDto; +import com.fuyuanshen.app.domain.vo.AppBusinessFileVo; import com.fuyuanshen.app.domain.vo.AppFileVo; -import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.oss.core.OssClient; +import com.fuyuanshen.common.oss.factory.OssFactory; +import com.fuyuanshen.common.satoken.utils.AppLoginHelper; +import com.fuyuanshen.system.domain.vo.SysOssVo; +import com.fuyuanshen.system.service.ISysOssService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -19,23 +25,44 @@ import java.util.List; @Service public class AppFileService { - private final IAppFileService appFileService; + private final ISysOssService sysOssService; - public List list(AppFileDto bo) { + private final IAppBusinessFileService appBusinessFileService; - return null; - } - public R add(AppFileDto bo) { - return R.ok(); + public List list(AppBusinessFileBo bo) { + bo.setCreateBy(AppLoginHelper.getUserId()); + return appBusinessFileService.queryAppFileList(bo); } - public R edit(AppFileDto bo) { - return R.ok(); + public Boolean add(AppFileDto bo) { + + // 上传文件 + SysOssVo upload = sysOssService.upload(bo.getFile()); + + if (upload == null) { + return false; + } + + AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo(); + appBusinessFileBo.setFileId(upload.getOssId()); + appBusinessFileBo.setBusinessId(bo.getDeviceId()); + appBusinessFileBo.setFileType(bo.getFileType()); + appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId()); + + return appBusinessFileService.insertByBo(appBusinessFileBo); } - - - public R delete(AppFileDto bo) { - return R.ok(); + public Boolean delete(Long[] ids) { + AppBusinessFileBo bo = new AppBusinessFileBo(); + bo.setCreateBy(AppLoginHelper.getUserId()); + bo.setIds(List.of(ids)); + List appBusinessFileVos = appBusinessFileService.queryList(bo); + List fileIds = appBusinessFileVos.stream().map(AppBusinessFileVo::getFileId).toList(); + List list = sysOssService.listByIds(fileIds); + for (SysOssVo sysOss : list) { + OssClient storage = OssFactory.instance(sysOss.getService()); + storage.delete(sysOss.getUrl()); + } + return appBusinessFileService.deleteWithValidByIds(List.of(ids), true); } } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java new file mode 100644 index 0000000..9ad7df3 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java @@ -0,0 +1,105 @@ +package com.fuyuanshen.app.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.app.domain.vo.AppBusinessFileVo; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; +import com.fuyuanshen.app.service.IAppBusinessFileService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; + +/** + * app业务文件 + * + * @author Lion Li + * @date 2025-07-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/businessFile") +public class AppBusinessFileController extends BaseController { + + private final IAppBusinessFileService appBusinessFileService; + + /** + * 查询app业务文件列表 + */ + @SaCheckPermission("app:businessFile:list") + @GetMapping("/list") + public TableDataInfo list(AppBusinessFileBo bo, PageQuery pageQuery) { + return appBusinessFileService.queryPageList(bo, pageQuery); + } + + /** + * 导出app业务文件列表 + */ + @SaCheckPermission("app:businessFile:export") + @Log(title = "app业务文件", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(AppBusinessFileBo bo, HttpServletResponse response) { + List list = appBusinessFileService.queryList(bo); + ExcelUtil.exportExcel(list, "app业务文件", AppBusinessFileVo.class, response); + } + + /** + * 获取app业务文件详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("app:businessFile:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(appBusinessFileService.queryById(id)); + } + + /** + * 新增app业务文件 + */ + @SaCheckPermission("app:businessFile:add") + @Log(title = "app业务文件", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody AppBusinessFileBo bo) { + return toAjax(appBusinessFileService.insertByBo(bo)); + } + + /** + * 修改app业务文件 + */ + @SaCheckPermission("app:businessFile:edit") + @Log(title = "app业务文件", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody AppBusinessFileBo bo) { + return toAjax(appBusinessFileService.updateByBo(bo)); + } + + /** + * 删除app业务文件 + * + * @param ids 主键串 + */ + @SaCheckPermission("app:businessFile:remove") + @Log(title = "app业务文件", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(appBusinessFileService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java new file mode 100644 index 0000000..307b4bb --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java @@ -0,0 +1,51 @@ +package com.fuyuanshen.app.domain; + +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * app业务文件对象 app_business_file + * + * @author Lion Li + * @date 2025-07-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("app_business_file") +public class AppBusinessFile extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 文件id + */ + private Long fileId; + + /** + * 业务id + */ + private Long businessId; + + /** + * 文件类型(1:操作说明,2:产品参数) + */ + private Long fileType; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java new file mode 100644 index 0000000..0454e72 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java @@ -0,0 +1,52 @@ +package com.fuyuanshen.app.domain.bo; + +import com.fuyuanshen.app.domain.AppBusinessFile; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +import java.util.List; + +/** + * app业务文件业务对象 app_business_file + * + * @author Lion Li + * @date 2025-07-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AppBusinessFile.class, reverseConvertGenerate = false) +public class AppBusinessFileBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 文件id + */ + private Long fileId; + + /** + * 业务id + */ + private Long businessId; + + /** + * 文件类型(1:操作说明,2:产品参数) + */ + private Long fileType; + + /** + * 备注 + */ + private String remark; + + + private List ids; +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java new file mode 100644 index 0000000..66f1041 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java @@ -0,0 +1,62 @@ +package com.fuyuanshen.app.domain.vo; + +import com.fuyuanshen.app.domain.AppBusinessFile; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * app业务文件视图对象 app_business_file + * + * @author Lion Li + * @date 2025-07-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AppBusinessFile.class) +public class AppBusinessFileVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 文件id + */ + @ExcelProperty(value = "文件id") + private Long fileId; + + /** + * 业务id + */ + @ExcelProperty(value = "业务id") + private Long businessId; + + /** + * 文件类型(1:操作说明,2:产品参数) + */ + @ExcelProperty(value = "文件类型(1:操作说明,2:产品参数)") + private Long fileType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java new file mode 100644 index 0000000..fd914bb --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java @@ -0,0 +1,21 @@ +package com.fuyuanshen.app.domain.vo; + +import lombok.Data; + +@Data +public class AppFileVo { + + private Long id; + /** + * 文件id + */ + private Long fileId; + /** + * 文件名称 + */ + private String fileName; + /** + * 文件url + */ + private String fileUrl; +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java new file mode 100644 index 0000000..c6defea --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java @@ -0,0 +1,20 @@ +package com.fuyuanshen.app.mapper; + +import com.fuyuanshen.app.domain.AppBusinessFile; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; +import com.fuyuanshen.app.domain.vo.AppBusinessFileVo; +import com.fuyuanshen.app.domain.vo.AppFileVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * app业务文件Mapper接口 + * + * @author Lion Li + * @date 2025-07-03 + */ +public interface AppBusinessFileMapper extends BaseMapperPlus { + + List queryAppFileList(AppBusinessFileBo bo); +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java deleted file mode 100644 index ba3d871..0000000 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppFileMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fuyuanshen.app.mapper; - -import com.fuyuanshen.app.domain.AppOperationVideo; -import com.fuyuanshen.app.domain.vo.AppOperationVideoVo; -import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; -import org.apache.ibatis.annotations.Mapper; - -/** - * 操作视频Mapper接口 - * - * @author Lion Li - * @date 2025-07-02 - */ -@Mapper -public interface AppFileMapper { - -} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java new file mode 100644 index 0000000..c99eb10 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java @@ -0,0 +1,72 @@ +package com.fuyuanshen.app.service; + +import com.fuyuanshen.app.domain.vo.AppBusinessFileVo; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; +import com.fuyuanshen.app.domain.vo.AppFileVo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * app业务文件Service接口 + * + * @author Lion Li + * @date 2025-07-03 + */ +public interface IAppBusinessFileService { + + /** + * 查询app业务文件 + * + * @param id 主键 + * @return app业务文件 + */ + AppBusinessFileVo queryById(Long id); + + /** + * 分页查询app业务文件列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return app业务文件分页列表 + */ + TableDataInfo queryPageList(AppBusinessFileBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的app业务文件列表 + * + * @param bo 查询条件 + * @return app业务文件列表 + */ + List queryList(AppBusinessFileBo bo); + + /** + * 新增app业务文件 + * + * @param bo app业务文件 + * @return 是否新增成功 + */ + Boolean insertByBo(AppBusinessFileBo bo); + + /** + * 修改app业务文件 + * + * @param bo app业务文件 + * @return 是否修改成功 + */ + Boolean updateByBo(AppBusinessFileBo bo); + + /** + * 校验并批量删除app业务文件信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + List queryAppFileList(AppBusinessFileBo bo); +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java deleted file mode 100644 index d15b2e1..0000000 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppFileService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.fuyuanshen.app.service; - -/** - * APP文件管理 业务层 - * - * @author Lion Li - * @date 2025-07-02 - */ -public interface IAppFileService { - -} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java new file mode 100644 index 0000000..4b643b4 --- /dev/null +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java @@ -0,0 +1,142 @@ +package com.fuyuanshen.app.service.impl; + +import com.fuyuanshen.app.domain.vo.AppFileVo; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.fuyuanshen.app.domain.bo.AppBusinessFileBo; +import com.fuyuanshen.app.domain.vo.AppBusinessFileVo; +import com.fuyuanshen.app.domain.AppBusinessFile; +import com.fuyuanshen.app.mapper.AppBusinessFileMapper; +import com.fuyuanshen.app.service.IAppBusinessFileService; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * app业务文件Service业务层处理 + * + * @author Lion Li + * @date 2025-07-03 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AppBusinessFileServiceImpl implements IAppBusinessFileService { + + private final AppBusinessFileMapper baseMapper; + + /** + * 查询app业务文件 + * + * @param id 主键 + * @return app业务文件 + */ + @Override + public AppBusinessFileVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询app业务文件列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return app业务文件分页列表 + */ + @Override + public TableDataInfo queryPageList(AppBusinessFileBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的app业务文件列表 + * + * @param bo 查询条件 + * @return app业务文件列表 + */ + @Override + public List queryList(AppBusinessFileBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(AppBusinessFileBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(AppBusinessFile::getId); + lqw.eq(bo.getFileId()!=null, AppBusinessFile::getFileId, bo.getFileId()); + lqw.eq(bo.getBusinessId() != null, AppBusinessFile::getBusinessId, bo.getBusinessId()); + lqw.eq(bo.getFileType() != null, AppBusinessFile::getFileType, bo.getFileType()); + lqw.in(bo.getIds()!=null, AppBusinessFile::getId, bo.getIds()); + return lqw; + } + + /** + * 新增app业务文件 + * + * @param bo app业务文件 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(AppBusinessFileBo bo) { + AppBusinessFile add = MapstructUtils.convert(bo, AppBusinessFile.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改app业务文件 + * + * @param bo app业务文件 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(AppBusinessFileBo bo) { + AppBusinessFile update = MapstructUtils.convert(bo, AppBusinessFile.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(AppBusinessFile entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除app业务文件信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List queryAppFileList(AppBusinessFileBo bo) { + return baseMapper.queryAppFileList(bo); + } +} diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java deleted file mode 100644 index afa4bbd..0000000 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppFileServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fuyuanshen.app.service.impl; - -import com.fuyuanshen.app.service.IAppFileService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - - -@Slf4j -@RequiredArgsConstructor -@Service -public class AppFileServiceImpl implements IAppFileService { - -} diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml new file mode 100644 index 0000000..6c333d4 --- /dev/null +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml deleted file mode 100644 index 51b35a9..0000000 --- a/fys-modules/fys-app/src/main/resources/mapper/app/AppFileMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - From 407103a71e41ce6714459e63ae50913d40cd5dd6 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Sat, 5 Jul 2025 14:08:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E6=99=B6?= =?UTF-8?q?=E5=85=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fys-admin/src/main/resources/application-dev.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fys-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml index 52b2877..feec2c1 100644 --- a/fys-admin/src/main/resources/application-dev.yml +++ b/fys-admin/src/main/resources/application-dev.yml @@ -49,9 +49,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://120.79.224.186:3366/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://47.120.79.150:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: 1fys@QWER.. + password: Jq_123456# # # 从库数据源 # slave: # lazy: true @@ -98,13 +98,13 @@ spring: spring.data: redis: # 地址 - host: 120.79.224.186 + host: 47.120.79.150 # 端口,默认为6379 - port: 26379 + port: 6379 # 数据库索引 database: 2 # redis 密码必须配置 - password: 1fys@QWER.. + password: xhYc_djkl382^#780! # 连接超时时间 timeout: 10s # 是否开启ssl