Skip to content

S
service-campaign
Commit 16d2959c authored by Tu Bach's avatar Tu Bach
Browse files
Options

update

parent 1298b06a
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 208 deletions
.idea/workspace.xml
View file @ 16d2959c
...@@ -2,24 +2,11 @@ ...@@ -2,24 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5c5a6e49-5215-4271-a1d3-f663530e06ec" name="Default" comment=""> <list default="true" id="5c5a6e49-5215-4271-a1d3-f663530e06ec" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/ApParamMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -34,11 +21,11 @@ ...@@ -34,11 +21,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="918"> <state relative-caret-position="272">
<caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" /> <caret line="16" column="87" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="87" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -46,11 +33,20 @@ ...@@ -46,11 +33,20 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state relative-caret-position="187">
<caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" /> <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="16" column="39" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="39" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -59,10 +55,10 @@ ...@@ -59,10 +55,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="272">
<caret line="16" column="39" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="39" /> <caret line="19" selection-start-line="19" selection-end-line="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -71,10 +67,10 @@ ...@@ -71,10 +67,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595"> <state relative-caret-position="952">
<caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" /> <caret line="60" column="13" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -83,10 +79,22 @@ ...@@ -83,10 +79,22 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="17" column="72" selection-start-line="17" selection-start-column="72" selection-end-line="17" selection-end-column="72" /> <caret line="20" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -127,6 +135,10 @@ ...@@ -127,6 +135,10 @@
<find>entity.</find> <find>entity.</find>
<find>entity</find> <find>entity</find>
<find>customerRepository</find> <find>customerRepository</find>
<find>security</find>
<find>ApParam.findAll</find>
<find>ApParam.findByCalendarTimeId</find>
<find>short</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>ApParam</replace> <replace>ApParam</replace>
...@@ -154,12 +166,10 @@ ...@@ -154,12 +166,10 @@
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/CorsFilter.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/CorsFilter.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerDTO.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/BaseDTO.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/BaseDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/BaseMapper.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/BaseMapper.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ResultDTO.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ResultDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerListMapping.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerListMapping.java" />
...@@ -177,7 +187,6 @@ ...@@ -177,7 +187,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCode.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCode.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java" />
...@@ -186,7 +195,10 @@ ...@@ -186,7 +195,10 @@
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -217,6 +229,7 @@ ...@@ -217,6 +229,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -224,6 +237,11 @@ ...@@ -224,6 +237,11 @@
<item name="service-campaign" type="b2602c69:ProjectViewProjectNode" /> <item name="service-campaign" type="b2602c69:ProjectViewProjectNode" />
<item name="service-campaign" type="462c0819:PsiDirectoryNode" /> <item name="service-campaign" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="service-campaign" type="b2602c69:ProjectViewProjectNode" />
<item name="service-campaign" type="462c0819:PsiDirectoryNode" />
<item name=".idea" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="service-campaign" type="b2602c69:ProjectViewProjectNode" /> <item name="service-campaign" type="b2602c69:ProjectViewProjectNode" />
<item name="service-campaign" type="462c0819:PsiDirectoryNode" /> <item name="service-campaign" type="462c0819:PsiDirectoryNode" />
...@@ -335,7 +353,6 @@ ...@@ -335,7 +353,6 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -453,7 +470,7 @@ ...@@ -453,7 +470,7 @@
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22068231" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17857143" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" /> <window_info id="Image Layers" order="3" />
...@@ -559,19 +576,6 @@ ...@@ -559,19 +576,6 @@
</expressions> </expressions>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/UserSession.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="50" selection-start-line="14" selection-start-column="50" selection-end-line="14" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/etc/app.conf">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/config/WebSocketConfig.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/config/WebSocketConfig.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442"> <state relative-caret-position="442">
...@@ -633,13 +637,6 @@ ...@@ -633,13 +637,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.11.RELEASE/spring-data-jpa-2.0.11.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/ServiceCampaignApplication.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/ServiceCampaignApplication.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="85">
...@@ -647,13 +644,6 @@ ...@@ -647,13 +644,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.11.RELEASE/spring-data-commons-2.0.11.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.11.RELEASE/spring-data-commons-2.0.11.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="136">
...@@ -833,60 +823,6 @@ ...@@ -833,60 +823,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" selection-start-line="1" selection-end-line="1" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1251#1252#0" expanded="true" />
<element signature="e#1288#1289#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1398#1399#0" expanded="true" />
<element signature="e#1437#1438#0" expanded="true" />
<element signature="e#1474#1475#0" expanded="true" />
<element signature="e#1532#1533#0" expanded="true" />
<element signature="e#1584#1585#0" expanded="true" />
<element signature="e#1627#1628#0" expanded="true" />
<element signature="e#1666#1667#0" expanded="true" />
<element signature="e#1730#1731#0" expanded="true" />
<element signature="e#1786#1787#0" expanded="true" />
<element signature="e#1829#1830#0" expanded="true" />
<element signature="e#1868#1869#0" expanded="true" />
<element signature="e#1932#1933#0" expanded="true" />
<element signature="e#1988#1989#0" expanded="true" />
<element signature="e#2020#2021#0" expanded="true" />
<element signature="e#2049#2050#0" expanded="true" />
<element signature="e#2092#2093#0" expanded="true" />
<element signature="e#2128#2129#0" expanded="true" />
<element signature="e#2163#2164#0" expanded="true" />
<element signature="e#2194#2195#0" expanded="true" />
<element signature="e#2242#2243#0" expanded="true" />
<element signature="e#2282#2283#0" expanded="true" />
<element signature="e#2315#2316#0" expanded="true" />
<element signature="e#2346#2347#0" expanded="true" />
<element signature="e#2392#2393#0" expanded="true" />
<element signature="e#2432#2433#0" expanded="true" />
<element signature="e#2467#2468#0" expanded="true" />
<element signature="e#2498#2499#0" expanded="true" />
<element signature="e#2546#2547#0" expanded="true" />
<element signature="e#2586#2587#0" expanded="true" />
<element signature="e#2619#2620#0" expanded="true" />
<element signature="e#2650#2651#0" expanded="true" />
<element signature="e#2696#2697#0" expanded="true" />
<element signature="e#2736#2737#0" expanded="true" />
<element signature="e#2769#2770#0" expanded="true" />
<element signature="e#2798#2799#0" expanded="true" />
<element signature="e#2842#2843#0" expanded="true" />
<element signature="e#2878#2879#0" expanded="true" />
<element signature="e#2915#2916#0" expanded="true" />
<element signature="e#2948#2949#0" expanded="true" />
<element signature="e#3000#3001#0" expanded="true" />
<element signature="e#3044#3045#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="34">
...@@ -1003,16 +939,6 @@ ...@@ -1003,16 +939,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="67" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="15" selection-end-column="67" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="187">
...@@ -1045,16 +971,6 @@ ...@@ -1045,16 +971,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149"> <state relative-caret-position="149">
...@@ -1065,26 +981,6 @@ ...@@ -1065,26 +981,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-end-line="8" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="60" column="37" lean-forward="true" selection-start-line="59" selection-start-column="35" selection-end-line="60" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerDTO.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerDTO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="272">
...@@ -1102,16 +998,6 @@ ...@@ -1102,16 +998,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/BaseDTO.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/BaseDTO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
...@@ -1135,17 +1021,6 @@ ...@@ -1135,17 +1021,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
<folding>
<element signature="e#1065#1066#0" expanded="true" />
<element signature="e#1101#1102#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560"> <state relative-caret-position="560">
...@@ -1176,50 +1051,152 @@ ...@@ -1176,50 +1051,152 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="8" column="25" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.11.RELEASE/spring-data-commons-2.0.11.RELEASE.jar!/org/springframework/data/repository/query/QueryByExampleExecutor.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.11.RELEASE/spring-data-jpa-2.0.11.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.11.RELEASE/spring-data-commons-2.0.11.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="918"> <state relative-caret-position="612">
<caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" /> <caret line="47" column="30" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="80" selection-start-line="23" selection-start-column="80" selection-end-line="23" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
<folding>
<element signature="e#1065#1066#0" expanded="true" />
<element signature="e#1101#1102#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1398#1399#0" expanded="true" />
<element signature="e#1435#1436#0" expanded="true" />
<element signature="e#1584#1585#0" expanded="true" />
<element signature="e#1621#1622#0" expanded="true" />
<element signature="e#1679#1680#0" expanded="true" />
<element signature="e#1731#1732#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="87" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="87" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
<caret line="16" column="39" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="39" /> <caret line="16" column="39" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="39" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595"> <state relative-caret-position="272">
<caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" /> <caret line="19" selection-start-line="19" selection-end-line="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="952">
<caret line="60" column="13" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="17" column="72" selection-start-line="17" selection-start-column="72" selection-end-line="17" selection-end-column="72" /> <caret line="20" selection-start-line="20" selection-end-line="20" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state relative-caret-position="204">
<caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" /> <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
src/main/java/com/viettel/campaign/model/ApParam.java
View file @ 16d2959c
...@@ -7,10 +7,6 @@ import java.io.Serializable; ...@@ -7,10 +7,6 @@ import java.io.Serializable;
@Entity @Entity
@Table(name = "AP_PARAM") @Table(name = "AP_PARAM")
@XmlRootElement
@NamedQueries({
@NamedQuery(name = "ApParam.findAll", query = "SELECT a FROM ApParam a"),
@NamedQuery(name = "ApParam.findByCalendarTimeId", query = "SELECT a FROM ApParam a WHERE a.apParamId = :apParamId")})
public class ApParam implements Serializable { public class ApParam implements Serializable {
@Id @Id
......
src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java
View file @ 16d2959c
...@@ -15,4 +15,6 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo ...@@ -15,4 +15,6 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
@Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ") @Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
List<CampaignCompleteCode> findByName(@Param("name") String Name, Pageable pageable); List<CampaignCompleteCode> findByName(@Param("name") String Name, Pageable pageable);
List<CampaignCompleteCode> findByCompleteNameContains(String Name, Pageable pageable);
} }
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java
View file @ 16d2959c
...@@ -33,7 +33,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ ...@@ -33,7 +33,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
Map result = new HashMap(); Map result = new HashMap();
List<CampaignCompleteCode> lst = new ArrayList<>(); List<CampaignCompleteCode> lst = new ArrayList<>();
lst = completeCodeRepository.findByName(name, PageRequest.of(page, pageSize, Sort.by(sort))); lst = completeCodeRepository.findByCompleteNameContains(name, PageRequest.of(page, pageSize, Sort.by(sort)));
result.put("totalItem", lst.size()); result.put("totalItem", lst.size());
result.put("customers", lst); result.put("customers", lst);
......
src/main/resources/application.yml
View file @ 16d2959c
server: server:
port: 9999 port: 9999
spring: spring:
# application: application:
# name: campaign name: campaign
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@10.60.157.135:1521:vt url: jdbc:oracle:thin:@10.60.157.135:1521:vt
...@@ -16,14 +16,14 @@ spring: ...@@ -16,14 +16,14 @@ spring:
ddl-auto: none ddl-auto: none
naming: naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# kafka: kafka:
# consumer: consumer:
# bootstrap-servers: 192.168.1.201:9092 bootstrap-servers: 192.168.1.201:9092
# group-id: group_id group-id: group_id
# auto-offset-reset: earliest auto-offset-reset: earliest
# key-deserializer: org.apache.kafka.common.serialization.StringDeserializer key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
# value-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
# producer: producer:
# bootstrap-servers: 192.168.1.201:9092 bootstrap-servers: 192.168.1.201:9092
# key-serializer: org.apache.kafka.common.serialization.StringSerializer key-serializer: org.apache.kafka.common.serialization.StringSerializer
# value-serializer: org.apache.kafka.common.serialization.StringSerializer value-serializer: org.apache.kafka.common.serialization.StringSerializer
\ No newline at end of file \ No newline at end of file
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