Skip to content

S
service-campaign
Commit 1298b06a authored by Tu Bach's avatar Tu Bach
Browse files
Options

update campaign_complete_code

parent d779a33f
Hide whitespace changes
Inline Side-by-side
Showing with 1123 additions and 267 deletions
.idea/workspace.xml
View file @ 1298b06a
...@@ -2,23 +2,20 @@ ...@@ -2,23 +2,20 @@
<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/BaseDTO.java" afterDir="false" /> <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/DTO/CustomerDTO.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/DTO/CustomerListDTO.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/DTO/ResultDTO.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/DTO/TicketSiteDTO.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/mapper/BaseMapper.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/mapper/CustomerMapper.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/model/CustomerList.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerListMapping.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/utils/DataUtil.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/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/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/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/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/model/Customer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.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/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/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/repository/CustomerRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.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/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/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/CustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java" afterDir="false" />
...@@ -36,36 +33,12 @@ ...@@ -36,36 +33,12 @@
<option name="isMigrated" value="true" /> <option name="isMigrated" value="true" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="26" column="57" selection-start-line="26" selection-start-column="57" selection-end-line="26" selection-end-column="57" />
<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/service/ApParamService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</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/ApParamServiceImpl.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="323"> <state relative-caret-position="918">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="28" /> <caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -73,11 +46,11 @@ ...@@ -73,11 +46,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<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/repository/ApParamRepository.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="238"> <state relative-caret-position="17">
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" /> <caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -86,10 +59,10 @@ ...@@ -86,10 +59,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/controller/CustomerController.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="432"> <state relative-caret-position="221">
<caret line="41" column="57" lean-forward="true" selection-start-line="41" selection-start-column="57" selection-end-line="41" selection-end-column="57" /> <caret line="16" column="39" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="39" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -98,10 +71,10 @@ ...@@ -98,10 +71,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/service/CustomerServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.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="595">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" /> <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -110,10 +83,10 @@ ...@@ -110,10 +83,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/repository/CustomerRepository.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="340"> <state relative-caret-position="238">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" /> <caret line="17" column="72" selection-start-line="17" selection-start-column="72" selection-end-line="17" selection-end-column="72" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -151,10 +124,16 @@ ...@@ -151,10 +124,16 @@
<find>curretn</find> <find>curretn</find>
<find>dtoBean</find> <find>dtoBean</find>
<find>MOBILE</find> <find>MOBILE</find>
<find>entity.</find>
<find>entity</find>
<find>customerRepository</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>ApParam</replace> <replace>ApParam</replace>
<replace>customerDTO</replace> <replace>customerDTO</replace>
<replace>completeCodeDTO</replace>
<replace>compCode</replace>
<replace>dtoBean.</replace>
</replaceStrings> </replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -172,20 +151,16 @@ ...@@ -172,20 +151,16 @@
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/config/WebSocketConfig.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/config/WebSocketConfig.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/web/controller/KafkaController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/web/controller/KafkaController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java" />
<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/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/service/CustomerService.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/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/mapper/CustomerMapper.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/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" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java" />
...@@ -193,11 +168,25 @@ ...@@ -193,11 +168,25 @@
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerList.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerList.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/utils/DataUtil.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/utils/DataUtil.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/ApParamService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.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/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/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/mapper/ApParamMapper.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.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/controller/CampaignCompleteCodeController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -214,7 +203,7 @@ ...@@ -214,7 +203,7 @@
</MavenImportingSettings> </MavenImportingSettings>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="7"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="166" /> <option name="x" value="166" />
<option name="y" value="27" /> <option name="y" value="27" />
<option name="width" value="1655" /> <option name="width" value="1655" />
...@@ -228,8 +217,6 @@ ...@@ -228,8 +217,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -281,6 +268,15 @@ ...@@ -281,6 +268,15 @@
<item name="campaign" type="462c0819:PsiDirectoryNode" /> <item name="campaign" type="462c0819:PsiDirectoryNode" />
<item name="DTO" type="462c0819:PsiDirectoryNode" /> <item name="DTO" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="service-campaign" type="b2602c69:ProjectViewProjectNode" />
<item name="service-campaign" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="campaign" type="462c0819:PsiDirectoryNode" />
<item name="mapper" 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" />
...@@ -338,6 +334,8 @@ ...@@ -338,6 +334,8 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -455,7 +453,7 @@ ...@@ -455,7 +453,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.2185501" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22068231" />
<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" />
...@@ -465,8 +463,8 @@ ...@@ -465,8 +463,8 @@
<window_info id="Web" order="7" side_tool="true" /> <window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.3290461" /> <window_info anchor="bottom" id="Find" order="1" weight="0.3290461" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290461" /> <window_info anchor="bottom" id="Run" order="2" weight="0.3290461" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39978564" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.25723472" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.3290461" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.3290461" />
...@@ -479,15 +477,15 @@ ...@@ -479,15 +477,15 @@
<window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50053304" weight="0.3108253" /> <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50053304" weight="0.3108253" />
<window_info anchor="right" id="Maven" order="0" /> <window_info anchor="right" id="Maven" order="0" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" /> <window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Palette" order="4" /> <window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="right" id="Capture Analysis" order="5" /> <window_info anchor="right" id="Maven Projects" order="5" />
<window_info anchor="right" id="Maven Projects" order="6" /> <window_info anchor="right" id="Database" order="6" />
<window_info anchor="right" id="Database" order="7" /> <window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Palette&#9;" order="8" /> <window_info anchor="right" id="Theme Preview" order="8" />
<window_info anchor="right" id="Theme Preview" order="9" /> <window_info anchor="right" id="Bean Validation" order="9" />
<window_info anchor="right" id="Bean Validation" order="10" /> <window_info anchor="right" id="Ant Build" order="10" weight="0.25" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" weight="0.21215352" /> <window_info content_ui="combo" id="Project" order="0" weight="0.21215352" />
...@@ -537,18 +535,6 @@ ...@@ -537,18 +535,6 @@
<properties /> <properties />
<option name="timeStamp" value="5" /> <option name="timeStamp" value="5" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java</url>
<line>60</line>
<properties />
<option name="timeStamp" value="32" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java</url>
<line>52</line>
<properties />
<option name="timeStamp" value="34" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="NONE" type="java-line"> <line-breakpoint enabled="true" suspend="NONE" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java</url> <url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java</url>
<line>9</line> <line>9</line>
...@@ -559,6 +545,10 @@ ...@@ -559,6 +545,10 @@
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="debuggerHistoryManager"> <component name="debuggerHistoryManager">
<expressions id="breakpointLogExpression"> <expressions id="breakpointLogExpression">
<expression> <expression>
...@@ -569,30 +559,6 @@ ...@@ -569,30 +559,6 @@
</expressions> </expressions>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/config/WebConfig.java" />
<entry file="file://$PROJECT_DIR$/src/test/java/com/viettel/campaign/ServiceCampaignApplicationTests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/kafka/spring-kafka/2.1.10.RELEASE/spring-kafka-2.1.10.RELEASE.jar!/org/springframework/kafka/core/KafkaTemplate.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="103" column="70" selection-start-line="103" selection-start-column="67" selection-end-line="103" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/Producer.java" />
<entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="88" selection-start-line="5" selection-start-column="84" selection-end-line="5" selection-end-column="88" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/HELP.md" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/UserSession.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/UserSession.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">
...@@ -674,55 +640,6 @@ ...@@ -674,55 +640,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" selection-start-line="7" selection-end-line="7" />
<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">
<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/DTO/BaseDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="31" lean-forward="true" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="31" />
<folding>
<element signature="e#206#207#0" expanded="true" />
<element signature="e#250#251#0" expanded="true" />
<element signature="e#286#287#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/BaseMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="39" column="5" selection-start-line="39" selection-start-column="5" selection-end-line="39" 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/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">
...@@ -737,16 +654,6 @@ ...@@ -737,16 +654,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="14" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
<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/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">
...@@ -754,18 +661,6 @@ ...@@ -754,18 +661,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ResultDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#361#362#0" expanded="true" />
<element signature="e#403#404#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.10.RELEASE/spring-tx-5.0.10.RELEASE.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.10.RELEASE/spring-tx-5.0.10.RELEASE.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178"> <state relative-caret-position="178">
...@@ -808,16 +703,6 @@ ...@@ -808,16 +703,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/CustomerMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
...@@ -871,23 +756,6 @@ ...@@ -871,23 +756,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="40" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="40" />
<folding>
<element signature="e#1299#1300#0" expanded="true" />
<element signature="e#1333#1334#0" expanded="true" />
<element signature="e#1812#1813#0" expanded="true" />
<element signature="e#1845#1846#0" expanded="true" />
<element signature="e#2721#2722#0" expanded="true" />
<element signature="e#2750#2751#0" expanded="true" />
<element signature="e#3319#3320#0" expanded="true" />
<element signature="e#3365#3366#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/TicketSiteDTO.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/TicketSiteDTO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68"> <state relative-caret-position="68">
...@@ -1019,20 +887,6 @@ ...@@ -1019,20 +887,6 @@
</state> </state>
</provider> </provider>
</entry> </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="136">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2486#2487#0" expanded="true" />
<element signature="e#2519#2520#0" expanded="true" />
<element signature="e#2569#2570#0" expanded="true" />
<element signature="e#2613#2614#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">
...@@ -1060,20 +914,89 @@ ...@@ -1060,20 +914,89 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state>
<caret line="18" column="26" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="26" /> <caret column="33" lean-forward="true" selection-start-column="33" selection-end-column="33" />
<folding>
<element signature="e#378#379#0" expanded="true" />
<element signature="e#410#411#0" expanded="true" />
<element signature="e#458#459#0" expanded="true" />
<element signature="e#500#501#0" expanded="true" />
<element signature="e#534#535#0" expanded="true" />
<element signature="e#564#565#0" expanded="true" />
<element signature="e#610#611#0" expanded="true" />
<element signature="e#648#649#0" expanded="true" />
<element signature="e#682#683#0" expanded="true" />
<element signature="e#712#713#0" expanded="true" />
<element signature="e#758#759#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#831#832#0" expanded="true" />
<element signature="e#862#863#0" expanded="true" />
<element signature="e#910#911#0" expanded="true" />
<element signature="e#950#951#0" expanded="true" />
<element signature="e#984#985#0" expanded="true" />
<element signature="e#1014#1015#0" expanded="true" />
<element signature="e#1060#1061#0" expanded="true" />
<element signature="e#1098#1099#0" expanded="true" />
<element signature="e#1134#1135#0" expanded="true" />
<element signature="e#1168#1169#0" expanded="true" />
<element signature="e#1220#1221#0" expanded="true" />
<element signature="e#1266#1267#0" expanded="true" />
<element signature="e#1299#1300#0" expanded="true" />
<element signature="e#1330#1331#0" expanded="true" />
<element signature="e#1376#1377#0" expanded="true" />
<element signature="e#1416#1417#0" expanded="true" />
<element signature="e#1450#1451#0" expanded="true" />
<element signature="e#1482#1483#0" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1572#1573#0" expanded="true" />
<element signature="e#1607#1608#0" expanded="true" />
<element signature="e#1640#1641#0" expanded="true" />
<element signature="e#1690#1691#0" expanded="true" />
<element signature="e#1734#1735#0" expanded="true" />
<element signature="e#1765#1766#0" expanded="true" />
<element signature="e#1794#1795#0" expanded="true" />
<element signature="e#1836#1837#0" expanded="true" />
<element signature="e#1872#1873#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.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="87" 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/controller/CustomerController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="27" column="46" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="27" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="493">
<caret line="41" column="57" lean-forward="true" selection-start-line="41" selection-start-column="57" selection-end-line="41" selection-end-column="57" /> <caret line="54" column="32" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="32" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -1082,58 +1005,221 @@ ...@@ -1082,58 +1005,221 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.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="340"> <state relative-caret-position="255">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" /> <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> <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/CustomerServiceImpl.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="34"> <state relative-caret-position="187">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" /> <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="15" selection-end-column="54" />
<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/repository/ApParamRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ResultDTO.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="85">
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" /> <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#361#362#0" expanded="true" />
<element signature="e#403#404#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state>
<caret line="9" selection-start-line="9" selection-end-line="9" /> <caret column="40" lean-forward="true" selection-start-column="40" selection-end-column="40" />
<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/ApParamServiceImpl.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="323"> <state relative-caret-position="306">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="28" /> <caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
<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/controller/ApParamController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="63" column="43" lean-forward="true" selection-start-line="63" selection-start-column="43" selection-end-line="63" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="357">
<caret line="26" column="57" selection-start-line="26" selection-start-column="57" selection-end-line="26" selection-end-column="57" /> <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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="28" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
<folding>
<element signature="e#1299#1300#0" expanded="true" />
<element signature="e#1333#1334#0" expanded="true" />
<element signature="e#1812#1813#0" expanded="true" />
<element signature="e#1845#1846#0" expanded="true" />
<element signature="e#2721#2722#0" expanded="true" />
<element signature="e#2750#2751#0" expanded="true" />
<element signature="e#3319#3320#0" expanded="true" />
<element signature="e#3365#3366#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="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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="29" lean-forward="true" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
<folding>
<element signature="e#173#174#0" expanded="true" />
<element signature="e#202#203#0" expanded="true" />
<element signature="e#246#247#0" expanded="true" />
<element signature="e#282#283#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/BaseMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="55" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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/mapper/CustomerMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560">
<caret line="44" column="8" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="8" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/mapper/ApParamMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="29" column="39" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="32" column="36" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="918">
<caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="17" selection-end-line="16" selection-end-column="39" />
<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="595">
<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="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="17">
<caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
src/main/java/com/viettel/campaign/DTO/ApParamDTO.java
View file @ 1298b06a
package com.viettel.campaign.DTO; package com.viettel.campaign.DTO;
public class ApParamDTO { public class ApParamDTO extends BaseDTO {
private Long apParamId; private Long apParamId;
private String parType;
private String parName; private String parName;
private String parValue; private String parValue;
private String parCode; private String parCode;
private Long resourceId; private Long description;
private Long status; private Long isDelete;
private Long isDefault;
private Long enableEdit;
private Long siteId;
public Long getApParamId() { public Long getApParamId() {
return apParamId; return apParamId;
...@@ -17,6 +21,14 @@ public class ApParamDTO { ...@@ -17,6 +21,14 @@ public class ApParamDTO {
this.apParamId = apParamId; this.apParamId = apParamId;
} }
public String getParType() {
return parType;
}
public void setParType(String parType) {
this.parType = parType;
}
public String getParName() { public String getParName() {
return parName; return parName;
} }
...@@ -41,19 +53,43 @@ public class ApParamDTO { ...@@ -41,19 +53,43 @@ public class ApParamDTO {
this.parCode = parCode; this.parCode = parCode;
} }
public Long getResourceId() { public Long getDescription() {
return resourceId; return description;
}
public void setDescription(Long description) {
this.description = description;
}
public Long getIsDelete() {
return isDelete;
}
public void setIsDelete(Long isDelete) {
this.isDelete = isDelete;
}
public Long getIsDefault() {
return isDefault;
}
public void setIsDefault(Long isDefault) {
this.isDefault = isDefault;
}
public Long getEnableEdit() {
return enableEdit;
} }
public void setResourceId(Long resourceId) { public void setEnableEdit(Long enableEdit) {
this.resourceId = resourceId; this.enableEdit = enableEdit;
} }
public Long getStatus() { public Long getSiteId() {
return status; return siteId;
} }
public void setStatus(Long status) { public void setSiteId(Long siteId) {
this.status = status; this.siteId = siteId;
} }
} }
src/main/java/com/viettel/campaign/DTO/CampaignCompleteCodeDTO.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.DTO;
import java.util.Date;
public class CampaignCompleteCodeDTO extends BaseDTO {
private Long campaignCompleteCodeId;
private Long campaignId;
private String completeValue;
private String completeName;
private String description;
private Short status;
private Short completeType;
private Short isRecall;
private String updateBy;
private Date updateAt;
private String createBy;
private Date createAt;
private String campaignType;
private Short isFinish;
private Long companySiteId;
private Short isLock;
private Long durationLock;
public Long getCampaignCompleteCodeId() {
return campaignCompleteCodeId;
}
public void setCampaignCompleteCodeId(Long campaignCompleteCodeId) {
this.campaignCompleteCodeId = campaignCompleteCodeId;
}
public Long getCampaignId() {
return campaignId;
}
public void setCampaignId(Long campaignId) {
this.campaignId = campaignId;
}
public String getCompleteValue() {
return completeValue;
}
public void setCompleteValue(String completeValue) {
this.completeValue = completeValue;
}
public String getCompleteName() {
return completeName;
}
public void setCompleteName(String completeName) {
this.completeName = completeName;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public Short getStatus() {
return status;
}
public void setStatus(Short status) {
this.status = status;
}
public Short getCompleteType() {
return completeType;
}
public void setCompleteType(Short completeType) {
this.completeType = completeType;
}
public Short getIsRecall() {
return isRecall;
}
public void setIsRecall(Short isRecall) {
this.isRecall = isRecall;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateAt() {
return updateAt;
}
public void setUpdateAt(Date updateAt) {
this.updateAt = updateAt;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateAt() {
return createAt;
}
public void setCreateAt(Date createAt) {
this.createAt = createAt;
}
public String getCampaignType() {
return campaignType;
}
public void setCampaignType(String campaignType) {
this.campaignType = campaignType;
}
public Short getIsFinish() {
return isFinish;
}
public void setIsFinish(Short isFinish) {
this.isFinish = isFinish;
}
public Long getCompanySiteId() {
return companySiteId;
}
public void setCompanySiteId(Long companySiteId) {
this.companySiteId = companySiteId;
}
public Short getIsLock() {
return isLock;
}
public void setIsLock(Short isLock) {
this.isLock = isLock;
}
public Long getDurationLock() {
return durationLock;
}
public void setDurationLock(Long durationLock) {
this.durationLock = durationLock;
}
}
src/main/java/com/viettel/campaign/controller/ApParamController.java
View file @ 1298b06a
...@@ -2,6 +2,7 @@ package com.viettel.campaign.controller; ...@@ -2,6 +2,7 @@ package com.viettel.campaign.controller;
import com.viettel.campaign.model.ApParam; import com.viettel.campaign.model.ApParam;
import com.viettel.campaign.service.ApParamService; import com.viettel.campaign.service.ApParamService;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
...@@ -14,6 +15,8 @@ import java.util.List; ...@@ -14,6 +15,8 @@ import java.util.List;
@RequestMapping("/ipcc/apParam") @RequestMapping("/ipcc/apParam")
public class ApParamController { public class ApParamController {
private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
@Autowired(required = true) @Autowired(required = true)
ApParamService apParamService; ApParamService apParamService;
......
src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.controller;
import com.viettel.campaign.DTO.CampaignCompleteCodeDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.service.CampaignCompleteCodeService;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Map;
@Controller
@RequestMapping("/ipcc/completeCode")
public class CampaignCompleteCodeController {
private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
@Autowired
CampaignCompleteCodeService completeCodeService;
@GetMapping("/findAll")
@ResponseBody
public ResponseEntity findAllCompleteCode(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
Map result = completeCodeService.listAllCompleteCode(page, pageSize, sort);
return new ResponseEntity<>(result, HttpStatus.OK);
}
@GetMapping("/findCompleteCodeByName")
@ResponseBody
public ResponseEntity findAllCompleteCodeName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("name") String name) {
Map result = completeCodeService.listCompleteCodeByName(page, pageSize, sort, name);
return new ResponseEntity(result, HttpStatus.OK);
}
@PostMapping("/create")
@ResponseBody
public ResultDTO createCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO result = new ResultDTO();
//LogUtil logUtil = new LogUtil();
//logUtil.initKpiLog("createCust");
try {
//LOGGER.info("Returning createCustomer: start");
result = completeCodeService.createCompleteCode(completeCodeDTO);
//LOGGER.info("Returning createCustomer:" + result.getErrorCode());
//logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
} catch (Exception e) {
result.setErrorCode("-1");
LOGGER.error(e);
//logUtil.endKpiLog(customerDTO, 1, result.getErrorCode(), e.getMessage(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
}
return result;
}
@PostMapping("/update")
@ResponseBody
public ResultDTO updateCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO result = new ResultDTO();
//LogUtil logUtil = new LogUtil();
//logUtil.initKpiLog("createCust");
try {
//LOGGER.info("Returning createCustomer: start");
result = completeCodeService.updateCompleteCode(completeCodeDTO);
//LOGGER.info("Returning createCustomer:" + result.getErrorCode());
//logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
} catch (Exception e) {
result.setErrorCode("-1");
LOGGER.error(e);
//logUtil.endKpiLog(customerDTO, 1, result.getErrorCode(), e.getMessage(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
}
return result;
}
@PostMapping("/delete")
@ResponseBody
public ResultDTO deleteCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO result = new ResultDTO();
result = completeCodeService.deleteCompleteCode(completeCodeDTO);
return result;
}
}
src/main/java/com/viettel/campaign/controller/CustomerController.java
View file @ 1298b06a
...@@ -2,8 +2,6 @@ package com.viettel.campaign.controller; ...@@ -2,8 +2,6 @@ package com.viettel.campaign.controller;
import com.viettel.campaign.DTO.CustomerDTO; import com.viettel.campaign.DTO.CustomerDTO;
import com.viettel.campaign.DTO.ResultDTO; import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.model.Customer;
import com.viettel.campaign.repository.CustomerRepository;
import com.viettel.campaign.service.CustomerService; import com.viettel.campaign.service.CustomerService;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,9 +23,6 @@ public class CustomerController { ...@@ -25,9 +23,6 @@ public class CustomerController {
@Autowired(required=true) @Autowired(required=true)
CustomerService customerService; CustomerService customerService;
@Autowired
CustomerRepository customerRepository;
@GetMapping("/findAll") @GetMapping("/findAll")
@ResponseBody @ResponseBody
public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) { public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
...@@ -35,14 +30,14 @@ public class CustomerController { ...@@ -35,14 +30,14 @@ public class CustomerController {
return new ResponseEntity<>(result, HttpStatus.OK); return new ResponseEntity<>(result, HttpStatus.OK);
} }
@GetMapping("/findCustName") @GetMapping("/findCustomerByName")
@ResponseBody @ResponseBody
public ResponseEntity findAllCustomerName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("name") String name) { public ResponseEntity findAllCustomerName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("name") String name) {
Map result = customerService.listCustByName(page, pageSize, sort, name); Map result = customerService.listCustByName(page, pageSize, sort, name);
return new ResponseEntity(result, HttpStatus.OK); return new ResponseEntity(result, HttpStatus.OK);
} }
@PostMapping(value = "/createCust") @PostMapping(value = "/create")
@ResponseBody @ResponseBody
public ResultDTO createCust(@RequestBody @Valid CustomerDTO customerDTO) { public ResultDTO createCust(@RequestBody @Valid CustomerDTO customerDTO) {
ResultDTO result = new ResultDTO(); ResultDTO result = new ResultDTO();
......
src/main/java/com/viettel/campaign/mapper/ApParamMapper.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.mapper;
import com.viettel.campaign.DTO.ApParamDTO;
import com.viettel.campaign.model.ApParam;
public class ApParamMapper extends BaseMapper<ApParam, ApParamDTO> {
@Override
public ApParamDTO toDtoBean(ApParam apParam) {
ApParamDTO apParamDTO = new ApParamDTO();
if (apParam != null) {
apParamDTO.setApParamId(apParam.getApParamId());
apParamDTO.setParType(apParam.getParType());
apParamDTO.setParName(apParam.getParName());
apParamDTO.setParValue(apParam.getParValue());
apParamDTO.setParCode(apParam.getParCode());
apParamDTO.setDescription(apParam.getDescription());
apParamDTO.setIsDelete(apParam.getIsDelete());
apParamDTO.setIsDefault(apParam.getIsDefault());
apParamDTO.setEnableEdit(apParam.getEnableEdit());
apParamDTO.setSiteId(apParam.getSiteId());
}
return apParamDTO;
}
@Override
public ApParam toPersistenceBean(ApParamDTO dtoBean) {
ApParam apParam = new ApParam();
if (dtoBean != null) {
apParam.setApParamId(dtoBean.getApParamId());
apParam.setParType(dtoBean.getParType());
apParam.setParName(dtoBean.getParName());
apParam.setParValue(dtoBean.getParValue());
apParam.setParCode(dtoBean.getParCode());
apParam.setDescription(dtoBean.getDescription());
apParam.setIsDelete(dtoBean.getIsDelete());
apParam.setIsDefault(dtoBean.getIsDefault());
apParam.setEnableEdit(dtoBean.getEnableEdit());
apParam.setSiteId(dtoBean.getSiteId());
}
return apParam;
}
}
src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.mapper;
import com.viettel.campaign.DTO.CampaignCompleteCodeDTO;
import com.viettel.campaign.model.CampaignCompleteCode;
public class CampaignCompleteCodeMapper extends BaseMapper<CampaignCompleteCode, CampaignCompleteCodeDTO> {
@Override
public CampaignCompleteCodeDTO toDtoBean(CampaignCompleteCode entity) {
CampaignCompleteCodeDTO dto = new CampaignCompleteCodeDTO();
if (entity != null) {
dto.setCampaignCompleteCodeId(entity.getCampaignCompleteCodeId());
dto.setCampaignId(entity.getCampaignId());
dto.setCompleteValue(entity.getCompleteValue());
dto.setCompleteName(entity.getCompleteName());
dto.setDescription(entity.getDescription());
dto.setStatus(entity.getStatus());
dto.setCompleteType(entity.getCompleteType());
dto.setIsRecall(entity.getIsRecall());
dto.setUpdateBy(entity.getUpdateBy());
dto.setUpdateAt(entity.getUpdateAt());
dto.setCreateBy(entity.getCreateBy());
dto.setCreateAt(entity.getCreateAt());
dto.setCampaignType(entity.getCampaignType());
dto.setIsFinish(entity.getIsFinish());
dto.setCompanySiteId(entity.getCompanySiteId());
dto.setIsLock(entity.getIsLock());
dto.setDurationLock(entity.getDurationLock());
}
return dto;
}
@Override
public CampaignCompleteCode toPersistenceBean(CampaignCompleteCodeDTO dtoBean) {
CampaignCompleteCode entity = new CampaignCompleteCode();
if (dtoBean != null) {
entity.setCampaignCompleteCodeId(dtoBean.getCampaignCompleteCodeId());
entity.setCampaignId(dtoBean.getCampaignId());
entity.setCompleteValue(dtoBean.getCompleteValue());
entity.setCompleteName(dtoBean.getCompleteName());
entity.setDescription(dtoBean.getDescription());
entity.setStatus(dtoBean.getStatus());
entity.setCompleteType(dtoBean.getCompleteType());
entity.setIsRecall(dtoBean.getIsRecall());
entity.setUpdateBy(dtoBean.getUpdateBy());
entity.setUpdateAt(dtoBean.getUpdateAt());
entity.setCreateBy(dtoBean.getCreateBy());
entity.setCreateAt(dtoBean.getCreateAt());
entity.setCampaignType(dtoBean.getCampaignType());
entity.setIsFinish(dtoBean.getIsFinish());
entity.setCompanySiteId(dtoBean.getCompanySiteId());
entity.setIsLock(dtoBean.getIsLock());
entity.setDurationLock(dtoBean.getDurationLock());
}
return entity;
}
}
src/main/java/com/viettel/campaign/mapper/CustomerMapper.java
View file @ 1298b06a
...@@ -9,7 +9,8 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -9,7 +9,8 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
@Override @Override
public CustomerDTO toDtoBean(Customer model) { public CustomerDTO toDtoBean(Customer model) {
CustomerDTO obj = null; CustomerDTO obj = new CustomerDTO();
if (model != null) { if (model != null) {
obj = new CustomerDTO(); obj = new CustomerDTO();
obj.setUserName(model.getUserName()); obj.setUserName(model.getUserName());
...@@ -41,12 +42,14 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -41,12 +42,14 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
obj.setCustomerType(model.getCustomerType()); obj.setCustomerType(model.getCustomerType());
obj.setDescription(model.getDescription()); obj.setDescription(model.getDescription());
} }
return obj; return obj;
} }
@Override @Override
public Customer toPersistenceBean(CustomerDTO dtoBean) { public Customer toPersistenceBean(CustomerDTO dtoBean) {
Customer obj = null; Customer obj = new Customer();
if (dtoBean != null) { if (dtoBean != null) {
obj = new Customer(); obj = new Customer();
//obj.setCustomerId(dtoBean.getCustomerId() == null ? null : dtoBean.getCustomerId()); //obj.setCustomerId(dtoBean.getCustomerId() == null ? null : dtoBean.getCustomerId());
...@@ -75,6 +78,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -75,6 +78,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
obj.setSmsAllowed(dtoBean.getSmsAllowed()); obj.setSmsAllowed(dtoBean.getSmsAllowed());
obj.setIpccStatus(dtoBean.getIpccStatus()); obj.setIpccStatus(dtoBean.getIpccStatus());
} }
return obj; return obj;
} }
} }
src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.model;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name = "CAMPAIGN_COMPLETE_CODE")
public class CampaignCompleteCode implements Serializable {
@Id
@GeneratedValue(generator = "CAMPAIGN_COMPLETE_CODE_SEQ")
@SequenceGenerator(name = "CAMPAIGN_COMPLETE_CODE_SEQ", sequenceName = "CAMPAIGN_COMPLETE_CODE_SEQ", allocationSize = 1)
@Basic(optional = false)
@Column(name = "CAMPAIGN_COMPLETE_CODE_ID")
private Long campaignCompleteCodeId;
@Column(name = "CAMPAIGN_ID")
private Long campaignId;
@Column(name = "COMPLETE_VALUE")
private String completeValue;
@Column(name = "COMPLETE_NAME")
private String completeName;
@Column(name = "DESCRIPTION")
private String description;
@Column(name = "STATUS")
private Short status;
@Column(name = "COMPLETE_TYPE")
private Short completeType;
@Column(name = "IS_RECALL")
private Short isRecall;
@Column(name = "UPDATE_BY")
private String updateBy;
@Column(name = "UPDATE_AT")
@Temporal(TemporalType.TIMESTAMP)
private Date updateAt;
@Column(name = "CREATE_BY")
private String createBy;
@Column(name = "CREATE_AT")
@Temporal(TemporalType.TIMESTAMP)
private Date createAt;
@Column(name = "CAMPAIGN_TYPE")
private String campaignType;
@Column(name = "IS_FINISH")
private Short isFinish;
@Column(name = "COMPANY_SITE_ID")
private Long companySiteId;
@Column(name = "IS_LOCK")
private Short isLock;
@Column(name = "DURATION_LOCK")
private Long durationLock;
public Long getCampaignCompleteCodeId() {
return campaignCompleteCodeId;
}
public void setCampaignCompleteCodeId(Long campaignCompleteCodeId) {
this.campaignCompleteCodeId = campaignCompleteCodeId;
}
public Long getCampaignId() {
return campaignId;
}
public void setCampaignId(Long campaignId) {
this.campaignId = campaignId;
}
public String getCompleteValue() {
return completeValue;
}
public void setCompleteValue(String completeValue) {
this.completeValue = completeValue;
}
public String getCompleteName() {
return completeName;
}
public void setCompleteName(String completeName) {
this.completeName = completeName;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public Short getStatus() {
return status;
}
public void setStatus(Short status) {
this.status = status;
}
public Short getCompleteType() {
return completeType;
}
public void setCompleteType(Short completeType) {
this.completeType = completeType;
}
public Short getIsRecall() {
return isRecall;
}
public void setIsRecall(Short isRecall) {
this.isRecall = isRecall;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateAt() {
return updateAt;
}
public void setUpdateAt(Date updateAt) {
this.updateAt = updateAt;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateAt() {
return createAt;
}
public void setCreateAt(Date createAt) {
this.createAt = createAt;
}
public String getCampaignType() {
return campaignType;
}
public void setCampaignType(String campaignType) {
this.campaignType = campaignType;
}
public Short getIsFinish() {
return isFinish;
}
public void setIsFinish(Short isFinish) {
this.isFinish = isFinish;
}
public Long getCompanySiteId() {
return companySiteId;
}
public void setCompanySiteId(Long companySiteId) {
this.companySiteId = companySiteId;
}
public Short getIsLock() {
return isLock;
}
public void setIsLock(Short isLock) {
this.isLock = isLock;
}
public Long getDurationLock() {
return durationLock;
}
public void setDurationLock(Long durationLock) {
this.durationLock = durationLock;
}
}
src/main/java/com/viettel/campaign/repository/ApParamRepository.java
View file @ 1298b06a
...@@ -5,6 +5,7 @@ import org.springframework.data.domain.Page; ...@@ -5,6 +5,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List; import java.util.List;
...@@ -12,6 +13,6 @@ public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParam ...@@ -12,6 +13,6 @@ public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParam
Page<ApParam> findAll(Pageable pageable); Page<ApParam> findAll(Pageable pageable);
@Query(value = "SELECT p FROM ApParam p WHERE parName LIKE %?1%") @Query(value = "SELECT p FROM ApParam p WHERE parName LIKE concat('%', :parName, '%') ")
List<ApParam> findParamByName(String parName, Pageable pageable); List<ApParam> findParamByName(@Param("parName") String parName, Pageable pageable);
} }
src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.repository;
import com.viettel.campaign.model.CampaignCompleteCode;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long> {
Page<CampaignCompleteCode> findAll(Pageable pageable);
@Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
List<CampaignCompleteCode> findByName(@Param("name") String Name, Pageable pageable);
}
src/main/java/com/viettel/campaign/service/ApParamService.java
View file @ 1298b06a
package com.viettel.campaign.service; package com.viettel.campaign.service;
import com.viettel.campaign.DTO.ApParamDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.model.ApParam; import com.viettel.campaign.model.ApParam;
import java.util.List; import java.util.List;
...@@ -9,4 +11,6 @@ public interface ApParamService { ...@@ -9,4 +11,6 @@ public interface ApParamService {
Iterable<ApParam> getAllParams(int page, int pageSize, String sort); Iterable<ApParam> getAllParams(int page, int pageSize, String sort);
List<ApParam> getParamByName(int page, int pageSize, String sort, String parName); List<ApParam> getParamByName(int page, int pageSize, String sort, String parName);
ResultDTO createApParam(ApParamDTO apParamDTO);
} }
src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java
View file @ 1298b06a
package com.viettel.campaign.service; package com.viettel.campaign.service;
import com.viettel.campaign.DTO.ApParamDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.mapper.ApParamMapper;
import com.viettel.campaign.model.ApParam; import com.viettel.campaign.model.ApParam;
import com.viettel.campaign.repository.ApParamRepository; import com.viettel.campaign.repository.ApParamRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -29,4 +32,29 @@ public class ApParamServiceImpl implements ApParamService { ...@@ -29,4 +32,29 @@ public class ApParamServiceImpl implements ApParamService {
return lst; return lst;
} }
@Override
public ResultDTO createApParam(ApParamDTO apParamDTO) {
ResultDTO result = new ResultDTO();
ApParamMapper apParamMapper = new ApParamMapper();
ApParam apparam = new ApParam();
try {
if (apParamDTO != null) {
apparam = apParamRepository.save(apParamMapper.toPersistenceBean(apParamDTO));
result.setErrorCode("0");
result.setDescription("create apparam");
result.setData(apparam);
} else {
result.setErrorCode("-1");
result.setDescription("create apparam FAIL");
result.setData(apparam);
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
} }
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.service;
import com.viettel.campaign.DTO.CampaignCompleteCodeDTO;
import com.viettel.campaign.DTO.ResultDTO;
import java.util.Map;
public interface CampaignCompleteCodeService {
Map listAllCompleteCode(int page, int pageSize, String sort);
Map listCompleteCodeByName(int page, int pageSize, String sort, String name);
ResultDTO createCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
ResultDTO updateCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
}
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java 0 → 100644
View file @ 1298b06a
package com.viettel.campaign.service;
import com.viettel.campaign.DTO.CampaignCompleteCodeDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
import com.viettel.campaign.model.CampaignCompleteCode;
import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import java.util.*;
@Service
public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeService {
@Autowired
CampaignCompleteCodeRepository completeCodeRepository;
@Override
public Map listAllCompleteCode(int page, int pageSize, String sort) {
Map result = new HashMap();
Page<CampaignCompleteCode> pg = completeCodeRepository.findAll(PageRequest.of(page, pageSize, Sort.by(sort)));
result.put("totalItems", pg.getTotalElements());
result.put("data", pg.iterator());
return result;
}
@Override
public Map listCompleteCodeByName(int page, int pageSize, String sort, String name) {
Map result = new HashMap();
List<CampaignCompleteCode> lst = new ArrayList<>();
lst = completeCodeRepository.findByName(name, PageRequest.of(page, pageSize, Sort.by(sort)));
result.put("totalItem", lst.size());
result.put("customers", lst);
return result;
}
@Override
public ResultDTO createCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO resultDTO = new ResultDTO();
CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
Date today = new Date();
CampaignCompleteCode compCode = new CampaignCompleteCode();
try {
if (completeCodeDTO != null) {
// insert
compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
compCode = completeCodeRepository.save(compCode);
resultDTO.setErrorCode("0");
resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " created!");
} else {
resultDTO.setErrorCode("-2");
resultDTO.setDescription("CompleteCodeDTO null");
}
} catch (Exception e) {
e.printStackTrace();
}
return resultDTO;
}
@Override
public ResultDTO updateCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO resultDTO = new ResultDTO();
CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
Date today = new Date();
CampaignCompleteCode compCode = new CampaignCompleteCode();
try {
if (completeCodeDTO != null) {
// update
compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
compCode = completeCodeRepository.save(compCode);
resultDTO.setErrorCode("0");
resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " updated!");
} else {
resultDTO.setErrorCode("-2");
resultDTO.setDescription("CompleteCodeDTO null");
}
} catch (Exception e) {
e.printStackTrace();
}
return resultDTO;
}
@Override
public ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
ResultDTO resultDTO = new ResultDTO();
CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
Date today = new Date();
CampaignCompleteCode compCode = new CampaignCompleteCode();
try {
if (completeCodeDTO != null) {
// delete
completeCodeRepository.deleteById(completeCodeDTO.getCampaignCompleteCodeId());
resultDTO.setErrorCode("0");
resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " deleted!");
} else {
resultDTO.setErrorCode("-2");
resultDTO.setDescription("CompleteCodeDTO null");
}
} catch (Exception e) {
e.printStackTrace();
}
return resultDTO;
}
}
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @ 1298b06a
...@@ -8,6 +8,7 @@ import java.util.List; ...@@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public interface CustomerService { public interface CustomerService {
Map listAllCustomer(int page, int pageSize, String sort); Map listAllCustomer(int page, int pageSize, String sort);
Map listCustByName(int page, int pageSize, String sort, String name); Map listCustByName(int page, int pageSize, String sort, String name);
......
src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java
View file @ 1298b06a
...@@ -23,6 +23,7 @@ public class CustomerServiceImpl implements CustomerService { ...@@ -23,6 +23,7 @@ public class CustomerServiceImpl implements CustomerService {
@Autowired @Autowired
EntityManager entityManager; EntityManager entityManager;
@Autowired @Autowired
CustomerRepository customerRepository; CustomerRepository customerRepository;
...@@ -86,6 +87,7 @@ public class CustomerServiceImpl implements CustomerService { ...@@ -86,6 +87,7 @@ public class CustomerServiceImpl implements CustomerService {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return resultDTO; return resultDTO;
} }
......
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