update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/LoginResult.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -40,7 +39,7 @@ public class LoginResult implements Serializable {
     String accessToken;
 
     @ApiModelProperty(value = "学校信息")
-    SchoolResult schoolInfo;
+    SchoolNativeBean schoolInfo;
 
     @ApiModelProperty(value = "机构信息")
     OrgNativeBean orgInfo;
@@ -62,7 +61,7 @@ public class LoginResult implements Serializable {
         this.roleList = roleList;
     }
 
-    public LoginResult(SysUser sysUser, String sessionId, String accessToken, SchoolResult schoolInfo, OrgNativeBean orgInfo) {
+    public LoginResult(SysUser sysUser, String sessionId, String accessToken, SchoolNativeBean schoolInfo, OrgNativeBean orgInfo) {
         this.loginName = sysUser.getLoginName();
         this.realName = sysUser.getRealName();
         this.sessionId = sessionId;
@@ -127,14 +126,69 @@ public class LoginResult implements Serializable {
         this.accessToken = accessToken;
     }
 
-    public SchoolResult getSchoolInfo() {
+    public SchoolNativeBean getSchoolInfo() {
         return schoolInfo;
     }
 
-    public void setSchoolInfo(SchoolResult schoolInfo) {
+    public void setSchoolInfo(SchoolNativeBean schoolInfo) {
         this.schoolInfo = schoolInfo;
     }
 
+    public class SchoolNativeBean implements Serializable {
+
+        @ApiModelProperty(value = "id")
+        @JsonSerialize(using = ToStringSerializer.class)
+        Long id;
+
+        @ApiModelProperty(value = "代码")
+        String code;
+
+        @ApiModelProperty(value = "名称")
+        String name;
+
+        public SchoolNativeBean() {
+
+        }
+
+        public SchoolNativeBean(BasicSchool tbSchool) {
+            this.id = tbSchool.getId();
+            this.code = tbSchool.getCode();
+            this.name = tbSchool.getName();
+            schoolInfo = this;
+        }
+
+        public SchoolNativeBean(Long id, String code, String name) {
+            this.id = id;
+            this.code = code;
+            this.name = name;
+            schoolInfo = this;
+        }
+
+        public Long getId() {
+            return id;
+        }
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
     public class OrgNativeBean implements Serializable {
 
         @ApiModelProperty(value = "id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/SchoolResult.java

@@ -1,68 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.entity.BasicSchool;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 学校result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/6
- */
-public class SchoolResult implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
-
-    @ApiModelProperty(value = "代码")
-    String code;
-
-    @ApiModelProperty(value = "名称")
-    String name;
-
-    public SchoolResult() {
-
-    }
-
-    public SchoolResult(BasicSchool tbSchool) {
-        this.id = tbSchool.getId();
-        this.code = tbSchool.getCode();
-        this.name = tbSchool.getName();
-    }
-
-    public SchoolResult(Long id, String code, String name) {
-        this.id = id;
-        this.code = code;
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/SysDomain.java

@@ -30,6 +30,16 @@ public class SysDomain implements Serializable {
 
     String serverHost;
 
+    String adminLogoUrl;
+
+    public String getAdminLogoUrl() {
+        return adminLogoUrl;
+    }
+
+    public void setAdminLogoUrl(String adminLogoUrl) {
+        this.adminLogoUrl = adminLogoUrl;
+    }
+
     public String getFileHost() {
         return fileHost;
     }

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

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qmth.distributed.print.business.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -28,6 +29,22 @@ public class BasicSchool extends BaseEntity implements Serializable {
     private String accessSecret;
     private String remark;
 
+    @ApiModelProperty(value = "学校logo")
+    @TableField(value = "logo")
+    private String logo;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
     public String getCode() {
         return code;
     }

distributed-print-common/src/main/java/com/qmth/distributed/print/common/contant/SystemConstant.java

@@ -41,6 +41,7 @@ public class SystemConstant {
     public static final String TYPE = "type";
     public static final String LOCAL = "local";
     public static final String OSS = "oss";
+    public static final String LOGO = "logo";
     public static final String UPLOAD_TYPE = "uploadType";
     public static final String HTTP = "http://";
     public static final String ID = "id";

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

@@ -11,7 +11,6 @@ import com.qmth.distributed.print.business.bean.auth.ExpireTimeBean;
 import com.qmth.distributed.print.business.bean.query.LoginParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
-import com.qmth.distributed.print.business.bean.result.SchoolResult;
 import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.entity.SysUser;
@@ -36,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -179,7 +179,7 @@ public class SysController {
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
         LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
-        loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? new SchoolResult(authBean.getSchool()) : null);
+        loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         return ResultUtil.ok(loginResult);
     }
@@ -237,16 +237,17 @@ public class SysController {
 
     @ApiOperation(value = "根据机构代码查询机构信息接口")
     @RequestMapping(value = "/school/query_by_school_code", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = SchoolResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = EditResult.class)})
     @Aac(auth = BOOL.FALSE)
     public Result queryBySchoolCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
-        BasicSchool basicSchool = null;
         if (!Objects.equals(code.toUpperCase(), RoleTypeEnum.ADMIN.name())) {
-            basicSchool = cacheService.schoolCache(code);
+            BasicSchool basicSchool = cacheService.schoolCache(code);
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }
+            return ResultUtil.ok(Collections.singletonMap(SystemConstant.LOGO, basicSchool.getLogo()));
+        } else {
+            return ResultUtil.ok(Collections.singletonMap(SystemConstant.LOGO, dictionaryConfig.sysDomain().getAdminLogoUrl()));
         }
-        return ResultUtil.ok(Objects.nonNull(basicSchool) ? new SchoolResult(basicSchool) : null);
     }
 }

distributed-print/src/main/resources/application.properties

@@ -51,6 +51,7 @@ sys.config.fileHost=localhost:7001
 sys.config.serverHost=localhost:7001
 sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
+sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn