3.2.7 优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamCardStage.java

@@ -1,61 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 题卡临时保存表
- * </p>
- */
-@TableName("exam_card_stage")
-public class ExamCardStage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "题卡id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("id")
-    private Long id;
-
-    /**
-     * 题卡内容
-     */
-    @TableField("content")
-    private String content;
-    /**
-     * html内容
-     */
-    @TableField("html_content")
-    private String htmlContent;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getHtmlContent() {
-        return htmlContent;
-    }
-
-    public void setHtmlContent(String htmlContent) {
-        this.htmlContent = htmlContent;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamCardStageMapper.java

@@ -1,13 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamCardStage;
-
-/**
- * <p>
- * 题卡临时表 Mapper 接口
- * </p>
- */
-public interface ExamCardStageMapper extends BaseMapper<ExamCardStage> {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamCardService.java

@@ -42,5 +42,4 @@ public interface ExamCardService extends IService<ExamCard> {
 
     void cardDownload(HttpServletResponse response, String id);
 
-    Long storageCard(String id, String content);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamCardStageService.java

@@ -1,13 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.ExamCardStage;
-
-/**
- * <p>
- * 题卡临时表 服务类
- * </p>
- */
-public interface ExamCardStageService extends IService<ExamCardStage> {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -87,9 +87,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     @Resource
     BasicRoleDataPermissionService basicRoleDataPermissionService;
 
-    @Resource
-    ExamCardStageService examCardStageService;
-
     @Transactional
     @Override
     public String saveExamCard(ExamCardParams examCardParams) {
@@ -515,20 +512,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         }
     }
 
-    @Override
-    public Long storageCard(String id, String content) {
-        ExamCardStage examCardStage = examCardStageService.getById(id);
-        if (examCardStage != null) {
-            examCardStage.setContent(content);
-        } else {
-            examCardStage = new ExamCardStage();
-            examCardStage.setId(SystemConstant.getDbUuid());
-            examCardStage.setContent(content);
-        }
-        examCardStageService.saveOrUpdate(examCardStage);
-        return examCardStage.getId();
-    }
-
     /**
      * 生成新的title
      *

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardStageServiceImpl.java

@@ -1,11 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.ExamCardStage;
-import com.qmth.distributed.print.business.mapper.ExamCardStageMapper;
-import com.qmth.distributed.print.business.service.ExamCardStageService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ExamCardStageServiceImpl extends ServiceImpl<ExamCardStageMapper, ExamCardStage> implements ExamCardStageService {
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPaperClassMarkerServiceImpl.java

@@ -33,7 +33,7 @@ public class ExamPaperClassMarkerServiceImpl extends ServiceImpl<ExamPaperClassM
     public void saveExamPaperClassInfo(ExamPaperStructure examPaperStructure, Boolean openClassReading, List<ClassMarker> classInfo) {
         // 1.删除原有数据
         this.deleteExamPaperClassInfo(examPaperStructure.getId());
-        if (openClassReading && !CollectionUtils.isEmpty(classInfo)) {
+        if (openClassReading != null && openClassReading && !CollectionUtils.isEmpty(classInfo)) {
             List<ExamPaperClassMarker> list = new ArrayList<>();
             for (ClassMarker classMarker : classInfo) {
                 ExamPaperClassMarker examPaperClassMarker = new ExamPaperClassMarker();

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -250,15 +250,6 @@ ALTER TABLE `exam_card`
 ALTER TABLE `basic_exam`
     ADD COLUMN `auto_sync_student` TINYINT(1) NULL DEFAULT 0 COMMENT '是否自动同步考务数据（默认否）' AFTER `name`;
 
-CREATE TABLE `sys_role_privilege_custom` (
-     `id` bigint NOT NULL COMMENT '主键',
-     `school_id` bigint NOT NULL COMMENT '学校id',
-     `role_id` bigint NOT NULL COMMENT '角色id',
-     `privilege_id` bigint NOT NULL COMMENT '菜单id',
-     `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
-     PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='内置角色和菜单关联表（学校自定义）';
-
 ALTER TABLE `sys_role_privilege`
     ADD COLUMN `school_id` BIGINT(20) NULL COMMENT '内置角色，按学校自定义的权限' AFTER `enable`;
 

distributed-print-business/src/main/resources/db/upgrade/3.2.7.sql

@@ -9,12 +9,12 @@ DELETE FROM `sys_privilege` WHERE (`id` = '645');
 ALTER TABLE `basic_major`
     CHANGE COLUMN `belong_org_id` `belong_org_id` BIGINT NOT NULL COMMENT '所属机构id' AFTER `org_id`,
 DROP INDEX `major_schoolId_name_idx` ,
-ADD UNIQUE INDEX `major_schoolId_name_idx` USING BTREE (`school_id`, `name`, `belong_org_id`) VISIBLE;
+ADD UNIQUE INDEX `major_schoolId_name_idx` USING BTREE (`school_id`, `name`, `belong_org_id`);
 
 
 ALTER TABLE `basic_clazz`
 DROP INDEX `clazz_schoolId_name_idx` ,
-ADD UNIQUE INDEX `clazz_schoolId_name_idx` USING BTREE (`school_id`, `major_id`, `clazz_name`) VISIBLE;
+ADD UNIQUE INDEX `clazz_schoolId_name_idx` USING BTREE (`school_id`, `major_id`, `clazz_name`);
 
 DELETE FROM `sys_privilege` WHERE (`id` = '425');
 DELETE FROM `sys_privilege` WHERE (`id` = '426');
@@ -150,15 +150,6 @@ ALTER TABLE `exam_card`
 ALTER TABLE `basic_exam`
     ADD COLUMN `auto_sync_student` TINYINT(1) NULL DEFAULT 0 COMMENT '是否自动同步考务数据（默认否）' AFTER `name`;
 
-CREATE TABLE `sys_role_privilege_custom` (
-     `id` bigint NOT NULL COMMENT '主键',
-     `school_id` bigint NOT NULL COMMENT '学校id',
-     `role_id` bigint NOT NULL COMMENT '角色id',
-     `privilege_id` bigint NOT NULL COMMENT '菜单id',
-     `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
-     PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='内置角色和菜单关联表（学校自定义）';
-
 ALTER TABLE `sys_role_privilege`
     ADD COLUMN `school_id` BIGINT(20) NULL COMMENT '内置角色，按学校自定义的权限' AFTER `enable`;
 
@@ -192,12 +183,12 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 
 UPDATE `sys_privilege` SET `related` = '490,540,667,669,671,672,754,855,882,883' WHERE (`id` = '670');
 UPDATE `sys_privilege` SET `name` = '分班阅（开关）', `url` = 'OpenClassReading', `type` = 'BUTTON', `sequence` = '9', `related` = NULL, `enable` = '1', `default_auth` = '0', `front_display` = '1' WHERE (`id` = '495');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '496');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '497');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '666');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '668');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '753');
-DELETE FROM `distributed-print-3.2.7`.`sys_privilege` WHERE (`id` = '854');
+DELETE FROM `sys_privilege` WHERE (`id` = '496');
+DELETE FROM `sys_privilege` WHERE (`id` = '497');
+DELETE FROM `sys_privilege` WHERE (`id` = '666');
+DELETE FROM `sys_privilege` WHERE (`id` = '668');
+DELETE FROM `sys_privilege` WHERE (`id` = '753');
+DELETE FROM `sys_privilege` WHERE (`id` = '854');
 
 ALTER TABLE `exam_paper_structure`
     ADD COLUMN `is_finish` TINYINT(1) NULL DEFAULT 0 COMMENT '是否完成。根据status中组合状态计算。用于当查询条件' AFTER `status`;

distributed-print-business/src/main/resources/mapper/ExamCardStageMapper.xml

@@ -1,4 +0,0 @@
-<?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.distributed.print.business.mapper.ExamCardStageMapper">
-</mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardController.java

@@ -178,18 +178,4 @@ public class ExamCardController {
     public void cardDownload(HttpServletResponse response, @RequestParam(value = "id") String id) {
         examCardService.cardDownload(response, id);
     }
-
-    /**
-     * 题卡自动保存临时表
-     *
-     * @param id      题卡ID
-     * @param content 卡格式
-     */
-    @ApiOperation(value = "题卡自动暂存")
-    @RequestMapping(value = "/storage_card", method = RequestMethod.POST)
-    public Result storageCard(@RequestParam(value = "id") String id,
-                              @RequestParam(value = "id") String content) {
-        Long cardId = examCardService.storageCard(id, content);
-        return ResultUtil.ok(String.valueOf(cardId), "");
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRolePrivilegeCustom.java

@@ -1,98 +0,0 @@
-package com.qmth.teachcloud.common.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 内置角色和菜单关联表（学校自定义）
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("sys_role_privilege_custom")
-public class SysRolePrivilegeCustom implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
-    /**
-     * 学校ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    /**
-     * 角色ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("role_id")
-    private Long roleId;
-
-    /**
-     * 菜单ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("privilege_id")
-    private Long privilegeId;
-
-    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @TableField(value = "enable")
-    private Boolean enable;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getPrivilegeId() {
-        return privilegeId;
-    }
-
-    public void setPrivilegeId(Long privilegeId) {
-        this.privilegeId = privilegeId;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysRolePrivilegeCustomMapper.java

@@ -1,14 +0,0 @@
-package com.qmth.teachcloud.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.common.entity.SysRolePrivilege;
-import com.qmth.teachcloud.common.entity.SysRolePrivilegeCustom;
-
-/**
- * <p>
- * 内置角色和菜单关联表 Mapper 接口
- * </p>
- */
-public interface SysRolePrivilegeCustomMapper extends BaseMapper<SysRolePrivilegeCustom> {
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysRolePrivilegeCustomService.java

@@ -1,13 +0,0 @@
-package com.qmth.teachcloud.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysRolePrivilegeCustom;
-
-/**
- * <p>
- * 内置角色和菜单关联表 服务类
- * </p>
- */
-public interface SysRolePrivilegeCustomService extends IService<SysRolePrivilegeCustom> {
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRolePrivilegeCustomServiceImpl.java

@@ -1,17 +0,0 @@
-package com.qmth.teachcloud.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.common.entity.SysRolePrivilegeCustom;
-import com.qmth.teachcloud.common.mapper.SysRolePrivilegeCustomMapper;
-import com.qmth.teachcloud.common.service.SysRolePrivilegeCustomService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 内置角色和菜单关联表 服务实现类
- * </p>
- */
-@Service
-public class SysRolePrivilegeCustomServiceImpl extends ServiceImpl<SysRolePrivilegeCustomMapper, SysRolePrivilegeCustom> implements SysRolePrivilegeCustomService {
-
-}

teachcloud-common/src/main/resources/mapper/SysRolePrivilegeCustomMapper.xml

@@ -1,4 +0,0 @@
-<?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.teachcloud.common.mapper.SysRolePrivilegeCustomMapper">
-</mapper>