Default Changelist

.gitignore

@@ -21,3 +21,36 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+
+### Spring Boot
+
+target/
+!target/classes/
+!target/dependency-reduced-pom.xml
+!target/maven-archiver/pom.properties
+!target/maven-archiver/pom.xml
+!**/.mvn/wrapper/maven-wrapper.jar
+!**/.mvn/wrapper/maven-wrapper.properties
+
+### IntelliJ IDEA
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+### Eclipse
+
+.project
+.classpath
+.settings/
+
+### Windows
+
+Thumbs.db
+*.DS_Store
+
+### macOS
+
+.DS_Store

.idea/compiler.xml

@@ -8,8 +8,8 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="mybatis_plus" />
-        <module name="template_code" />
         <module name="Back-endDevelopmentFramework" />
+        <module name="template_code" />
       </profile>
     </annotationProcessing>
   </component>

.idea/encodings.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/workspace.xml

@@ -5,31 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-<<<<<<< HEAD
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/ePunish.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/UpdateSmartSchoolRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScreenshotRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScreenshotRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartEnumVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartSchoolControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartSchoolControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScreenshotControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScreenshotControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartSchoolService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartSchoolService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartScreenshotService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartScreenshotService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSchoolServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSchoolServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotServiceImpl.java" afterDir="false" />
-=======
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataClassServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataClassServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
->>>>>>> e73f26a5f4190843adc2579cbc0537a907e36fe6
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -42,43 +25,91 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceLogServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="251">
-              <caret line="115" column="49" selection-start-line="115" selection-start-column="24" selection-end-line="115" selection-end-column="49" />
+            <state relative-caret-position="978">
+              <caret line="57" column="54" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="138">
+              <caret line="69" column="7" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" 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/api/SmartDataClassControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="207">
+              <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScreenshotControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="161">
+              <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" 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/services/impl/SmartDataSourceServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="31" column="101" selection-start-line="31" selection-start-column="92" selection-end-line="31" selection-end-column="101" />
+            <state relative-caret-position="1058">
+              <caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartBuildService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="58" column="63" selection-start-line="58" selection-start-column="63" selection-end-line="58" selection-end-column="63" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="299">
+              <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="24" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/UpdateSmartSchoolRequest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceLogService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="123">
-              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="483">
+              <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="161">
+              <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartBuildServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="687">
+              <caret line="60" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -94,6 +125,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+      <find>冻结记录</find>
+      <find>学校基本信息</find>
+      <find>水电表能耗明细</find>
       <find>截屏记录</find>
       <find>用户</find>
       <find>访客预约</find>
@@ -119,11 +153,8 @@
       <find>queryIdentityByName</find>
       <find>预警信息</find>
       <find>数据源</find>
-      <find>@NotBlank</find>
       <find>Build</find>
       <find>楼栋</find>
-      <find>@NotNull</find>
-      <find>getSmartByTimes</find>
     </findStrings>
     <replaceStrings>
       <replace>身份</replace>
@@ -164,6 +195,23 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMeterServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSchoolServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartWarningServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartApplyMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/changePasswordRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/freezeRepairAdminRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/queryAccountPageRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateRepairAdminRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertIdentityRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" />
@@ -177,8 +225,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartIdentityVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDataSourceLogMapper.java" />
@@ -196,25 +246,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceLogServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartSchoolRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartSchoolService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSchoolServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/smartSchoolRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/UpdateSmartSchoolRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartSchoolControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/ePunish.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartEnumVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartScreenshotService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScreenshotRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScreenshotRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartScreenshotControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" />
       </list>
     </option>
   </component>
@@ -224,9 +255,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="D:\Software\Develop\Maven\repository" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../Software/Develop/Maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.3.9\conf\settings.xml" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../Software/Develop/Maven/apache-maven-3.8.8" />
+        <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.8.8\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -249,8 +279,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="953" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -347,7 +377,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
+              <item name="pojo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -434,6 +464,7 @@
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
     &quot;spring.configuration.checksum&quot;: &quot;64bf9ba214eb006c40cb35e0f61a7d20&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
@@ -442,20 +473,20 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.template" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.template.model.request" />
       <recent name="com.template.api" />
       <recent name="com.template.model.vo" />
+      <recent name="com.template.model.request" />
       <recent name="com.template.model.result" />
       <recent name="com.template.utils" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
-    </key>
   </component>
   <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" nameIsGenerated="true">
@@ -505,19 +536,25 @@
       <workItem from="1688612583930" duration="14000" />
       <workItem from="1688623572162" duration="6039000" />
       <workItem from="1701393315043" duration="136000" />
-<<<<<<< HEAD
-      <workItem from="1701669886732" duration="49622000" />
-=======
       <workItem from="1701669886732" duration="27098000" />
       <workItem from="1701764903042" duration="5734000" />
       <workItem from="1701865008670" duration="65000" />
       <workItem from="1701869528061" duration="202000" />
->>>>>>> e73f26a5f4190843adc2579cbc0537a907e36fe6
+      <workItem from="1702001001960" duration="9678000" />
+      <workItem from="1702021190308" duration="1252000" />
+      <workItem from="1702022482922" duration="262000" />
+      <workItem from="1702022763352" duration="675000" />
+      <workItem from="1702025530468" duration="1600000" />
+      <workItem from="1702027894702" duration="309000" />
+      <workItem from="1702029297620" duration="202000" />
+      <workItem from="1702029596859" duration="116000" />
+      <workItem from="1702029914028" duration="156000" />
+      <workItem from="1702030090469" duration="6723000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="86092000" />
+    <option name="totallyTimeSpent" value="63568000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -529,10 +566,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="953" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.26280624" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33102345" />
       <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" />
@@ -543,8 +580,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" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.47045952" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.3392265" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.48687088" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.34901533" />
       <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" weight="0.32932165" />
@@ -639,379 +676,375 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataClass.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="359">
+          <caret line="33" column="56" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1403">
-          <caret line="71" column="47" selection-start-line="71" selection-start-column="47" selection-end-line="71" selection-end-column="47" />
+        <state relative-caret-position="-317">
+          <caret line="130" column="39" selection-start-line="130" selection-start-column="39" selection-end-line="130" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartBuildMeterController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="124">
+          <caret line="132" column="26" selection-start-line="132" selection-start-column="26" selection-end-line="132" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartBuildMeterControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="19" column="17" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
+        <state relative-caret-position="1224">
+          <caret line="65" column="48" selection-start-line="65" selection-start-column="48" selection-end-line="65" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartBuildControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="33" column="60" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="33" selection-end-column="60" />
+        <state relative-caret-position="92">
+          <caret line="4" column="59" selection-start-line="4" selection-start-column="59" selection-end-line="4" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartBuildController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="91" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="91" selection-end-column="5" />
+        <state relative-caret-position="-19">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceLogController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1288">
-          <caret line="87" column="71" selection-start-line="87" selection-start-column="71" selection-end-line="87" selection-end-column="71" />
+        <state relative-caret-position="23">
+          <caret line="35" selection-start-line="35" selection-end-line="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataClassService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="11" column="2" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
+        <state relative-caret-position="134">
+          <caret line="21" column="51" lean-forward="true" selection-start-line="21" selection-start-column="51" selection-end-line="21" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartBuildService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SystemMenuTreeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="24" selection-end-column="36" />
+        <state relative-caret-position="198">
+          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceLogService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/handle/NonStaticResourceHttpRequestHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
+        <state relative-caret-position="253">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/core/JwtlnterceptorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+        <state relative-caret-position="115">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartBuildServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartIdentityVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="687">
-          <caret line="60" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
+        <state relative-caret-position="207">
+          <caret line="27" column="4" selection-start-line="27" selection-start-column="4" selection-end-line="31" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertIdentityRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1058">
-          <caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
+        <state relative-caret-position="197">
+          <caret line="20" column="23" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceLogServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="978">
-          <caret line="57" column="54" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+        <state relative-caret-position="188">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="69" column="7" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+        <state relative-caret-position="243">
+          <caret line="49" column="38" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SendController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+        <state relative-caret-position="161">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
+        <state relative-caret-position="220">
+          <caret line="25" column="14" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertIdentityRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="26" column="34" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="34" />
+        <state relative-caret-position="276">
+          <caret line="59" column="9" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java">
+    <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="321">
-          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+        <state relative-caret-position="188">
+          <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/pojo/RepairAdmin.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
+        <state relative-caret-position="186">
+          <caret line="43" selection-start-line="43" selection-end-line="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/freezeRepairAdminRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state relative-caret-position="243">
+          <caret line="44" column="54" selection-start-line="44" selection-start-column="54" selection-end-line="44" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/UpdateSmartSchoolRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
+        <state relative-caret-position="220">
+          <caret line="20" column="51" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
+        <state relative-caret-position="280">
+          <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSchoolServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateIdentityRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="70" selection-start-line="70" selection-end-line="70" />
+        <state relative-caret-position="47">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" 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/SmartSchoolService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="24" column="15" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="15" />
+        <state relative-caret-position="347">
+          <caret line="33" column="49" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateRepairAdminRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="415">
+          <caret line="53" column="34" selection-start-line="53" selection-start-column="34" selection-end-line="53" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartBuildMeterMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-503">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <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/model/enumModel/eStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDataSourceLogMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <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/enumModel/eIsSuper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDataClassMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="12" />
+        <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/api/SmartSchoolControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDataSourceMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="26" column="67" lean-forward="true" selection-start-line="26" selection-start-column="67" selection-end-line="26" selection-end-column="67" />
+        <state relative-caret-position="276">
+          <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SystemMenuTreeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataSource.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="295">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataSourceLog.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="21" column="28" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="21" selection-end-column="28" />
+        <state relative-caret-position="23">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartEnumVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataClassServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="24" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="24" />
+        <state relative-caret-position="164">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/ePunish.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataClass.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="65" column="25" selection-start-line="65" selection-start-column="25" selection-end-line="65" selection-end-column="25" />
-          <folding>
-            <element signature="e#455#456#0" expanded="true" />
-            <element signature="e#512#513#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="310">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </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">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="213" selection-start-line="213" selection-end-line="213" />
+        <state relative-caret-position="1403">
+          <caret line="71" column="47" selection-start-line="71" selection-start-column="47" selection-end-line="71" selection-end-column="47" />
         </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">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartBuildMeterController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="102" selection-start-line="102" selection-end-line="102" />
+        <state relative-caret-position="295">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartScreenshotServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartBuildMeterControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="65" column="24" lean-forward="true" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" />
+        <state relative-caret-position="276">
+          <caret line="19" column="17" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartBuildControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        <state relative-caret-position="621">
+          <caret line="33" column="60" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="33" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateScreenshotRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartBuildController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="67">
-          <caret line="15" column="36" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="36" />
+        <state relative-caret-position="654">
+          <caret line="91" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="91" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartScreenshotService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceLogController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="24" column="19" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="19" />
+        <state relative-caret-position="1288">
+          <caret line="87" column="71" selection-start-line="87" selection-start-column="71" selection-end-line="87" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertScreenshotRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataClassService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="534">
-          <caret line="34" column="12" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="12" />
+        <state relative-caret-position="184">
+          <caret line="11" column="2" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateIdentityRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartBuildService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="299">
+          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="24" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceLogService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-499">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="483">
+          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="76" column="8" selection-start-line="76" selection-start-column="8" selection-end-line="87" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="161">
+          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartBuildServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="49" column="38" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="687">
+          <caret line="60" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="25" column="14" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="14" />
+        <state relative-caret-position="1058">
+          <caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceLogServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="766">
-          <caret line="89" column="50" selection-start-line="89" selection-start-column="50" selection-end-line="89" selection-end-column="50" />
+        <state relative-caret-position="978">
+          <caret line="57" column="54" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/UpdateSmartSchoolRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="123">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="138">
+          <caret line="69" column="7" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="58" column="63" selection-start-line="58" selection-start-column="63" selection-end-line="58" selection-end-column="63" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="150">
+          <caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="115" column="49" selection-start-line="115" selection-start-column="24" selection-end-line="115" selection-end-column="49" />
+        <state relative-caret-position="207">
+          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScreenshotControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="31" column="101" selection-start-line="31" selection-start-column="92" selection-end-line="31" selection-end-column="101" />
+        <state relative-caret-position="161">
+          <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/api/SmartDataSourceControllerAPI.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 public interface SmartDataSourceControllerAPI {
     @PostMapping(value = "/insertSmartDataSource")
     @ApiOperation(value = "添加数据源", notes = "添加数据源数据", httpMethod = "POST")
-    CommonResult insertSmartDataSource(@Validated @RequestBody SmartDataSource smartApply, BindingResult bindingResult);
+    CommonResult insertSmartDataSource(@Validated @RequestBody SmartDataSource smartDataSource, BindingResult bindingResult);
 
     @PostMapping(value = "/updateSmartDataSourceById")
     @ApiOperation(value = "编辑数据源数据", notes = "编辑数据源数据", httpMethod = "POST")

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

@@ -59,8 +59,8 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
             return CommonResult.fail(st);
         }
 
-        int result = smartDataSourceService.updateSmartDataSource(smartDataSource);
-        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+        Map<String, String> result = smartDataSourceService.updateSmartDataSource(smartDataSource);
+        return Integer.parseInt(result.get("code")) > 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail(result.get("msg"));
     }
 
     /**

src/main/java/com/template/services/SmartDataSourceService.java

@@ -18,7 +18,7 @@ import java.util.Map;
 public interface SmartDataSourceService extends IService<SmartDataSource> {
     Map<String, String> insertSmartDataSource(SmartDataSource rns);
 
-    int updateSmartDataSource(SmartDataSource rns);
+    Map<String, String> updateSmartDataSource(SmartDataSource rns);
 
     PageUtils<SmartDataSource> queryPageSmartDataSources(int currentPage, int pageCount, SmartDataSource smartDataSource);
 

src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java

@@ -3,22 +3,18 @@ package com.template.services.impl;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.common.utils.CommonUtil;
+import com.template.mapper.SmartDataClassMapper;
 import com.template.mapper.SmartDataSourceMapper;
+import com.template.model.pojo.SmartDataClass;
 import com.template.model.pojo.SmartDataSource;
-import com.template.model.pojo.SmartDataSource;
-import com.template.mapper.SmartDataSourceMapper;
-import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.SmartDataSourceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.lang.reflect.Field;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,15 +28,37 @@ import java.util.Map;
  */
 @Service
 public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMapper, SmartDataSource> implements SmartDataSourceService {
+
     @Autowired
     private SmartDataSourceMapper smartDataSourceMapper;
 
+    @Autowired
+    private SmartDataClassMapper smartDataClassMapper;
+
     @Override
     public Map<String, String> insertSmartDataSource(SmartDataSource smartDataSource) {
+        // 看是否有相同的记录
+        QueryWrapper<SmartDataSource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(smartDataSource.getDsClsId() != null, "ds_cls_id", smartDataSource.getDsClsId());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsName()), "ds_name", smartDataSource.getDsName());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsUrl()), "ds_url", smartDataSource.getDsUrl());
+        queryWrapper.like(smartDataSource.getDsStatus() != null, "ds_status", smartDataSource.getDsStatus());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsSql()), "ds_sql", smartDataSource.getDsSql());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsDescrition()), "ds_descrition", smartDataSource.getDsDescrition());
+        List<SmartDataSource> smartDataSources = smartDataSourceMapper.selectList(queryWrapper);
+        if (smartDataSources.size() > 0) {
+            return CommonUtil.getReturnMap("0", "有重复记录！");
+        }
         // 检测必要参数是否为null
         if (smartDataSource.getDsClsId() == null) {
             return CommonUtil.getReturnMap("0", "【数据源类型id】不能为空！");
         }
+
+        SmartDataClass smartDataClass = smartDataClassMapper.selectById(smartDataSource.getDsClsId());
+        if (smartDataClass == null) {
+            return CommonUtil.getReturnMap("0", "选择的【数据源类型】不存在！");
+        }
+
         if (smartDataSource.getDsName() == null) {
             return CommonUtil.getReturnMap("0", "【数据源名称】不能为空！");
         }
@@ -63,9 +81,55 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
     }
 
     @Override
-    public int updateSmartDataSource(SmartDataSource sa) {
-        int result = smartDataSourceMapper.updateById(sa);
-        return result;
+    public Map<String, String> updateSmartDataSource(SmartDataSource smartDataSource) {
+        // 看是否有相同的记录
+        QueryWrapper<SmartDataSource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(smartDataSource.getDsId() != null, "ds_id", smartDataSource.getDsId());
+        queryWrapper.like(smartDataSource.getDsClsId() != null, "ds_cls_id", smartDataSource.getDsClsId());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsName()), "ds_name", smartDataSource.getDsName());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsUrl()), "ds_url", smartDataSource.getDsUrl());
+        queryWrapper.like(smartDataSource.getDsStatus() != null, "ds_status", smartDataSource.getDsStatus());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsSql()), "ds_sql", smartDataSource.getDsSql());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsDescrition()), "ds_descrition", smartDataSource.getDsDescrition());
+        List<SmartDataSource> smartDataSources = smartDataSourceMapper.selectList(queryWrapper);
+        if (smartDataSources.size() > 0) {
+            return CommonUtil.getReturnMap("0", "数据未修改，请修改后再提交！");
+        }
+        // 检测必要参数是否为null
+        if (smartDataSource.getDsId() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源id】不能为空！");
+        }
+        SmartDataSource sdc = smartDataSourceMapper.selectById(smartDataSource.getDsId());
+        if (sdc == null) {
+            return CommonUtil.getReturnMap("0", "要修改的【数据源】不存在！");
+        }
+
+        if (smartDataSource.getDsClsId() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源类型id】不能为空！");
+        }
+        SmartDataClass smartDataClass = smartDataClassMapper.selectById(smartDataSource.getDsClsId());
+        if (smartDataClass == null) {
+            return CommonUtil.getReturnMap("0", "选择的【数据源类型】不存在！");
+        }
+
+        if (smartDataSource.getDsName() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源名称】不能为空！");
+        }
+        if (smartDataSource.getDsUrl() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源连接地址】不能为空！");
+        }
+        if (smartDataSource.getDsSql() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源SQL语言】不能为空！");
+        }
+        if (smartDataSource.getDsDescrition() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源描述】不能为空！");
+        }
+        int result = smartDataSourceMapper.updateById(smartDataSource);
+        if (result > 0) {
+            return CommonUtil.getReturnMap(String.valueOf(result), "数据源修改成功！");
+        } else {
+            return CommonUtil.getReturnMap(String.valueOf(result), "数据源修改失败！");
+        }
     }
 
     @Override