修改加解密方式

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/OrganizeSaveDTO.java

@@ -26,9 +26,9 @@ public class OrganizeSaveDTO {
     @NotEmpty(message = "小组不能为空")
     private List<Organize> organizeList;
 
-    @ApiModelProperty(value = "此次任务是否加密线索手机号 0:不加密  1:加密")
+    @ApiModelProperty(value = "此次任务是否加密线索手机号 0:不加密  1:加密 2:随机字符串")
     @NotNull(message = "请选择是否加密")
-    private Integer isEncryption;
+    private Integer encryptionType;
 
     @ApiModelProperty(value = "标签组ID")
     private Long labelOrganizeId;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java

@@ -300,7 +300,7 @@ public class OrganizeServiceImpl implements OrganizeService {
         task.setIsDistribution(1);
         task.setUpdateTime(new Date());
         task.setTaskName(organizeSaveDTO.getOrganizeTaskName());
-        task.setEncryptionType(organizeSaveDTO.getIsEncryption());
+        task.setEncryptionType(organizeSaveDTO.getEncryptionType());
         //插入标签
         List<String> labelList = labelService.findLabelList(new HashSet<>(Collections.singleton(labelOrganizeId)));
         if (CollUtil.isNotEmpty(labelList)) {

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java

@@ -8,6 +8,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import java.math.BigInteger;
 
 /**
  * @author Enzo
@@ -35,5 +41,45 @@ public class UpdateImeiTask {
     }
 
 
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    /**
+     * 凌晨五点 查询定时任务 删除记录
+     */
+    @Scheduled(cron = "0 0 5 * * ?")
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDataTask() {
+        //数据中需要删除的数据量
+        long expiredCount;
+        // 已经删除数据量
+        long totalDeleted = 0L;
+        String deleteStr = "DELETE FROM tb_task_imei WHERE  create_time  <:DATE ";
+        // 时间偏移六个月
+        DateTime date = DateUtil.offsetMonth(DateUtil.date(), -DefaultNumberConstants.SIX_NUMBER);
+        do {
+            Query deleteTagByQuery = entityManager.createNativeQuery(deleteStr.concat(" limit 50000"));
+            deleteTagByQuery.setParameter("DATE", date.toDateStr());
+            int executeUpdate = deleteTagByQuery.executeUpdate();
+            totalDeleted += executeUpdate;
+            expiredCount = queryCount(date);
+        } while (expiredCount > 0);
+        log.info("========  delete table size as [{}]   ========", totalDeleted);
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param date
+     * @return
+     */
+    private Long queryCount(DateTime date) {
+        String sql = "select count(1)  FROM  tb_task_imei  where  create_time < :date ";
+        Query selectQueryCount = entityManager.createNativeQuery(sql);
+        selectQueryCount.setParameter("date", date.toDateStr());
+        BigInteger bigInteger = (BigInteger) selectQueryCount.getSingleResult();
+        return bigInteger.longValue();
+    }
+
 
 }

ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml

@@ -59,7 +59,7 @@ spring:
           # 记录慢SQL
           log-slow-sql: true
           slow-sql-millis: 1000
-          merge-sql: true
+          merge-sql: false
         wall:
           config:
             multi-statement-allow: true

ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml

@@ -57,7 +57,7 @@ spring:
           # 记录慢SQL
           log-slow-sql: true
           slow-sql-millis: 1000
-          merge-sql: true
+          merge-sql: false
         wall:
           config:
             multi-statement-allow: true