Przeglądaj źródła

add 订单配置

he2802 3 lat temu
rodzic
commit
139b3012f4

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderBusinessConfigController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigAddBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigEditBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo;
+import com.zhongzheng.modules.order.service.IOrderBusinessConfigService;
+import com.zhongzheng.modules.order.vo.OrderBusinessConfigVo;
+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 2022-04-01
+ */
+@Api(value = "录单配置控制器", tags = {"录单配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/business/config")
+public class OrderBusinessConfigController extends BaseController {
+
+    private final IOrderBusinessConfigService iOrderBusinessConfigService;
+
+    /**
+     * 查询录单配置列表
+     */
+    @ApiOperation("查询录单配置列表")
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderBusinessConfigVo> list(OrderBusinessConfigQueryBo bo) {
+        startPage();
+        List<OrderBusinessConfigVo> list = iOrderBusinessConfigService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出录单配置列表
+     */
+   /* @ApiOperation("导出录单配置列表")
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @Log(title = "录单配置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderBusinessConfigVo> export(OrderBusinessConfigQueryBo bo) {
+        List<OrderBusinessConfigVo> list = iOrderBusinessConfigService.queryList(bo);
+        ExcelUtil<OrderBusinessConfigVo> util = new ExcelUtil<OrderBusinessConfigVo>(OrderBusinessConfigVo.class);
+        return util.exportExcel(list, "录单配置");
+    }*/
+
+    /**
+     * 获取录单配置详细信息
+     */
+    @ApiOperation("获取录单配置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<OrderBusinessConfigVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iOrderBusinessConfigService.queryById(id));
+    }
+
+    /**
+     * 新增录单配置
+     */
+    @ApiOperation("新增录单配置")
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "录单配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody OrderBusinessConfigAddBo bo) {
+        return toAjax(iOrderBusinessConfigService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改录单配置
+     */
+    @ApiOperation("修改录单配置")
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "录单配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody OrderBusinessConfigEditBo bo) {
+        return toAjax(iOrderBusinessConfigService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除录单配置
+     */
+   /* @ApiOperation("删除录单配置")
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "录单配置" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iOrderBusinessConfigService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigAddBo.java

@@ -0,0 +1,36 @@
+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_business_config
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+@Data
+@ApiModel("录单配置添加对象")
+public class OrderBusinessConfigAddBo {
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 配置名称 */
+    @ApiModelProperty("配置名称")
+    private String configName;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+}

+ 40 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigEditBo.java

@@ -0,0 +1,40 @@
+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_business_config
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+@Data
+@ApiModel("录单配置编辑对象")
+public class OrderBusinessConfigEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 配置名称 */
+    @ApiModelProperty("配置名称")
+    private String configName;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigQueryBo.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_business_config
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("录单配置分页查询对象")
+public class OrderBusinessConfigQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 配置名称 */
+	@ApiModelProperty("配置名称")
+	private String configName;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

+ 41 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBusinessConfig.java

@@ -0,0 +1,41 @@
+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_business_config
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_business_config")
+public class OrderBusinessConfig implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 业务层次id */
+    private Long businessId;
+    /** 配置名称 */
+    private String configName;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderBusinessConfigMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
+
+/**
+ * 录单配置Mapper接口
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+public interface OrderBusinessConfigMapper extends BaseMapper<OrderBusinessConfig> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderBusinessConfigService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigAddBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigEditBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
+import com.zhongzheng.modules.order.vo.OrderBusinessConfigVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 录单配置Service接口
+ *
+ * @author hjl
+ * @date 2022-04-01
+ */
+public interface IOrderBusinessConfigService extends IService<OrderBusinessConfig> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderBusinessConfigVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderBusinessConfigVo> queryList(OrderBusinessConfigQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入录单配置
+	 * @param bo 录单配置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderBusinessConfigAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改录单配置
+	 * @param bo 录单配置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderBusinessConfigEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 118 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBusinessConfigServiceImpl.java

@@ -0,0 +1,118 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseChapter;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigAddBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigEditBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
+import com.zhongzheng.modules.order.mapper.OrderBusinessConfigMapper;
+import com.zhongzheng.modules.order.service.IOrderBusinessConfigService;
+import com.zhongzheng.modules.order.vo.OrderBusinessConfigVo;
+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 2022-04-01
+ */
+@Service
+public class OrderBusinessConfigServiceImpl extends ServiceImpl<OrderBusinessConfigMapper, OrderBusinessConfig> implements IOrderBusinessConfigService {
+
+    @Override
+    public OrderBusinessConfigVo queryById(Long id){
+        OrderBusinessConfig db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderBusinessConfigVo.class);
+    }
+
+    @Override
+    public List<OrderBusinessConfigVo> queryList(OrderBusinessConfigQueryBo bo) {
+        LambdaQueryWrapper<OrderBusinessConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getBusinessId() != null, OrderBusinessConfig::getBusinessId, bo.getBusinessId());
+        lqw.like(StrUtil.isNotBlank(bo.getConfigName()), OrderBusinessConfig::getConfigName, bo.getConfigName());
+        lqw.eq(bo.getStatus() != null, OrderBusinessConfig::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderBusinessConfigVo> entity2Vo(Collection<OrderBusinessConfig> collection) {
+        List<OrderBusinessConfigVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderBusinessConfigVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderBusinessConfig> page = (Page<OrderBusinessConfig>)collection;
+            Page<OrderBusinessConfigVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderBusinessConfigAddBo bo) {
+        OrderBusinessConfig add = BeanUtil.toBean(bo, OrderBusinessConfig.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderBusinessConfigEditBo bo) {
+        OrderBusinessConfig update = BeanUtil.toBean(bo, OrderBusinessConfig.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderBusinessConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    private boolean checkNameUnique(OrderBusinessConfig entity) {
+        OrderBusinessConfig info = getOne(new LambdaQueryWrapper<OrderBusinessConfig>()
+                .eq(OrderBusinessConfig::getConfigName,entity.getConfigName()).ne(OrderBusinessConfig::getStatus,-1).last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            if(Validator.isNotEmpty(entity.getId())){
+                if(entity.getId().longValue() != info.getId().longValue()){
+                    return true;
+                }
+            }else{
+                return true;
+            }
+        }
+        return false;
+    }
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigVo.java

@@ -0,0 +1,39 @@
+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 2022-04-01
+ */
+@Data
+@ApiModel("录单配置视图对象")
+public class OrderBusinessConfigVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 配置名称 */
+	@Excel(name = "配置名称")
+	@ApiModelProperty("配置名称")
+	private String configName;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

+ 17 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigMapper.xml

@@ -0,0 +1,17 @@
+<?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.OrderBusinessConfigMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderBusinessConfig" id="OrderBusinessConfigResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="configName" column="config_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>