默认部门

.idea/workspace.xml

@@ -2,9 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.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/model/enumModel/eSexStatu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.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$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -19,20 +22,58 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
+            <state relative-caret-position="430">
+              <caret line="880" selection-start-line="880" selection-end-line="880" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="28">
+              <caret line="741" selection-start-line="741" selection-end-line="741" />
+              <folding>
+                <element signature="e#23978#23979#0" expanded="true" />
+                <element signature="e#24010#24011#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="11" column="30" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+            </state>
+          </provider>
+        </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="-1173" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
+            <state relative-caret-position="241">
+              <caret line="50" selection-start-line="50" selection-end-line="50" />
             </state>
           </provider>
         </entry>
@@ -46,6 +87,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="624">
+              <caret line="86" column="43" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -57,7 +107,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>departmentNo</find>
       <find>updateSmartUserById</find>
       <find>oldSchoolClass</find>
       <find>getTeacherScoreList</find>
@@ -84,9 +133,10 @@
       <find>rowNum</find>
       <find>从0开始统计数量 所以得+1</find>
       <find>importSmartScoreExcel</find>
-      <find>导入</find>
       <find>headImage</find>
+      <find>cardNo</find>
       <find>百胜新增</find>
+      <find>导入</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -99,7 +149,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/annotation/DESRespondSecret.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/EncryptUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" />
@@ -145,11 +194,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SystemMenuServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorityController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.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/BsDeleteStudentVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
     </option>
   </component>
@@ -182,7 +232,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -257,7 +307,8 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -304,6 +355,16 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="services" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -346,7 +407,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../校车预约移动端/carBooksDevelopV" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../民宿/mhotel" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -356,8 +417,8 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.template.annotation" />
       <recent name="com.template.model.vo" />
+      <recent name="com.template.annotation" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
@@ -427,18 +488,18 @@
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <workItem from="1707008843054" duration="16121000" />
-      <workItem from="1708481187426" duration="61513000" />
+      <workItem from="1708481187426" duration="72681000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="77634000" />
+    <option name="totallyTimeSpent" value="88802000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37260127" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24387528" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -449,8 +510,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <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.3358862" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.3129103" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33701658" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.84573305" />
       <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" />
@@ -467,7 +528,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.85412025" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.8262806" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -485,19 +546,13 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1420</line>
-          <properties />
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2100</line>
+          <line>2121</line>
           <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1506</line>
+          <line>1527</line>
           <properties />
           <option name="timeStamp" value="15" />
         </line-breakpoint>
@@ -509,17 +564,11 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1162</line>
+          <line>1183</line>
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1362</line>
-          <properties />
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
           <line>348</line>
           <properties />
@@ -543,44 +592,40 @@
           <properties />
           <option name="timeStamp" value="38" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>146</line>
+          <properties />
+          <option name="timeStamp" value="55" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>1472</line>
+          <properties />
+          <option name="timeStamp" value="57" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
+          <line>753</line>
+          <properties />
+          <option name="timeStamp" value="60" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
+          <line>748</line>
+          <properties />
+          <option name="timeStamp" value="61" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
+          <line>741</line>
+          <properties />
+          <option name="timeStamp" value="62" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/UploadController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="31" column="10" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/Task.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="34" column="52" selection-start-line="34" selection-start-column="52" selection-end-line="34" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="761">
-          <caret line="79" column="24" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
-          <folding>
-            <element signature="e#1747#1748#0" expanded="true" />
-            <element signature="e#1804#1805#0" expanded="true" />
-            <element signature="e#2139#2140#0" expanded="true" />
-            <element signature="e#2204#2205#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="232">
-          <caret line="30" selection-start-line="30" selection-end-line="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1072">
@@ -864,13 +909,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="736" column="8" selection-start-line="736" selection-start-column="8" selection-end-line="736" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="489">
@@ -895,6 +933,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="86" column="43" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="575">
@@ -902,17 +947,47 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
+        <state relative-caret-position="241">
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1173" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="30" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="28">
+          <caret line="741" selection-start-line="741" selection-end-line="741" />
+          <folding>
+            <element signature="e#23978#23979#0" expanded="true" />
+            <element signature="e#24010#24011#0" expanded="true" />
+          </folding>
+        </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="264">
-          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
+        <state relative-caret-position="430">
+          <caret line="880" selection-start-line="880" selection-end-line="880" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/common/utils/TimeExchange.java

@@ -1,5 +1,6 @@
 package com.template.common.utils;
 
+import com.alibaba.druid.sql.visitor.functions.Char;
 import com.template.model.enumModel.eWeekStatu;
 import com.template.model.pojo.UnitTimeHelpModel;
 import com.template.model.vo.ClassSettingDateVo;
@@ -733,8 +734,25 @@ public class TimeExchange {
         return new SimpleDateFormat("EEEE").format(c.getTime());
     }
 
-    public static void main(String[] args){
-        
+    public static void main(String[] args) {
+        findTheDifference();
+    }
+
+    public static char findTheDifference() {
+        String s = "abcd";
+        String t = "abcde";
+
+        if(s.length() > t.length()){
+            for (int i = 0;i<t.length();i++){
+                s = s.replaceFirst(String.valueOf(t.charAt(i)),"");
+            }
+            return s.charAt(0);
+        }else{
+            for (int i = 0;i<=s.length();i++){
+                t = t.replaceFirst(String.valueOf(s.charAt(i)),"");
+            }
+            return t.charAt(0);
+        }
     }
 
 }

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

@@ -176,11 +176,25 @@ public class SmartUserController implements SmartUserControllerAPI {
             Optional<String> image = uploadImages == null ? null : uploadImages.stream().filter(e -> e.equals("https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/" + user.getHeadImage())).findFirst();
             if (image != null && image.isPresent()) {
                 user.setHeadImage(image.get());
+            }else{
+                if(user.getIdentityId().equals(eIdentityStatu.Student.getValue())){
+                    return CommonResult.fail(user.getName()+"头像不存在，导入失败");
+                }
+
             }
         }
 
         //region 将数据加入第三方
         List<SmartUser> studentDatas = result.stream().filter(e -> e.getIdentityId().intValue() == eIdentityStatu.Student.getValue()).collect(Collectors.toList());
+
+        //判断是否存在重复数据
+        List<String> cardNos = studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList());
+        List<SmartUser> existUsers = smartUserService.querySmartUserByCardNos(cardNos);
+        if(existUsers != null && existUsers.size() > 0){
+            String names = StringUtils.join(existUsers.stream().map(SmartUser::getName).collect(Collectors.toList()),",");
+            return CommonResult.fail("系统中已存在"+names+"的信息数据，请勿重复导入");
+        }
+
         for (SmartUser student : studentDatas) {
 
             //region 学生参数必填判断：年级、班级
@@ -287,7 +301,6 @@ public class SmartUserController implements SmartUserControllerAPI {
                 return CommonResult.fail("导入失败");
             }
 
-            List<String> cardNos = studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList());
             for (String cardNo : cardNos) {
 
                 //region 希沃新增编辑学生家长信息
@@ -351,7 +364,6 @@ public class SmartUserController implements SmartUserControllerAPI {
         //endregion
 
         List<SmartUser> parents = result.stream().filter(e -> e.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()).collect(Collectors.toList());
-        List<String> cardNos = studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList());
         if (cardNos != null && cardNos.size() > 0) {
             List<SmartUser> students = smartUserService.querySmartUserByCardNos(cardNos);
             for (SmartUser parent : parents) {
@@ -613,6 +625,8 @@ public class SmartUserController implements SmartUserControllerAPI {
                         Optional<SmartDepartment> departModel = departments.stream().filter(e -> e.getName().equals(department)).findFirst();
                         if (departModel != null && departModel.isPresent()) {
                             departmentId = departModel.get().getId();
+                        }else{
+                            departmentId = 1;
                         }
 
                         //学号重复判断
@@ -677,6 +691,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         //region 家属
                         SmartUser familyOne = new SmartUser();
                         familyOne.setName(family);
+                        familyOne.setDepartmentId(1);
                         familyOne.setPhone(phone);
                         familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
                         familyOne.setSexId(eSexStatu.Man.getValue());
@@ -690,6 +705,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         String familyNameTwo = dataFormatter.formatCellValue(row.getCell(13));//家属2
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
                             familyTwo.setName(familyNameTwo);
+                            familyTwo.setDepartmentId(1);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(12));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
@@ -859,8 +875,11 @@ public class SmartUserController implements SmartUserControllerAPI {
                         Optional<SmartDepartment> departModel = departments.stream().filter(e -> e.getName().equals(department)).findFirst();
                         if (departModel != null && departModel.isPresent()) {
                             departmentId = departModel.get().getId();
+                        }else{
+                            departmentId = 1;
                         }
 
+
                         //学号重复判断
                         String cardNo = dataFormatter.formatCellValue(row.getCell(1));
                         if (!ObjectUtils.isEmpty(cardNo)) {
@@ -923,6 +942,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         //region 家属
                         SmartUser familyOne = new SmartUser();
                         familyOne.setName(family);
+                        familyOne.setDepartmentId(1);
                         familyOne.setPhone(phone);
                         familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
                         familyOne.setAffiliate(user.getCardNo());
@@ -936,6 +956,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         String familyNameTwo = dataFormatter.formatCellValue(row.getCell(13));//家属2
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
                             familyTwo.setName(familyNameTwo);
+                            familyTwo.setDepartmentId(1);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(12));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
@@ -2084,9 +2105,9 @@ public class SmartUserController implements SmartUserControllerAPI {
         String bsResult = RequestUtils.httpPost(url, jsonobject.toJSONString());
 
         ObjectMapper objectMapper = new ObjectMapper();
-        BsControlVo result = objectMapper.readValue(bsResult, BsControlVo.class);
+        BsDeleteStudentVo result = objectMapper.readValue(bsResult, BsDeleteStudentVo.class);
 
-        if (!bsResult.contains("删除成功")) {
+        if (!bsResult.contains("删除学生成功")) {
             return CommonResult.fail(result.getMsg());
         }
 

src/main/java/com/template/model/vo/BsDeleteStudentVo.java

@@ -0,0 +1,26 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2024/1/5 星期五 14:53
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class BsDeleteStudentVo {
+
+    private String resultcode;
+
+    private String msg;
+
+    private String appid;
+
+    private String timestamp;
+
+    private String data;
+
+    private String sign;
+
+}

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

@@ -664,6 +664,7 @@ com\template\model\dto\WarningDeletePushDto.class
 com\template\common\utils\UUIDUtil.class
 com\template\mapper\SystemMenuMapper.class
 com\template\model\enumModel\eFileType.class
+com\template\model\vo\BsDeleteStudentVo.class
 com\template\model\request\useridsRequest.class
 com\template\model\request\updateRepairAdminRequest.class
 com\template\model\pojo\SmartNotification.class

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

@@ -445,6 +445,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\HikvisionController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\EncryptUtil.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\TeacherServiceBatchRemoveTeachersResult.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\BsDeleteStudentVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartCarAccessControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartFaceDiscernControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\BsDepartmentNoVo.java