Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

src/main/java/com/viettel/campaign/repository/UserActionLogRepositoryCustom.java

+package com.viettel.campaign.repository;
+
+
+import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.UserActionLogDTO;
+
+/**
+ * @author anhvd_itsol
+ */
+
+public interface UserActionLogRepositoryCustom {
+     ResultDTO insertToUserActionLog(UserActionLogDTO userActionLogDTO);
+}

src/main/java/com/viettel/campaign/repository/impl/UserActionLogRepositoryImpl.java

+package com.viettel.campaign.repository.impl;
+
+import com.viettel.campaign.repository.UserActionLogRepositoryCustom;
+import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.HibernateUtil;
+import com.viettel.campaign.utils.SQLBuilder;
+import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.UserActionLogDTO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Repository
+@Transactional
+public class UserActionLogRepositoryImpl implements UserActionLogRepositoryCustom {
+    private static final Logger logger = LogManager.getLogger(CampaignRepositoryImpl.class);
+    @Override
+    public ResultDTO insertToUserActionLog(UserActionLogDTO userActionLogDTO) {
+        logger.info("Start search campaign::");
+
+        ResultDTO result = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        try{
+            StringBuilder sqlStr = new StringBuilder();
+            sqlStr.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "insert-to-user-action-log"));
+            SQLQuery query = session.createSQLQuery(sqlStr.toString());
+            query.setParameter("par_agentId", userActionLogDTO.getAgentId() == null ? "" : userActionLogDTO.getAgentId());
+            query.setParameter("par_companySiteId", userActionLogDTO.getCompanySiteId());
+            query.setParameter("par_sessionId", userActionLogDTO.getSessionId());
+            query.setParameter("par_startTime", userActionLogDTO.getStartTime());
+            query.setParameter("par_actionType", userActionLogDTO.getActionType());
+            query.setParameter("par_objectId", userActionLogDTO.getObjectId());
+
+            query.executeUpdate();
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        }catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }finally {
+            session.close();
+        }
+
+        return result;
+    }
+}

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -6,15 +6,13 @@ import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 
-import java.util.Map;
-
 public interface CustomerService {
 
-    ResultDTO listAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
+    ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
 
     ResultDTO getCustomerId(Long customerId);
 
-    Map listCustByName(int page, int pageSize, String sort, String name);
+    ResultDTO searchAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId, String name, String mobileNumber, String email);
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
 
@@ -24,7 +22,7 @@ public interface CustomerService {
 
     // ------------ customer list ------------ //
 
-    Map getCustomerList(int page, int pageSize, String sort);
+    ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
 
     ResultDTO createCustomerList(CustomerListDTO customerListDTO);
 

src/main/java/com/viettel/campaign/service/UserActionLogService.java

+package com.viettel.campaign.service;
+
+/**
+ * @author anhvd_itsol
+ */
+public interface UserActionLogService {
+
+}

src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java

@@ -3,16 +3,16 @@ package com.viettel.campaign.service.impl;
 import com.viettel.campaign.model.Campaign;
 import com.viettel.campaign.model.TimeRangeDialMode;
 import com.viettel.campaign.model.TimeZoneDialMode;
+//import com.viettel.campaign.model.UserActionLog;
 import com.viettel.campaign.repository.CampaignRepository;
 import com.viettel.campaign.repository.TimeRangeDialModeRepository;
 import com.viettel.campaign.repository.TimeZoneDialModeRepository;
+//import com.viettel.campaign.repository.UserActionLogRepository;
+import com.viettel.campaign.repository.UserActionLogRepositoryCustom;
 import com.viettel.campaign.repository.impl.CampaignRepositoryImpl;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.utils.Constants;
-import com.viettel.campaign.web.dto.CampaignDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
-import com.viettel.campaign.web.dto.TimeRangeDialModeDTO;
-import com.viettel.campaign.web.dto.TimeZoneDialModeDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,6 +38,9 @@ public class CampaignServiceImpl implements CampaignService {
     @Autowired
     TimeRangeDialModeRepository timeRangeDialModeRepository;
 
+    @Autowired
+    UserActionLogRepositoryCustom userActionLogRepository;
+
     @Autowired
     ModelMapper modelMapper;
 
@@ -149,6 +152,28 @@ public class CampaignServiceImpl implements CampaignService {
                 entity.setUpdateTime(new Date());
                 entity.setUpdateBy(dto.getUpdateBy());
                 campaignRepository.save(entity);
+                UserActionLogDTO userActionLog = new UserActionLogDTO();
+                userActionLog.setAgentId(null);
+                userActionLog.setSessionId(dto.getSessionId());
+                userActionLog.setCompanySiteId(dto.getCompanySiteId());
+                userActionLog.setDescription(null);
+                userActionLog.setStartTime(new Date());
+                userActionLog.setEndTime(null);
+                userActionLog.setObjectId(entity.getCampaignId());
+                if(dto.getStatus().equals((short) -1)) {
+                    userActionLog.setActionType((short) 2);
+                }
+                else if(dto.getStatus().equals((short) 5)) {
+                    userActionLog.setActionType((short) 7);
+                }
+                else if(dto.getStatus().equals((short) 4)) {
+                    userActionLog.setActionType((short) 4);
+                }
+                else if(dto.getStatus().equals((short) 3)) {
+                    userActionLog.setActionType((short) 5);
+                }
+
+                userActionLogRepository.insertToUserActionLog(userActionLog);
                 result.setData(entity);
                 result.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 result.setErrorCode(Constants.ApiErrorCode.SUCCESS);

src/main/java/com/viettel/campaign/service/impl/UserActionLogServiceImpl.java

+package com.viettel.campaign.service.impl;
+
+import com.viettel.campaign.service.UserActionLogService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class UserActionLogServiceImpl implements UserActionLogService {
+}

src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java

@@ -64,4 +64,5 @@ public class CampaignDTO extends BaseDTO {
     private List<TimeRangeDialModeDTO> lstTimeRange;
     private List<TimeZoneDialModeDTO> lstTimeZone;
     private Short agentStatus;
+    private String sessionId;
 }

src/main/java/com/viettel/campaign/web/dto/UserActionLogDTO.java

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Getter
+@Setter
+public class UserActionLogDTO {
+    private Long agentId; //userId
+    private Long companySiteId;
+    private String sessionId;
+    private Date startTime;
+    private Date endTime;
+    private Short actionType;
+    private String description;
+    private Long objectId; //campaignId
+}

src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java

@@ -15,6 +15,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -103,8 +105,9 @@ public class CampaignController {
         return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
     }
 
-    @PostMapping("/changeCampaignStatus")
-    public ResultDTO changeCampaignStatus(@RequestBody CampaignDTO dto) {
+    @RequestMapping(value = "/changeCampaignStatus", method = RequestMethod.PUT)
+    public ResultDTO changeCampaignStatus(@RequestBody CampaignDTO dto, HttpServletRequest request) {
+        dto.setSessionId(request.getSession().getId());
         return campaignService.changeCampaignStatus(dto);
     }
 }

src/main/java/com/viettel/campaign/web/rest/controller/CustomerController.java

@@ -40,7 +40,7 @@ public class CustomerController {
     @GetMapping("/findAll")
     @ResponseBody
     public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("customerListId") long customerListId, @RequestParam("companySiteId") long companySiteId) {
-        ResultDTO result = customerService.listAllCustomer(page, pageSize, sort, customerListId, companySiteId);
+        ResultDTO result = customerService.getAllCustomer(page, pageSize, sort, customerListId, companySiteId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -51,10 +51,10 @@ public class CustomerController {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
-    @GetMapping("/findCustomerByName")
+    @GetMapping("/searchAllCustomerByParams")
     @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);
+    public ResponseEntity findAllCustomerName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("customerListId") Long customerListId, @RequestParam("companySiteId") Long companySiteId, @RequestParam("name") String name, @RequestParam("mobileNumber") String mobileNumber, @RequestParam("email") String email) {
+        ResultDTO result = customerService.searchAllCustomer(page, pageSize, sort, customerListId, companySiteId, name, mobileNumber, email);
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
@@ -98,8 +98,8 @@ public class CustomerController {
 
     @GetMapping("/findAlls")
     @ResponseBody
-    public ResponseEntity findAllCustomerList(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        Map result = customerService.getCustomerList(page, pageSize, sort);
+    public ResponseEntity findAllCustomerList(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = customerService.getAllCustomerList(page, pageSize, sort, companySiteId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

src/main/resources/sql/campaign-mng/insert-to-user-action-log.sql

+INSERT INTO "CCMS_FULL"."USER_ACTION_LOG" (
+    AGENT_ID,
+    COMPANY_SITE_ID,
+    SESSION_ID,
+    START_TIME,
+    END_TIME,
+    ACTION_TYPE,
+    DESCRIPTION,
+    OBJECT_ID)
+VALUES (
+    :par_agentId,
+    :par_companySiteId,
+    :par_sessionId,
+    :par_startTime,
+    null,
+    :par_actionType,
+    null,
+    :par_objectId)

src/main/resources/sql/campaign-mng/search-campaign-customer-by-params.sql

@@ -12,5 +12,4 @@ SELECT
     DEPT_CREATE deptCreate
 FROM CUSTOMER_LIST
 WHERE 1 = 1
-  AND CREATE_AT BETWEEN to_date(:p_date_from, 'YYYYMMDD') AND to_date(:p_date_to, 'YYYYMMDD')
   AND COMPANY_SITE_ID = :p_company_site_id