add 证书

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.CertificateAddBo;
+import com.zhongzheng.modules.base.bo.CertificateEditBo;
+import com.zhongzheng.modules.base.bo.CertificateQueryBo;
+import com.zhongzheng.modules.base.service.ICertificateService;
+import com.zhongzheng.modules.base.vo.CertificateVo;
+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 ruoyi
+ * @date 2021-10-08
+ */
+@Api(value = "证书控制器", tags = {"证书管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/certificate")
+public class CertificateController extends BaseController {
+
+    private final ICertificateService iCertificateService;
+
+    /**
+     * 查询证书列表
+     */
+    @ApiOperation("查询证书列表")
+    @PreAuthorize("@ss.hasPermi('system:certificate:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CertificateVo> list(CertificateQueryBo bo) {
+        startPage();
+        List<CertificateVo> list = iCertificateService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出证书列表
+     */
+   /* @ApiOperation("导出证书列表")
+    @PreAuthorize("@ss.hasPermi('system:certificate:export')")
+    @Log(title = "证书", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CertificateVo> export(CertificateQueryBo bo) {
+        List<CertificateVo> list = iCertificateService.queryList(bo);
+        ExcelUtil<CertificateVo> util = new ExcelUtil<CertificateVo>(CertificateVo.class);
+        return util.exportExcel(list, "证书");
+    }*/
+
+    /**
+     * 获取证书详细信息
+     */
+    @ApiOperation("获取证书详细信息")
+    @PreAuthorize("@ss.hasPermi('system:certificate:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CertificateVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCertificateService.queryById(id));
+    }
+
+    /**
+     * 新增证书
+     */
+    @ApiOperation("新增证书")
+    @PreAuthorize("@ss.hasPermi('system:certificate:add')")
+    @Log(title = "证书", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CertificateAddBo bo) {
+        return toAjax(iCertificateService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改证书
+     */
+    @ApiOperation("修改证书")
+    @PreAuthorize("@ss.hasPermi('system:certificate:edit')")
+    @Log(title = "证书", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody CertificateEditBo bo) {
+        return toAjax(iCertificateService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除证书
+     */
+   /* @ApiOperation("删除证书")
+    @PreAuthorize("@ss.hasPermi('system:certificate:remove')")
+    @Log(title = "证书" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iCertificateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 证书添加对象 certificate
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+@Data
+@ApiModel("证书添加对象")
+public class CertificateAddBo {
+
+    /** 证书名称 */
+    @ApiModelProperty("证书名称")
+    private String certificateName;
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateEditBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 证书编辑对象 certificate
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+@Data
+@ApiModel("证书编辑对象")
+public class CertificateEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 证书名称 */
+    @ApiModelProperty("证书名称")
+    private String certificateName;
+
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.base.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;
+
+/**
+ * 证书分页查询对象 certificate
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("证书分页查询对象")
+public class CertificateQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 证书名称 */
+	@ApiModelProperty("证书名称")
+	private String certificateName;
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/Certificate.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.base.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;
+
+/**
+ * 证书对象 certificate
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("certificate")
+public class Certificate implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 证书名称 */
+    private String certificateName;
+    /**  状态 1正常 0关闭 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 编码 */
+    private String code;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/CertificateMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.Certificate;
+
+/**
+ * 证书Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+public interface CertificateMapper extends BaseMapper<Certificate> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/ICertificateService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.base.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.CertificateAddBo;
+import com.zhongzheng.modules.base.bo.CertificateEditBo;
+import com.zhongzheng.modules.base.bo.CertificateQueryBo;
+import com.zhongzheng.modules.base.domain.Certificate;
+import com.zhongzheng.modules.base.vo.CertificateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 证书Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+public interface ICertificateService extends IService<Certificate> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CertificateVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<CertificateVo> queryList(CertificateQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入证书
+	 * @param bo 证书新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CertificateAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改证书
+	 * @param bo 证书编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CertificateEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ApplyAreasServiceImpl.java

@@ -73,8 +73,7 @@ public class ApplyAreasServiceImpl extends ServiceImpl<ApplyAreasMapper, ApplyAr
     @Override
     public Boolean insertByAddBo(ApplyAreasAddBo bo) {
         ApplyAreas add = BeanUtil.toBean(bo, ApplyAreas.class);
-        String code = ServletUtils.getEncoded("SS");
-        add.setCode(code);
+        add.setCode(ServletUtils.getEncoded("SS"));
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.base.bo.CertificateAddBo;
+import com.zhongzheng.modules.base.bo.CertificateEditBo;
+import com.zhongzheng.modules.base.bo.CertificateQueryBo;
+import com.zhongzheng.modules.base.domain.Certificate;
+import com.zhongzheng.modules.base.mapper.CertificateMapper;
+import com.zhongzheng.modules.base.service.ICertificateService;
+import com.zhongzheng.modules.base.vo.CertificateVo;
+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 ruoyi
+ * @date 2021-10-08
+ */
+@Service
+public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certificate> implements ICertificateService {
+
+    @Override
+    public CertificateVo queryById(Long id){
+        Certificate db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CertificateVo.class);
+    }
+
+    @Override
+    public List<CertificateVo> queryList(CertificateQueryBo bo) {
+        LambdaQueryWrapper<Certificate> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCertificateName()), Certificate::getCertificateName, bo.getCertificateName());
+        lqw.eq(bo.getStatus() != null, Certificate::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), Certificate::getCode, bo.getCode());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CertificateVo> entity2Vo(Collection<Certificate> collection) {
+        List<CertificateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CertificateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Certificate> page = (Page<Certificate>)collection;
+            Page<CertificateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CertificateAddBo bo) {
+        Certificate add = BeanUtil.toBean(bo, Certificate.class);
+        add.setCode(ServletUtils.getEncoded("ZS"));
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CertificateEditBo bo) {
+        Certificate update = BeanUtil.toBean(bo, Certificate.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(Certificate 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/base/vo/CertificateVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.base.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 ruoyi
+ * @date 2021-10-08
+ */
+@Data
+@ApiModel("证书视图对象")
+public class CertificateVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 证书名称 */
+	@Excel(name = "证书名称")
+	@ApiModelProperty("证书名称")
+	private String certificateName;
+	/**  状态 1正常 0关闭 */
+	@Excel(name = " 状态 1正常 0关闭")
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+}

zhongzheng-system/src/main/resources/mapper/modules/base/CertificateMapper.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.base.mapper.CertificateMapper">
+
+    <resultMap type="com.zhongzheng.modules.base.domain.Certificate" id="CertificateResult">
+        <result property="id" column="id"/>
+        <result property="certificateName" column="certificate_name"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="code" column="code"/>
+    </resultMap>
+
+
+</mapper>