Bladeren bron

Merge remote-tracking branch 'origin/test' into test

zhaoxian 3 jaren geleden
bovenliggende
commit
e1320c1c49

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreative.java

@@ -224,4 +224,7 @@ public class KuaiShouCreative {
     private Integer creativeCategory;
     private String creativeTag;
 
+    private Integer submit_size;
+
+    private Integer resubmit;
 }

+ 38 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/controller/AuditRejectedResubmitController.java

@@ -0,0 +1,38 @@
+package cn.com.ctop.kuaishou.modules.document.controller;
+
+import cn.com.ctop.kuaishou.modules.document.service.AuditRejectedResubmitService;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * @Description: 文档库管理
+ * @Author: zzy
+ * @Date: 2021-09-06
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/rejected/audit")
+public class AuditRejectedResubmitController {
+
+    @Autowired
+    AuditRejectedResubmitService auditRejectedResubmitService;
+
+    /**
+     * 创建文案
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/resubmit")
+    public Result resubmit() {
+        return auditRejectedResubmitService.resubmit();
+
+    }
+}

+ 16 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/mapper/AuditRejectedResubmitMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ctop.kuaishou.modules.document.mapper;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AuditRejectedResubmitMapper {
+    List<KuaiShouCreative> getCreativeList(@Param("status") int status,@Param("date") String date);
+
+    List<String> getRejectThesaurusListByStatus(@Param("status") int status);
+
+    void updateCreativeResubmit(@Param("creativeId") String creativeId,@Param("status") int status);
+}

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/mapper/DocumentLibraryMapper.java

@@ -19,4 +19,6 @@ public interface DocumentLibraryMapper {
     List<JSONObject> getRefusedList(@Param("copyWriterId")String copyWriterId);
 
     List<String> getAcoountId(@Param("copyWriterId")String copyWriterId);
+
+    List<String> getDataByAccountId(@Param("accountId")String accountId, @Param("copyWriterId")String copyWriterId);
 }

+ 22 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/mapper/xml/AuditRejectedResubmitMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.kuaishou.modules.document.mapper.AuditRejectedResubmitMapper">
+
+
+    <select id="getCreativeList" resultType="cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative" >
+        select * from ctop_kuaishou_creative t where t.status=#{status}
+         <if test="date!=null and date !=''">
+             and DATE_FORMAT(t.creative_create_time,'%Y-%m-%d')=#{date}
+         </if>
+    </select>
+
+    <select id="getRejectThesaurusListByStatus" resultType="String">
+        select phrase from ctop_reject_reason_thesaurus where type=#{status}
+    </select>
+
+    <update id="updateCreativeResubmit">
+        update ctop_kuaishou_creative set resubmit=#{status} where creative_id=#{creativeId}
+    </update>
+
+
+</mapper>

+ 4 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/mapper/xml/DocumentLibraryMapper.xml

@@ -52,4 +52,8 @@
         select account_id as 'accountId' from  ctop_document_library where copy_writer_id=#{copyWriterId}
     </select>
 
+    <select id="getDataByAccountId" resultType="String">
+        select id from ctop_document_library  where account_id=#{accountId} and copy_writer_id=#{copyWriterId}
+     </select>
+
 </mapper>

+ 15 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/service/AuditRejectedResubmitService.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.document.service;
+
+import org.jeecg.common.api.vo.Result;
+
+/**
+ * @Description: 拒审重提
+ * @Author: zzy
+ * @Date: 2021-09-06
+ * @Version: V1.0
+ */
+public interface AuditRejectedResubmitService {
+
+    Result resubmit();
+
+}

+ 120 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/service/impl/AuditRejectedResubmitServiceImpl.java

@@ -0,0 +1,120 @@
+package cn.com.ctop.kuaishou.modules.document.service.impl;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
+import cn.com.ctop.kuaishou.modules.document.mapper.AuditRejectedResubmitMapper;
+import cn.com.ctop.kuaishou.modules.document.service.AuditRejectedResubmitService;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 拒审重提
+ * @Author: zzy
+ * @Date: 2021-09-06
+ * @Version: V1.0
+ */
+@Service
+@Slf4j
+public class AuditRejectedResubmitServiceImpl implements AuditRejectedResubmitService {
+
+    @Autowired
+    AuditRejectedResubmitMapper auditRejectedResubmitMapper;
+
+    /**
+     * 重新提交创意
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public Result resubmit() {
+        Result result = new Result();
+        List<KuaiShouCreative> creativeList = new ArrayList<>();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            //creativeList = auditRejectedResubmitMapper.getCreativeList(42,formatter.format(new Date()));
+            creativeList = auditRejectedResubmitMapper.getCreativeList(42,null);
+            //可重提词组
+            List<String> submit = auditRejectedResubmitMapper.getRejectThesaurusListByStatus(0);
+            //不可重提词组
+            List<String> resubmit = auditRejectedResubmitMapper.getRejectThesaurusListByStatus(1);
+            creativeList.stream().forEach(obj -> {
+                String reviewDetail = obj.getReviewDetail();
+                List<String> strings = Arrays.asList(reviewDetail.split(";"));
+                Boolean flag = isSubmit(strings, resubmit);
+                if (!flag) {
+                    //不可重提
+                    log.info("修改为不可重提:{}",reviewDetail);
+                    auditRejectedResubmitMapper.updateCreativeResubmit(String.valueOf(obj.getCreativeId()),1);
+                } else {
+                    Boolean flag2 = isNotSubmit(strings, submit);
+                    if(flag2){
+                        //重提
+                        log.info("进行重提:{}",reviewDetail);
+                    }else {
+                        //手动重提
+                        log.info("手动重提:{}",reviewDetail);
+                    }
+                }
+            });
+            result.setSuccess(true);
+            result.success("重提创意成功");
+        } catch (Exception e) {
+            log.info("重提创意错误:{}", e.toString());
+            result.error500("重提创意错误");
+        }
+
+        return result;
+    }
+
+    /**
+     * 判断不可重提
+     *
+     * @param
+     * @return
+     */
+    public Boolean isSubmit(List<String> reviewDetail, List<String> thesaurusList) {
+        Boolean flag = true;
+        if (reviewDetail != null && thesaurusList != null) {
+            for (String review : reviewDetail) {
+                for (String thesaurus : thesaurusList) {
+                    if (review.contains(thesaurus)) {
+                        flag = false;
+                        return flag;
+                    }
+                }
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 判断可重提
+     *
+     * @param
+     * @return
+     */
+    public Boolean isNotSubmit(List<String> reviewDetail, List<String> thesaurusList) {
+        if (reviewDetail != null && thesaurusList != null) {
+            for (String review : reviewDetail) {
+                Boolean flag = false;
+                for (String thesaurus : thesaurusList) {
+                    if (review.contains(thesaurus)) {
+                        flag = true;
+                    }
+                }
+                if (!flag) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}