fix:新增并修改烧花工厂功能

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/OrderRecordService.java

@@ -1,11 +1,9 @@
 package org.dromara.bulk.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.dromara.bulk.domain.bo.OrderRecordBo;
 import org.dromara.bulk.domain.vo.OrderRecordVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.springframework.data.domain.Page;
 
 public interface OrderRecordService {
     TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page);

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/OrderRecordServiceImpl.java

@@ -13,9 +13,6 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 
@@ -25,6 +22,12 @@ public class OrderRecordServiceImpl implements OrderRecordService {
 
     private final OrderRecordMapper orderRecordMapper;
 
+    /**
+     * 查询客户下单记录列表
+     * @param orderRecordBo
+     * @param page
+     * @return
+     */
     @Override
     public TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page) {
         QueryWrapper<OrderRecord> qw = new QueryWrapper<>();

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

@@ -1,15 +1,11 @@
 package org.dromara.productionManagement.controller;
 
-
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.productionManagement.domain.bo.FactoryBo;
 import org.dromara.productionManagement.domain.bo.ShaoHuaFactoryBo;
-import org.dromara.productionManagement.domain.vo.FactoryVo;
 import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
 import org.dromara.productionManagement.service.ShaoHuaFactoryService;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +15,6 @@ import java.util.List;
 /**
  * 烧花工厂管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/shaohuaFactory")
@@ -80,7 +75,7 @@ public class ShaoHuaFactoryController extends BaseController {
     }
 
     /**
-     * 回收站还原
+     * 回收站还原（id还原）
      * @param ids
      * @return
      */
@@ -89,4 +84,31 @@ public class ShaoHuaFactoryController extends BaseController {
         return toAjax(shaoHuaFactoryService.backFactoryByIds(ids));
     }
 
+    /**
+     * 回收站还原（全部还原）
+     * @return
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backFactoryAll() {
+        return toAjax(shaoHuaFactoryService.backFactoryAll());
+    }
+
+    /**
+     * 回收站删除（id删除）
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryByIds(ids));
+    }
+
+    /**
+     * 回收站删除（全部删除）
+     * @return
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecycleFactoryAll() {
+        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryAll());
+    }
 }

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

@@ -20,4 +20,10 @@ public interface ShaoHuaFactoryService {
     TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery);
 
     int backFactoryByIds(List<Integer> ids);
+
+    int backFactoryAll();
+
+    int deleteRecycleFactoryByIds(List<Integer> ids);
+
+    int deleteRecycleFactoryAll();
 }

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

@@ -25,6 +25,12 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     private final ShaoHuaFactoryMapper shaoHuaFactoryMapper;
 
+    /**
+     * 分页查询烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @param pageQuery
+     * @return
+     */
     @Override
     public TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
@@ -36,18 +42,33 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 新增烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
     @Override
     public int insertFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
         ShaoHuaFactory shaohuaFactory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
         return shaoHuaFactoryMapper.insert(shaohuaFactory);
     }
 
+    /**
+     * 修改烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
     @Override
     public int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
         ShaoHuaFactory factory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
         return shaoHuaFactoryMapper.updateById(factory);
     }
 
+    /**
+     * 删除烧花工厂信息（删除到回收站）
+     * @param ids
+     * @return
+     */
     @Override
     public int deleteFactoryByIds(int[] ids) {
         List<ShaoHuaFactory> list = new ArrayList<>();
@@ -60,6 +81,12 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
         return shaoHuaFactoryMapper.updateById(list).size();
     }
 
+    /**
+     * 查询回收站信息
+     * @param shaohuafactoryBo
+     * @param pageQuery
+     * @return
+     */
     @Override
     public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
@@ -69,6 +96,11 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 回收站还原（id还原）
+     * @param ids
+     * @return
+     */
     @Override
     public int backFactoryByIds(List<Integer> ids) {
         UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
@@ -77,4 +109,40 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
         return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
+    /**
+     * 回收站还原（全部还原）
+     * @return
+     */
+    @Override
+    public int backFactoryAll() {
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return shaoHuaFactoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 回收站删除（id删除）
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> ids) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.in("id",ids);
+        qw.isNotNull("deletetime");
+        return shaoHuaFactoryMapper.delete(qw);
+    }
+
+    /**
+     * 回收站删除（全部删除）
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryAll() {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return shaoHuaFactoryMapper.delete(qw);
+    }
+
+
 }