提交

code-generation/src/main/java/com/sd/Generation.java

@@ -6,7 +6,7 @@ public class Generation {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://121.37.194.75:30102/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .url("jdbc:mysql://121.37.194.75:30102/shdy_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
                 .username("root")
                 .password("5fWD*oa^nso@kmKa")
                 .port(9989)

sd-business/src/main/java/com/sd/business/controller/warehouse/WarehouseController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.warehouse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import com.sd.business.service.warehouse.WarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 仓库 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@RestController
+@RequestMapping("/warehouse")
+public class WarehouseController {
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    /**
+     * 仓库分页
+     */
+    @PostMapping("/page")
+    public Page<WarehouseVo> page(@RequestBody WarehouseSelectDto dto) {
+        return warehouseService.getPage(dto);
+    }
+
+    /**
+     * 仓库明细
+     */
+    @PostMapping("/detail")
+    public WarehouseVo detail(@RequestBody BaseSelectDto dto) {
+        return warehouseService.detail(dto.getId());
+    }
+
+    /**
+     * 仓库新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody WarehouseDto warehouseDto) {
+        warehouseService.add(warehouseDto);
+    }
+
+    /**
+     * 仓库编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody WarehouseDto warehouseDto) {
+        warehouseService.edit(warehouseDto);
+    }
+
+    /**
+     * 仓库删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        warehouseService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.warehouse.dto;
+
+import com.sd.business.entity.warehouse.po.Warehouse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库新增编辑入参实体
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@Getter
+@Setter
+public class WarehouseDto extends Warehouse {
+
+}

sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseSelectDto.java

@@ -0,0 +1,27 @@
+package com.sd.business.entity.warehouse.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库列表查询入参实体
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@Getter
+@Setter
+public class WarehouseSelectDto extends BaseSelectDto {
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String type;
+
+    /**
+     * 仓库名称
+     */
+    private String name;
+
+}

sd-business/src/main/java/com/sd/business/entity/warehouse/po/Warehouse.java

@@ -0,0 +1,41 @@
+package com.sd.business.entity.warehouse.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 仓库
+ * </p>
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@Getter
+@Setter
+@TableName("warehouse")
+public class Warehouse extends BasePo {
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String type;
+
+    /**
+     * 仓库编号 对应E10上的仓库编号
+     */
+    private String code;
+
+    /**
+     * 仓库名称
+     */
+    private String name;
+
+    /**
+     * 仓库说明
+     */
+    private String remark;
+
+}

sd-business/src/main/java/com/sd/business/entity/warehouse/vo/WarehouseVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.warehouse.vo;
+
+import com.sd.business.entity.warehouse.po.Warehouse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库列表查询返回值实体
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@Getter
+@Setter
+public class WarehouseVo extends Warehouse {
+
+}

sd-business/src/main/java/com/sd/business/mapper/warehouse/WarehouseMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.warehouse;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 仓库 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-11-07
+ */
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
+
+    /**
+     * 仓库分页
+     */
+    Page<WarehouseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Warehouse> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/warehouse/WarehouseService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.warehouse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+
+
+/**
+ * <p>
+ * 仓库 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-11-07
+ */
+public interface WarehouseService extends BaseService<Warehouse> {
+
+    /**
+     * 仓库分页
+     */
+    Page<WarehouseVo> getPage(WarehouseSelectDto dto);
+
+    /**
+     * 仓库明细
+     */
+    WarehouseVo detail(Long id);
+
+    /**
+     * 仓库新增
+     */
+    void add(WarehouseDto warehouseDto);
+
+    /**
+     * 仓库编辑
+     */
+    void edit(WarehouseDto warehouseDto);
+
+    /**
+     * 仓库删除
+     */
+    void delete(Long id);
+
+}

sd-business/src/main/java/com/sd/business/service/warehouse/impl/WarehouseServiceImpl.java

@@ -0,0 +1,58 @@
+package com.sd.business.service.warehouse.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import com.sd.business.mapper.warehouse.WarehouseMapper;
+import com.sd.business.service.warehouse.WarehouseService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 仓库 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-11-07
+ */
+@Service
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
+
+    @Override
+    public Page<WarehouseVo> getPage(WarehouseSelectDto dto) {
+        IWrapper<Warehouse> wrapper = getWrapper();
+        wrapper.orderByDesc("w", Warehouse::getId);
+        wrapper.eq("w", Warehouse::getType, dto.getType());
+        wrapper.like("w", Warehouse::getName, dto.getName());
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
+    }
+
+    @Override
+    public WarehouseVo detail(Long id) {
+        Warehouse warehouse = this.getById(id);
+        WarehouseVo result = BeanUtil.toBean(warehouse, WarehouseVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(WarehouseDto warehouseDto) {
+        this.save(warehouseDto);
+    }
+
+    @Override
+    public void edit(WarehouseDto warehouseDto) {
+        this.updateById(warehouseDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

sd-business/src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.sd.business.mapper.warehouse.WarehouseMapper">
+    <select id="getPage" resultType="com.sd.business.entity.warehouse.vo.WarehouseVo">
+        select
+            w.id,
+            w.type,
+            w.code,
+            w.name,
+            w.remark,
+            w.create_user,
+            w.create_time,
+            w.update_user,
+            w.update_time
+        from warehouse w
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

sd-framework/src/main/java/com/sd/framework/util/TemplateExcelUtil.java

@@ -67,6 +67,7 @@ public class TemplateExcelUtil {
         }
 
     }
+
     /**
      * 自定义模板excel写入浏览器
      *

sd-framework/src/main/java/com/sd/framework/util/excel/util/ExcelUtil.java

@@ -168,16 +168,17 @@ public class ExcelUtil {
 
     /**
      * 获取修改ExcelProperty的value值的class，用于导出
-     * @param t 类对象
+     *
+     * @param t    类对象
      * @param keys key为修改的字段和value为它对应表头值
      * @return
      */
     public static <T> Class<T> getClassNew(T t, Map<String, String> keys) {
-        if(t == null) {
+        if (t == null) {
             return null;
         }
-        try{
-            for(String key: keys.keySet()) {
+        try {
+            for (String key : keys.keySet()) {
                 Field value = t.getClass().getDeclaredField(key);
                 value.setAccessible(true);
                 ExcelProperty property = value.getAnnotation(ExcelProperty.class);

sd-starter/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
           username: root
           password: 5fWD*oa^nso@kmKa
         business:
-          url: jdbc:mysql://121.37.194.75:30102/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.37.194.75:30102/shdy_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: 5fWD*oa^nso@kmKa
 

sd-starter/src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
           username: sd_prod
           password: lG0-nX8#rJ4#jT5
         business:
-          url: jdbc:mysql://192.168.0.238:23063/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://192.168.0.238:23063/shdy_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: sd_prod
           password: lG0-nX8#rJ4#jT5
 

sd-starter/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
           username: root
           password: 5fWD*oa^nso@kmKa
         business:
-          url: jdbc:mysql://127.0.0.1:30102/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:30102/shdy_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: 5fWD*oa^nso@kmKa