Merge remote-tracking branch 'origin/master'

.gitignore

@@ -4,3 +4,4 @@ logs/
 out/
 /campaign.iml
 /lib
+/log

log/campaign.log

-[main] 19/08/2019 17:50:53  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
-[main] 19/08/2019 17:53:34  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 08:36:29  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 09:37:28  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 10:56:57  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 11:26:26  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 11:38:32  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 22/08/2019 12:57:40  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016

pom.xml

@@ -49,8 +49,8 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc7</artifactId>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>-->
             <version>1.0</version>
         </dependency>
         <dependency>

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -31,27 +31,27 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-//        chain.doFilter(req, resp);
-
-        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        if ("/".equals(request.getRequestURI())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        String xAuthToken = request.getHeader("X-Auth-Token");
-        if (xAuthToken == null || "".equals(xAuthToken)) {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
-            return;
-        }
-        Object obj = RedisUtil.getInstance().get(xAuthToken);
-        if (obj instanceof UserSession) {
-            chain.doFilter(req, resp);
-        } else {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
-        }
+        chain.doFilter(req, resp);
+
+//        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        if ("/".equals(request.getRequestURI())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        String xAuthToken = request.getHeader("X-Auth-Token");
+//        if (xAuthToken == null || "".equals(xAuthToken)) {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
+//            return;
+//        }
+//        Object obj = RedisUtil.getInstance().get(xAuthToken);
+//        if (obj instanceof UserSession) {
+//            chain.doFilter(req, resp);
+//        } else {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
+//        }
     }
 
     @Override

src/main/java/com/viettel/campaign/job/CampaignJob.java

 package com.viettel.campaign.job;
 
-import com.viettel.campaign.model.ccms_full.Campaign;
-import com.viettel.campaign.model.ccms_full.Customer;
-import com.viettel.campaign.model.ccms_full.CustomerTime;
-import com.viettel.campaign.model.ccms_full.ProcessConfig;
-import com.viettel.campaign.service.CampaignService;
-import com.viettel.campaign.service.CustomerService;
-import com.viettel.campaign.service.CustomerTimeService;
-import com.viettel.campaign.service.ProcessConfigService;
+import com.viettel.campaign.model.ccms_full.*;
+import com.viettel.campaign.service.*;
 import com.viettel.campaign.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +36,9 @@ public class CampaignJob {
     @Autowired
     private CustomerService customerService;
 
+    @Autowired
+    private UserActionLogService userActionLogService;
+
 //    @Scheduled(fixedRate = 5000)
 //    @Transactional( propagation = Propagation.REQUIRED)
     public void process() {
@@ -74,6 +71,8 @@ public class CampaignJob {
                             campaign.setStatus(2L);
                             campaign.setCampaignStart(new Date());
                             campaignService.updateProcess(campaign);
+                            //write log
+                            saveLog(campaign, 1);
                         });
 
                         log.info("Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}", p.getSiteId());
@@ -93,6 +92,8 @@ public class CampaignJob {
                             campaign.setStatus(4L);
                             campaign.setCampaignEnd(new Date());
                             campaignService.updateProcess(campaign);
+                            //write log
+                            saveLog(campaign, 2);
                         });
 
                         log.info("Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}", p.getSiteId());
@@ -129,5 +130,16 @@ public class CampaignJob {
         });
     }
 
+    private void saveLog(Campaign c, int t){
+        UserActionLog log = new UserActionLog();
+        log.setAgentId(1L);
+        log.setSessionId("-1");
+        log.setStartTime(new Date());
+        log.setActionType(t == 1 ? 13L : 14L);
+        log.setObjectId(c.getCampaignId());
+        log.setCompanySiteId(c.getCompanySiteId());
+        userActionLogService.save(log);
+    }
+
 
 }

src/main/java/com/viettel/campaign/model/ccms_full/UserActionLog.java

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Entity
+@Table(name = "USER_ACTION_LOG")
+@Data
+public class UserActionLog implements Serializable {
+
+    @Id
+    @NotNull
+    @Column(name = "AGENT_ID")
+    private Long agentId;
+
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+
+    @Column(name = "SESSION_ID")
+    private String sessionId;
+
+    @Column(name = "START_TIME")
+    private Date startTime;
+
+    @Column(name = "END_TIME")
+    private Date endTime;
+
+    @Column(name = "ACTION_TYPE")
+    private Long actionType;
+
+    @Column(name = "DESCRIPTION")
+    private String description;
+
+    @Column(name = "OBJECT_ID")
+    private  Long objectId;
+}

src/main/java/com/viettel/campaign/repository/ccms_full/ScenarioAnswerRepository.java

@@ -24,4 +24,7 @@ public interface ScenarioAnswerRepository extends JpaRepository<ScenarioAnswer,
     Integer deleteScenarioAnswersByScenarioQuestionId(Long scenarioQuestionId);
 
     ScenarioAnswer findScenarioAnswerByScenarioAnswerId(Long scenarioAnswerId);
+
+    @Query(value = "SELECT COUNT(1) FROM ScenarioAnswer WHERE 1 = 1 AND code = :code AND scenarioQuestionId = :scenarioQuestionId AND scenarioAnswerId <> :scenarioAnswerId")
+    Integer countDuplicateScenarioCode(@Param("code") String code, @Param("scenarioQuestionId") Long scenarioQuestionId, @Param("scenarioAnswerId") Long scenarioAnswerId);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/ScenarioQuestionRepositoryCustom.java

@@ -9,4 +9,6 @@ import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
 
 public interface ScenarioQuestionRepositoryCustom {
     Integer countDuplicateQuestionCode(ScenarioQuestionDTO questionDTO);
+
+    Integer countDuplicateOrderIndex(ScenarioQuestionDTO questionDTO);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/ScenarioRepository.java

@@ -2,7 +2,9 @@ package com.viettel.campaign.repository.ccms_full;
 
 import com.viettel.campaign.model.ccms_full.Scenario;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.data.repository.query.Param;
 
 /**
  * @author anhvd_itsol
@@ -11,4 +13,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ScenarioRepository extends JpaRepository<Scenario, Long> {
     Scenario findScenarioByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
+
+    @Query(value = "SELECT COUNT(1) FROM Scenario WHERE 1 = 1 AND companySiteId = :companySiteId AND code = :code AND scenarioId <> :scenarioId")
+    Integer countDuplicateScenarioCode(@Param("companySiteId") Long companySiteId, @Param("code") String code, @Param("scenarioId") Long scenarioId);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/UserActionLogRepository.java

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.UserActionLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+@Repository
+public interface UserActionLogRepository extends JpaRepository<UserActionLog, Long> {
+    //
+}

src/main/java/com/viettel/campaign/repository/ccms_full/impl/ScenarioQuestionRepositoryImpl.java

@@ -68,6 +68,61 @@ public class ScenarioQuestionRepositoryImpl implements ScenarioQuestionRepositor
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
+        } finally {
+            session.close();
+        }
+        return count;
+    }
+
+    @Override
+    public Integer countDuplicateOrderIndex(ScenarioQuestionDTO questionDTO) {
+        logger.info("Start search duplicate order index::");
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        Integer count = null;
+
+        try {
+            StringBuilder sb = new StringBuilder();
+            sb.append("SELECT COUNT(1) FROM SCENARIO_QUESTION WHERE 1 = 1 AND STATUS = 1 ");
+            if (questionDTO.getScenarioQuestionId() != null) {
+                sb.append(" AND SCENARIO_QUESTION_ID <> :p_question_id ");
+            }
+            if (questionDTO.getOrderIndex() != null) {
+                sb.append(" AND ORDER_INDEX = :p_orderIndex ");
+            }
+            if (questionDTO.getCampaignId() != null) {
+                sb.append(" AND CAMPAIGN_ID = :p_campaign_id");
+            }
+            if (questionDTO.getCompanySiteId() != null) {
+                sb.append(" AND COMPANY_SITE_ID = :p_site_id");
+            }
+            SQLQuery query = session.createSQLQuery(sb.toString());
+            if (questionDTO.getScenarioQuestionId() != null) {
+                query.setParameter("p_question_id", questionDTO.getScenarioQuestionId());
+            }
+            if (questionDTO.getOrderIndex() != null) {
+                query.setParameter("p_orderIndex", questionDTO.getOrderIndex());
+            }
+            if (questionDTO.getCampaignId() != null) {
+                query.setParameter("p_campaign_id", questionDTO.getCampaignId());
+            }
+            if (questionDTO.getCompanySiteId() != null) {
+                query.setParameter("p_site_id", questionDTO.getCompanySiteId());
+            }
+
+            final List<BigDecimal> obj = query.list();
+
+            for (BigDecimal i : obj) {
+                if (i != null) {
+                    count = i.intValue();
+                }
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        } finally {
+            session.close();
         }
         return count;
     }

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

@@ -13,4 +13,6 @@ public interface ScenarioAnswerService {
     Long getMaxAnswerOrderId(Long scenarioQuestionId, Long companySiteId);
 
     ResultDTO delete(ScenarioAnswerDTO scenarioAnswerDTO);
+
+    Integer countDuplicateScenarioCode(String code, Long scenarioQuestionId, Long scenarioAnswerId);
 }

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

@@ -20,4 +20,6 @@ public interface ScenarioQuestionService {
 
     ResultDTO update(ScenarioQuestionDTO scenarioQuestionDTO);
 
+    Integer countDuplicateOrderIndex(ScenarioQuestionDTO questionDTO);
+
 }

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

@@ -16,5 +16,7 @@ public interface ScenarioService {
 
     ResultDTO sortQuestionAndAnswer(ScenarioDTO scenarioDTO);
 
+    Integer countDuplicateScenarioCode(Long companySiteId, String code, Long scenarioId);
+
     ResultDTO saveContacQuestResult(ContactQuestResultDTO dto);
 }

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.model.ccms_full.UserActionLog;
+
 /**
- * @author anhvd_itsol
+ * @author hanv_itsol
+ * @project campaign
  */
 public interface UserActionLogService {
 
+    void save(UserActionLog log);
 }

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

@@ -113,4 +113,15 @@ public class ScenarioAnswerServiceImpl implements ScenarioAnswerService {
         }
         return resultDTO;
     }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public Integer countDuplicateScenarioCode(String code, Long scenarioQuestionId, Long scenarioAnswerId) {
+        try {
+            return scenarioAnswerRepository.countDuplicateScenarioCode(code, scenarioQuestionId, scenarioAnswerId);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return null;
+    }
 }

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

@@ -302,4 +302,15 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public Integer countDuplicateOrderIndex(ScenarioQuestionDTO questionDTO) {
+        try {
+            return questionRepositoryCustom.countDuplicateOrderIndex(questionDTO);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return null;
+    }
+
 }

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

@@ -117,6 +117,15 @@ public class ScenarioServiceImpl implements ScenarioService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public Integer countDuplicateScenarioCode(Long companySiteId, String code, Long scenarioId) {
+        try {
+            return scenarioRepository.countDuplicateScenarioCode(companySiteId, code, scenarioId);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return null;
+    }
     public ResultDTO saveContacQuestResult(ContactQuestResultDTO dto) {
         ResultDTO resultDTO = new ResultDTO();
 

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.UserActionLog;
+import com.viettel.campaign.repository.ccms_full.UserActionLogRepository;
 import com.viettel.campaign.service.UserActionLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,4 +15,13 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class UserActionLogServiceImpl implements UserActionLogService {
+
+    @Autowired
+    UserActionLogRepository userActionLogRepository;
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public void save(UserActionLog log) {
+        userActionLogRepository.save(log);
+    }
 }

src/main/java/com/viettel/campaign/web/rest/ScenarioAnswerController.java

@@ -37,4 +37,10 @@ public class ScenarioAnswerController {
         ResultDTO resultDTO = scenarioAnswerService.delete(answerDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @RequestMapping(value = "/count-duplicate-code", method = RequestMethod.GET)
+    ResponseEntity<Integer> countDuplicateCode(@RequestParam String code, @RequestParam Long scenarioQuestionId, @RequestParam Long scenarioAnswerId) {
+        Integer count = scenarioAnswerService.countDuplicateScenarioCode(code, scenarioQuestionId, scenarioAnswerId);
+        return new ResponseEntity<>(count, HttpStatus.OK);
+    }
 }

src/main/java/com/viettel/campaign/web/rest/ScenarioController.java

@@ -43,6 +43,12 @@ public class ScenarioController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/count-duplicate-code", method = RequestMethod.GET)
+    ResponseEntity<Integer> countDuplicateCode(@RequestParam String code, @RequestParam Long scenarioId, @RequestParam Long companySiteId) {
+        Integer count = scenarioService.countDuplicateScenarioCode(companySiteId, code, scenarioId);
+        return new ResponseEntity<>(count, HttpStatus.OK);
+    }
+
     @RequestMapping(value = "/saveContactQuestResult", method = RequestMethod.POST)
     ResponseEntity<ResultDTO> saveContactQuestResult(@RequestBody ContactQuestResultDTO dto) {
         ResultDTO resultDTO = scenarioService.saveContacQuestResult(dto);

src/main/java/com/viettel/campaign/web/rest/ScenarioQuestionController.java

@@ -56,4 +56,9 @@ public class ScenarioQuestionController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/count-duplicate-order-index", method = RequestMethod.POST)
+    public Integer countDuplicateOrderIndex(@RequestBody ScenarioQuestionDTO questionDTO) {
+        return scenarioQuestionService.countDuplicateOrderIndex(questionDTO);
+    }
+
 }