Skip to content

M
manager
Commit 496b9874 by manxiaoqiang
Options

test pom

parent 8109e0b5
Showing with 111 additions and 81 deletions
.idea/workspace.xml
......@@ -4,7 +4,7 @@
<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/service/impl/UserServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java" afterPath="$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
</list>
<list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -21,23 +21,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="BussinussManServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="17" column="55" lean-forward="false" selection-start-line="17" selection-start-column="55" selection-end-line="17" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BussinessManRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java">
<file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="false">
<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="207">
<caret line="9" column="74" lean-forward="false" selection-start-line="9" selection-start-column="62" selection-end-line="9" selection-end-column="74" />
<state relative-caret-position="184">
<caret line="36" column="17" lean-forward="false" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -45,11 +33,11 @@
</provider>
</entry>
</file>
<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">
<file leaf-file-name="BussinussManServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1242">
<caret line="67" column="3" lean-forward="false" selection-start-line="67" selection-start-column="3" selection-end-line="67" selection-end-column="3" />
<state relative-caret-position="79">
<caret line="14" column="18" lean-forward="false" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -57,11 +45,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="BussinussManService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java">
<file leaf-file-name="applicationContext.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="33" lean-forward="false" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="33" />
<state relative-caret-position="122">
<caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
......@@ -84,6 +72,8 @@
<find>show_sql</find>
<find>testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn</find>
<find>log</find>
<find>officeEntityManagerFactory</find>
<find>officeTransactionManager</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -130,7 +120,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/model/AppDevNum.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppDevNumRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/.idea/workspace.xml" />
......@@ -138,8 +127,6 @@
<option value="$PROJECT_DIR$/src/main/resources/logback/product/logback.xml" />
<option value="$PROJECT_DIR$/src/main/java/dic/RoleEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/office/model/BussinessMan.java" />
<option value="$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/model/BussinessMan.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/BussinussManService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/BussinussManServiceImpl.java" />
......@@ -151,6 +138,9 @@
<option value="$PROJECT_DIR$/src/main/java/office/service/AccountFlowRestrictService.java" />
<option value="$PROJECT_DIR$/src/main/java/office/service/impl/OffAccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
</list>
</option>
</component>
......@@ -547,6 +537,40 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="office" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="repository" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
......@@ -1222,11 +1246,18 @@
<option name="project" value="LOCAL" />
<updated>1514882467020</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="test pom">
<created>1514887175849</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1514887175849</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68258000" />
<option name="totallyTimeSpent" value="69324000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1599,16 +1630,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="15" column="53" lean-forward="false" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/SalesManService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
......@@ -1633,14 +1654,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/CampaignRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="14" />
<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="161">
......@@ -1657,16 +1670,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="9" column="74" lean-forward="false" selection-start-line="9" selection-start-column="62" selection-end-line="9" selection-end-column="74" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/OffAccountFlowRestrictService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
......@@ -1675,16 +1678,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="17" column="55" lean-forward="false" selection-start-line="17" selection-start-column="55" selection-end-line="17" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/OffAccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
......@@ -1709,32 +1702,68 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<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="197">
<caret line="65" column="42" lean-forward="true" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
<folding />
<state relative-caret-position="184">
<caret line="36" column="17" lean-forward="false" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="33" lean-forward="false" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="33" />
<state relative-caret-position="115">
<caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="37" lean-forward="false" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/CampaignRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1242">
<caret line="67" column="3" lean-forward="false" selection-start-line="67" selection-start-column="3" selection-end-line="67" selection-end-column="3" />
<state relative-caret-position="211">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="14" column="18" lean-forward="false" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/service/impl/UserServiceImpl.java
......@@ -33,8 +33,8 @@ public class UserServiceImpl implements UserService {
private AuthRepository authRepository;
@Autowired
private CodeRepository codeRepository;
// @Autowired
// BussinussManService bussinussManService;
@Autowired
BussinussManService bussinussManService;
@Autowired
private SalesManService salesManService;
......@@ -61,10 +61,10 @@ public class UserServiceImpl implements UserService {
User save = userRepository.save(resource);
if(resource.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey())){
// bussinussManService.create(login.getEmail(), save.getEmail(), save.getName(),"华北");
bussinussManService.create(login.getEmail(), save.getEmail(), save.getName(),"华北");
salesManService.create(login.getEmail(), save.getEmail(), save.getName());
} else if(resource.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey())){
// bussinussManService.create(login.getEmail(), save.getEmail(), save.getName(),"华南");
bussinussManService.create(login.getEmail(), save.getEmail(), save.getName(),"华南");
salesManService.create(login.getEmail(), save.getEmail(), save.getName());
}
......
src/main/resources/applicationContext.xml
......@@ -21,6 +21,7 @@
<context:component-scan base-package="tkio" />
<context:component-scan base-package="track" />
<context:component-scan base-package="common" />
<context:component-scan base-package="office" />
<context:component-scan base-package="dmp" />
<context:component-scan base-package="security" />
......
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