Skip to content

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

update

parent 4d890fa1
Hide whitespace changes
Inline Side-by-side
Showing with 1845 additions and 150 deletions
.idea/workspace.xml
View file @ d779a33f
......@@ -2,28 +2,27 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5c5a6e49-5215-4271-a1d3-f663530e06ec" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/ApParamDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/filter/CorsFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepository.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_16.xml" beforeDir="false" />
<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/CustomerDTO.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/DTO/ResultDTO.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/mapper/BaseMapper.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/model/CustomerList.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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service-campaign.iml" beforeDir="false" afterPath="$PROJECT_DIR$/service-campaign.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/web/controller/KafkaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/web/controller/KafkaController.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/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/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/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/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>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -37,30 +36,24 @@
<option name="isMigrated" value="true" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java">
<leaf>
<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="3026">
<caret line="272" selection-start-line="272" selection-end-line="272" />
<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" />
<element signature="e#3115#3116#0" expanded="true" />
<element signature="e#3149#3150#0" expanded="true" />
<element signature="e#4705#4706#0" expanded="true" />
<element signature="e#4739#4740#0" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
<element signature="e#5371#5372#0" 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/CustomerService.java">
<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="170">
<caret line="10" column="58" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
<state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -69,10 +62,10 @@
</entry>
</file>
<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/service/ApParamServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="47" column="71" selection-start-line="47" selection-start-column="71" selection-end-line="47" selection-end-column="71" />
<state relative-caret-position="323">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -81,10 +74,10 @@
</entry>
</file>
<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/repository/ApParamRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="41" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -92,11 +85,35 @@
</provider>
</entry>
</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/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="26" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="26" />
<state relative-caret-position="432">
<caret line="41" column="57" lean-forward="true" selection-start-line="41" selection-start-column="57" selection-end-line="41" 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/CustomerServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<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="340">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -129,9 +146,15 @@
<find>\n</find>
<find>customer</find>
<find>page</find>
<find>userN</find>
<find>addtio</find>
<find>curretn</find>
<find>dtoBean</find>
<find>MOBILE</find>
</findStrings>
<replaceStrings>
<replace>ApParam</replace>
<replace>customerDTO</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
......@@ -151,19 +174,30 @@
<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/service/ApParamService.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/model/ApParam.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/repository/ApParamRepository.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CustomerRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.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/model/Customer.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/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/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/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/DTO/TicketSiteDTO.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/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/service/ApParamServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/ApParamController.java" />
</list>
</option>
</component>
......@@ -180,7 +214,7 @@
</MavenImportingSettings>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="166" />
<option name="y" value="27" />
<option name="width" value="1655" />
......@@ -194,6 +228,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
......@@ -228,15 +263,6 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="campaign" type="462c0819:PsiDirectoryNode" />
</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="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="service-campaign" type="b2602c69:ProjectViewProjectNode" />
<item name="service-campaign" type="462c0819:PsiDirectoryNode" />
......@@ -312,7 +338,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -430,7 +455,7 @@
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21215352" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2185501" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
......@@ -440,7 +465,7 @@
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.3290461" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3290461" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290461" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39978564" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
......@@ -513,14 +538,36 @@
<option name="timeStamp" value="5" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java</url>
<line>30</line>
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java</url>
<line>60</line>
<properties />
<option name="timeStamp" value="9" />
<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">
<url>file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java</url>
<line>9</line>
<log-expression expression="@Table(name = &quot;CUSTOMER&quot;)" language="JAVA" />
<properties />
<option name="timeStamp" value="35" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="debuggerHistoryManager">
<expressions id="breakpointLogExpression">
<expression>
<expression-string>@Table(name = &quot;CUSTOMER&quot;)</expression-string>
<language-id>JAVA</language-id>
<evaluation-mode>EXPRESSION</evaluation-mode>
</expression>
</expressions>
</component>
<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">
......@@ -603,13 +650,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/ServiceCampaignApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
......@@ -641,106 +681,399 @@
</state>
</provider>
</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/repository/ApParamRepositoryCustom.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="20" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="20" />
<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/controller/ApParamController.java">
<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="408">
<caret line="36" selection-start-line="36" selection-end-line="36" />
<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/ApParamService.java">
<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="153">
<caret line="9" column="1" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
<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/service/ApParamServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/ServiceCampaignApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="22" column="56" selection-start-line="22" selection-start-column="56" selection-end-line="22" selection-end-column="56" />
<state relative-caret-position="85">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</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="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="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" />
<element signature="e#630#631#0" expanded="true" />
<element signature="e#657#658#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java">
<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">
<state relative-caret-position="119">
<caret line="7" selection-start-line="7" selection-end-line="7" />
<state relative-caret-position="136">
<caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
</state>
</provider>
</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="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java">
<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">
<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" />
<state relative-caret-position="178">
<caret line="184" selection-start-line="184" selection-end-line="184" />
</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/TransactionInterceptor.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="38" selection-start-line="38" selection-end-line="38" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.10.RELEASE/spring-aop-5.0.10.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.10.RELEASE/spring-aop-5.0.10.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="510" selection-start-line="510" selection-end-line="510" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.10.RELEASE/spring-web-5.0.10.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="121" selection-start-line="121" selection-end-line="121" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.10.RELEASE/spring-core-5.0.10.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="103" selection-start-line="103" selection-end-line="103" />
</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>
<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/repository/ApParamRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/TicketSite.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1287#1288#0" expanded="true" />
<element signature="e#1316#1317#0" expanded="true" />
<element signature="e#1358#1359#0" expanded="true" />
<element signature="e#1394#1395#0" expanded="true" />
<element signature="e#1429#1430#0" expanded="true" />
<element signature="e#1460#1461#0" expanded="true" />
<element signature="e#1508#1509#0" expanded="true" />
<element signature="e#1548#1549#0" expanded="true" />
<element signature="e#1583#1584#0" expanded="true" />
<element signature="e#1614#1615#0" expanded="true" />
<element signature="e#1662#1663#0" expanded="true" />
<element signature="e#1702#1703#0" expanded="true" />
<element signature="e#1737#1738#0" expanded="true" />
<element signature="e#1770#1771#0" expanded="true" />
<element signature="e#1820#1821#0" expanded="true" />
<element signature="e#1864#1865#0" expanded="true" />
<element signature="e#1899#1900#0" expanded="true" />
<element signature="e#1930#1931#0" expanded="true" />
<element signature="e#1978#1979#0" expanded="true" />
<element signature="e#2018#2019#0" expanded="true" />
<element signature="e#2053#2054#0" expanded="true" />
<element signature="e#2086#2087#0" expanded="true" />
<element signature="e#2136#2137#0" expanded="true" />
<element signature="e#2180#2181#0" expanded="true" />
<element signature="e#2215#2216#0" expanded="true" />
<element signature="e#2246#2247#0" expanded="true" />
<element signature="e#2294#2295#0" expanded="true" />
<element signature="e#2334#2335#0" expanded="true" />
<element signature="e#2365#2366#0" expanded="true" />
<element signature="e#2394#2395#0" expanded="true" />
<element signature="e#2436#2437#0" expanded="true" />
<element signature="e#2472#2473#0" expanded="true" />
<element signature="e#2505#2506#0" expanded="true" />
<element signature="e#2536#2537#0" expanded="true" />
<element signature="e#2582#2583#0" expanded="true" />
<element signature="e#2622#2623#0" expanded="true" />
<element signature="e#2663#2664#0" expanded="true" />
<element signature="e#2700#2701#0" expanded="true" />
<element signature="e#2760#2761#0" expanded="true" />
<element signature="e#2812#2813#0" expanded="true" />
<element signature="e#2850#2851#0" expanded="true" />
<element signature="e#2886#2887#0" expanded="true" />
<element signature="e#2942#2943#0" expanded="true" />
<element signature="e#2992#2993#0" 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="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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
<folding>
<element signature="e#1104#1105#0" expanded="true" />
<element signature="e#1133#1134#0" expanded="true" />
<element signature="e#1175#1176#0" expanded="true" />
<element signature="e#1211#1212#0" expanded="true" />
<element signature="e#1246#1247#0" expanded="true" />
<element signature="e#1277#1278#0" expanded="true" />
<element signature="e#1325#1326#0" expanded="true" />
<element signature="e#1365#1366#0" expanded="true" />
<element signature="e#1400#1401#0" expanded="true" />
<element signature="e#1431#1432#0" expanded="true" />
<element signature="e#1479#1480#0" expanded="true" />
<element signature="e#1519#1520#0" expanded="true" />
<element signature="e#1554#1555#0" expanded="true" />
<element signature="e#1587#1588#0" expanded="true" />
<element signature="e#1637#1638#0" expanded="true" />
<element signature="e#1681#1682#0" expanded="true" />
<element signature="e#1716#1717#0" expanded="true" />
<element signature="e#1747#1748#0" expanded="true" />
<element signature="e#1795#1796#0" expanded="true" />
<element signature="e#1835#1836#0" expanded="true" />
<element signature="e#1870#1871#0" expanded="true" />
<element signature="e#1903#1904#0" expanded="true" />
<element signature="e#1953#1954#0" expanded="true" />
<element signature="e#1997#1998#0" expanded="true" />
<element signature="e#2032#2033#0" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="e#2111#2112#0" expanded="true" />
<element signature="e#2151#2152#0" expanded="true" />
<element signature="e#2182#2183#0" expanded="true" />
<element signature="e#2211#2212#0" expanded="true" />
<element signature="e#2253#2254#0" expanded="true" />
<element signature="e#2289#2290#0" expanded="true" />
<element signature="e#2322#2323#0" expanded="true" />
<element signature="e#2353#2354#0" expanded="true" />
<element signature="e#2399#2400#0" expanded="true" />
<element signature="e#2439#2440#0" expanded="true" />
<element signature="e#2480#2481#0" expanded="true" />
<element signature="e#2517#2518#0" expanded="true" />
<element signature="e#2577#2578#0" expanded="true" />
<element signature="e#2629#2630#0" expanded="true" />
<element signature="e#2667#2668#0" expanded="true" />
<element signature="e#2703#2704#0" expanded="true" />
<element signature="e#2759#2760#0" expanded="true" />
<element signature="e#2809#2810#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CustomerListMapping.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
<caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#496#497#0" expanded="true" />
<element signature="e#540#541#0" expanded="true" />
<element signature="e#713#714#0" expanded="true" />
<element signature="e#746#747#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#840#841#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" />
<element signature="e#914#915#0" expanded="true" />
<element signature="e#970#971#0" expanded="true" />
<element signature="e#1020#1021#0" expanded="true" />
<element signature="e#1059#1060#0" expanded="true" />
<element signature="e#1096#1097#0" expanded="true" />
<element signature="e#1154#1155#0" expanded="true" />
<element signature="e#1206#1207#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<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="408">
<caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
<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="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.10.RELEASE/spring-web-5.0.10.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
<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="178">
<caret line="127" selection-start-line="127" selection-end-line="127" />
<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/service/CustomerServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
<folding>
<element signature="e#1260#1261#0" expanded="true" />
<element signature="e#1299#1300#0" expanded="true" />
<element signature="e#1983#1984#0" expanded="true" />
<element signature="e#2023#2024#0" expanded="true" />
<element signature="e#2137#2138#0" expanded="true" />
<element signature="e#2177#2178#0" expanded="true" />
<element signature="e#2441#2442#0" expanded="true" />
<element signature="e#2485#2486#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/utils/DataUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="47" column="71" selection-start-line="47" selection-start-column="71" selection-end-line="47" selection-end-column="71" />
<state relative-caret-position="4148">
<caret line="252" column="27" selection-start-line="252" selection-start-column="27" selection-end-line="252" 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/CustomerService.java">
<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="170">
<caret line="10" column="58" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
<state relative-caret-position="255">
<caret line="18" column="26" selection-start-line="18" selection-start-column="17" selection-end-line="18" 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/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="41" column="57" lean-forward="true" selection-start-line="41" selection-start-column="57" selection-end-line="41" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -748,35 +1081,59 @@
</provider>
</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="340">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="34">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="imports" 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="238">
<caret line="14" column="41" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/Customer.java">
<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="3026">
<caret line="272" selection-start-line="272" selection-end-line="272" />
<state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3115#3116#0" expanded="true" />
<element signature="e#3149#3150#0" expanded="true" />
<element signature="e#4705#4706#0" expanded="true" />
<element signature="e#4739#4740#0" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
<element signature="e#5371#5372#0" expanded="true" />
</folding>
</state>
</provider>
</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/service/ApParamServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="26" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="26" />
<state relative-caret-position="323">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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>
......
src/main/java/com/viettel/campaign/DTO/BaseDTO.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.DTO;
import java.io.Serializable;
public class BaseDTO implements Serializable {
protected String keySet;
public String getKeySet(){
return keySet;
}
public void setKeySet(String keySet) {
this.keySet = keySet;
}
}
src/main/java/com/viettel/campaign/DTO/CustomerDTO.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.DTO;
import java.util.Date;
public class CustomerDTO extends BaseDTO {
private Long customerId;
private String code;
private String name;
private String description;
private String companyName;
private String customerImg;
private Date createDate;
private Date updateDate;
private String status;
private String createBy;
private String updateBy;
private Long siteId;
private Short gender;
private String currentAddress;
private String placeOfBirth;
private Date dateOfBirth;
private String mobileNumber;
private String email;
private String userName;
private String areaCode;
private Long customerType;
private String callAllowed;
private Long emailAllowed;
private Long smsAllowed;
private String ipccStatus;
public Long getCustomerId() {
return customerId;
}
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getCustomerImg() {
return customerImg;
}
public void setCustomerImg(String customerImg) {
this.customerImg = customerImg;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Long getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
public Short getGender() {
return gender;
}
public void setGender(Short gender) {
this.gender = gender;
}
public String getCurrentAddress() {
return currentAddress;
}
public void setCurrentAddress(String currentAddress) {
this.currentAddress = currentAddress;
}
public String getPlaceOfBirth() {
return placeOfBirth;
}
public void setPlaceOfBirth(String placeOfBirth) {
this.placeOfBirth = placeOfBirth;
}
public Date getDateOfBirth() {
return dateOfBirth;
}
public void setDateOfBirth(Date dateOfBirth) {
this.dateOfBirth = dateOfBirth;
}
public String getMobileNumber() {
return mobileNumber;
}
public void setMobileNumber(String mobileNumber) {
this.mobileNumber = mobileNumber;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getAreaCode() {
return areaCode;
}
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
public Long getCustomerType() {
return customerType;
}
public void setCustomerType(Long customerType) {
this.customerType = customerType;
}
public String getCallAllowed() {
return callAllowed;
}
public void setCallAllowed(String callAllowed) {
this.callAllowed = callAllowed;
}
public Long getEmailAllowed() {
return emailAllowed;
}
public void setEmailAllowed(Long emailAllowed) {
this.emailAllowed = emailAllowed;
}
public Long getSmsAllowed() {
return smsAllowed;
}
public void setSmsAllowed(Long smsAllowed) {
this.smsAllowed = smsAllowed;
}
public String getIpccStatus() {
return ipccStatus;
}
public void setIpccStatus(String ipccStatus) {
this.ipccStatus = ipccStatus;
}
}
src/main/java/com/viettel/campaign/DTO/CustomerListDTO.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.DTO;
public class CustomerListDTO extends BaseDTO {
private String customerListId;
private String customerListPK;
private String customerSiteId;
private String customerListCode;
private String customerListName;
private String status;
private String createBy;
private String createAt;
private String updateBy;
private String updateAt;
private String source;
private String deptCreate;
public String getCustomerListId() {
return customerListId;
}
public void setCustomerListId(String customerListId) {
this.customerListId = customerListId;
}
public String getCustomerListPK() {
return customerListPK;
}
public void setCustomerListPK(String customerListPK) {
this.customerListPK = customerListPK;
}
public String getCustomerSiteId() {
return customerSiteId;
}
public void setCustomerSiteId(String customerSiteId) {
this.customerSiteId = customerSiteId;
}
public String getCustomerListCode() {
return customerListCode;
}
public void setCustomerListCode(String customerListCode) {
this.customerListCode = customerListCode;
}
public String getCustomerListName() {
return customerListName;
}
public void setCustomerListName(String customerListName) {
this.customerListName = customerListName;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getCreateAt() {
return createAt;
}
public void setCreateAt(String createAt) {
this.createAt = createAt;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getUpdateAt() {
return updateAt;
}
public void setUpdateAt(String updateAt) {
this.updateAt = updateAt;
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
public String getDeptCreate() {
return deptCreate;
}
public void setDeptCreate(String deptCreate) {
this.deptCreate = deptCreate;
}
}
src/main/java/com/viettel/campaign/DTO/ResultDTO.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.DTO;
import java.util.ArrayList;
import java.util.List;
public class ResultDTO {
private String errorCode;
private String description;
private List listData = new ArrayList();
private Object data;
public String getErrorCode() {
return errorCode;
}
public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public List getListData() {
return listData;
}
public void setListData(List listData) {
this.listData = listData;
}
public Object getData() {
return data;
}
public void setData(Object data) {
this.data = data;
}
}
src/main/java/com/viettel/campaign/DTO/TicketSiteDTO.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.DTO;
import java.util.Date;
public class TicketSiteDTO extends BaseDTO {
private Long siteId;
private String siteCode;
private String siteName;
private Date createDate;
private String createBy;
private Date updateDate;
private String updateBy;
private Long status;
private Long parentId;
private String accountKazooId;
private Long servicePlanId;
public Long getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Long getStatus() {
return status;
}
public void setStatus(Long status) {
this.status = status;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getAccountKazooId() {
return accountKazooId;
}
public void setAccountKazooId(String accountKazooId) {
this.accountKazooId = accountKazooId;
}
public Long getServicePlanId() {
return servicePlanId;
}
public void setServicePlanId(Long servicePlanId) {
this.servicePlanId = servicePlanId;
}
}
src/main/java/com/viettel/campaign/controller/ApParamController.java
View file @ d779a33f
package com.viettel.campaign.controller;
import com.viettel.campaign.DTO.ApParamDTO;
import com.viettel.campaign.model.ApParam;
import com.viettel.campaign.service.ApParamService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,29 +11,29 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@Controller
@RequestMapping("/ipcc")
@RequestMapping("/ipcc/apParam")
public class ApParamController {
@Autowired(required=true)
@Autowired(required = true)
ApParamService apParamService;
@GetMapping(path = "/apParam/findAlls")
@GetMapping(path = "/findAlls")
@ResponseBody
public ResponseEntity<List<ApParam>> listAllCustomer(){
List<ApParam> listCustomer = (List<ApParam>) apParamService.getAllParams();
if(listCustomer.isEmpty()) {
public ResponseEntity listAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
Iterable<ApParam> listCustomer = apParamService.getAllParams(page, pageSize, sort);
if (listCustomer == null) {
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
return new ResponseEntity<List<ApParam>>(listCustomer, HttpStatus.OK);
return new ResponseEntity(listCustomer.iterator(), HttpStatus.OK);
}
@PostMapping(path = "/apParam/findByName")
@PostMapping(path = "/findByName")
@ResponseBody
public ResponseEntity<List<ApParam>> searchParamByName(@RequestParam(name = "parName") String parName) {
List<ApParam> lst = apParamService.getParamByName(parName);
public ResponseEntity searchParamByName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam(name = "parName") String parName) {
List<ApParam> lst = apParamService.getParamByName(page, pageSize, sort, parName);
if (lst.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<List<ApParam>>(lst, HttpStatus.OK);
return new ResponseEntity(lst, HttpStatus.OK);
}
}
src/main/java/com/viettel/campaign/controller/CustomerController.java
View file @ d779a33f
package com.viettel.campaign.controller;
import com.viettel.campaign.DTO.CustomerDTO;
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 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.Date;
import java.util.Map;
@Controller
@RequestMapping("/ipcc")
@RequestMapping("/ipcc/customer")
public class CustomerController {
private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
@Autowired(required=true)
CustomerService customerService;
@GetMapping("/customer/findAll")
@Autowired
CustomerRepository customerRepository;
@GetMapping("/findAll")
@ResponseBody
public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
Map result = customerService.listAllCustomer(page, pageSize, sort);
return new ResponseEntity<>(result, HttpStatus.OK);
}
@GetMapping("/customer/findCustName")
@GetMapping("/findCustName")
@ResponseBody
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);
return new ResponseEntity(result, HttpStatus.OK);
}
@PostMapping(value = "/createCust")
@ResponseBody
public ResultDTO createCust(@RequestBody @Valid CustomerDTO customerDTO) {
ResultDTO result = new ResultDTO();
//LogUtil logUtil = new LogUtil();
//logUtil.initKpiLog("createCust");
try {
//LOGGER.info("Returning createCustomer: start");
result = customerService.createCustomer(customerDTO);
//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;
}
}
src/main/java/com/viettel/campaign/mapper/BaseMapper.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.mapper;
import com.viettel.campaign.DTO.BaseDTO;
import java.util.ArrayList;
import java.util.List;
public abstract class BaseMapper<Model extends Object, DTO extends BaseDTO> {
public abstract DTO toDtoBean(Model model);
public abstract Model toPersistenceBean(DTO dtoBean);
public List<DTO> toDtoBean(Iterable<Model> models) {
List<DTO> dtoBeans = new ArrayList<>();
if (models == null) return dtoBeans;
for (Model model : models) {
dtoBeans.add(toDtoBean(model));
}
return dtoBeans;
}
public List<DTO> toDtoBean(List<Model> models) {
List<DTO> dtoBeans = new ArrayList<>();
if (models == null) return dtoBeans;
for (Model model : models) {
dtoBeans.add(toDtoBean(model));
}
return dtoBeans;
}
public List<Model> toPersistenceBean(List<DTO> dtoBeans) {
List<Model> models = new ArrayList<>();
if (dtoBeans == null || dtoBeans.isEmpty()) return models;
for (DTO dtoBean : dtoBeans) {
models.add(toPersistenceBean(dtoBean));
}
return models;
}
}
src/main/java/com/viettel/campaign/mapper/CustomerMapper.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.mapper;
import com.viettel.campaign.DTO.CustomerDTO;
import com.viettel.campaign.model.Customer;
import java.util.Date;
public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
@Override
public CustomerDTO toDtoBean(Customer model) {
CustomerDTO obj = null;
if (model != null) {
obj = new CustomerDTO();
obj.setUserName(model.getUserName());
obj.setCompanyName(model.getCompanyName());
obj.setCurrentAddress(model.getCurrentAddress());
obj.setCustomerId(model.getCustomerId());
obj.setCustomerImg(model.getCustomerImg());
obj.setEmail(model.getEmail());
obj.setGender(model.getGender());
obj.setMobileNumber(model.getMobileNumber());
obj.setName(model.getName());
obj.setSiteId(model.getSiteId());
obj.setStatus(model.getStatus());
// String additionalInfo = "";
// if (model.getName() != null && !"".equals(model.getName())) {
// additionalInfo += model.getName();
// }
// if (model.getUserName() != null && !"".equals(model.getUserName())) {
// additionalInfo += "".equals(additionalInfo) ? model.getUserName() : " - " + model.getUserName();
// }
// if (model.getMobileNumber() != null && !"".equals(model.getMobileNumber())) {
// additionalInfo += "".equals(additionalInfo) ? model.getMobileNumber() : " - " + model.getMobileNumber();
// }
// if (model.getEmail() != null && !"".equals(model.getEmail())) {
// additionalInfo += "".equals(additionalInfo) ? model.getEmail() : " - " + model.getEmail();
// }
// obj.setAdditionalInfo(additionalInfo);
obj.setAreaCode(model.getAreaCode());
obj.setCustomerType(model.getCustomerType());
obj.setDescription(model.getDescription());
}
return obj;
}
@Override
public Customer toPersistenceBean(CustomerDTO dtoBean) {
Customer obj = null;
if (dtoBean != null) {
obj = new Customer();
//obj.setCustomerId(dtoBean.getCustomerId() == null ? null : dtoBean.getCustomerId());
obj.setCode(dtoBean.getCode());
obj.setName(dtoBean.getName());
obj.setDescription(dtoBean.getDescription());
obj.setCompanyName(dtoBean.getCompanyName());
obj.setCustomerImg(dtoBean.getCustomerImg());
obj.setCreateDate(dtoBean.getCreateDate());
obj.setUpdateDate(dtoBean.getUpdateDate());
obj.setStatus(dtoBean.getStatus());
obj.setCreateBy(dtoBean.getCreateBy());
obj.setUpdateBy(dtoBean.getUpdateBy());
obj.setSiteId(dtoBean.getSiteId());
obj.setGender(dtoBean.getGender());
obj.setCurrentAddress(dtoBean.getCurrentAddress());
obj.setPlaceOfBirth(dtoBean.getPlaceOfBirth());
obj.setDateOfBirth(dtoBean.getDateOfBirth());
obj.setMobileNumber(dtoBean.getMobileNumber());
obj.setEmail(dtoBean.getEmail());
obj.setUserName(dtoBean.getUserName());
obj.setAreaCode(dtoBean.getAreaCode());
obj.setCustomerType(dtoBean.getCustomerType());
obj.setCallAllowed(dtoBean.getCallAllowed());
obj.setEmailAllowed(dtoBean.getEmailAllowed());
obj.setSmsAllowed(dtoBean.getSmsAllowed());
obj.setIpccStatus(dtoBean.getIpccStatus());
}
return obj;
}
}
src/main/java/com/viettel/campaign/model/Customer.java
View file @ d779a33f
......@@ -2,6 +2,7 @@ package com.viettel.campaign.model;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
......@@ -16,12 +17,16 @@ public class Customer implements Serializable {
@NotNull
@Column(name = "CUSTOMER_ID")
private Long customerId;
@Size(max = 1000)
@Column(name = "CODE")
private String code;
@Size(max = 1000)
@Column(name = "NAME")
private String name;
@Size(max = 2000)
@Column(name = "DESCRIPTION")
private String description;
@Size(max = 100)
@Column(name = "COMPANY_NAME")
private String companyName;
@Column(name = "CUSTOMER_IMG")
......@@ -36,27 +41,35 @@ public class Customer implements Serializable {
private Date updateDate;
@Column(name = "STATUS")
private String status;
@Size(max = 50)
@Column(name = "CREATE_BY")
private String createBy;
@Size(max = 50)
@Column(name = "UPDATE_BY")
private String updateBy;
@Column(name = "SITE_ID")
private Long siteId;
@Column(name = "GENDER")
private Short gender;
@Size(max = 500)
@Column(name = "CURRENT_ADDRESS")
private String currentAddress;
@Size(max = 500)
@Column(name = "PLACE_OF_BIRTH")
private String placeOfBirth;
@Column(name = "DATE_OF_BIRTH")
@Temporal(TemporalType.TIMESTAMP)
private Date dateOfBirth;
@Size(max = 20)
@Column(name = "MOBILE_NUMBER")
private String mobileNumber;
@Size(max = 500)
@Column(name = "EMAIL")
private String email;
@Size(max = 200)
@Column(name = "USERNAME")
private String userName;
@Size(max = 25)
@Column(name = "AREA_CODE")
private String areaCode;
@Column(name = "CUSTOMER_TYPE")
......@@ -67,6 +80,7 @@ public class Customer implements Serializable {
private Long emailAllowed;
@Column(name = "SMS_ALLOWED")
private Long smsAllowed;
@Size(max = 100)
@Column(name = "IPCC_STATUS")
private String ipccStatus;
......
src/main/java/com/viettel/campaign/model/CustomerList.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.model;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name = "CUSTOMER_LIST")
public class CustomerList implements Serializable {
@Id
@GeneratedValue(generator = "customer_list_seq")
@SequenceGenerator(name = "customer_list_seq", sequenceName = "customer_list_seq", allocationSize = 1)
@Basic(optional = false)
@NotNull
@Column(name = "CUSTOMER_LIST_ID")
private Long customerListId;
@Column(name = "COMPANY_SITE_ID")
private Long customerSiteId;
@Size(max = 200)
@Column(name = "CUSTOMER_LIST_CODE")
private String customerListCode;
@Size(max = 500)
@Column(name = "CUSTOMER_LIST_NAME")
private String customerListName;
@NotNull
@Column(name = "STATUS")
private Short status;
@Size(max = 200)
@Column(name = "CREATE_BY")
private String createBy;
@Column(name = "CREATE_AT")
private Date createAt;
@Size(max = 200)
@Column(name = "UPDATE_BY")
private String updateBy;
@Column(name = "UPDATE_AT")
private Date updateAt;
@Size(max = 100)
@Column(name = "SOURCE")
private String source;
@Size(max = 100)
@Column(name = "DEPT_CREATE")
private String deptCreate;
public Long getCustomerListId() {
return customerListId;
}
public void setCustomerListId(Long customerListId) {
this.customerListId = customerListId;
}
public Long getCustomerSiteId() {
return customerSiteId;
}
public void setCustomerSiteId(Long customerSiteId) {
this.customerSiteId = customerSiteId;
}
public String getCustomerListCode() {
return customerListCode;
}
public void setCustomerListCode(String customerListCode) {
this.customerListCode = customerListCode;
}
public String getCustomerListName() {
return customerListName;
}
public void setCustomerListName(String customerListName) {
this.customerListName = customerListName;
}
public Short getStatus() {
return status;
}
public void setStatus(Short status) {
this.status = status;
}
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 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 getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
public String getDeptCreate() {
return deptCreate;
}
public void setDeptCreate(String deptCreate) {
this.deptCreate = deptCreate;
}
}
src/main/java/com/viettel/campaign/model/CustomerListMapping.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
@Entity
@Table(name = "CUSTOMER_LIST_MAPPING")
public class CustomerListMapping implements Serializable {
@Id
@Column(name = "CUSTOMER_LIST_MAPPING_ID")
private Long customerListMappingId;
@Column(name = "CUSTOMER_ID")
private Long customerId;
@Column(name = "COMPANY_SITE_ID")
private Long companySiteId;
@Column(name = "CUSTOMER_LIST_ID")
private Long customerListId;
public Long getCustomerListMappingId() {
return customerListMappingId;
}
public void setCustomerListMappingId(Long customerListMappingId) {
this.customerListMappingId = customerListMappingId;
}
public Long getCustomerId() {
return customerId;
}
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
public Long getCompanySiteId() {
return companySiteId;
}
public void setCompanySiteId(Long companySiteId) {
this.companySiteId = companySiteId;
}
public Long getCustomerListId() {
return customerListId;
}
public void setCustomerListId(Long customerListId) {
this.customerListId = customerListId;
}
}
src/main/java/com/viettel/campaign/model/TicketSite.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.model;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name = "TICKET_SITE")
public class TicketSite implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Basic(optional = false)
@NotNull
@Column(name = "SITE_ID")
private Long siteId;
@Size(max = 400)
@Column(name = "SITE_CODE")
private String siteCode;
@Size(max = 400)
@Column(name = "SITE_NAME")
private String siteName;
@Column(name = "CREATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date createDate;
@Size(max = 200)
@Column(name = "CREATE_BY")
private String createBy;
@Column(name = "UPDATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date updateDate;
@Size(max = 200)
@Column(name = "UPDATE_BY")
private String updateBy;
@Column(name = "STATUS")
private Long status;
@Column(name = "PARENT_ID")
private Long parentId;
@Size(max = 200)
@Column(name = "ACCOUNT_KAZOO_ID")
private String accountKazooId;
@Column(name = "SERVICE_PLAN_ID")
private Long servicePlanId;
public Long getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
this.siteId = siteId;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Long getStatus() {
return status;
}
public void setStatus(Long status) {
this.status = status;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getAccountKazooId() {
return accountKazooId;
}
public void setAccountKazooId(String accountKazooId) {
this.accountKazooId = accountKazooId;
}
public Long getServicePlanId() {
return servicePlanId;
}
public void setServicePlanId(Long servicePlanId) {
this.servicePlanId = servicePlanId;
}
}
src/main/java/com/viettel/campaign/repository/ApParamRepository.java
View file @ d779a33f
package com.viettel.campaign.repository;
import com.viettel.campaign.model.ApParam;
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 java.util.List;
public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParamRepositoryCustom {
@Query(value = "SELECT * FROM AP_PARAM p WHERE PAR_NAME LIKE %?1%", nativeQuery = true)
List<ApParam> findParamByName(String parName);
Page<ApParam> findAll(Pageable pageable);
@Query(value = "SELECT p FROM ApParam p WHERE parName LIKE %?1%")
List<ApParam> findParamByName(String parName, Pageable pageable);
}
src/main/java/com/viettel/campaign/repository/CustomerRepository.java
View file @ d779a33f
......@@ -14,4 +14,7 @@ public interface CustomerRepository extends JpaRepository<Customer, Long> {
@Query("FROM Customer WHERE name = ?1")
List<Customer> findByName(String firstName, Pageable pageable);
@Query("SELECT COUNT(0) FROM Customer t WHERE t.mobileNumber = ?1 and t.siteId = ?2 and t.status = 1 ")
Long findByMobileNumberAndSiteId(String mobileNumber, Long siteId);
}
src/main/java/com/viettel/campaign/service/ApParamService.java
View file @ d779a33f
......@@ -5,6 +5,8 @@ import com.viettel.campaign.model.ApParam;
import java.util.List;
public interface ApParamService {
Iterable<ApParam> getAllParams();
List<ApParam> getParamByName(String parName);
Iterable<ApParam> getAllParams(int page, int pageSize, String sort);
List<ApParam> getParamByName(int page, int pageSize, String sort, String parName);
}
src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java
View file @ d779a33f
......@@ -3,8 +3,11 @@ package com.viettel.campaign.service;
import com.viettel.campaign.model.ApParam;
import com.viettel.campaign.repository.ApParamRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
......@@ -14,12 +17,16 @@ public class ApParamServiceImpl implements ApParamService {
ApParamRepository apParamRepository;
@Override
public Iterable<ApParam> getAllParams() {
return apParamRepository.findAll();
public Iterable<ApParam> getAllParams(int page, int pageSize, String sort) {
return apParamRepository.findAll(PageRequest.of(page, pageSize, Sort.by(sort)));
}
@Override
public List<ApParam> getParamByName(String parName) {
return apParamRepository.findParamByName(parName);
public List<ApParam> getParamByName(int page, int pageSize, String sort, String parName) {
List<ApParam> lst = new ArrayList<>();
lst = apParamRepository.findParamByName(parName, PageRequest.of(page, pageSize, Sort.by(sort)));
return lst;
}
}
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @ d779a33f
package com.viettel.campaign.service;
import com.viettel.campaign.DTO.CustomerDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.model.Customer;
import java.util.List;
......@@ -9,4 +11,6 @@ public interface CustomerService {
Map listAllCustomer(int page, int pageSize, String sort);
Map listCustByName(int page, int pageSize, String sort, String name);
ResultDTO createCustomer(CustomerDTO customerDTO);
}
src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java
View file @ d779a33f
package com.viettel.campaign.service;
import com.viettel.campaign.DTO.CustomerDTO;
import com.viettel.campaign.DTO.ResultDTO;
import com.viettel.campaign.mapper.CustomerMapper;
import com.viettel.campaign.model.Customer;
import com.viettel.campaign.repository.CustomerRepository;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import com.viettel.campaign.utils.DataUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
public class CustomerServiceImpl implements CustomerService {
......@@ -53,4 +53,53 @@ public class CustomerServiceImpl implements CustomerService {
return result;
}
@Override
@Transactional
public ResultDTO createCustomer(CustomerDTO customerDTO) {
ResultDTO resultDTO = new ResultDTO();
CustomerMapper customerMapper = new CustomerMapper();
Date today = new Date();
Customer customer = new Customer();
try {
if (customerDTO != null) {
//check trung mobile number
Long cusExist = customerRepository.findByMobileNumberAndSiteId(customerDTO.getMobileNumber(), customerDTO.getSiteId());
if (cusExist > 0) {
resultDTO.setErrorCode("-7");
resultDTO.setDescription("Mobile number is existed");
return resultDTO;
}
// insert
customer = customerMapper.toPersistenceBean(customerDTO);
customer.setCreateDate(new Date());
customer = customerRepository.save(customer);
resultDTO.setErrorCode(customer.getCustomerId() + "");
resultDTO.setDescription("customer created");
} else {
resultDTO.setErrorCode("-2");
resultDTO.setDescription("customerDTO null");
}
} catch (Exception e) {
e.printStackTrace();
}
return resultDTO;
}
public Date getSysdate() {
try {
Query query = entityManager.createNativeQuery("SELECT to_char(sysdate, 'dd/MM/YYYY hh24:mi:ss') FROM DUAL ");
List list = query.getResultList();
if (list != null && list.size() > 0) {
return DataUtil.convertStringToDateDDMMYYYYHHMISS(DataUtil.safeToString(list.get(0)));
}
} catch (Exception e) {
//logger.info(e.getMessage(), e);
e.printStackTrace();
}
return new Date();
}
}
src/main/java/com/viettel/campaign/utils/DataUtil.java 0 → 100644
View file @ d779a33f
package com.viettel.campaign.utils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.math.BigDecimal;
import java.sql.Clob;
import java.sql.SQLException;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.Date;
public class DataUtil {
private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(DataUtil.class);
public static boolean isNullOrZero(Long value) {
return (value == null || value.equals(0L));
}
public static boolean isNullOrEmpty(String value) {
return (value == null || value.isEmpty());
}
public static boolean isNullOrZero(BigDecimal value) {
return (value == null || value.compareTo(BigDecimal.ZERO) == 0);
}
public static Long safeToLong(Object obj1, Long defaultValue) {
Long result = defaultValue;
if (obj1 != null) {
try {
result = Long.parseLong(obj1.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
return result;
}
public static Long safeToLong(Object obj1) {
Long result = null;
if (obj1 != null) {
try {
result = Long.parseLong(obj1.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
return result;
}
public static BigDecimal safeToBigDecimal(Object obj1) {
BigDecimal result = new BigDecimal(0);
if (obj1 != null) {
try {
result = BigDecimal.valueOf(Long.parseLong(obj1.toString()));
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
return result;
}
public static Double safeToDouble(Object obj1) {
Double result = null;
if (obj1 != null) {
try {
result = Double.parseDouble(obj1.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
return result;
}
public static Short safeToShort(Object obj1) {
Short result = 0;
if (obj1 != null) {
try {
result = Short.parseShort(obj1.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
return result;
}
public static int safeToInt(Object obj1) {
int result = 0;
if (obj1 == null) {
return 0;
}
try {
result = Integer.parseInt(obj1.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
return result;
}
public static String safeToString(Object obj1) {
if (obj1 == null) {
return "";
}
return obj1.toString();
}
public static Date safeToDate(Object obj1) {
Date result = null;
if (obj1 == null) {
return null;
}
try {
result = (Date) obj1;
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
return result;
}
public static boolean safeEqual(Long obj1, Long obj2) {
if (obj1 == obj2) {
return true;
}
return ((obj1 != null) && (obj2 != null) && (obj1.compareTo(obj2) == 0));
}
public static boolean safeEqual(String obj1, String obj2) {
if (obj1 == obj2) {
return true;
}
return ((obj1 != null) && (obj2 != null) && obj1.equals(obj2));
}
public static String convertDateToStringDDMMYYYYHHMISS(Date datetime) {
String s = null;
if (datetime != null) {
Format formatter = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
s = formatter.format(datetime);
}
return s;
}
public static Date convertStringToDateDDMMYYYYHHMISS(String str) {
Date dateTime = null;
try {
if (str != null) {
SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
dateTime = formatter.parse(str);
}
} catch (Exception e) {
logger.error(e);
}
return dateTime;
}
public static String safeToClob(Clob clobValue) {
String result = null;
if (clobValue != null) {
StringBuilder sb = new StringBuilder();
try {
Reader reader = clobValue.getCharacterStream();
BufferedReader br = new BufferedReader(reader);
String line;
while (null != (line = br.readLine())) {
sb.append(line);
}
br.close();
} catch (SQLException | IOException e) {
logger.error(e.getMessage(), e);
}
result = sb.toString();
}
return result;
}
public static Date toDatefromStringFormat(String value, String format) {
Date date = null;
try {
SimpleDateFormat sdf = new SimpleDateFormat(format);
date = sdf.parse(value);
if (!value.equals(sdf.format(date))) {
date = null;
}
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
return date;
}
public static boolean isNumber(String strId) {
return strId.matches("-?\\d+(\\.\\d+)?");
}
public static boolean isLong(String strId) {
return strId.matches("\\d*");
}
public static String standardPhone(String mobilePhone) {
if (mobilePhone != null) {
if (mobilePhone.startsWith("0")) {
mobilePhone = mobilePhone.substring(1, mobilePhone.length());
} else if (mobilePhone.startsWith("84")) {
mobilePhone = mobilePhone.substring(2, mobilePhone.length());
}
}
return mobilePhone;
}
public static String tohhmmss(Long conferenctime) {
String fmt = "0";
try {
if (conferenctime == 0) {
return "0";
}
// conferencetime: tinh theo s
long mmt = conferenctime / 60;
long ss = conferenctime % 60;
long mm = mmt % 60;
long hh = mmt / 60;
fmt = replace(hh) + ":" + replace(mm) + ":" + replace(ss);
} catch (Exception ex) {
logger.error(ex);
}
return fmt;
}
public static String replace(long m) {
String mt = String.valueOf(m);
mt = (m >= 10) ? mt : '0' + mt;
return mt;
}
public static String getSafeFileName(String input) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < input.length(); i++) {
char c = input.charAt(i);
if (c != '/' && c != '\\' && c != 0) {
sb.append(c);
}
}
return sb.toString();
}
// public static void main(String[] args) {
//// Date rs = DataUtil.toDatefromStringFormat("20170702", "yyyyMMdd");
//// System.out.println(rs);
// String rs = standardPhoneNew("000953478578358");
// System.out.println(rs);
// }
public static String standardPhoneNew(String input) {
if (input == null) {
return null;
}
while (input.startsWith("0")) {
input = input.substring(1, input.length());
}
return input;
}
}
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