夏文涛 2 yıl önce
ebeveyn
işleme
ff6a5ba6f4

+ 70 - 62
.idea/workspace.xml

@@ -5,8 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
+      <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$/src/main/java/com/template/controller/WechatScanLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.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" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -36,37 +39,28 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesTestOne.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-151">
-              <caret line="54" column="41" selection-start-line="54" selection-start-column="24" selection-end-line="54" selection-end-column="41" />
+            <state relative-caret-position="286">
+              <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1107">
-              <caret line="340" column="8" selection-start-line="340" selection-start-column="8" selection-end-line="340" selection-end-column="8" />
+            <state relative-caret-position="264">
+              <caret line="407" column="9" lean-forward="true" selection-start-line="407" selection-start-column="9" selection-end-line="407" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesTestOne.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="66" column="26" lean-forward="true" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="568">
-              <caret line="1388" selection-start-line="1388" selection-end-line="1388" />
+            <state relative-caret-position="180">
+              <caret line="1288" lean-forward="true" selection-start-line="1288" selection-end-line="1288" />
               <folding>
                 <element signature="method#importZipUsers#0;class#SmartUserController#0" />
                 <element signature="e#47329#47346#0" />
@@ -83,6 +77,15 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="368">
+              <caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="279">
@@ -102,9 +105,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>smartVisitorPageByUserId</find>
-      <find>like</find>
-      <find>queryVisitorPage</find>
       <find>appointmentPageRecord</find>
       <find>insertSmartScore</find>
       <find>SYSTEM_ERROR</find>
@@ -131,7 +131,10 @@
       <find>querySmartIdentityDatas</find>
       <find>queryLeaveRecords</find>
       <find>queryInfoData</find>
+      <find>classData</find>
       <find>WechatUserVo</find>
+      <find>Jsonobject</find>
+      <find>sonobject</find>
     </findStrings>
     <replaceStrings>
       <replace>班级</replace>
@@ -155,7 +158,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java" />
@@ -206,6 +208,7 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" />
       </list>
     </option>
   </component>
@@ -236,9 +239,10 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
-    <option name="width" value="958" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectId" id="2b6sxhjtfk5YsWPguK3OYQgIn3k" />
@@ -585,12 +589,12 @@
       <workItem from="1705388695984" duration="51258000" />
       <workItem from="1705885614332" duration="695000" />
       <workItem from="1705886328968" duration="31068000" />
-      <workItem from="1705992981607" duration="24464000" />
+      <workItem from="1705992981607" duration="28562000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="470490000" />
+    <option name="totallyTimeSpent" value="474588000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
@@ -604,11 +608,11 @@
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="8" weight="0.14179105" />
+      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.06769723" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.30165747" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.28008753" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3005525" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.27352297" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -622,7 +626,7 @@
       <window_info anchor="bottom" id="Version Control" order="14" />
       <window_info anchor="bottom" id="JRebel Executor" order="15" />
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
-      <window_info anchor="right" id="Maven" order="0" weight="0.84187084" />
+      <window_info anchor="right" id="Maven" order="0" weight="0.84298444" />
       <window_info anchor="right" id="Palette" order="1" />
       <window_info anchor="right" id="Capture Analysis" order="2" />
       <window_info anchor="right" id="Database" order="3" weight="0.32942432" />
@@ -720,7 +724,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java</url>
-          <line>81</line>
+          <line>84</line>
           <properties />
           <option name="timeStamp" value="59" />
         </line-breakpoint>
@@ -758,7 +762,7 @@
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
           <line>1179</line>
           <properties />
-          <option name="timeStamp" value="115" />
+          <option name="timeStamp" value="117" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -768,16 +772,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/WarningEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4209">
@@ -1101,31 +1095,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-151">
-          <caret line="54" column="41" selection-start-line="54" selection-start-column="24" selection-end-line="54" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1107">
-          <caret line="340" column="8" selection-start-line="340" selection-start-column="8" selection-end-line="340" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesTestOne.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="66" column="26" lean-forward="true" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+        <state relative-caret-position="368">
+          <caret line="70" column="27" selection-start-line="70" selection-start-column="27" selection-end-line="70" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="568">
-          <caret line="1388" selection-start-line="1388" selection-end-line="1388" />
+        <state relative-caret-position="180">
+          <caret line="1288" lean-forward="true" selection-start-line="1288" selection-end-line="1288" />
           <folding>
             <element signature="method#importZipUsers#0;class#SmartUserController#0" />
             <element signature="e#47329#47346#0" />
@@ -1140,6 +1120,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="56" column="120" selection-start-line="56" selection-start-column="120" selection-end-line="56" selection-end-column="120" />
+          <caret line="57" column="106" lean-forward="true" selection-start-line="57" selection-start-column="106" selection-end-line="57" selection-end-column="106" />
+          <caret line="58" column="40" lean-forward="true" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
+          <caret line="59" column="120" selection-start-line="59" selection-start-column="120" selection-end-line="59" selection-end-column="120" />
+          <caret line="60" column="25" lean-forward="true" selection-start-line="60" selection-start-column="25" selection-end-line="60" selection-end-column="25" />
+          <caret line="61" column="42" lean-forward="true" selection-start-line="61" selection-start-column="42" selection-end-line="61" selection-end-column="42" />
+          <caret line="62" column="15" lean-forward="true" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="15" />
+          <caret line="63" column="120" selection-start-line="63" selection-start-column="120" selection-end-line="63" selection-end-column="120" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesTestOne.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="407" column="9" lean-forward="true" selection-start-line="407" selection-start-column="9" selection-end-line="407" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 3 - 0
src/main/java/com/template/controller/SmartAttendanceController.java

@@ -79,6 +79,9 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         PersonalLeaveListSchoolPeriodRecordsResult result = seewoClient.invoke(request);
         System.out.println("出参:" +result);
 
+        //新增请假数据
+
+
         return CommonResult.ok("操作成功");
     }
 }

+ 6 - 6
src/main/java/com/template/controller/SmartUserController.java

@@ -1356,20 +1356,20 @@ public class SmartUserController implements SmartUserControllerAPI {
                 String insertUrl = controlConfig.getUrl() + "student/create";
 
                 JSONObject insertJsonobject = new JSONObject();
-                jsonobject.put("appid", appId);
+                insertJsonobject.put("appid", appId);
                 String insertStr = "{\"student_name\":\"" + usur.getName() + "\",\"classtab_no\":\"" + classData.getBsClassNo() + "\",\"student_number\":\"" + usur.getCardNo() + "\",\"student_sex\":\"" + usur.getSexId() + "\",\"student_photo\":\"" + imageUtils.getBase64Url(usur.getHeadImage()) + "\",\"student_tgno\":\"" + eTimeGroup.stringOf(usur.getTimeGroupId()) + "\"}";
                 String insertAesStr = URLEncoder.encode(AesTestOne.encrypt(insertStr, controlConfig.getAppSecret()), "UTF-8");
-                jsonobject.put("data", insertAesStr);
-                jsonobject.put("schoolno", schoolno);
-                jsonobject.put("timestamp", timestamp);
+                insertJsonobject.put("data", insertAesStr);
+                insertJsonobject.put("schoolno", schoolno);
+                insertJsonobject.put("timestamp", timestamp);
 
                 String insertMd5Str = "appid=" + appId + "&data={\"student_name\":\"" + usur.getName() + "\",\"classtab_no\":\"" + classData.getBsClassNo() + "\",\"student_number\":\"" + usur.getCardNo() + "\",\"student_sex\":\"" + usur.getSexId() + "\",\"student_photo\":\"" + imageUtils.getBase64Url(usur.getHeadImage()) + "\",\"student_tgno\":\"" + eTimeGroup.stringOf(usur.getTimeGroupId()) + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
                 String insertSign = CommonUtil.MD5(insertMd5Str);
                 //sign签名
-                jsonobject.put("sign", insertSign);
+                insertJsonobject.put("sign", insertSign);
 
                 //返回的结果中 code为1表示成功
-                String insertBsResult = RequestUtils.httpPost(url, jsonobject.toJSONString());
+                String insertBsResult = RequestUtils.httpPost(insertUrl, insertJsonobject.toJSONString());
 
                 if (insertBsResult.contains("添加成功")) {
                     ObjectMapper objectMapper = new ObjectMapper();

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

@@ -1,5 +1,4 @@
 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
@@ -433,6 +432,7 @@ com\template\model\enumModel\eExamType.class
 com\template\model\seewo\StudentLeaveStudentLeaveRequestHandlerResult$StudentLeaveRecordResult.class
 com\template\model\pojo\SmsCode.class
 com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsParam.class
+com\template\model\pojo\SmartDataTaskLog.class
 com\template\mapper\SmartScreenshotRecordMapper.class
 com\template\controller\UploadController.class
 com\template\model\seewo\AttendanceServiceListAttendClassRecordsResult$ResponseBody.class
@@ -610,4 +610,5 @@ com\template\model\seewo\TeacherServiceBatchSetClassMastersParam$TeacherServiceB
 com\template\model\seewo\HomeSchoolServiceSendNoteToKidParam$HomeSchoolServiceSendNoteToKidParamBuilder.class
 com\template\model\vo\BsStaffNoVo.class
 com\template\services\impl\SmartFreezeRecordServiceImpl.class
+com\template\model\pojo\SmartDataTaskDebug.class
 com\template\model\vo\BsStudentVo.class

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

@@ -55,6 +55,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\UploadControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\HttpUtils.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataTask.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataTaskDebug.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartIdentityControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\insertScreenshotRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartWarningControllerAPI.java
@@ -308,7 +309,6 @@ 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
@@ -395,6 +395,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\ExcelUtil3.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\student\SmartEvaluateSdetailList.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\EncryptionUtil.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataTaskLog.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\loginRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\result\CommonResult.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\exception\EmsExceptionHandler.java

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original