|
|
@@ -2,8 +2,15 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/classes/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -19,19 +26,70 @@
|
|
|
<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/mapper/SmartUserMapper.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="29" column="39" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="2986" column="21" lean-forward="true" selection-start-line="2986" selection-start-column="21" selection-end-line="2986" selection-end-column="21" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="197">
|
|
|
+ <caret line="34" column="25" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="230">
|
|
|
+ <caret line="22" column="31" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="139">
|
|
|
+ <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" 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/mapper/SmartUserMapper.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="299">
|
|
|
+ <caret line="31" column="62" selection-start-line="31" selection-start-column="62" selection-end-line="31" selection-end-column="62" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="125">
|
|
|
- <caret line="209" column="53" selection-start-line="209" selection-start-column="53" selection-end-line="209" selection-end-column="53" />
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="214" column="83" selection-start-line="214" selection-start-column="71" selection-end-line="214" selection-end-column="83" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="261" column="86" lean-forward="true" selection-start-line="261" selection-start-column="11" selection-end-line="261" selection-end-column="86" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#6225#6226#0" expanded="true" />
|
|
|
+ <element signature="e#6284#6285#0" expanded="true" />
|
|
|
+ <element signature="e#7254#7255#0" expanded="true" />
|
|
|
+ <element signature="e#7310#7311#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -47,8 +105,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>.join</find>
|
|
|
- <find>insertSmartGradeToBaisheng</find>
|
|
|
<find>StringUtils.join</find>
|
|
|
<find>@TableField(</find>
|
|
|
<find>applyIds</find>
|
|
|
@@ -77,6 +133,8 @@
|
|
|
<find>queryPageSmartUsers</find>
|
|
|
<find>deleteUser.getReason()</find>
|
|
|
<find>querySmartSecordPage</find>
|
|
|
+ <find>(currentPage, pageCount</find>
|
|
|
+ <find>QueryParentDepartments</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace />
|
|
|
@@ -135,18 +193,18 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/daleteUserVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -247,6 +305,24 @@
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="template" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="api" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="backend_code" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="template" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="backend_code" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="template" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="mapper" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
@@ -431,18 +507,18 @@
|
|
|
<workItem from="1709604835831" duration="41000" />
|
|
|
<workItem from="1709604890825" duration="250000" />
|
|
|
<workItem from="1709606083794" duration="10623000" />
|
|
|
- <workItem from="1709688259937" duration="54906000" />
|
|
|
+ <workItem from="1709688259937" duration="57566000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="205621000" />
|
|
|
+ <option name="totallyTimeSpent" value="208281000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-7" y="0" width="974" height="1039" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" weight="0.26695842" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18708971" />
|
|
|
<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" />
|
|
|
@@ -453,7 +529,7 @@
|
|
|
<window_info id="Web" order="8" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" visible="true" weight="0.32265192" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.319337" />
|
|
|
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.40220994" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
@@ -471,7 +547,7 @@
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="3" weight="0.12694877" />
|
|
|
+ <window_info anchor="right" id="Maven" order="3" visible="true" weight="0.12691467" />
|
|
|
<window_info anchor="right" id="Palette" order="4" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="5" />
|
|
|
<window_info anchor="right" id="Database" order="6" />
|
|
|
@@ -584,6 +660,12 @@
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="118" />
|
|
|
</line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="java-line">
|
|
|
+ <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
|
|
|
+ <line>2999</line>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="122" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
@@ -591,13 +673,6 @@
|
|
|
<SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMenu.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="309">
|
|
|
- <caret line="51" column="5" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeter.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="470">
|
|
|
@@ -908,10 +983,17 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="214" column="83" selection-start-line="214" selection-start-column="71" selection-end-line="214" selection-end-column="83" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="654">
|
|
|
- <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="261" column="86" lean-forward="true" selection-start-line="261" selection-start-column="11" selection-end-line="261" selection-end-column="86" />
|
|
|
<folding>
|
|
|
<element signature="e#6225#6226#0" expanded="true" />
|
|
|
<element signature="e#6284#6285#0" expanded="true" />
|
|
|
@@ -921,45 +1003,45 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="2876" column="24" lean-forward="true" selection-start-line="2876" selection-start-column="24" selection-end-line="2876" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="385">
|
|
|
+ <caret line="92" column="26" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="26" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="172">
|
|
|
- <caret line="24" column="44" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="299">
|
|
|
+ <caret line="31" column="62" selection-start-line="31" selection-start-column="62" selection-end-line="31" selection-end-column="62" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="313">
|
|
|
- <caret line="77" column="39" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="230">
|
|
|
+ <caret line="22" column="31" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="29" column="39" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="197">
|
|
|
+ <caret line="34" column="25" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="25" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="189">
|
|
|
- <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="2986" column="21" lean-forward="true" selection-start-line="2986" selection-start-column="21" selection-end-line="2986" selection-end-column="21" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="125">
|
|
|
- <caret line="209" column="53" selection-start-line="209" selection-start-column="53" selection-end-line="209" selection-end-column="53" />
|
|
|
+ <state relative-caret-position="139">
|
|
|
+ <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|