脚本更新

distributed-print/install/mysql/upgrade/3.4.5.sql

@@ -100,4 +100,6 @@ INSERT INTO sys_privilege
 VALUES(1231, '校验code', '/api/admin/exam/print/package_code/verify', 'URL', 47, 10, 'AUTH', NULL, 1, 1, 1);
 UPDATE sys_privilege
 SET name='AI智能评卷统计', url='ExportAIStats', `type`='BUTTON', parent_id=917, `sequence`=4, property='AUTH', related='1226', enable=1, default_auth=0, front_display=1
-WHERE id=1227;
+WHERE id=1227;
+ALTER TABLE basic_school ADD system_logo MEDIUMTEXT NULL COMMENT '系统logo';
+ALTER TABLE basic_school ADD tab_name varchar(200) NULL COMMENT '标签标题';

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/BasicSchoolController.java

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -56,10 +57,13 @@ public class BasicSchoolController {
                          @RequestParam(value = "logoMd5", required = false) String logoMd5,
                          @RequestParam(value = "backgroundImage", required = false) MultipartFile backgroundImage,
                          @RequestParam(value = "backgroundImageMd5", required = false) String backgroundImageMd5,
-                         @RequestParam(value = "examTaskInstr", required = false) String examTaskInstr) {
+                         @RequestParam(value = "examTaskInstr", required = false) String examTaskInstr,
+                         @ApiParam(value = "系统logo") @RequestParam(required = false) MultipartFile systemLogo,
+                         @ApiParam(value = "系统logoMD5") @RequestParam(required = false) String systemLogoMd5,
+                         @ApiParam(value = "标签标题") @RequestParam(required = false) String tabName) {
         return ResultUtil.ok(
                 basicSchoolService.updateSchool(id, code, name, initPassword, defaultSchool, hasPaperNumber, logo,
-                        logoMd5, backgroundImage, backgroundImageMd5, examTaskInstr));
+                        logoMd5, backgroundImage, backgroundImageMd5, examTaskInstr, systemLogo, systemLogoMd5, tabName));
     }
 }
 

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

@@ -66,6 +66,28 @@ public class BasicSchool extends BaseEntity implements Serializable {
     @TableField(value = "exam_task_instr")
     private String examTaskInstr;
 
+    @ApiModelProperty(value = "系统logo")
+    private String systemLogo;
+
+    @ApiModelProperty(value = "标签标题")
+    private String tabName;
+
+    public String getSystemLogo() {
+        return systemLogo;
+    }
+
+    public void setSystemLogo(String systemLogo) {
+        this.systemLogo = systemLogo;
+    }
+
+    public String getTabName() {
+        return tabName;
+    }
+
+    public void setTabName(String tabName) {
+        this.tabName = tabName;
+    }
+
     public BasicSchool() {
 
     }

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

@@ -18,7 +18,8 @@ public interface BasicSchoolService extends IService<BasicSchool> {
 
     List<BasicSchool> listSchool(String code);
 
-    boolean updateSchool(Long id, String code, String name, String initPassword, Boolean defaultSchool, Boolean hasPaperNumber, MultipartFile logo, String logoMd5, MultipartFile backgroundImage, String backgroundImageMd5, String examTaskInstr);
+    boolean updateSchool(Long id, String code, String name, String initPassword, Boolean defaultSchool, Boolean hasPaperNumber, MultipartFile logo, String logoMd5, MultipartFile backgroundImage, String backgroundImageMd5,
+                         String examTaskInstr, MultipartFile systemLogo, String systemLogoMd5, String tabName);
 
     List<BasicSchool> listByDefaultSchool(boolean defaultSchool);
 

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.bean.vo.FilePathVo;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -17,9 +16,7 @@ import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.FileUploadService;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.util.Base64Util;
-import com.qmth.teachcloud.common.util.FileStoreUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -29,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.util.Base64;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -71,7 +69,8 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
     }
 
     @Override
-    public boolean updateSchool(Long id, String code, String name, String initPassword, Boolean defaultSchool, Boolean hasPaperNumber, MultipartFile logo, String logoMd5, MultipartFile backgroundImage, String backgroundImageMd5, String examTaskInstr) {
+    public boolean updateSchool(Long id, String code, String name, String initPassword, Boolean defaultSchool, Boolean hasPaperNumber, MultipartFile logo, String logoMd5, MultipartFile backgroundImage, String backgroundImageMd5,
+                                String examTaskInstr, MultipartFile systemLogo, String systemLogoMd5, String tabName) {
         BasicSchool basicSchool = this.getById(id);
         basicSchool.setCode(code);
         basicSchool.setName(name);
@@ -88,6 +87,17 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
                 throw ExceptionResultEnum.ERROR.exception(e.getMessage());
             }
         }
+        if (Objects.nonNull(systemLogo)) {
+            try {
+                if (!DigestUtils.md5DigestAsHex(systemLogo.getBytes()).equals(systemLogoMd5)) {
+                    throw ExceptionResultEnum.ERROR.exception("系统logo图片上传有误");
+                }
+                String toBase64 = "data:image/png;base64," + new String(Base64.getEncoder().encode(systemLogo.getBytes()), SystemConstant.CHARSET);
+                basicSchool.setSystemLogo(toBase64);
+            } catch (Exception e) {
+                throw ExceptionResultEnum.ERROR.exception(e.getMessage());
+            }
+        }
         // 登录页背景图
         if (backgroundImage != null) {
             try {
@@ -128,6 +138,7 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
         basicSchool.setDefaultSchool(defaultSchool);
         basicSchool.setHasPaperNumber(hasPaperNumber);
         basicSchool.setExamTaskInstr(examTaskInstr);
+        basicSchool.setTabName(tabName);
 
         // 清除学校缓存
         commonCacheService.removeSchoolCache(basicSchool.getCode());