Browse Source

班级完事

wuheng 1 year ago
parent
commit
e92761c8ea

+ 8 - 6
controller/src/main/java/com/koobietech/eas/config/ExceptionAdviceConfiguration.java

@@ -24,9 +24,10 @@ public class ExceptionAdviceConfiguration {
     public JsonResult exceptionHandler(Exception e){
         StackTraceElement[] stackTrace = e.getStackTrace();
         logger.error("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
-        for (StackTraceElement element : stackTrace) {
-            logger.error(element.toString());
-        }
+//        for (StackTraceElement element : stackTrace) {
+//            logger.error(element.toString());
+//        }
+        e.printStackTrace();
         logger.error(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
         return JsonResult.fail(e.getMessage(), 500);
     }
@@ -37,9 +38,10 @@ public class ExceptionAdviceConfiguration {
     public JsonResult exceptionHandler(EasException e){
         StackTraceElement[] stackTrace = e.getStackTrace();
         logger.error("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
-        for (StackTraceElement element : stackTrace) {
-            logger.error(element.toString());
-        }
+//        for (StackTraceElement element : stackTrace) {
+//            logger.error(element.toString());
+//        }
+        e.printStackTrace();
         logger.error("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
         return JsonResult.fail(e.getMessage(), e.getCode());
     }

+ 7 - 5
controller/src/main/java/com/koobietech/eas/controller/EasSysStuProfileController.java

@@ -1,7 +1,9 @@
 package com.koobietech.eas.controller;
 
 
+import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
 import com.koobietech.eas.service.EasStuProfileService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -12,13 +14,13 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 
 /**
  * @author lc
  */
 @Tag(name = "学生档案下载模块")
 @RestController
+@RequestMapping("/student")
 public class EasSysStuProfileController {
 
     @Resource
@@ -45,10 +47,10 @@ public class EasSysStuProfileController {
     }
     @PostMapping("/query")
     @Operation(summary = "查询学员信息", description = "查询学员信息")
-    public JsonResult query(@RequestBody(required = false) EasArcTlsStudents studentDto,
-                            @RequestParam Integer pageNum, @RequestParam Integer pageSize){
-        List<EasArcTlsStudents> res = easStuProfileService.query(studentDto, pageNum, pageSize);
-        return JsonResult.data(res);
+    public JsonPageResult query(@RequestBody(required = false) EasArcTlsStudents studentDto,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize){
+        PageDataResult res = easStuProfileService.query(studentDto, pageNum, pageSize);
+        return JsonPageResult.data(res);
     }
 
     @PostMapping("/importExcel")

+ 22 - 0
controller/src/main/java/com/koobietech/eas/controller/EasSysUserInfoController.java

@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @Tag(name = "用户信息模块")
@@ -57,4 +58,25 @@ public class EasSysUserInfoController {
         PageDataResult ret = easSysUserInfoService.query(userinfo);
         return JsonResult.data(ret);
     }
+
+    @GetMapping("/queryUserById/{uid}")
+    @Operation(summary = "查询用户信息根据ID", description = "根据参数查询用户信息表信息")
+    public JsonResult queryByUid(@PathVariable Long uid ) {
+        EasSysUserinfo userinfo = easSysUserInfoService.queryByUid(uid);
+        return JsonResult.data(userinfo);
+    }
+
+    @GetMapping("/queryUserByRealname/{realname}")
+    @Operation(summary = "查询用户信息根据用户名", description = "根据参数查询用户信息表信息")
+    public JsonResult queryByRealname(@PathVariable String realname ) {
+        EasSysUserinfo userinfo = easSysUserInfoService.queryByRealname(realname);
+        return JsonResult.data(userinfo);
+    }
+
+    @GetMapping("/queryAll")
+    @Operation(summary = "查询用户信息", description = "查询用户字典表所有信息")
+    public JsonResult queryAll() {
+        List<EasSysUserinfo> list = easSysUserInfoService.queryAll();
+        return JsonResult.data(list);
+    }
 }

+ 2 - 2
service/src/main/java/com/koobietech/eas/service/EasStuProfileService.java

@@ -1,9 +1,9 @@
 package com.koobietech.eas.service;
 
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
 
 import java.io.InputStream;
-import java.util.List;
 
 /**
  * @author lc
@@ -11,7 +11,7 @@ import java.util.List;
 public interface EasStuProfileService {
     boolean add(EasArcTlsStudents easArcTlsStudents);
 
-    List<EasArcTlsStudents> query(EasArcTlsStudents studentDto, Integer pageNum, Integer pageSize);
+    PageDataResult query(EasArcTlsStudents studentDto, Integer pageNum, Integer pageSize);
 
     boolean update(EasArcTlsStudents studentDto);
 

+ 8 - 0
service/src/main/java/com/koobietech/eas/service/EasSysUserInfoService.java

@@ -3,6 +3,8 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 
+import java.util.List;
+
 public interface EasSysUserInfoService {
 
     Boolean add(EasSysUserinfo userinfo);
@@ -12,4 +14,10 @@ public interface EasSysUserInfoService {
     Boolean update(EasSysUserinfo userinfo);
 
     PageDataResult query(EasSysUserinfo userinfo);
+
+    EasSysUserinfo queryByUid(Long uid);
+
+    EasSysUserinfo queryByRealname(String realname);
+
+    List<EasSysUserinfo> queryAll();
 }

+ 1 - 1
service/src/main/java/com/koobietech/eas/service/impl/EasEduClassServiceImpl.java

@@ -27,7 +27,7 @@ public class EasEduClassServiceImpl implements EasEduClassService {
 
     @Override
     public int updateClass(EasEduClass easEduClass) {
-        return easEduClassMapper.updateByPrimaryKey( easEduClass );
+        return easEduClassMapper.updateByPrimaryKeySelective( easEduClass );
     }
 
     @Override

+ 4 - 2
service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

@@ -7,6 +7,7 @@ import com.koobietech.eas.common.constant.FileType;
 import com.koobietech.eas.common.constant.Gender;
 import com.koobietech.eas.common.constant.UniversityCode;
 import com.koobietech.eas.common.exception.EasException;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.common.utils.ArchiveManager;
 import com.koobietech.eas.common.utils.DateManager;
 import com.koobietech.eas.common.utils.SecurityManager;
@@ -96,7 +97,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
     }
 
     @Override
-    public List<EasArcTlsStudents> query(EasArcTlsStudents studentDto, Integer pageNum, Integer pageSize) {
+    public PageDataResult query(EasArcTlsStudents studentDto, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         EasArcTlsStudentsExample easArcTlsStudentsExample = new EasArcTlsStudentsExample();
         EasArcTlsStudentsExample.Criteria criteria = easArcTlsStudentsExample.createCriteria();
@@ -130,7 +131,8 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
             }
         }
         List<EasArcTlsStudents> easArcTlsStudents = easArcTlsStudentsMapper.selectByExample(easArcTlsStudentsExample);
-        return easArcTlsStudents;
+        long l = easArcTlsStudentsMapper.countByExample(easArcTlsStudentsExample);
+        return PageDataResult.init(easArcTlsStudents, l);
     }
 
     @Override

+ 19 - 0
service/src/main/java/com/koobietech/eas/service/impl/EasSysUserInfoServiceImpl.java

@@ -114,4 +114,23 @@ public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
         ret.setTotal(l);
         return ret;
     }
+
+    @Override
+    public EasSysUserinfo queryByUid(Long uid) {
+        return easSysUserinfoMapper.selectByPrimaryKey(uid);
+    }
+
+    @Override
+    public EasSysUserinfo queryByRealname(String realname) {
+        EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
+        easSysUserinfoExample.createCriteria().andRelnameEqualTo(realname);
+        List<EasSysUserinfo> easSysUserinfos = easSysUserinfoMapper.selectByExample(easSysUserinfoExample);
+        EasSysUserinfo easSysUserinfo = easSysUserinfos.stream().findFirst().orElse(null);
+        return easSysUserinfo;
+    }
+
+    @Override
+    public List<EasSysUserinfo> queryAll() {
+        return easSysUserinfoMapper.selectByExample(null);
+    }
 }