fix 订单录入模板

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInputTemplateController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.order.bo.OrderInputTemplateAddBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateEditBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateQueryBo;
+import com.zhongzheng.modules.order.service.IOrderInputTemplateService;
+import com.zhongzheng.modules.order.vo.OrderInputTemplateVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单采集信息模板Controller
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Api(value = "订单采集信息模板控制器", tags = {"订单采集信息模板管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/input/template")
+public class OrderInputTemplateController extends BaseController {
+
+    private final IOrderInputTemplateService iOrderInputTemplateService;
+
+    /**
+     * 查询订单采集信息模板列表
+     */
+    @ApiOperation("查询订单采集信息模板列表")
+    @PreAuthorize("@ss.hasPermi('system:template:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderInputTemplateVo> list(OrderInputTemplateQueryBo bo) {
+        startPage();
+        List<OrderInputTemplateVo> list = iOrderInputTemplateService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单采集信息模板列表
+     */
+    /*@ApiOperation("导出订单采集信息模板列表")
+    @PreAuthorize("@ss.hasPermi('system:template:export')")
+    @Log(title = "订单采集信息模板", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderInputTemplateVo> export(OrderInputTemplateQueryBo bo) {
+        List<OrderInputTemplateVo> list = iOrderInputTemplateService.queryList(bo);
+        ExcelUtil<OrderInputTemplateVo> util = new ExcelUtil<OrderInputTemplateVo>(OrderInputTemplateVo.class);
+        return util.exportExcel(list, "订单采集信息模板");
+    }*/
+
+    /**
+     * 获取订单采集信息模板详细信息
+     */
+    @ApiOperation("获取订单采集信息模板详细信息")
+    @PreAuthorize("@ss.hasPermi('system:template:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<OrderInputTemplateVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iOrderInputTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增订单采集信息模板
+     */
+    @ApiOperation("新增订单采集信息模板")
+    @PreAuthorize("@ss.hasPermi('system:template:add')")
+    @Log(title = "订单采集信息模板", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody OrderInputTemplateAddBo bo) {
+        return toAjax(iOrderInputTemplateService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单采集信息模板
+     */
+    @ApiOperation("修改订单采集信息模板")
+    @PreAuthorize("@ss.hasPermi('system:template:edit')")
+    @Log(title = "订单采集信息模板", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody OrderInputTemplateEditBo bo) {
+        return toAjax(iOrderInputTemplateService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单采集信息模板
+     */
+    /*@ApiOperation("删除订单采集信息模板")
+    @PreAuthorize("@ss.hasPermi('system:template:remove')")
+    @Log(title = "订单采集信息模板" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iOrderInputTemplateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputTemplateAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单采集信息模板添加对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@ApiModel("订单采集信息模板添加对象")
+public class OrderInputTemplateAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String type;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String name;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputTemplateEditBo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 订单采集信息模板编辑对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@ApiModel("订单采集信息模板编辑对象")
+public class OrderInputTemplateEditBo {
+
+    /** 模板id */
+    @ApiModelProperty("模板id")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String type;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String name;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputTemplateQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单采集信息模板分页查询对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单采集信息模板分页查询对象")
+public class OrderInputTemplateQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String type;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String name;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInputTemplate.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单采集信息模板对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_input_template")
+public class OrderInputTemplate implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 模板id */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private String type;
+    /** $column.columnComment */
+    private String name;
+    /** 备注 */
+    private String remark;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInputTemplateMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderInputTemplate;
+
+/**
+ * 订单采集信息模板Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+public interface OrderInputTemplateMapper extends BaseMapper<OrderInputTemplate> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInputTemplateService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateAddBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateEditBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInputTemplate;
+import com.zhongzheng.modules.order.vo.OrderInputTemplateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单采集信息模板Service接口
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+public interface IOrderInputTemplateService extends IService<OrderInputTemplate> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderInputTemplateVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderInputTemplateVo> queryList(OrderInputTemplateQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单采集信息模板
+	 * @param bo 订单采集信息模板新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderInputTemplateAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单采集信息模板
+	 * @param bo 订单采集信息模板编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderInputTemplateEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputTemplateServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateAddBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateEditBo;
+import com.zhongzheng.modules.order.bo.OrderInputTemplateQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInputTemplate;
+import com.zhongzheng.modules.order.mapper.OrderInputTemplateMapper;
+import com.zhongzheng.modules.order.service.IOrderInputTemplateService;
+import com.zhongzheng.modules.order.vo.OrderInputTemplateVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单采集信息模板Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Service
+public class OrderInputTemplateServiceImpl extends ServiceImpl<OrderInputTemplateMapper, OrderInputTemplate> implements IOrderInputTemplateService {
+
+    @Override
+    public OrderInputTemplateVo queryById(Long id){
+        OrderInputTemplate db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderInputTemplateVo.class);
+    }
+
+    @Override
+    public List<OrderInputTemplateVo> queryList(OrderInputTemplateQueryBo bo) {
+        LambdaQueryWrapper<OrderInputTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getType()), OrderInputTemplate::getType, bo.getType());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), OrderInputTemplate::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, OrderInputTemplate::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderInputTemplateVo> entity2Vo(Collection<OrderInputTemplate> collection) {
+        List<OrderInputTemplateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderInputTemplateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderInputTemplate> page = (Page<OrderInputTemplate>)collection;
+            Page<OrderInputTemplateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderInputTemplateAddBo bo) {
+        OrderInputTemplate add = BeanUtil.toBean(bo, OrderInputTemplate.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderInputTemplateEditBo bo) {
+        OrderInputTemplate update = BeanUtil.toBean(bo, OrderInputTemplate.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderInputTemplate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInputTemplateVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单采集信息模板视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@ApiModel("订单采集信息模板视图对象")
+public class OrderInputTemplateVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 模板id */
+	@ApiModelProperty("模板id")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private String type;
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private String name;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInputTemplateMapper.xml

@@ -0,0 +1,18 @@
+<?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.zhongzheng.modules.order.mapper.OrderInputTemplateMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderInputTemplate" id="OrderInputTemplateResult">
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>