Skip to content

M
manager
Commit 7a07d01c by manxiaoqiang
Options

app排序

parent ba2cdf81
Showing with 206 additions and 213 deletions
.idea/workspace.xml
......@@ -4,6 +4,10 @@
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -24,23 +28,21 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<file leaf-file-name="UserLogController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="343">
<caret line="29" column="49" lean-forward="false" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<file leaf-file-name="UserLogService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
<state relative-caret-position="207">
<caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<folding />
</state>
</provider>
......@@ -49,46 +51,85 @@
<file leaf-file-name="NewUserLogThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<state relative-caret-position="552">
<caret line="49" column="22" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<file leaf-file-name="UserLogServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="373" column="41" lean-forward="false" selection-start-line="373" selection-start-column="31" selection-end-line="373" selection-end-column="41" />
<state relative-caret-position="207">
<caret line="36" column="46" lean-forward="false" selection-start-line="36" selection-start-column="46" selection-end-line="36" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractMoneyRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<file leaf-file-name="UserService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<state relative-caret-position="398">
<caret line="40" column="15" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="331" column="75" lean-forward="true" selection-start-line="331" selection-start-column="75" selection-end-line="331" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserLogRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="481">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<state relative-caret-position="230">
<caret line="14" column="89" lean-forward="false" selection-start-line="14" selection-start-column="89" selection-end-line="14" selection-end-column="89" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1272">
<caret line="199" column="179" lean-forward="false" selection-start-line="199" selection-start-column="179" selection-end-line="199" selection-end-column="179" />
<folding>
<element signature="e#1123#1124#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="238" column="25" lean-forward="false" selection-start-line="238" selection-start-column="25" selection-end-line="238" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -145,10 +186,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/User.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
......@@ -195,7 +232,11 @@
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
</list>
</option>
</component>
......@@ -290,7 +331,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -815,8 +856,8 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -1311,14 +1352,8 @@
<workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="10716000" />
</task>
<task id="LOCAL-00034" summary="location">
<created>1515399705101</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1515399705101</updated>
<workItem from="1517447750893" duration="11115000" />
<workItem from="1517533917524" duration="2083000" />
</task>
<task id="LOCAL-00035" summary="location">
<created>1515574261522</created>
......@@ -1656,15 +1691,22 @@
<option name="project" value="LOCAL" />
<updated>1517478623526</updated>
</task>
<option name="localTasksCounter" value="83" />
<task id="LOCAL-00083" summary="app排序">
<created>1517478695938</created>
<option name="number" value="00083" />
<option name="presentableId" value="LOCAL-00083" />
<option name="project" value="LOCAL" />
<updated>1517478695938</updated>
</task>
<option name="localTasksCounter" value="84" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="327763000" />
<option name="totallyTimeSpent" value="330245000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="false" />
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
......@@ -1801,7 +1843,7 @@
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
<option name="time" value="27" />
<option name="time" value="29" />
</breakpoint-manager>
<watches-manager />
</component>
......@@ -1810,62 +1852,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="202" column="33" lean-forward="false" selection-start-line="202" selection-start-column="22" selection-end-line="202" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/model/Channel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="52" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="53" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/DateUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="137" column="31" lean-forward="false" selection-start-line="137" selection-start-column="25" selection-end-line="137" selection-end-column="31" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2402#2403#0" expanded="false" />
<element signature="e#2459#2460#0" expanded="false" />
<element signature="e#2609#2610#0" expanded="false" />
<element signature="e#2666#2667#0" expanded="false" />
<element signature="e#3534#3535#0" expanded="false" />
<element signature="e#3590#3591#0" expanded="false" />
<element signature="e#3773#3774#0" expanded="false" />
<element signature="e#3830#3831#0" expanded="false" />
<element signature="e#4613#4614#0" expanded="false" />
<element signature="e#4669#4670#0" expanded="false" />
<element signature="e#4723#4724#0" expanded="false" />
<element signature="e#4780#4781#0" expanded="false" />
<element signature="e#4838#4839#0" expanded="false" />
<element signature="e#4892#4893#0" expanded="false" />
<element signature="e#29079#29080#0" expanded="false" />
<element signature="e#29124#29125#0" expanded="false" />
<element signature="e#29180#29181#0" expanded="false" />
<element signature="e#29224#29225#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/repository/TrackAppRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="11" column="45" lean-forward="false" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
......@@ -1891,7 +1877,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="44" column="53" lean-forward="true" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
......@@ -1944,16 +1929,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7176">
<caret line="332" column="52" lean-forward="false" selection-start-line="332" selection-start-column="52" selection-end-line="332" selection-end-column="52" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1493">
......@@ -1987,7 +1962,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="13" column="16" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
......@@ -1995,7 +1969,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
......@@ -2003,7 +1976,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="119" column="9" lean-forward="false" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -2059,7 +2031,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="41" column="20" lean-forward="false" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -2075,61 +2046,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="79" column="161" lean-forward="false" selection-start-line="79" selection-start-column="161" selection-end-line="79" selection-end-column="161" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1633">
<caret line="139" column="36" lean-forward="false" selection-start-line="139" selection-start-column="36" selection-end-line="139" selection-end-column="36" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#637#638#0" expanded="false" />
<element signature="e#662#663#0" expanded="false" />
<element signature="e#700#701#0" expanded="false" />
<element signature="e#728#729#0" expanded="false" />
<element signature="e#770#771#0" expanded="false" />
<element signature="e#804#805#0" expanded="false" />
<element signature="e#862#863#0" expanded="false" />
<element signature="e#908#909#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#986#987#0" expanded="false" />
<element signature="e#1046#1047#0" expanded="false" />
<element signature="e#1094#1095#0" expanded="false" />
<element signature="e#1136#1137#0" expanded="false" />
<element signature="e#1170#1171#0" expanded="false" />
<element signature="e#1228#1229#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1307#1308#0" expanded="false" />
<element signature="e#1332#1333#0" expanded="false" />
<element signature="e#1372#1373#0" expanded="false" />
<element signature="e#1400#1401#0" expanded="false" />
<element signature="e#1448#1449#0" expanded="false" />
<element signature="e#1488#1489#0" expanded="false" />
<element signature="e#1558#1559#0" expanded="false" />
<element signature="e#1616#1617#0" expanded="false" />
<element signature="e#1660#1661#0" expanded="false" />
<element signature="e#1696#1697#0" expanded="false" />
<element signature="e#1758#1759#0" expanded="false" />
<element signature="e#1808#1809#0" expanded="false" />
<element signature="e#1850#1851#0" expanded="false" />
<element signature="e#1884#1885#0" expanded="false" />
<element signature="e#1942#1943#0" expanded="false" />
<element signature="e#1988#1989#0" expanded="false" />
<element signature="e#2027#2028#0" expanded="false" />
<element signature="e#2058#2059#0" expanded="false" />
<element signature="e#2110#2111#0" expanded="false" />
<element signature="e#2150#2151#0" expanded="false" />
<element signature="e#2186#2187#0" expanded="false" />
<element signature="e#2218#2219#0" expanded="false" />
<element signature="e#2268#2269#0" expanded="false" />
<element signature="e#2305#2306#0" expanded="false" />
<element signature="e#2341#2342#0" expanded="false" />
<element signature="e#2373#2374#0" expanded="false" />
<element signature="e#2423#2424#0" expanded="false" />
<element signature="e#2465#2466#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2203,7 +2119,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="37" column="13" lean-forward="false" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -2211,7 +2126,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -2219,7 +2133,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="116" column="39" lean-forward="false" selection-start-line="116" selection-start-column="39" selection-end-line="116" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
......@@ -2227,7 +2140,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="9" lean-forward="false" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -2235,7 +2147,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="45" column="3" lean-forward="true" selection-start-line="45" selection-start-column="3" selection-end-line="45" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
......@@ -2243,7 +2154,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-46">
<caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
<folding />
</state>
</provider>
</entry>
......@@ -2259,7 +2169,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="36" column="49" lean-forward="true" selection-start-line="36" selection-start-column="49" selection-end-line="36" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
......@@ -2267,7 +2176,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
......@@ -2275,63 +2183,119 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="695" column="29" lean-forward="false" selection-start-line="695" selection-start-column="29" selection-end-line="695" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<folding />
<state relative-caret-position="253">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="481">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<state relative-caret-position="989">
<caret line="63" column="32" lean-forward="false" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<folding>
<element signature="e#1123#1124#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<state relative-caret-position="343">
<caret line="29" column="49" lean-forward="false" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="373" column="41" lean-forward="false" selection-start-line="373" selection-start-column="31" selection-end-line="373" selection-end-column="41" />
<state relative-caret-position="161">
<caret line="238" column="25" lean-forward="false" selection-start-line="238" selection-start-column="25" selection-end-line="238" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
<state relative-caret-position="136">
<caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552">
<caret line="49" column="22" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<state relative-caret-position="1272">
<caret line="199" column="179" lean-forward="false" selection-start-line="199" selection-start-column="179" selection-end-line="199" selection-end-column="179" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="16" column="31" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="14" column="89" lean-forward="false" selection-start-line="14" selection-start-column="89" selection-end-line="14" selection-end-column="89" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="36" column="46" lean-forward="false" selection-start-line="36" selection-start-column="46" selection-end-line="36" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="40" column="15" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="331" column="75" lean-forward="true" selection-start-line="331" selection-start-column="75" selection-end-line="331" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/controller/ContractController.java
......@@ -186,20 +186,29 @@ public class ContractController {
@RequestMapping(value = "update", method = RequestMethod.PUT)
@ResponseBody
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract) {
return ResultModel.OK(service.update(loginAccount, contract));
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
Contract contract1 = service.update(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改合同","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "pay", method = RequestMethod.POST)
@ResponseBody
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract) {
return ResultModel.OK(service.pay(loginAccount, contract));
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
ContractMoney contract1 = service.pay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "收款开票","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "change", method = RequestMethod.POST)
@ResponseBody
public ResultModel change(@CurrentAccount User loginAccount, @RequestBody ContractChange contract) {
return ResultModel.OK(service.change(loginAccount, contract));
public ResultModel change(@CurrentAccount User loginAccount, @RequestBody ContractChange contract, HttpServletRequest request) {
Contract contract1 = service.change(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改套餐","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "find/pay", method = RequestMethod.GET)
......@@ -218,8 +227,11 @@ public class ContractController {
@RequestMapping(value = "update/pay", method = RequestMethod.PUT)
@ResponseBody
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract) {
return ResultModel.OK(service.updatePay(loginAccount, contract));
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
Contract contract1 = service.updatePay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "find/payall", method = RequestMethod.GET)
......
src/main/java/common/controller/UserLogController.java
package common.controller;
import common.model.User;
import common.model.UserLog;
import common.service.UserLogService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import security.annotation.CurrentAccount;
import util.ResultModel;
import java.util.List;
......@@ -24,7 +26,7 @@ public class UserLogController
///api/userlog/list?startDate=2017-12-26&endDate=2017-12-27
@RequestMapping(value = "list", method = RequestMethod.GET)
@ResponseBody
public ResultModel findByDS(@RequestParam String startDate, @RequestParam String endDate) {
return ResultModel.OK(userLogService.findUserLog(startDate, endDate));
public ResultModel findByDS(@CurrentAccount User user, @RequestParam String startDate, @RequestParam String endDate) {
return ResultModel.OK(userLogService.findUserLog(user,startDate, endDate));
}
}
src/main/java/common/repository/UserLogRepository.java
......@@ -11,6 +11,6 @@ import java.util.List;
*/
public interface UserLogRepository extends JpaRepository<UserLog, Long>
{
@Query(value = "select * from user_log where substr(operate_time, 1, 10)>=?1 and substr(operate_time, 1, 10)<=?2", nativeQuery = true)
List<UserLog> findByOperateTime(String startDate, String endDate);
@Query(value = "select * from user_log where substr(operate_time, 1, 10)>=?1 and substr(operate_time, 1, 10)<=?2 and opera_account in ?3", nativeQuery = true)
List<UserLog> findByOperateTime(String startDate, String endDate, List<String> emails);
}
src/main/java/common/service/UserLogService.java
package common.service;
import common.model.User;
import common.model.UserLog;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
......@@ -11,5 +12,5 @@ import java.util.List;
*/
public interface UserLogService
{
List<UserLog> findUserLog(String startDate, String endDate);
List<UserLog> findUserLog(User user, String startDate, String endDate);
}
src/main/java/common/service/impl/UserLogServiceImpl.java
package common.service.impl;
import common.model.User;
import common.model.UserLog;
import common.repository.UserLogRepository;
import common.service.UserLogService;
import common.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import util.StringUtil;
import util.ValidateUtil;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
......@@ -25,11 +28,22 @@ public class UserLogServiceImpl implements UserLogService
{
@Autowired UserLogRepository userLogRepository;
@Autowired
UserService userService;
@Override
public List<UserLog> findUserLog(String startDate, String endDate)
public List<UserLog> findUserLog(User user,String startDate, String endDate)
{
return userLogRepository.findByOperateTime(startDate, endDate);
List<User> allSons = userService.findAllSons(user.getId());
List<String> emailList = new ArrayList<>();
emailList.add(user.getEmail());
if(ValidateUtil.isValid(allSons)){
for(User u : allSons){
emailList.add(u.getEmail());
}
}
return userLogRepository.findByOperateTime(startDate, endDate, emailList);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment