sdsd

.idea/workspace.xml

@@ -5,15 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
-<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-=======
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
->>>>>>> d423a496fa85745d290d803e21cc0f32ea1880a2
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -37,7 +34,6 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-<<<<<<< HEAD
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
@@ -98,8 +94,6 @@
       </file>
     </leaf>
   </component>
-=======
->>>>>>> d423a496fa85745d290d803e21cc0f32ea1880a2
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -247,9 +241,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -439,16 +432,12 @@
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "WebServerToolWindowFactoryState": "false",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "MavenSettings",
-    "spring.configuration.checksum": "64bf9ba214eb006c40cb35e0f61a7d20"
-  }
-}]]></component>
+  <component name="PropertiesComponent">
+    <property name="RequestMappingsPanelOrder0" value="0" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
+  </component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
@@ -585,12 +574,9 @@
       <workItem from="1705388695984" duration="51258000" />
       <workItem from="1705885614332" duration="695000" />
       <workItem from="1705886328968" duration="31068000" />
-<<<<<<< HEAD
       <workItem from="1705992981607" duration="28562000" />
-=======
       <workItem from="1705992981607" duration="24464000" />
       <workItem from="1706163623253" duration="58000" />
->>>>>>> d423a496fa85745d290d803e21cc0f32ea1880a2
     </task>
     <servers />
   </component>
@@ -717,12 +703,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java</url>
-<<<<<<< HEAD
           <line>84</line>
           <properties />
-=======
           <line>81</line>
->>>>>>> d423a496fa85745d290d803e21cc0f32ea1880a2
           <option name="timeStamp" value="59" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -753,12 +736,9 @@
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
           <line>1179</line>
-<<<<<<< HEAD
           <properties />
           <option name="timeStamp" value="117" />
-=======
           <option name="timeStamp" value="115" />
->>>>>>> d423a496fa85745d290d803e21cc0f32ea1880a2
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

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

@@ -13,10 +13,7 @@ import com.template.common.utils.*;
 import com.template.config.ControlConfig;
 import com.template.config.SeewoConfig;
 import com.template.model.enumModel.*;
-import com.template.model.pojo.SmartClass;
-import com.template.model.pojo.SmartDepartment;
-import com.template.model.pojo.SmartGrade;
-import com.template.model.pojo.SmartUser;
+import com.template.model.pojo.*;
 import com.template.model.request.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
@@ -85,6 +82,9 @@ public class SmartUserController implements SmartUserControllerAPI {
     @Autowired
     private SmartDepartmentService smartDepartmentService;
 
+    @Autowired
+    private SmartIdentityService smartIdentityService;
+
     @Override
     public CommonResult logoffAccount(useridsRequest ur, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -1512,8 +1512,14 @@ public class SmartUserController implements SmartUserControllerAPI {
             List<SmartUser> students = smartUserService.getSmartUserByIds(studentIds);
             List<SmartClass> classs = smartClassService.list(null);
 
+            List<SmartIdentity> idnetitys = smartIdentityService.list(null);
+
             for (UserVo data : result.getList()) {
-                data.setIdentity(eIdentityStatu.stringOf(data.getIdentityId()));
+                Optional<SmartIdentity> identityData = idnetitys.stream().filter(e -> e.getId().equals(data.getIdentityId())).findFirst();
+                if(identityData != null && identityData.isPresent()){
+                    data.setIdentity(identityData.get().getName());
+                }
+
                 data.setSex(eSexStatu.stringOf(data.getSexId()));
                 Optional<SmartDepartment> departmentData = departments == null ? null : departments.stream().filter(e -> e.getId().equals(data.getDepartmentId())).findFirst();
                 if (departmentData != null && departmentData.isPresent()) {

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

@@ -15,10 +15,10 @@ import com.template.common.utils.*;
 import com.template.model.enumModel.eIdentityStatu;
 import com.template.model.evaluate.student.SmartEvaluateStudent;
 import com.template.model.evaluate.student.SmartSubjectManage;
-import com.template.model.pojo.SmartAuthority;
-import com.template.model.pojo.SmartDepartment;
-import com.template.model.pojo.SmartUser;
-import com.template.model.pojo.SmsCode;
+import com.template.model.phoneBook.BookUser;
+import com.template.model.phoneBook.ClassBook;
+import com.template.model.phoneBook.GradeBook;
+import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.tongji.*;
@@ -67,6 +67,10 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
     public SmartDepartmentService smartDepartmentService;
     @Autowired
     public SmsCodeService smsCodeService;
+    @Autowired
+    public SmartGradeService smartGradeService;
+    @Autowired
+    public SmartClassService smartClassService;
 
     /**
      * Title: list
@@ -578,5 +582,5 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 		}
 		return CommonResult.ok(gradeBookList);
 	}
-    
+
 }

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,4 +1,5 @@
 com\template\api\SmartDataSourceLogControllerAPI.class
+com\template\model\pojo\SmartDataTaskErr.class
 com\template\model\vo\BsDepartmentNoVo.class
 com\template\model\seewo\AttendanceRuleListEventByClazzRequest.class
 com\template\model\seewo\ParentServiceBatchSaveOrUpdateParentsParam$ParentsItem$ParentsItemBuilder.class
@@ -34,6 +35,7 @@ com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesResult.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam$RequestBody.class
 com\template\config\ScheduleConfig.class
 com\template\common\utils\ExcelUtil3.class
+com\template\model\phoneBook\BookUser.class
 com\template\model\seewo\OrgClassOpenSeewoUcOpenV1ClassFullParam$JSONRequestBody.class
 com\template\MybatisPlusApplication.class
 com\template\model\seewo\ParentServiceBatchSaveOrUpdateParentsParam$StudentParentsItem$StudentParentsItemBuilder.class
@@ -306,6 +308,7 @@ com\template\model\pojo\SmartDataSource.class
 com\template\config\MySecurity.class
 com\template\controller\SmartAuthorGroupController.class
 com\template\services\impl\SmartScreenshotRecordServiceImpl.class
+com\template\model\phoneBook\GradeBook.class
 com\template\common\utils\GetCameraPreviewURL.class
 com\template\controller\SmartAttendanceController.class
 com\template\model\seewo\StudentServiceBatchSaveClassStudentsParam$StudentInfo.class
@@ -333,6 +336,7 @@ com\template\model\seewo\AttendanceRuleListSchoolAttendRuleParam$RequestBody.cla
 com\template\mapper\SmartFreezeRecordMapper.class
 com\template\model\vo\BaseImageVo.class
 com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsParam$PersonalLeaveListSchoolPeriodRecordsParamBuilder.class
+com\template\model\dto\WarningUserDto.class
 com\template\model\seewo\StudentServiceBatchSaveClassStudentsParam$Boolean$BooleanBuilder.class
 com\template\controller\LoginController.class
 com\template\model\request\insertSmartUserRequest.class
@@ -353,6 +357,7 @@ com\template\services\impl\SmartUploadServiceImpl.class
 com\template\common\utils\HttpClientUtils.class
 com\template\controller\WechatScanLoginController.class
 com\template\services\impl\SmartAuthorityServiceImpl.class
+com\template\model\phoneBook\ClassBook.class
 com\template\common\result\Code.class
 com\template\api\SmartIdentityControllerAPI.class
 com\template\common\utils\Base64Util.class
@@ -579,6 +584,7 @@ com\template\model\enumModel\eDutiesType.class
 com\template\model\pojo\SmartBuildMeter.class
 com\template\common\utils\AesUtil.class
 com\template\api\SmartGradeControllerAPI.class
+com\template\model\dto\WarningDeletePushDto.class
 com\template\common\utils\UUIDUtil.class
 com\template\mapper\SystemMenuMapper.class
 com\template\model\enumModel\eFileType.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -132,6 +132,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\FileUtils.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\weixin\HttpParame.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\StudentServiceBatchSaveClassStudentsResult.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\dto\WarningUserDto.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartWarningService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\tongji\All.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\TimeGroupVo.java
@@ -148,6 +149,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\HttpsClient.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\updateIdentityRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\tongji\MonthMeterDetail.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\phoneBook\BookUser.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\handler\MyMetaObjectHandler.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eLogOff.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartUserService.java
@@ -290,6 +292,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eIdentityStatu.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\GetCameraPreviewURL.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartDataClassController.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\phoneBook\ClassBook.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartDutiesServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartQrcodeControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\RepairAdminMapper.java
@@ -309,6 +312,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\UserVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SystemMenuServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\weixin\AuthorAndGroup2.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataTaskErr.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartScoreService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartEvaluateSdetailMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\WechatScanLoginController.java
@@ -329,6 +333,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eFreezeRecord.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\TurnOnDeviceVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\teacher\SimpleScore.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\dto\WarningDeletePushDto.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartSubjectManageServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\SystemMenuTreeVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\HomeSchoolServiceSendNoteToKidParam.java
@@ -354,6 +359,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartUserMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartDutiesService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\result\Code.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\phoneBook\GradeBook.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartScreenshotRecordController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\ePunish.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartBuildServiceImpl.java