kgy 5 месяцев назад
Родитель
Сommit
fa699c7c33

+ 3 - 0
ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/CustomerService.java

@@ -8,6 +8,9 @@ import org.dromara.customerManagement.domain.vo.CustomerVo;
 
 import java.util.List;
 
+/**
+ * 客户Service接口
+ */
 public interface CustomerService {
     /**
      * 查询客户管理列表

+ 39 - 2
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/WorkShopController.java

@@ -1,5 +1,4 @@
 package org.dromara.dataManagement.controller;
-
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletResponse;
@@ -14,35 +13,73 @@ import org.dromara.dataManagement.domain.vo.WorkShopVo;
 import org.dromara.dataManagement.service.WorkShopService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.HashMap;
 
+/**
+ * 车间管理接口
+ */
 @SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/workshop")
 public class WorkShopController extends BaseController {
     private final WorkShopService workShopService;
+
+    /**
+     * 查询车间管理列表
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
         return workShopService.selectPageWorkshopList(workshopBo, pageQuery);
     }
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 新增结果
+     */
     @PostMapping()
     public R<Void> insertWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
         return toAjax(workShopService.insertWorkShop(workshopBo));
     }
+
+    /**
+     * 修改车间
+     * @param workshopBo 车间Bo对象
+     * @return 修改结果
+     */
     @PutMapping()
     public R<Void> updateWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
         return toAjax(workShopService.updateWorkShop(workshopBo));
     }
+
+    /**
+     * 删除车间
+     * @param workshopIds 车间ID数组
+     * @return 删除结果
+     */
     @DeleteMapping("/{workshopIds}")
     public R<Void> deleteWorkShopByIds(@PathVariable Long[] workshopIds){
         return toAjax(workShopService.deleteWorkShopByIds(workshopIds));
     }
+
+    /**
+     * 通过Excel导出车间数据
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcel")
     public void exportWorkShopExcel(HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectList()),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
     }
+
+    /**
+     * 根据车间Ids导出Excel
+     * @param workshopIds 车间Ids数组
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcelByIds")
     public void exportWorkShopExcel(@RequestParam("ids")Long[] workshopIds,HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectWorkshopListByIds(workshopIds)),"车间列表.xlsx","excel/车间导出模板.xlsx",response);

+ 5 - 4
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/WorkShopBo.java

@@ -2,14 +2,15 @@ package org.dromara.dataManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.dataManagement.domain.WorkShop;
 
+/**
+ * 车间业务对象
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WorkShop.class,reverseConvertGenerate = false)
-public class WorkShopBo extends BaseEntity {
+public class WorkShopBo {
     /**
      * 车间id
      */

+ 5 - 4
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/WorkShopVo.java

@@ -2,14 +2,15 @@ package org.dromara.dataManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.dataManagement.domain.WorkShop;
 
+/**
+ * 车间值对象
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WorkShop.class)
-public class WorkShopVo extends BaseEntity {
+public class WorkShopVo {
     /**
      * 车间id
      */

+ 39 - 1
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/WorkShopService.java

@@ -5,14 +5,52 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dataManagement.domain.WorkShop;
 import org.dromara.dataManagement.domain.bo.WorkShopBo;
 import org.dromara.dataManagement.domain.vo.WorkShopVo;
-
 import java.util.List;
 
+/**
+ * 车间Service接口
+ */
+
 public interface WorkShopService {
+    /**
+     * 查询车间列表
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery);
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 影响行数
+     */
     int insertWorkShop(WorkShopBo workshopBo);
+
+    /**
+     * 更新车间
+     * @param workshopBo 车间Bo对象
+     * @return 影响行数
+     */
     int updateWorkShop(WorkShopBo workshopBo);
+
+    /**
+     * 删除车间
+     * @param workshopIds 车间id数组
+     * @return 影响行数
+     */
     int deleteWorkShopByIds(Long[] workshopIds);
+
+    /**
+     * 查询车间列表
+     * @return 车间列表
+     */
     List<WorkShop> selectList();
+
+    /**
+     * 根据车间Ids查询车间列表
+     * @param workshopIds 车间id数组
+     * @return 车间列表
+     */
     List<WorkShop> selectWorkshopListByIds(Long[] workshopIds);
 }

+ 24 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/WorkShopServiceImpl.java

@@ -22,6 +22,12 @@ import java.util.List;
 public class WorkShopServiceImpl implements WorkShopService {
     private final WorkShopMapper workShopMapper;
 
+    /**
+     * 查询车间对象分页查询车间数据
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
         QueryWrapper<WorkShop> qw=new QueryWrapper<>();
@@ -31,11 +37,23 @@ public class WorkShopServiceImpl implements WorkShopService {
         Page<WorkShopVo>page =workShopMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 结果
+     */
     @Override
     public int insertWorkShop(WorkShopBo workshopBo) {
         WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
         return workShopMapper.insert(workShop);
     }
+
+    /**
+     * 修改车间
+     * @param workshopBo 车间Bo对象
+     * @return 结果
+     */
     @Override
     public int updateWorkShop(WorkShopBo workshopBo) {
         WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
@@ -43,6 +61,12 @@ public class WorkShopServiceImpl implements WorkShopService {
         qw.eq("id",workshopBo.getId());
         return workShopMapper.updateById(workShop);
     }
+
+    /**
+     * 删除车间
+     * @param ids 车间id数组
+     * @return 结果
+     */
     @Override
     public int deleteWorkShopByIds(Long[] ids) {
         return workShopMapper.deleteByIds(Arrays.asList(ids));