فهرست منبع

Merge branch 'V2.0.1' into test

# Conflicts:
#	jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/service/impl/DocumentLibraryServiceImpl.java
zhaoxian 3 سال پیش
والد
کامیت
125a88eb80

+ 33 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouAccountAutoStrategyController.java

@@ -245,6 +245,34 @@ public class AiKuaishouAccountAutoStrategyController {
         return result;
     }
 
+    /**
+     * 编辑
+     *
+     * @param aiKuaishouAccountAutoStrategy
+     * @return
+     */
+    @PostMapping(value = "/updateAppUrl")
+    public Result<AiKuaishouAccountAutoStrategy> updateAppUrl(@RequestBody AiKuaishouAccountAutoStrategy strategy) {
+        Result<AiKuaishouAccountAutoStrategy> result = new Result<AiKuaishouAccountAutoStrategy>();
+        if (Check.isNull(strategy.getAccountId())) {
+            result.error500("缺少账户数据");
+            return result;
+        }
+        QueryWrapper<AiKuaishouAccountAutoStrategy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("account_id", strategy.getAccountId()).last("limit 1");
+        AiKuaishouAccountAutoStrategy one = aiKuaishouAccountAutoStrategyService.getOne(queryWrapper);
+        if (one == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = aiKuaishouAccountAutoStrategyService.update(strategy, queryWrapper);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
 
     /**
      * 修改状态
@@ -261,10 +289,11 @@ public class AiKuaishouAccountAutoStrategyController {
             AiKuaishouAdvertiserStrategy getEntity = aiKuaishouAdvertiserStrategyService.getByAccountId(entity.getAccountId());
             if (null != getEntity && getEntity.getStatus() == strategy.getStatus() && strategy.getStatus() == 1) {
                 result.error500("修改失败,该账户旧版自动投放策略已运行");
-            }
-            boolean ok = aiKuaishouAccountAutoStrategyService.updateById(strategy);
-            if (ok) {
-                result.success("修改成功!");
+            } else {
+                boolean ok = aiKuaishouAccountAutoStrategyService.updateById(strategy);
+                if (ok) {
+                    result.success("修改成功!");
+                }
             }
         }
 

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

@@ -23,7 +23,8 @@ public interface DocumentLibraryMapper {
 
     List<String> getDataByAccountId(@Param("accountId") String accountId, @Param("copyWriterId") String copyWriterId);
 
-    List<Map<String,String>> getDocumentByAccountId(@Param("accountId") String accountId, @Param("copyWriterId") String copyWriterId);
+    List<Map<String, String>> getDocumentByAccountId(@Param("accountId") String accountId, @Param("copyWriterId") String copyWriterId);
 
     void insertBatch(@Param("list") List<DocumentLibraryInfo> list);
+
 }

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

@@ -4,7 +4,7 @@
 
 
     <insert id="saveDocumentLibrary" parameterType="cn.com.ctop.kuaishou.modules.document.entity.DocumentLibraryInfo">
-        insert into ctop_document_library (copy_writer_id,copy_writer,account_id,status,create_time) values
+        replace into ctop_document_library (copy_writer_id,copy_writer,account_id,status,create_time) values
         (#{copyWriterId},#{copyWriter},#{accountId},#{status},#{createTime})
     </insert>
 

+ 17 - 11
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/document/service/impl/DocumentLibraryServiceImpl.java

@@ -17,6 +17,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.MD5Util;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -61,20 +62,25 @@ public class DocumentLibraryServiceImpl implements DocumentLibraryService {
             return result;
         }
         try {
-            if (accountIds != null && !documentList.isEmpty() && !accountIds.isEmpty()) {
+            if (accountIds != null && !documentList.isEmpty() && accountIds != null && !accountIds.isEmpty()) {
 
+                List<DocumentLibraryInfo> list = new ArrayList<>();
                 for (String docu : documentList) {
-                    DocumentLibraryInfo documentLibraryInfo = new DocumentLibraryInfo();
-                    documentLibraryInfo.setCopyWriter(docu);
-                    documentLibraryInfo.setCopyWriterId(UUID.randomUUID().toString());
-                    documentLibraryInfo.setCreateTime(formatter.format(new Date()));
-                    documentLibraryInfo.setStatus(0);
                     if (docu != null && docu != "" && docu.length() <= 30) {
                         for (String accountId : accountIds) {
+                            DocumentLibraryInfo documentLibraryInfo = new DocumentLibraryInfo();
+                            documentLibraryInfo.setCopyWriter(docu);
+                            documentLibraryInfo.setCreateTime(formatter.format(new Date()));
+                            documentLibraryInfo.setStatus(0);
                             documentLibraryInfo.setAccountId(accountId);
-                            documentLibraryMapper.saveDocumentLibrary(documentLibraryInfo);
+                            documentLibraryInfo.setCopyWriterId(MD5Util.getMd5(accountId + docu));
+                            list.add(documentLibraryInfo);
                         }
                     }
+
+                    if (list.size() > 0) {
+                        documentLibraryMapper.insertBatch(list);
+                    }
                 }
             }
             result.success("添加成功");
@@ -252,20 +258,20 @@ public class DocumentLibraryServiceImpl implements DocumentLibraryService {
     }
 
     @Override
-    public void insertBatch(String description,Long accountId) {
+    public void insertBatch(String description, Long accountId) {
         JSONArray array = JSONArray.parseArray(description);
         List<DocumentLibraryInfo> list = new ArrayList<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (int i = 0; i < array.size(); i++) {
             DocumentLibraryInfo documentLibraryInfo = new DocumentLibraryInfo();
-            documentLibraryInfo.setCopyWriter(array.getString(i).trim());
-            documentLibraryInfo.setCopyWriterId(UUID.randomUUID().toString());
+            String copyWriter = array.getString(i).trim();
+            documentLibraryInfo.setCopyWriter(copyWriter);
+            documentLibraryInfo.setCopyWriterId(MD5Util.getMd5(accountId + copyWriter));
             documentLibraryInfo.setCreateTime(formatter.format(new Date()));
             documentLibraryInfo.setStatus(0);
             documentLibraryInfo.setAccountId(accountId.toString());
             list.add(documentLibraryInfo);
         }
-
         documentLibraryMapper.insertBatch(list);
     }
 }

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AiKuaishouAdvertiserStrategyController.java

@@ -73,9 +73,9 @@ public class AiKuaishouAdvertiserStrategyController {
      */
     @GetMapping(value = "/list")
     public Result<PageInfo<AiKuaishouAdvertiserStrategy>> queryPageList(AiKuaishouAdvertiserStrategy aiKuaishouAdvertiserStrategy,
-                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                      HttpServletRequest req) {
+                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                        HttpServletRequest req) {
         Result<PageInfo<AiKuaishouAdvertiserStrategy>> result = new Result<>();
         String roleCode = sysRoleService.getRoleCodeByUserId(aiKuaishouAdvertiserStrategy.getUserId());
         if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
@@ -196,9 +196,9 @@ public class AiKuaishouAdvertiserStrategyController {
             status = 1;
         }
         QueryWrapper<AiKuaishouAccountAutoStrategy> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("project_id", aiKuaishouAdvertiserStrategyEntity.getAccountId());
+        queryWrapper.eq("account_id", aiKuaishouAdvertiserStrategyEntity.getAccountId()).last("limit 1");
         AiKuaishouAccountAutoStrategy one = aiKuaishouAccountAutoStrategyService.getOne(queryWrapper);
-        if(null!=one&&one.getStatus() == status &&status ==1){
+        if (null != one && one.getStatus() == status && status == 1) {
             ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_AUTO_STRATEGY_UPDATE);
             return result;
         }