夏文涛 2 lat temu
rodzic
commit
8736d06837

+ 62 - 86
.idea/workspace.xml

@@ -2,31 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertIdentityRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateIdentityRequest.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/LoginControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.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/model/pojo/SmartIdentity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/changePasswordRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/changePasswordRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/freezeRepairAdminRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/freezeRepairAdminRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/queryAccountPageRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/queryAccountPageRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateRepairAdminRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateRepairAdminRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java" afterDir="false" />
+      <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" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -42,46 +18,55 @@
   <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/SmartDataSourceLogController.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="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="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/services/impl/SmartDataSourceLogServiceImpl.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="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="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="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java">
+      <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="425">
-              <caret line="69" column="7" lean-forward="true" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+            <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/services/impl/SmartDataSourceServiceImpl.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="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="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/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/SmartDataClassService.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="184">
-              <caret line="11" column="2" lean-forward="true" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
+            <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>
@@ -108,7 +93,7 @@
         <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" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+              <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -117,16 +102,7 @@
         <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" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="654">
-              <caret line="91" column="5" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="91" selection-end-column="5" />
+              <caret line="60" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -170,8 +146,8 @@
       <find>queryIdentityByName</find>
       <find>预警信息</find>
       <find>数据源</find>
-      <find>楼栋</find>
       <find>Build</find>
+      <find>楼栋</find>
     </findStrings>
     <replaceStrings>
       <replace>身份</replace>
@@ -199,11 +175,11 @@
       <replace>School</replace>
       <replace>Warning</replace>
       <replace>DataClass</replace>
-      <replace>数据源</replace>
       <replace>数据源类别</replace>
       <replace>操作记录</replace>
       <replace>DataSource</replace>
       <replace>DataSourceLog</replace>
+      <replace>数据源</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -254,7 +230,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataClassServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataClassService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java" />
@@ -263,6 +238,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java" />
         <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" />
       </list>
     </option>
   </component>
@@ -294,7 +270,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -503,7 +479,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.AutoCode">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
       <module name="mybatis_plus" />
@@ -551,12 +527,12 @@
       <workItem from="1688612583930" duration="14000" />
       <workItem from="1688623572162" duration="6039000" />
       <workItem from="1701393315043" duration="136000" />
-      <workItem from="1701669886732" duration="26971000" />
+      <workItem from="1701669886732" duration="27098000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="63441000" />
+    <option name="totallyTimeSpent" value="63568000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -956,31 +932,10 @@
         </state>
       </provider>
     </entry>
-    <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>
-    <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="276">
-          <caret line="19" column="45" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <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="276">
-          <caret line="18" column="48" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <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="654">
-          <caret line="91" column="5" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="91" selection-end-column="5" />
+          <caret line="91" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="91" selection-end-column="5" />
         </state>
       </provider>
     </entry>
@@ -994,7 +949,7 @@
     <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="184">
-          <caret line="11" column="2" lean-forward="true" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
+          <caret line="11" column="2" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
         </state>
       </provider>
     </entry>
@@ -1015,14 +970,14 @@
     <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" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+          <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/SmartBuildServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="687">
-          <caret line="60" column="5" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
+          <caret line="60" column="5" selection-start-line="26" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
         </state>
       </provider>
     </entry>
@@ -1042,8 +997,29 @@
     </entry>
     <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="425">
-          <caret line="69" column="7" lean-forward="true" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+        <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/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>
+    <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>
+    <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>

+ 4 - 4
src/main/java/com/template/api/SmartDataSourceControllerAPI.java

@@ -19,18 +19,18 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"SmartDataClassControllerAPI"}, value = "数据源")
 public interface SmartDataSourceControllerAPI {
     @PostMapping(value = "/insertSmartDataSource")
-    @ApiOperation(value = "添加楼栋", notes = "添加楼栋数据", httpMethod = "POST")
+    @ApiOperation(value = "添加数据源", notes = "添加数据源数据", httpMethod = "POST")
     CommonResult insertSmartDataSource(@Validated @RequestBody SmartDataSource smartApply, BindingResult bindingResult);
 
     @PostMapping(value = "/updateSmartDataSourceById")
-    @ApiOperation(value = "编辑楼栋数据", notes = "编辑楼栋数据", httpMethod = "POST")
+    @ApiOperation(value = "编辑数据源数据", notes = "编辑数据源数据", httpMethod = "POST")
     CommonResult updateSmartDataSourceById(@Validated @RequestBody SmartDataSource ra, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageSmartDataSource")
-    @ApiOperation(value = "楼栋分页数据", notes = "楼栋分页数据", httpMethod = "GET")
+    @ApiOperation(value = "数据源分页数据", notes = "数据源分页数据", httpMethod = "GET")
     CommonResult queryPageSmartDataSources(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
     @GetMapping(value = "/deleteSmartDataSourceById")
-    @ApiOperation(value = "根据ID删除指定楼栋", notes = "根据ID删除指定楼栋", httpMethod = "GET")
+    @ApiOperation(value = "根据ID删除指定数据源", notes = "根据ID删除指定数据源", httpMethod = "GET")
     CommonResult deleteSmartDataSourceById(@RequestParam int id);
 }