fix:完善数码印花厂回收站功能，增加注释，修改基类id类型

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/FactoryController.java

@@ -10,6 +10,8 @@ import org.dromara.productionManagement.domain.vo.FactoryVo;
 import org.dromara.productionManagement.service.FactoryService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 工厂管理接口
  */
@@ -18,33 +20,94 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/productionManagement/factory")
 public class FactoryController extends BaseController {
     private final FactoryService factoryService;
+
+    /**
+     * 根据条件获取工厂管理列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
         return factoryService.selectPageFactoryList(factoryBo, pageQuery);
     }
+
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 新增结果
+     */
     @PostMapping
     public R<Void> insertFactory(@RequestBody FactoryBo factoryBo){
         return toAjax(factoryService.insertFactory(factoryBo));
     }
+
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 修改结果
+     */
     @PutMapping
     public R<Void> updateFactory(@RequestBody FactoryBo factoryBo){
         return toAjax(factoryService.updateFactory(factoryBo));
     }
+
+    /**
+     * 将工厂放入回收站
+     * @param ids 工厂id数组
+     * @return 回收结果
+     */
     @DeleteMapping("/{ids}")
-    public R<Void> deleteFactoryByIds(@PathVariable Long[] ids) {
+    public R<Void> deleteFactoryByIds(@PathVariable List<Integer> ids) {
         return toAjax(factoryService.deleteFactoryByIds(ids));
     }
 
+    /**
+     * 根据条件查询回收站工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/recycle")
     public TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
         return factoryService.selectRecycleFactoryList(factoryBo, pageQuery);
     }
+
+    /**
+     * 还原回收站中指定id的工厂
+     * @param ids 工厂id数组
+     * @return 还原结果
+     */
     @PostMapping("/recycle/back/{ids}")
-    public R<Void> backFactoryByIds(@PathVariable Long[] ids) {
+    public R<Void> backFactoryByIds(@PathVariable List<Integer> ids) {
         return toAjax(factoryService.backFactoryByIds(ids));
     }
+
+    /**
+     * 还原回收站中的全部工厂
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backFactoryAll() {
+        return toAjax(factoryService.backFactoryAll());
+    }
+
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param ids 工厂id数组
+     * @return 销毁结果
+     */
     @DeleteMapping("/recycle/{ids}")
-    public R<Void> deleteRecycleFactoryByIds(@PathVariable Long[] ids) {
+    public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
         return toAjax(factoryService.deleteRecycleFactoryByIds(ids));
     }
+
+    /**
+     * 销毁回收站中的全部工厂
+     * @return 销毁结果
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecycleFactoryAll() {
+        return toAjax(factoryService.deleteRecycleFactoryAll());
+    }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/Factory.java

@@ -1,6 +1,4 @@
 package org.dromara.productionManagement.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -16,7 +14,7 @@ public class Factory extends TenantEntity {
     /**
      * id
      */
-    private Long id;
+    private int id;
     /**
      * 工厂名称
      */
@@ -30,16 +28,6 @@ public class Factory extends TenantEntity {
      * 联系人
      */
     private String linkman;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createtime;
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updatetime;
     /**
      * 删除时间
      */

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/FactoryBo.java

@@ -19,7 +19,7 @@ public class FactoryBo extends BaseEntity implements Serializable {
     /**
      * id
      */
-    private Long id;
+    private int id;
     /**
      * 工厂名称
      */
@@ -32,14 +32,6 @@ public class FactoryBo extends BaseEntity implements Serializable {
      * 联系人
      */
     private String linkman;
-    /**
-     * 创建时间
-     */
-    private Date createtime;
-    /**
-     * 更新时间
-     */
-    private Date updatetime;
     /**
      * 删除时间
      */

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/FactoryVo.java

@@ -18,7 +18,7 @@ public class FactoryVo extends BaseEntity {
     /**
      * id
      */
-    private Long id;
+    private int id;
     /**
      * 工厂名称
      */
@@ -31,14 +31,6 @@ public class FactoryVo extends BaseEntity {
      * 联系人
      */
     private String linkman;
-    /**
-     * 创建时间
-     */
-    private Date createtime;
-    /**
-     * 更新时间
-     */
-    private Date updatetime;
     /**
      * 删除时间
      */

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/FactoryMapper.java

@@ -7,6 +7,10 @@ import org.dromara.productionManagement.domain.vo.FactoryVo;
 
 @Mapper
 public interface FactoryMapper extends BaseMapperPlus<Factory, FactoryVo> {
+    /**
+     * 还原回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     */
      void backFactoryByIds(Long[] factoryIds);
 }
 

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/FactoryService.java

@@ -5,12 +5,61 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.domain.bo.FactoryBo;
 import org.dromara.productionManagement.domain.vo.FactoryVo;
 
+import java.util.List;
+
 public interface FactoryService {
+    /**
+     * 根据条件查询工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery);
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 影响行数
+     */
     int insertFactory(FactoryBo factoryBo);
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 影响行数
+     */
     int updateFactory(FactoryBo factoryBo);
-    int deleteFactoryByIds(Long[] factoryIds);
+    /**
+     * 将工厂放入回收站
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int deleteFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 查询回收站列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery);
-    int backFactoryByIds(Long[] factoryIds);
-    int deleteRecycleFactoryByIds(Long[] factoryIds);
+    /**
+     * 将工厂从回收站还原
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int backFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int deleteRecycleFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 还原回收站中的全部工厂
+     * @return 影响行数
+     */
+    int backFactoryAll();
+    /**
+     * 销毁回收站中的全部工厂
+     * @return 影响行数
+     */
+    int deleteRecycleFactoryAll();
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/FactoryServiceImpl.java

@@ -15,65 +15,129 @@ import org.dromara.productionManagement.mapper.FactoryMapper;
 import org.dromara.productionManagement.service.FactoryService;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
 public class FactoryServiceImpl implements FactoryService {
     private final FactoryMapper factoryMapper;
+
+    /**
+     * 查询数码印花厂管理列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery){
         QueryWrapper<Factory> qw=new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
-        qw.eq(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
-        qw.eq(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
+        qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
+        qw.like(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
+        qw.like(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
         qw.isNull("deletetime");
         Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertFactory(FactoryBo factoryBo){
         Factory factory= MapstructUtils.convert(factoryBo, Factory.class);
         return factoryMapper.insert(factory);
     }
+
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updateFactory(FactoryBo factoryBo){
         Factory factory= MapstructUtils.convert(factoryBo, Factory.class);
         return factoryMapper.updateById(factory);
     }
+
+    /**
+     * 将指定id的工厂移入回收站
+     * @param factoryIds 工厂id数组
+     * @return 删除结果
+     */
     @Override
-    public int deleteFactoryByIds(Long[] factoryIds){
-        List<Factory> factoryList = new ArrayList<>();
-        for (Long factoryId : factoryIds) {
-            Factory factory = new Factory();
-            factory.setId(factoryId);
-            factory.setDeletetime(new Date());
-            factoryList.add(factory);
-        }
-        return factoryMapper.updateById(factoryList).size();
+    public int deleteFactoryByIds(List<Integer> factoryIds){
+        UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", factoryIds);
+        updateWrapper.set("deletetime",new Date());
+        return factoryMapper.update(updateWrapper);
     }
 
+    /**
+     * 还原回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 还原结果
+     */
     @Override
-    public int backFactoryByIds(Long[] factoryIds){
+    public int backFactoryByIds(List<Integer> factoryIds){
         UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
-        updateWrapper.in("id",factoryIds);
+        updateWrapper.in("id", factoryIds);
         updateWrapper.set("deletetime",null);
         return factoryMapper.update(updateWrapper);
     }
 
+    /**
+     * 查询回收站中的工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
         QueryWrapper<Factory> qw=new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
+        Map<String, Object> params = factoryBo.getParams();
+        qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
         qw.isNotNull("deletetime");
         Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 销毁结果
+     */
     @Override
-    public int deleteRecycleFactoryByIds(Long[] factoryIds) {
-        return factoryMapper.deleteByIds(Arrays.asList(factoryIds));
+    public int deleteRecycleFactoryByIds(List<Integer> factoryIds) {
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.in("id",factoryIds);
+        qw.isNotNull("deletetime");
+        return factoryMapper.delete(qw);
     }
+
+    /**
+     * 还原回收站中所有的工厂
+     * @return 还原结果
+     */
+    @Override
+    public int backFactoryAll() {
+        UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return factoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 销毁回收站中所有的工厂
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecycleFactoryAll() {
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return factoryMapper.delete(qw);
+    }
+
 }