夏文涛 преди 2 години
родител
ревизия
66340312bc

+ 206 - 232
.idea/workspace.xml

@@ -2,26 +2,13 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="9931dd54-c6ba-4f79-99b0-d746475b8903" name="Default Changelist" comment="">
     <list default="true" id="9931dd54-c6ba-4f79-99b0-d746475b8903" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertMenuRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateClassRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateMenuRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartGradeRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDutiesType.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateDutiesRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/DutiesListVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartClassControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartClassControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.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/pojo/SmartAttendance.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAttendance.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartClassService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartClassService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartGradeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartGradeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartClassServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartClassServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartGradeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartGradeServiceImpl.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$/src/main/java/com/template/controller/SmartMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -50,35 +37,11 @@
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="57" column="9" lean-forward="true" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="58" column="41" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartMenuService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
-              <caret line="4" column="43" lean-forward="true" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
+            <state relative-caret-position="2760">
+              <caret line="120" column="45" selection-start-line="120" selection-start-column="24" selection-end-line="120" selection-end-column="45" />
               <folding>
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="imports" expanded="true" />
               </folding>
               </folding>
@@ -87,22 +50,19 @@
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="355">
-              <caret line="24" column="66" selection-start-line="24" selection-start-column="66" selection-end-line="24" selection-end-column="66" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="194">
+              <caret line="23" column="68" selection-start-line="23" selection-start-column="68" selection-end-line="23" selection-end-column="68" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertMenuRequest.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+            <state relative-caret-position="368">
+              <caret line="19" column="23" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="23" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -118,9 +78,6 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
-      <find>, int</find>
-      <find>smartVisitorPageByUserId</find>
-      <find>, Int</find>
       <find>appointmentPageRecord</find>
       <find>appointmentPageRecord</find>
       <find>XWR</find>
       <find>XWR</find>
       <find>\\\</find>
       <find>\\\</find>
@@ -148,6 +105,9 @@
       <find>School</find>
       <find>School</find>
       <find>班级</find>
       <find>班级</find>
       <find>querySmartMenus</find>
       <find>querySmartMenus</find>
+      <find>菜单</find>
+      <find>Menu</find>
+      <find>getSmartDutiesByCategoryId</find>
     </findStrings>
     </findStrings>
     <replaceStrings>
     <replaceStrings>
       <replace>班级</replace>
       <replace>班级</replace>
@@ -160,6 +120,8 @@
       <replace>\</replace>
       <replace>\</replace>
       <replace>菜单</replace>
       <replace>菜单</replace>
       <replace>Menu</replace>
       <replace>Menu</replace>
+      <replace>职务</replace>
+      <replace>Duties</replace>
     </replaceStrings>
     </replaceStrings>
   </component>
   </component>
   <component name="Git.Settings">
   <component name="Git.Settings">
@@ -168,15 +130,6 @@
   <component name="IdeDocumentHistory">
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
     <option name="CHANGED_PATHS">
       <list>
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartVisitorControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/imageUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/GradeVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsStudentVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsStudentNoVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParentOfStudentVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParentOfStudentVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParentOfStudentsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParentOfStudentsVo.java" />
@@ -209,7 +162,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartClassServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartClassServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartClassService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartClassService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartMenuMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartMenuMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartClassControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartClassControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateMenuRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateMenuRequest.java" />
@@ -218,7 +170,17 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartMenuService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartMenuService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDutiesMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateDutiesRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/DutiesListVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDutiesType.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -301,6 +263,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="api" 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="controller" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -329,7 +300,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="pojo" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -348,6 +319,16 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" 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" />
               <item name="services" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -407,11 +388,11 @@
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
     </key>
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.template.model.enumModel" />
+      <recent name="com.template.model.vo" />
       <recent name="com.template.model.request" />
       <recent name="com.template.model.request" />
       <recent name="com.template.api" />
       <recent name="com.template.api" />
-      <recent name="com.template.model.vo" />
       <recent name="com.template.config" />
       <recent name="com.template.config" />
-      <recent name="com.template.model.enumModel" />
     </key>
     </key>
     <key name="CopyFile.RECENT_KEYS">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
@@ -520,12 +501,12 @@
       <workItem from="1704765975943" duration="72000" />
       <workItem from="1704765975943" duration="72000" />
       <workItem from="1704766062941" duration="43011000" />
       <workItem from="1704766062941" duration="43011000" />
       <workItem from="1704936821369" duration="29299000" />
       <workItem from="1704936821369" duration="29299000" />
-      <workItem from="1705280443643" duration="16858000" />
+      <workItem from="1705280443643" duration="25331000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="344202000" />
+    <option name="totallyTimeSpent" value="352675000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
@@ -539,11 +520,11 @@
       <window_info id="Designer" order="5" />
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.4474836" />
+      <window_info content_ui="combo" id="Project" order="8" weight="0.4474836" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.3127072" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.3127072" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.66077346" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.65414363" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <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="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -578,11 +559,11 @@
       <window_info id="Designer" order="5" />
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.20895523" />
+      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.21801706" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3129103" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.66740334" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3127072" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.65426695" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <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="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -659,144 +640,6 @@
     <option name="FILTER_TARGETS" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.1/spring-aop-5.3.1.jar!/org/springframework/aop/framework/CglibAopProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="433" selection-start-line="433" selection-end-line="433" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.1/spring-core-5.3.1.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="104" selection-start-line="104" selection-end-line="104" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="73">
-          <caret line="112" column="6" selection-start-line="112" selection-start-column="6" selection-end-line="112" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartGradeRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="213" selection-start-line="213" selection-end-line="213" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="11" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="117" column="73" selection-start-line="117" selection-start-column="53" selection-end-line="117" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="113" column="13" lean-forward="true" selection-start-line="113" selection-start-column="13" selection-end-line="113" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/OrganizationNodeServiceInitSchoolClassesParam.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-276" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1334">
-          <caret line="65" column="13" lean-forward="true" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/AttendanceRuleListEventByClazzParam.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="295">
-          <caret line="203" column="25" selection-start-line="203" selection-start-column="25" selection-end-line="203" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-50">
-          <caret line="235" selection-start-line="235" selection-end-line="235" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <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="292">
-          <caret line="106" column="19" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAttendance.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1058">
-          <caret line="58" column="32" selection-start-line="58" selection-start-column="32" selection-end-line="58" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/AttendanceRuleListEventByClazzResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1955">
-          <caret line="117" column="30" selection-start-line="117" selection-start-column="20" selection-end-line="117" selection-end-column="30" />
-          <folding>
-            <element signature="e#2421#2422#0" expanded="true" />
-            <element signature="e#2463#2464#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="8073">
-          <caret line="1031" selection-start-line="1024" selection-start-column="12" selection-end-line="1031" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#logoffAccount#0;class#SmartUserController#0" />
-            <element signature="method#changeDepartment#0;class#SmartUserController#0" />
-            <element signature="method#importExcelUsers#0;class#SmartUserController#0" />
-            <element signature="docComment;method#importZipUsers#0;class#SmartUserController#0" />
-            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
-            <element signature="docComment;method#readXlsx#0;class#SmartUserController#0" />
-            <element signature="method#readXlsx#0;class#SmartUserController#0" />
-            <element signature="docComment;method#readXls#0;class#SmartUserController#0" />
-            <element signature="method#readXls#0;class#SmartUserController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartFreezeRecordController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartFreezeRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="292">
         <state relative-caret-position="292">
@@ -938,13 +781,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml">
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </entry>
@@ -1019,18 +855,53 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartMenuControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="24" column="66" selection-start-line="24" selection-start-column="66" selection-end-line="24" selection-end-column="66" />
+        <state relative-caret-position="369">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="433">
+          <caret line="72" column="35" lean-forward="true" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDepartmentMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="14" selection-start-line="14" selection-end-line="14" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDutiesMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="14" column="11" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDuties.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDepartmentService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartMenuService.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartMenuService.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="43" lean-forward="true" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
+        <state relative-caret-position="621">
+          <caret line="27" column="62" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="27" selection-end-column="62" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
           </folding>
           </folding>
@@ -1039,24 +910,127 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="58" column="41" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="41" />
+        <state relative-caret-position="562">
+          <caret line="75" column="8" selection-start-line="75" selection-start-column="8" selection-end-line="80" selection-end-column="57" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsClassVo.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/BsClassNoVo.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/GradeVo.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/GradeListVo.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/DutiesListVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="25" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eExamType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDutiesType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="57" column="9" lean-forward="true" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
+        <state relative-caret-position="516">
+          <caret line="70" column="66" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="66" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateDutiesRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDutiesService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="667">
+          <caret line="31" column="69" selection-start-line="31" selection-start-column="69" selection-end-line="31" selection-end-column="69" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="631">
+          <caret line="85" column="55" selection-start-line="85" selection-start-column="29" selection-end-line="85" selection-end-column="55" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2760">
+          <caret line="120" column="45" selection-start-line="120" selection-start-column="24" selection-end-line="120" selection-end-column="45" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="23" column="68" selection-start-line="23" selection-start-column="68" selection-end-line="23" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="19" column="23" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
   <component name="masterDetails">
   <component name="masterDetails">
     <states>
     <states>

+ 1 - 1
src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         mpg.setPackageInfo(pc);
         //4、策略配置
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("smart_menu"); // 设置要映射的表名"smart_class","smart_grade","smart_attendance"
+        strategy.setInclude("smart_duties"); // 设置要映射的表名"smart_class","smart_grade","smart_attendance"
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok;
         strategy.setEntityLombokModel(true); // 自动lombok;

+ 46 - 0
src/main/java/com/template/api/SmartDutiesControllerAPI.java

@@ -0,0 +1,46 @@
+package com.template.api;
+
+import com.template.model.request.insertDutiesRequest;
+import com.template.model.request.updateDutiesRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @Author: binguo
+ * @Date: 2023/3/30 星期四 17:28
+ * @Description: com.video.api
+ * @Version: 1.0
+ */
+@RequestMapping("/api/smartDuties")
+@Api(tags = {"SmartDutiesControllerAPI"}, value = "职务")
+public interface SmartDutiesControllerAPI {
+    @PostMapping(value = "/insertSmartDuties")
+    @ApiOperation(value = "添加职务", notes = "添加职务数据", httpMethod = "POST")
+    CommonResult insertSmartDuties(@Validated @RequestBody insertDutiesRequest imr, BindingResult bindingResult);
+
+    @PostMapping(value = "/updateSmartDutiesById")
+    @ApiOperation(value = "编辑职务数据", notes = "编辑职务数据", httpMethod = "POST")
+    CommonResult updateSmartDutiesById(@Validated @RequestBody updateDutiesRequest ra, BindingResult bindingResult) throws Exception;
+
+    @GetMapping(value = "/queryPageSmartDuties")
+    @ApiOperation(value = "职务分页数据", notes = "职务分页数据", httpMethod = "GET")
+    CommonResult queryPageSmartDutiess(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+
+    @GetMapping(value = "/deleteSmartDutiesById")
+    @ApiOperation(value = "根据ID删除指定职务", notes = "根据ID删除指定职务", httpMethod = "GET")
+    CommonResult deleteSmartDutiesById(@RequestParam int id);
+
+    @GetMapping(value = "/queryDutiesCategorys")
+    @ApiOperation(value = "获取职务类型数据集合", notes = "获取职务类型数据集合", httpMethod = "GET")
+    CommonResult queryDutiesCategorys();
+
+    @GetMapping(value = "/queryDutiesByCategory")
+    @ApiOperation(value = "获取职务数据集合", notes = "获取职务数据集合", httpMethod = "GET")
+    CommonResult queryDutiesByCategory(@RequestParam int categoryId);
+
+}

+ 137 - 0
src/main/java/com/template/controller/SmartDutiesController.java

@@ -0,0 +1,137 @@
+package com.template.controller;
+
+
+import com.template.api.SmartDutiesControllerAPI;
+import com.template.common.utils.paramUtils;
+import com.template.model.enumModel.eDutiesType;
+import com.template.model.pojo.SmartDuties;
+import com.template.model.request.insertDutiesRequest;
+import com.template.model.request.updateDutiesRequest;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.DutiesListVo;
+import com.template.services.SmartDutiesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 应用管理 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-01-16
+ */
+@RestController
+public class SmartDutiesController implements SmartDutiesControllerAPI {
+
+    @Autowired
+    private SmartDutiesService smartDutiesService;
+
+    @Override
+    public CommonResult insertSmartDuties(insertDutiesRequest idr, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+        //去重判断
+        SmartDuties existSm = smartDutiesService.querySmartDutiesByName(idr.getName(), idr.getCategoryId());
+        if (existSm != null) {
+            return CommonResult.fail("系统中存在重复职务,添加失败");
+        }
+
+        SmartDuties sm = new SmartDuties();
+        sm.setName(idr.getName());
+        sm.setCategoryId(idr.getCategoryId());
+
+        int result = smartDutiesService.insertSmartDuties(sm);
+
+        return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
+    }
+
+    @Override
+    public CommonResult updateSmartDutiesById(updateDutiesRequest udr, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        if (udr.getId() == null) {
+            return CommonResult.fail("数据ID不能为空");
+        }
+
+        SmartDuties oldData = smartDutiesService.getSmartById(udr.getId());
+        if (oldData == null) {
+            return CommonResult.fail("职务基本信息无效,修改失败");
+        }
+
+        //去重判断
+        SmartDuties existSm = smartDutiesService.querySmartDutiesByName(udr.getName(), udr.getCategoryId());
+        if (existSm != null && !existSm.getId().equals(udr.getId())) {
+            return CommonResult.fail("系统中存在重复职务,修改失败");
+        }
+
+        oldData.setName(udr.getName() == null ? oldData.getName() : udr.getName());
+        oldData.setCategoryId(udr.getCategoryId() == null ? oldData.getCategoryId() : udr.getCategoryId());
+
+        int result = smartDutiesService.updateSmartDuties(oldData);
+        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+    }
+
+    @Override
+    public CommonResult queryPageSmartDutiess(int currentPage, int pageCount, String name) {
+        PageUtils<SmartDuties> result = smartDutiesService.queryPageSmartDutiess(currentPage, pageCount, name);
+
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult deleteSmartDutiesById(int id) {
+        SmartDuties data = smartDutiesService.getSmartById(id);
+
+        if (data == null) {
+            return CommonResult.fail("当前数据不存在,删除失败!");
+        }
+
+        int result = smartDutiesService.deleteSmartDutiesById(id);
+
+        return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+    }
+
+    @Override
+    public CommonResult queryDutiesCategorys() {
+        List<DutiesListVo> result = new ArrayList<>();
+
+        for (int i = 1; i <= 2; i++) {
+            DutiesListVo data = new DutiesListVo();
+            data.setId(i);
+            data.setName(eDutiesType.stringOf(i));
+            result.add(data);
+        }
+
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult queryDutiesByCategory(int categoryId){
+        List<DutiesListVo> result = new ArrayList<>();
+
+        List<SmartDuties> datas = smartDutiesService.getSmartDutiesByCategoryId(categoryId);
+
+        for (SmartDuties data:datas) {
+            DutiesListVo model = new DutiesListVo();
+            model.setId(data.getId());
+            model.setName(data.getName());
+            result.add(model);
+        }
+
+        return CommonResult.ok(result);
+    }
+
+}
+

+ 1 - 1
src/main/java/com/template/controller/SmartMenuController.java

@@ -68,7 +68,7 @@ public class SmartMenuController implements SmartMenuControllerAPI {
 
 
         //去重判断
         //去重判断
         SmartMenu existSm = smartMenuService.querySmartMenuByName(umr.getName(),umr.getRoute());
         SmartMenu existSm = smartMenuService.querySmartMenuByName(umr.getName(),umr.getRoute());
-        if(existSm != null){
+        if(existSm != null && !existSm.getId().equals(umr.getId())){
             return CommonResult.fail("系统中存在重复菜单,修改失败");
             return CommonResult.fail("系统中存在重复菜单,修改失败");
         }
         }
 
 

+ 18 - 0
src/main/java/com/template/mapper/SmartDutiesMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.SmartDuties;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 应用管理 Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-01-16
+ */
+@Repository
+public interface SmartDutiesMapper extends BaseMapper<SmartDuties> {
+
+}

+ 55 - 0
src/main/java/com/template/model/enumModel/eDutiesType.java

@@ -0,0 +1,55 @@
+package com.template.model.enumModel;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 账号状态
+ */
+public enum eDutiesType {
+    Student(1),//学生
+    Teacher(2);//老师
+
+    private int value;
+
+    eDutiesType(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eDutiesType valueOf(int value) {
+        switch (value) {
+            case 1:
+                return eDutiesType.Student;
+            case 2:
+                return eDutiesType.Teacher;
+            default:
+                return null;
+        }
+    }
+
+    public static Integer integerOf(String value) {
+        switch (value) {
+            case "学生":
+                return 1;
+            case "老师":
+                return 2;
+            default:
+                return null;
+        }
+    }
+
+    public static String stringOf(Integer value) {
+        switch (value) {
+            case 1:
+                return "学生";
+            case 2:
+                return "老师";
+            default:
+                return null;
+        }
+    }
+}

+ 65 - 0
src/main/java/com/template/model/pojo/SmartDuties.java

@@ -0,0 +1,65 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 应用管理
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SmartDuties对象", description="应用管理")
+public class SmartDuties implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "职务名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型ID  学生:1 老师:2")
+    private Integer categoryId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

+ 30 - 0
src/main/java/com/template/model/request/insertDutiesRequest.java

@@ -0,0 +1,30 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/7 星期五 14:27
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class insertDutiesRequest {
+    /**
+     * 职务名称
+     */
+    @NotBlank(message = "职务名称不能为空")
+    private String name;
+
+    /**
+     * 类型ID
+     * 学生:1
+     * 老师:2
+     */
+    @NotBlank(message = "类型ID不能为空")
+    private Integer categoryId;
+
+}

+ 37 - 0
src/main/java/com/template/model/request/updateDutiesRequest.java

@@ -0,0 +1,37 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/7 星期五 14:27
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class updateDutiesRequest {
+
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空")
+    private Integer id;
+
+    /**
+     * 职务名称
+     */
+    @NotBlank(message = "职务名称不能为空")
+    private String name;
+
+    /**
+     * 类型ID
+     * 学生:1
+     * 老师:2
+     */
+    @NotNull(message = "类型ID不能为空")
+    private Integer categoryId;
+
+}

+ 23 - 0
src/main/java/com/template/model/vo/DutiesListVo.java

@@ -0,0 +1,23 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/4 星期一 15:57
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class DutiesListVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 职务名称
+     */
+    private String name;
+
+}

+ 33 - 0
src/main/java/com/template/services/SmartDutiesService.java

@@ -0,0 +1,33 @@
+package com.template.services;
+
+import com.template.model.pojo.SmartDuties;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.result.PageUtils;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 应用管理 服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-01-16
+ */
+public interface SmartDutiesService extends IService<SmartDuties> {
+    int insertSmartDuties(SmartDuties rns);
+
+    int updateSmartDuties(SmartDuties rns);
+
+    PageUtils<SmartDuties> queryPageSmartDutiess(int currentPage, int pageCount, String name);
+
+    int deleteSmartDutiesById(int id);
+
+    SmartDuties getSmartById(int id);
+
+    SmartDuties getSmartDuties();
+
+    SmartDuties querySmartDutiesByName(String name, Integer categoryId);
+
+    List<SmartDuties> getSmartDutiesByCategoryId(Integer categoryId);
+}

+ 94 - 0
src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java

@@ -0,0 +1,94 @@
+package com.template.services.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.template.mapper.SmartDutiesMapper;
+import com.template.model.pojo.SmartDuties;
+import com.template.model.result.PageUtils;
+import com.template.services.SmartDutiesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 应用管理 服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-01-16
+ */
+@Service
+public class SmartDutiesServiceImpl extends ServiceImpl<SmartDutiesMapper, SmartDuties> implements SmartDutiesService {
+
+    @Autowired
+    private SmartDutiesMapper smartDutiesMapper;
+
+    @Override
+    public int insertSmartDuties(SmartDuties rns) {
+        int result = smartDutiesMapper.insert(rns);
+        return result;
+    }
+
+    @Override
+    public int updateSmartDuties(SmartDuties rns) {
+        int result = smartDutiesMapper.updateById(rns);
+        return result;
+    }
+
+    @Override
+    public PageUtils<SmartDuties> queryPageSmartDutiess(int currentPage, int pageCount, String name) {
+        Page<SmartDuties> page = new Page<>(currentPage, pageCount);
+        QueryWrapper<SmartDuties> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.hasText(name), "name", name);
+        IPage<SmartDuties> result = smartDutiesMapper.selectPage(page, queryWrapper);
+        return new PageUtils<>(result);
+    }
+
+    @Override
+    public int deleteSmartDutiesById(int id) {
+        int result = smartDutiesMapper.deleteById(id);
+        return result;
+    }
+
+    @Override
+    public SmartDuties getSmartById(int id) {
+        SmartDuties result = smartDutiesMapper.selectById(id);
+        return result;
+    }
+
+    @Override
+    public SmartDuties getSmartDuties() {
+        SmartDuties newOne = this.getOne(new LambdaQueryWrapper<SmartDuties>()
+                .orderBy(true, false, SmartDuties::getCreateTime)
+                .last("limit 1")
+        );
+
+        return newOne == null ? new SmartDuties() : newOne;
+    }
+
+    @Override
+    public SmartDuties querySmartDutiesByName(String name, Integer categoryId) {
+        QueryWrapper<SmartDuties> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(name), "name", name)
+                .or()
+                .eq(categoryId != null && categoryId > 0, "category_id", categoryId);
+        SmartDuties result = smartDutiesMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<SmartDuties> getSmartDutiesByCategoryId(Integer categoryId) {
+        QueryWrapper<SmartDuties> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(categoryId != null && categoryId > 0, "category_id", categoryId);
+
+        List<SmartDuties> result = smartDutiesMapper.selectList(queryWrapper);
+
+        return result;
+    }
+}