更新代码

src/main/java/com/template/api/LoginControllerAPI.java

@@ -22,6 +22,11 @@ public interface LoginControllerAPI {
     @ApiOperation(value = "获取密钥", notes = "获取密钥", httpMethod = "GET")
     CommonResult getAesStr();
 
+    @GetMapping(value = "/getToken")
+    @ApiOperation(value = "获取token", notes = "获取token", httpMethod = "GET")
+    String getToken(@RequestParam int userId);
+
+
     @GetMapping(value = "/queryReduce")
     @ApiOperation(value = "查看系统版本", notes = "查看系统版本", httpMethod = "GET")
     CommonResult queryReduce();

src/main/java/com/template/controller/LoginController.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -115,6 +116,19 @@ public class LoginController implements LoginControllerAPI {
     }
 
     /**
+     * 获取token
+     * @return
+     */
+    @Override
+    @PassToken
+    @DESRespondSecret(validated = false)
+    public String getToken(@RequestParam int userId) {
+        SmartUser user = smartUserService.getSmartById(userId);
+        String token = JWTUtil.getToken(user, null);
+        return token;
+    }
+
+    /**
      * 登录接口
      *
      * @param loginRequest account 账号

src/main/java/com/template/controller/SmartUserController.java

@@ -3949,7 +3949,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 return CommonResult.fail("班级数据无效，新增失败");
             }
 
-            gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(isur.getGrade()));
+            gradeData = smartGradeService.querySmartGradeById(su.getGrade() == null || su.getGrade() == "" ? null : Integer.valueOf(isur.getGrade()));
             if (gradeData == null) {
                 return CommonResult.fail("年级数据无效，新增失败");
             }
@@ -4118,7 +4118,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 }
                 //region 新增用户的时候同步新增教师综合评价数据
                 List<SmartSemester> semesters = smartSemesterService.querySemesterByTime(new Date());
-                gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(isur.getGrade()));
+                gradeData = smartGradeService.querySmartGradeById((isur.getGrade() == null || isur.getGrade() == "") ? null : Integer.valueOf(isur.getGrade()));
                 if (semesters != null && semesters.size() > 0) {
                     List<SmartEvaluateTeacher> eTeachers = new ArrayList<>();
                     for (SmartSemester semester : semesters) {
@@ -4129,7 +4129,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         set.setTermId(semester.getId());
                         set.setTerm(semester.getName());
                         if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
-                            set.setGradeId(Integer.valueOf(su.getGrade()));
+                            set.setGradeId(su.getGrade() == null || su.getGrade() == "" ? null : Integer.valueOf(su.getGrade()));
                             if (gradeData != null) {
                                 set.setGradeName(gradeData.getName());
                             }
@@ -4548,7 +4548,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 return CommonResult.fail("班级数据无效，更新失败");
             }
             //获取年级Uid
-            SmartGrade gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(su.getGrade()));
+            SmartGrade gradeData = smartGradeService.querySmartGradeById(su.getGrade() == null || su.getGrade() == "" ? null : Integer.valueOf(su.getGrade()));
             if (gradeData == null) {
                 return CommonResult.fail("年级数据无效，新增失败");
             }

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai2023.
-    url: jdbc:mysql://111.231.169.217:3306/smart_middle?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://111.231.169.217:3306/smart_middle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai2023.
-    url: jdbc:mysql://111.231.169.217:3306/smart_middle?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://111.231.169.217:3306/smart_middle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis