Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/PaperArchivesResult.java

@@ -0,0 +1,46 @@
+package com.qmth.paper.library.business.bean.result;
+
+import com.qmth.paper.library.business.entity.PaperArchives;
+
+public class PaperArchivesResult extends PaperArchives {
+
+    private String archivesTypeName;
+
+    private String semesterName;
+
+    private String orgName;
+
+    private String managerOrgName;
+
+    public String getArchivesTypeName() {
+        return archivesTypeName;
+    }
+
+    public void setArchivesTypeName(String archivesTypeName) {
+        this.archivesTypeName = archivesTypeName;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getManagerOrgName() {
+        return managerOrgName;
+    }
+
+    public void setManagerOrgName(String managerOrgName) {
+        this.managerOrgName = managerOrgName;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperArchives.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.paper.library.common.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -27,17 +28,20 @@ public class PaperArchives extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "学期id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("semester_id")
+    @NotBlank(message = "请选择档学期")
     private Long semesterId;
 
-    @ApiModelProperty(value = "机构id")
+    @ApiModelProperty(value = "档案管理部门Id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
-    private Long orgId;
+    @TableField("manager_org_id")
+    @NotBlank(message = "请选择档案管理部门")
+    private Long managerOrgId;
 
     /**
      * 档案名称
      */
     @TableField("archives_name")
+    @NotBlank(message = "档案名称必填")
     private String archivesName;
 
     /**
@@ -49,11 +53,13 @@ public class PaperArchives extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "档案类型id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("archives_type_id")
+    @NotBlank(message = "请选择档案类型")
     private Long archivesTypeId;
 
     @ApiModelProperty(value = "档案管理员")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("manager_id")
+    @NotBlank(message = "请选择档案管理员")
     private Long managerId;
 
     @ApiModelProperty(value = "档案到期预警时间")
@@ -77,12 +83,12 @@ public class PaperArchives extends BaseEntity implements Serializable {
         this.semesterId = semesterId;
     }
 
-    public Long getOrgId() {
-        return orgId;
+    public Long getManagerOrgId() {
+        return managerOrgId;
     }
 
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
+    public void setManagerOrgId(Long managerOrgId) {
+        this.managerOrgId = managerOrgId;
     }
 
     public String getArchivesName() {

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperArchivesType.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.paper.library.common.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -28,8 +29,9 @@ public class PaperArchivesType extends BaseEntity implements Serializable {
     /**
      * 类型名称
      */
-    @TableField("archivesType")
-    private String archives_type;
+    @NotBlank(message = "类型名称必填")
+    @TableField("archives_type_name")
+    private String archivesTypeName;
 
     public Long getSchoolId() {
         return schoolId;
@@ -39,11 +41,11 @@ public class PaperArchivesType extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
-    public String getArchives_type() {
-        return archives_type;
+    public String getArchivesTypeName() {
+        return archivesTypeName;
     }
 
-    public void setArchives_type(String archives_type) {
-        this.archives_type = archives_type;
+    public void setArchivesTypeName(String archivesTypeName) {
+        this.archivesTypeName = archivesTypeName;
     }
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesMapper.java

@@ -1,7 +1,11 @@
 package com.qmth.paper.library.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -10,4 +14,7 @@ import com.qmth.paper.library.business.entity.PaperArchives;
  */
 public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
+    IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName);
+
+    PaperArchives selectByArchivesName(@Param("schoolId") Long schoolId, @Param("archivesName") String archivesName);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesTypeMapper.java

@@ -2,6 +2,7 @@ package com.qmth.paper.library.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -10,4 +11,5 @@ import com.qmth.paper.library.business.entity.PaperArchivesType;
  */
 public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
 
+    PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("archivesTypeName") String archivesTypeName);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesService.java

@@ -1,6 +1,8 @@
 package com.qmth.paper.library.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
 
 /**
@@ -10,4 +12,9 @@ import com.qmth.paper.library.business.entity.PaperArchives;
  */
 public interface PaperArchivesService extends IService<PaperArchives> {
 
+    IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize);
+
+    boolean saveData(PaperArchives paperArchives);
+
+    boolean delete(Long id);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesTypeService.java

@@ -1,5 +1,6 @@
 package com.qmth.paper.library.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 
@@ -10,4 +11,9 @@ import com.qmth.paper.library.business.entity.PaperArchivesType;
  */
 public interface PaperArchivesTypeService extends IService<PaperArchivesType> {
 
+    IPage<PaperArchivesType> pageData(Integer pageNumber, Integer pageSize);
+
+    boolean saveData(PaperArchivesType paperArchivesType);
+
+    boolean delete(Long id);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperScanTaskService.java

@@ -3,6 +3,8 @@ package com.qmth.paper.library.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 
+import java.util.List;
+
 /**
  * <p>
  * 扫描任务表 服务类
@@ -10,4 +12,5 @@ import com.qmth.paper.library.business.entity.PaperScanTask;
  */
 public interface PaperScanTaskService extends IService<PaperScanTask> {
 
+    List<PaperScanTask> listByPaperArchivesId(Long id);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesServiceImpl.java

@@ -1,11 +1,23 @@
 package com.qmth.paper.library.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
+import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperArchivesMapper;
 import com.qmth.paper.library.business.service.PaperArchivesService;
+import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
+import com.qmth.paper.library.common.enums.ExceptionResultEnum;
+import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 档案管理表 服务实现类
@@ -14,4 +26,43 @@ import org.springframework.stereotype.Service;
 @Service
 public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, PaperArchives> implements PaperArchivesService {
 
+    @Resource
+    PaperScanTaskService paperScanTaskService;
+
+    @Override
+    public IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize) {
+        return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), semesterId, managerOrgId, archivesTypeId, archivesName);
+    }
+
+    @Override
+    public boolean saveData(PaperArchives paperArchives) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        // todo 生成档案编号
+
+        PaperArchives archives = this.baseMapper.selectByArchivesName(schoolId, paperArchives.getArchivesName());
+        if (archives != null) {
+            throw ExceptionResultEnum.ERROR.exception("档案名称已存在");
+        }
+        paperArchives.setId(SystemConstant.getDbUuid());
+        paperArchives.setSchoolId(schoolId);
+        paperArchives.setCreateId(sysUser.getId());
+        paperArchives.setCreateTime(System.currentTimeMillis());
+        return this.save(paperArchives);
+    }
+
+    @Override
+    public boolean delete(Long id) {
+        PaperArchives paperArchives = this.getById(id);
+        if (paperArchives == null) {
+            throw ExceptionResultEnum.ERROR.exception("数据有误");
+        }
+
+        List<PaperScanTask> paperScanTaskList = paperScanTaskService.listByPaperArchivesId(id);
+        if (!paperScanTaskList.isEmpty()) {
+            throw ExceptionResultEnum.ERROR.exception("已有扫描任务，不能删除");
+        }
+        return this.removeById(id);
+    }
+
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesTypeServiceImpl.java

@@ -1,9 +1,16 @@
 package com.qmth.paper.library.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 import com.qmth.paper.library.business.mapper.PaperArchivesTypeMapper;
 import com.qmth.paper.library.business.service.PaperArchivesTypeService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
+import com.qmth.paper.library.common.enums.ExceptionResultEnum;
+import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,4 +21,51 @@ import org.springframework.stereotype.Service;
 @Service
 public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeMapper, PaperArchivesType> implements PaperArchivesTypeService {
 
+    @Override
+    public IPage<PaperArchivesType> pageData(Integer pageNumber, Integer pageSize) {
+        QueryWrapper<PaperArchivesType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(PaperArchivesType::getCreateTime);
+        return this.baseMapper.selectPage(new Page<>(pageNumber, pageSize), queryWrapper);
+    }
+
+    @Override
+    public boolean saveData(PaperArchivesType paperArchivesType) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+
+        PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(schoolId, paperArchivesType.getArchivesTypeName());
+
+        // 新增
+        if (paperArchivesType.getId() == null) {
+            if (archivesType != null) {
+                throw ExceptionResultEnum.ERROR.exception("类型名称已存在");
+            }
+            paperArchivesType.setId(SystemConstant.getDbUuid());
+            paperArchivesType.setSchoolId(schoolId);
+            paperArchivesType.setCreateId(sysUser.getCreateId());
+            paperArchivesType.setCreateTime(System.currentTimeMillis());
+            return this.save(paperArchivesType);
+        }
+        // 修改
+        else {
+            if (archivesType == null) {
+                throw ExceptionResultEnum.ERROR.exception("数据有误");
+            } else if (!paperArchivesType.getId().equals(archivesType.getId())) {
+                throw ExceptionResultEnum.ERROR.exception("类型名称已存在");
+            }
+            archivesType.setArchivesTypeName(paperArchivesType.getArchivesTypeName());
+            archivesType.setUpdateId(sysUser.getId());
+            archivesType.setUpdateTime(System.currentTimeMillis());
+            return this.updateById(archivesType);
+        }
+    }
+
+    @Override
+    public boolean delete(Long id) {
+        PaperArchivesType paperArchivesType = this.getById(id);
+        if (paperArchivesType == null) {
+            throw ExceptionResultEnum.ERROR.exception("数据有误");
+        }
+        return this.removeById(id);
+    }
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java

@@ -1,11 +1,14 @@
 package com.qmth.paper.library.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperScanTaskMapper;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 扫描任务表 服务实现类
@@ -14,4 +17,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, PaperScanTask> implements PaperScanTaskService {
 
+    @Override
+    public List<PaperScanTask> listByPaperArchivesId(Long paperArchivesId) {
+        QueryWrapper<PaperScanTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperScanTask::getPaperArchivesId, paperArchivesId);
+        return this.list(queryWrapper);
+    }
 }

paper-library-business/src/main/resources/mapper/PaperArchivesMapper.xml

@@ -1,4 +1,76 @@
 <?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.qmth.paper.library.business.mapper.PaperArchivesMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.PaperArchives">
+        <result column="id" property="id"/>
+        <result column="school_id" property="schoolId"/>
+        <result column="semester_id" property="semesterId"/>
+        <result column="manager_org_id" property="managerOrgId"/>
+        <result column="archives_name" property="archivesName"/>
+        <result column="archives_code" property="archivesCode"/>
+        <result column="archives_type_id" property="archivesTypeId"/>
+        <result column="manager_id" property="managerId"/>
+        <result column="warning_time" property="warningTime"/>
+        <result column="create_id" property="createId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_id" property="updateId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        select id, school_id, semester_id, manager_org_id,archives_name, archives_code, archives_type_id, manager_id, warning_time, create_id, create_time, update_id, update_time from paper_archives
+    </sql>
+
+    <select id="pageData" resultType="com.qmth.paper.library.business.bean.result.PaperArchivesResult">
+        SELECT
+            pa.id,
+            pa.archives_name archivesName,
+            pa.archives_code archivesCode,
+            pa.archives_type_id archivesTypeId,
+            pat.archives_type_name archivesTypeName,
+            pa.semester_id semesterName,
+            bs.name semesterName,
+            pa.manager_org_id managerOrgId,
+            so.name managerOrgName,
+            pa.manager_id managerId,
+            su.real_name managerName,
+            pa.warning_time warningTime,
+            pa.create_time createTime
+        FROM
+            paper_archives pa
+                LEFT JOIN
+            basic_semester bs ON pa.school_id = bs.school_id
+                AND pa.semester_id = bs.id
+                LEFT JOIN
+            paper_archives_type pat ON pa.school_id = pat.school_id
+                AND pa.archives_type_id = pat.id
+                LEFT JOIN
+            sys_org so ON pa.school_id = so.school_id
+                AND pa.manager_org_id = so.id
+                LEFT JOIN
+            sys_user su ON pa.manager_id = su.id
+        <where>
+            <if test="semesterId != null and semesterId != ''">
+                and pa.semester_id = #{semesterId}
+            </if>
+            <if test="managerOrgId != null and managerOrgId != ''">
+                and pa.manager_org_id = #{managerOrgId}
+            </if>
+            <if test="archivesTypeId != null and archivesTypeId != ''">
+                and pa.archives_type_id = #{archivesTypeId}
+            </if>
+            <if test="archivesName != null and archivesName != ''">
+                and pa.archives_name like concat('%',#{archivesName},'%')
+            </if>
+        </where>
+    </select>
+    <select id="selectByArchivesName" resultMap="BaseResultMap">
+        <include refid="Base_Column_List"></include>
+        <where>
+            and school_id = #{schoolId}
+            and archives_name = #{archivesName}
+        </where>
+    </select>
 </mapper>

paper-library-business/src/main/resources/mapper/PaperArchivesTypeMapper.xml

@@ -1,4 +1,27 @@
 <?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.qmth.paper.library.business.mapper.PaperArchivesTypeMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.PaperArchivesType">
+        <result column="id" property="id"/>
+        <result column="school_id" property="schoolId"/>
+        <result column="archives_type_name" property="archivesTypeName"/>
+        <result column="create_id" property="createId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_id" property="updateId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+       select id, school_id, archives_type_name, create_id, create_time, update_id, update_time from paper_archives_type
+    </sql>
+
+    <select id="selectByArchivesType" resultMap="BaseResultMap">
+        <include refid="Base_Column_List"></include>
+        <where>
+            and school_id = #{schoolId}
+            and archives_type = #{archivesTypeName}
+        </where>
+    </select>
 </mapper>

paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java

@@ -8,10 +8,8 @@ import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
-import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -29,7 +27,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "档案管理表controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/library")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/archives")
 @Validated
 @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class PaperArchivesController {
@@ -37,34 +35,33 @@ public class PaperArchivesController {
     private PaperArchivesService paperArchivesService;
 
     @ApiOperation(value = "分页查询")
-    @RequestMapping(value = "/page", method = RequestMethod.POST)
+    @PostMapping("/page")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result page(@ApiParam(value = "档案所属学期") @RequestParam(required = false) Long semesterId,
-                       @ApiParam(value = "档案管理部门") @RequestParam(required = false) Long orgId,
+                       @ApiParam(value = "档案管理部门") @RequestParam(required = false) Long managerOrgId,
                        @ApiParam(value = "档案类型") @RequestParam(required = false) Long archivesTypeId,
                        @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
                        @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok();
+        return ResultUtil.ok(paperArchivesService.pageData(semesterId, managerOrgId, archivesTypeId, archivesName, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
+    @PostMapping("/save")
+    @ApiResponses({@ApiResponse(code = 200, message = "新增成功", response = EditResult.class)})
     public Result save(@Valid @RequestBody PaperArchives paperArchives, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok();
+        return ResultUtil.ok(paperArchivesService.saveData(paperArchives));
     }
 
 
     @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    @PostMapping("/delete")
+    @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = Result.class)})
     public Result delete(@ApiParam(value = "主键") @RequestParam(required = false) Long id) {
-        return ResultUtil.ok();
+        return ResultUtil.ok(paperArchivesService.delete(id));
     }
 
 }

paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesTypeController.java

@@ -0,0 +1,63 @@
+package com.qmth.paper.library.api;
+
+
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.business.entity.PaperArchivesType;
+import com.qmth.paper.library.business.service.PaperArchivesTypeService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.util.Result;
+import com.qmth.paper.library.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+/**
+ * <p>
+ * 档案类型 前端控制器
+ * </p>
+ */
+@Api(tags = "档案类型controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/archives_type")
+@Validated
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+public class PaperArchivesTypeController {
+    @Resource
+    private PaperArchivesTypeService paperArchivesTypeService;
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/page")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result page(@ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(paperArchivesTypeService.pageData(pageNumber, pageSize));
+    }
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/save")
+    @ApiResponses({@ApiResponse(code = 200, message = "保存/更新成功", response = EditResult.class)})
+    public Result save(@Valid @RequestBody PaperArchivesType paperArchivesType, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(paperArchivesTypeService.saveData(paperArchivesType));
+    }
+
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete")
+    @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = Result.class)})
+    public Result delete(@ApiParam(value = "主键") @RequestParam(required = false) Long id) {
+        return ResultUtil.ok(paperArchivesTypeService.delete(id));
+    }
+
+}