From c50f674f66096bfcec82dac1b02c25f954f688f7 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 26 Mar 2025 17:57:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receive/asn/controller/AsnController.java | 28 +++++------ .../business/receive/asn/dao/AsnDao.java | 6 +-- .../receive/asn/manager/AsnManager.java | 4 +- .../receive/asn/service/AsnQueryService.java | 33 +++++++++++++ .../receive/asn/service/AsnService.java | 48 ++++++++----------- .../business/receive/asn}/AsnMapper.xml | 4 +- .../resources/mapper/business/receive/xxxx.js | 0 7 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java rename smart-admin-api-java17-springboot3/sa-admin/src/main/{java/net/lab1024/sa/admin/module/business/receive/asn/mapper => resources/mapper/business/receive/asn}/AsnMapper.xml (89%) create mode 100644 smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/xxxx.js diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java index 0b89ccb..6a8d837 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/controller/AsnController.java @@ -1,18 +1,15 @@ package net.lab1024.sa.admin.module.business.receive.asn.controller; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnAddForm; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnUpdateForm; -import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO; -import net.lab1024.sa.admin.module.business.asn.service.AsnService; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.receive.asn.service.AsnQueryService; +import net.lab1024.sa.admin.module.business.receive.asn.service.AsnService; import net.lab1024.sa.base.common.domain.ValidateList; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -34,11 +31,14 @@ public class AsnController { @Resource private AsnService asnService; + @Resource + private AsnQueryService asnQueryService; + @Operation(summary = "分页查询 @author 霍锦") @PostMapping("/asn/queryPage") @SaCheckPermission("asn:query") public ResponseDTO> queryPage(@RequestBody @Valid AsnQueryForm queryForm) { - return ResponseDTO.ok(asnService.queryPage(queryForm)); + return ResponseDTO.ok(asnQueryService.queryPage(queryForm)); } @Operation(summary = "添加 @author 霍锦") @@ -57,15 +57,15 @@ public class AsnController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/asn/batchDelete") - @SaCheckPermission("asn:delete") + @SaCheckPermission("asn:batchDelete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return asnService.batchDelete(idList); } @Operation(summary = "单个删除 @author 霍锦") - @GetMapping("/asn/delete/{asnId}") + @GetMapping("/asn/delete") @SaCheckPermission("asn:delete") - public ResponseDTO batchDelete(@PathVariable Long asnId) { + public ResponseDTO delete(@RequestParam Long asnId) { return asnService.delete(asnId); } } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java index 6319d1e..cdfa200 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/dao/AsnDao.java @@ -1,9 +1,9 @@ package net.lab1024.sa.admin.module.business.receive.asn.dao; import java.util.List; -import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java index 2ba863a..d540f43 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/manager/AsnManager.java @@ -1,7 +1,7 @@ package net.lab1024.sa.admin.module.business.receive.asn.manager; -import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java new file mode 100644 index 0000000..4b157c0 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnQueryService.java @@ -0,0 +1,33 @@ +package net.lab1024.sa.admin.module.business.receive.asn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.base.common.domain.PageResult; +import net.lab1024.sa.base.common.util.SmartPageUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AsnQueryService { + + @Resource + private AsnDao asnDao; + + /** + * 分页查询 + * + * @param queryForm 查询条件 + * @return PageResult + */ + public PageResult queryPage(AsnQueryForm queryForm) { + Page page = SmartPageUtil.convert2PageQuery(queryForm); + List list = asnDao.queryPage(page, queryForm); + return SmartPageUtil.convert2PageResult(page, list); + } + + +} diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java index 45c32bc..5c1b285 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/service/AsnService.java @@ -1,12 +1,13 @@ package net.lab1024.sa.admin.module.business.receive.asn.service; import java.util.List; -import net.lab1024.sa.admin.module.business.asn.dao.AsnDao; -import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnAddForm; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm; -import net.lab1024.sa.admin.module.business.asn.domain.form.AsnUpdateForm; -import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao; +import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm; +import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO; +import net.lab1024.sa.admin.module.business.receive.asn.manager.AsnManager; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; @@ -20,9 +21,9 @@ import jakarta.annotation.Resource; /** * 入库单 Service * - * @Author 霍锦 - * @Date 2025-03-26 15:10:02 - * @Copyright 友仓 + * @author 霍锦 + * @since 2025-03-26 15:10:02 + * copyright 友仓 */ @Service @@ -31,21 +32,14 @@ public class AsnService { @Resource private AsnDao asnDao; - /** - * 分页查询 - * - * @param queryForm - * @return - */ - public PageResult queryPage(AsnQueryForm queryForm) { - Page page = SmartPageUtil.convert2PageQuery(queryForm); - List list = asnDao.queryPage(page, queryForm); - PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); - return pageResult; - } + @Resource + private AsnManager asnManager; - /** + /** * 添加 + * + * @param addForm 添加参数 + * @return ResponseDTO */ public ResponseDTO add(AsnAddForm addForm) { AsnEntity asnEntity = SmartBeanUtil.copy(addForm, AsnEntity.class); @@ -56,8 +50,8 @@ public class AsnService { /** * 更新 * - * @param updateForm - * @return + * @param updateForm 更新参数 + * @return ResponseDTO */ public ResponseDTO update(AsnUpdateForm updateForm) { AsnEntity asnEntity = SmartBeanUtil.copy(updateForm, AsnEntity.class); @@ -68,15 +62,15 @@ public class AsnService { /** * 批量删除 * - * @param idList - * @return + * @param idList id集合 + * @return ResponseDTO */ public ResponseDTO batchDelete(List idList) { if (CollectionUtils.isEmpty(idList)){ return ResponseDTO.ok(); } - asnDao.deleteBatchIds(idList); + asnManager.removeBatchByIds(idList); return ResponseDTO.ok(); } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/mapper/AsnMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml similarity index 89% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/mapper/AsnMapper.xml rename to smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml index 03fb4a6..448ab43 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/receive/asn/mapper/AsnMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/asn/AsnMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - SELECT FROM t_asn diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/xxxx.js b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/receive/xxxx.js new file mode 100644 index 0000000..e69de29