feat:新增烧花工厂功能

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/OrderRecordController.java

@@ -1,6 +1,7 @@
 package org.dromara.bulk.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.OrderRecordBo;
 import org.dromara.bulk.domain.vo.OrderRecordVo;
@@ -18,6 +19,13 @@ public class OrderRecordController {
 
     private final OrderRecordService orderRecordService;
 
+    /**
+     * 查询客户下单记录列表
+     * @param orderRecordBo
+     * @param page
+     * @return
+     */
+    @SaIgnore
     @GetMapping("PageList")
     public TableDataInfo<OrderRecordVo> selectPageOrderRecordList(OrderRecordBo orderRecordBo, PageQuery page) {
         return orderRecordService.selectPageOrderList(orderRecordBo,page);

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

@@ -13,6 +13,9 @@ 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;
 
 

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

@@ -0,0 +1,92 @@
+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.*;
+
+import java.util.List;
+
+/**
+ * 烧花工厂管理接口
+ */
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/productionManagement/shaohuaFactory")
+public class ShaoHuaFactoryController extends BaseController {
+
+    private final ShaoHuaFactoryService shaoHuaFactoryService;
+
+    /**
+     * 分页查询烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery) {
+        return shaoHuaFactoryService.selectPageShaoHuaFactoryList(shaohuaFactoryBo, pageQuery);
+    }
+
+    /**
+     * 新增烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @PostMapping
+    public R<Void> insertFactory(@RequestBody ShaoHuaFactoryBo shaohuaFactoryBo){
+        return toAjax(shaoHuaFactoryService.insertFactory(shaohuaFactoryBo));
+    }
+
+    /**
+     * 修改烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @PutMapping
+    public R<Void> updateFactory(@RequestBody ShaoHuaFactoryBo shaohuaFactoryBo){
+        return toAjax(shaoHuaFactoryService.updateFactory(shaohuaFactoryBo));
+    }
+
+    /**
+     * 删除烧花工厂信息
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> deleteFactoryByIds(@PathVariable int [] ids) {
+        return toAjax(shaoHuaFactoryService.deleteFactoryByIds(ids));
+    }
+
+    /**
+     * 回收站查询
+     * @param shaohuafactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/recycle")
+    public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
+        return shaoHuaFactoryService.selectRecycleFactoryList(shaohuafactoryBo, pageQuery);
+    }
+
+    /**
+     * 回收站还原
+     * @param ids
+     * @return
+     */
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(shaoHuaFactoryService.backFactoryByIds(ids));
+    }
+
+}

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

@@ -0,0 +1,60 @@
+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;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 烧花工厂基类
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_sh_factory")
+public class ShaoHuaFactory extends TenantEntity {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    @NotBlank(message = "工厂名称不能为空")
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+
+}

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

@@ -0,0 +1,59 @@
+package org.dromara.productionManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 烧花工厂业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHuaFactory.class, reverseConvertGenerate = false)
+public class ShaoHuaFactoryBo extends BaseEntity implements Serializable {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+
+}

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

@@ -0,0 +1,57 @@
+package org.dromara.productionManagement.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+
+import java.util.Date;
+
+/**
+ * 烧花工厂业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHuaFactory.class)
+public class ShaoHuaFactoryVo extends BaseEntity {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+}

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

@@ -0,0 +1,11 @@
+package org.dromara.productionManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+
+@Mapper
+public interface ShaoHuaFactoryMapper extends BaseMapperPlus<ShaoHuaFactory, ShaoHuaFactoryVo> {
+}

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

@@ -0,0 +1,23 @@
+package org.dromara.productionManagement.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.productionManagement.domain.bo.ShaoHuaFactoryBo;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+
+import java.util.List;
+
+public interface ShaoHuaFactoryService {
+
+    TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery);
+
+    int insertFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
+
+    int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
+
+    int deleteFactoryByIds(int[] ids);
+
+    TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery);
+
+    int backFactoryByIds(List<Integer> ids);
+}

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

@@ -0,0 +1,80 @@
+package org.dromara.productionManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+import org.dromara.productionManagement.domain.bo.ShaoHuaFactoryBo;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+import org.dromara.productionManagement.mapper.ShaoHuaFactoryMapper;
+import org.dromara.productionManagement.service.ShaoHuaFactoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
+
+    private final ShaoHuaFactoryMapper shaoHuaFactoryMapper;
+
+    @Override
+    public TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getName()), "name", shaohuaFactoryBo.getName());
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getAddress()), "address", shaohuaFactoryBo.getAddress());
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getLinkman()), "linkman", shaohuaFactoryBo.getLinkman());
+        qw.isNull("deletetime");
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public int insertFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
+        ShaoHuaFactory shaohuaFactory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
+        return shaoHuaFactoryMapper.insert(shaohuaFactory);
+    }
+
+    @Override
+    public int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
+        ShaoHuaFactory factory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
+        return shaoHuaFactoryMapper.updateById(factory);
+    }
+
+    @Override
+    public int deleteFactoryByIds(int[] ids) {
+        List<ShaoHuaFactory> list = new ArrayList<>();
+        for (int factoryId : ids) {
+            ShaoHuaFactory factory = new ShaoHuaFactory();
+            factory.setId(factoryId);
+            factory.setDeleteTime(new Date());
+            list.add(factory);
+        }
+        return shaoHuaFactoryMapper.updateById(list).size();
+    }
+
+    @Override
+    public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        qw.isNotNull("deletetime");
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public int backFactoryByIds(List<Integer> ids) {
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",ids);
+        updateWrapper.set("deletetime",null);
+        return shaoHuaFactoryMapper.update(updateWrapper);
+    }
+
+}

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/resources/mapper/ShaoHuaFactoryMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.productionManagement.mapper.ShaoHuaFactoryMapper">
+    <resultMap id="BaseResultMap" type="org.dromara.productionManagement.domain.ShaoHuaFactory">
+    </resultMap>
+<!--    <update id="backFactoryByIds">-->
+<!--        update fa_kuyou_factory set deletetime = null where id in-->
+<!--        <foreach collection="array" item="id" open="(" separator="," close=")">-->
+<!--            #{id}-->
+<!--        </foreach>-->
+<!--    </update>-->
+
+</mapper>