Przeglądaj źródła

拒审重提&&项目列表查询速度优化

yumeng 4 lat temu
rodzic
commit
ba946b9e82

+ 66 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -152,6 +152,72 @@ public class ProjectController {
         return map;
     }
 
+
+    @AutoLog(value = "项目-分页列表查询")
+    @ApiOperation(value = "项目-分页列表查询", notes = "项目-分页列表查询")
+    @GetMapping(value = "/responsibleListV2")
+    public Result<IPage<Project>> responsibleListV2(Project project,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<Project>> result = new Result<>();
+        String userId = project.getUserId();
+        if (Check.isNull(userId)) {
+            result.setSuccess(false);
+            result.setMessage("用户信息不能为空");
+            return result;
+        }
+        project.setUserId(null);
+        String projectName = project.getProjectName();
+        project.setProjectName(null);
+        String roleCode = sysRoleService.getRoleCodeByUserId(userId);
+
+        QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
+        if (!Check.isNull(projectName)) {
+            queryWrapper.like("project_name", projectName);
+        }
+        queryWrapper.orderByDesc("create_time");
+        Page<Project> page = new Page<>(pageNo, pageSize);
+        IPage<Project> pageList = null;
+        // 查询所有
+        if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
+            pageList = projectService.page(page, queryWrapper);
+            // 经理岗查询所在项目
+        } else if ("designTeamLeader".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "planeLeader".equals(roleCode)) {
+
+            List<Long> projectIds = projectMemberService.getProjectByMap(userId);
+            if (!Check.isNull(projectIds)) {
+                queryWrapper.in("id", projectIds);
+                pageList = projectService.page(page, queryWrapper);
+
+            }
+            // 剪辑 编导 平面 拍摄 查询自己为设计负责人项目
+        } else if ("clip".equals(roleCode) || "shot".equals(roleCode) || "plan".equals(roleCode) || "plane".equals(roleCode)) {
+            queryWrapper.eq("design_responsible_id", userId);
+            pageList = projectService.page(page, queryWrapper);
+            // 运营 运营助理查询 自己负责项目
+        } else if ("operator".equals(roleCode) || "operationAssistant".equals(roleCode)) {
+            queryWrapper.eq("responsible_id", userId);
+            pageList = projectService.page(page, queryWrapper);
+        }
+        List<Project> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            if (!Check.isNull(records)) {
+                for (Project project2 : records) {
+                    QueryWrapper<TransferAccount> transferAccountQueryWrapper = new QueryWrapper<>();
+                    transferAccountQueryWrapper.eq("project_id", project2.getId());
+                    transferAccountQueryWrapper.eq("status", 0);
+                    List<TransferAccount> list = transferAccountService.list(transferAccountQueryWrapper);
+                    project2.setNeedExamine(list.size());
+                }
+
+            }
+        }
+        result.setResult(pageList);
+        return result;
+    }
+
+
     @Autowired
     private ISysCategoryService sysCategoryService;
     @Autowired

+ 64 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -125,6 +125,65 @@ public class ProjectMemberController {
     }
 
 
+    @GetMapping(value = "/participateListV2")
+    public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<ProjectMember>> result = new Result<>();
+
+        String userId = projectMember.getUserId();
+        if (Check.isNull(userId)) {
+            result.setSuccess(false);
+            result.setMessage("未获取到用户信息");
+            return result;
+
+        }
+        String projectName = projectMember.getProjectName();
+        projectMember.setUserId(null);
+        projectMember.setProjectName(null);
+        QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
+
+        String roleCode = sysRoleService.getRoleCodeByUserId(userId);
+        if (!"admin".equals(roleCode) && !"sale".equals(roleCode) && !"saleDirector".equals(roleCode)) {
+            queryWrapper.eq("user_id", userId);
+        }
+        if (!Check.isNull(projectName)) {
+            queryWrapper.like("project_name", projectName);
+        }
+        queryWrapper.groupBy("project_id");
+        queryWrapper.orderByDesc("create_time");
+
+
+        Page<ProjectMember> page = new Page<>(pageNo, pageSize);
+        IPage<ProjectMember> pageList = projectMemberService.page(page, queryWrapper);
+        List<ProjectMember> projectMembers = pageList.getRecords();
+        List<ProjectMember> projectMemberList = new ArrayList<>();
+        if (!Check.isNull(projectMembers)) {
+            for (ProjectMember member : projectMembers) {
+                if (Check.isNull(member)) {
+                    continue;
+                }
+                Project project = projectService.getById(member.getProjectId());
+                if (!Check.isNull(project)) {
+                    member.setResponsibleName(project.getResponsibleName());
+                    member.setDesignResponsibleName(project.getDesignResponsibleName());
+                    member.setAdvertiserName(project.getAdvertiserName());
+                    member.setAdvertiserId(project.getAdvertiserId());
+                    member.setMediaId(project.getMediaId());
+                    member.setMaxBid(project.getMaxBid());
+                    projectMemberList.add(member);
+                }
+            }
+        }
+
+
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
     /**
      * 分页列表查询
      *
@@ -329,7 +388,7 @@ public class ProjectMemberController {
     public Result<List<Map<String, Object>>> getProjectAccountBy() {
         Result<List<Map<String, Object>>> resultBody = new Result<>();
         try {
-            String userId=((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+            String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
             List<Map<String, Object>> result = projectMemberService.getProjectAccountByUserId(userId);
             resultBody.setSuccess(true);
             resultBody.setResult(result);
@@ -352,8 +411,8 @@ public class ProjectMemberController {
 
         JSONArray ids = data.getJSONArray("mediaIds");
         List<Integer> mediaIds = new ArrayList<>();
-        if(null!=ids&&!ids.isEmpty()){
-            for(int i=0;i<ids.size();i++){
+        if (null != ids && !ids.isEmpty()) {
+            for (int i = 0; i < ids.size(); i++) {
                 mediaIds.add(ids.getIntValue(i));
             }
         }
@@ -378,8 +437,8 @@ public class ProjectMemberController {
         Result<List<ProjectMember>> result = new Result<>();
         JSONArray ids = data.getJSONArray("mediaIds");
         List<Integer> mediaIds = new ArrayList<>();
-        if(null!=ids&&!ids.isEmpty()){
-            for(int i=0;i<ids.size();i++){
+        if (null != ids && !ids.isEmpty()) {
+            for (int i = 0; i < ids.size(); i++) {
                 mediaIds.add(ids.getIntValue(i));
             }
         }
@@ -395,5 +454,4 @@ public class ProjectMemberController {
     }
 
 
-
 }

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMemberMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目成员
@@ -34,4 +35,5 @@ public interface ProjectMemberMapper extends BaseMapper<ProjectMember> {
 
     List<ProjectMember> getSaleProjects(@Param("userId")String userId, @Param("mediaIds")List<Integer> mediaIds);
 
+    List<Long> getProjectByMap(@Param("userId") String userId);
 }

+ 30 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml

@@ -33,11 +33,11 @@
     <!-- 视频报表设计师leader展示自己所在公司的所有项目 -->
     <select id="designLeaderProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-            distinct b.id as projectId,
-            b.project_name as projectName,
-            b.advertiser_id as advertiserId,
-            b.advertiser_name as advertiserName,
-            b.media_id as mediaId
+        distinct b.id as projectId,
+        b.project_name as projectName,
+        b.advertiser_id as advertiserId,
+        b.advertiser_name as advertiserName,
+        b.media_id as mediaId
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
@@ -53,11 +53,11 @@
     <!-- 设计师展示所有自己的角色下制作的视频 -->
     <select id="designProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-            distinct a.project_id as projectId,
-            b.project_name as projectName,
-            b.advertiser_id as advertiserId,
-            b.advertiser_name as advertiserName,
-            b.media_id as mediaId
+        distinct a.project_id as projectId,
+        b.project_name as projectName,
+        b.advertiser_id as advertiserId,
+        b.advertiser_name as advertiserName,
+        b.media_id as mediaId
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
@@ -72,11 +72,11 @@
     <!-- 运营和运营负责人展示所在项目视频 -->
     <select id="operationProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-           distinct b.id as projectId,
-           b.project_name as projectName,
-           b.advertiser_id as advertiserId,
-           b.advertiser_name as advertiserName,
-           b.media_id as mediaId
+        distinct b.id as projectId,
+        b.project_name as projectName,
+        b.advertiser_id as advertiserId,
+        b.advertiser_name as advertiserName,
+        b.media_id as mediaId
         from
         ctop_user_allocation a
         left join ctop_project b on a.project_id = b.id
@@ -124,14 +124,14 @@
     </select>
 
     <select id="getSaleProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
-            select
-            distinct a.id as projectId,
-            a.project_name as projectName,
-            a.advertiser_id as advertiserId,
-            a.advertiser_name as advertiserName,
-            a.media_id as mediaId,
-            a.sale_id as saleId,
-            b.realname as saleName
+        select
+        distinct a.id as projectId,
+        a.project_name as projectName,
+        a.advertiser_id as advertiserId,
+        a.advertiser_name as advertiserName,
+        a.media_id as mediaId,
+        a.sale_id as saleId,
+        b.realname as saleName
         from
         ctop_project a
         left join sys_user b on a.sale_id = b.id
@@ -143,4 +143,11 @@
         </foreach>
     </select>
 
+    <select id="getProjectByMap" resultType="java.lang.Long">
+        select project_id
+        from ctop_project_member
+        where user_id = #{userId}
+        group by project_id
+    </select>
+
 </mapper>

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java

@@ -25,8 +25,10 @@ public interface IProjectMemberService extends IService<ProjectMember> {
     List<Map<String, Object>> getProjectAccountByUserId(String userId);
 
     ProjectMember getProjectByParams(Long targetProject, String userId);
+
     List<ProjectMember> getOwnProjects(List<Integer> mediaIds);
 
     List<ProjectMember> getSaleOwnProjects(List<Integer> mediaIds);
 
+    List<Long> getProjectByMap(String userId);
 }

+ 17 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -90,12 +90,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
             projectMemberList = memberMapper.adminProjects(mediaIds);
         } else if (roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")) {
             projectMemberList = memberMapper.designProjects(userId, mediaIds);
-        }else{
+        } else {
             //如果以上角色都不是的话直接查询此角色所属项目
             projectMemberList = memberMapper.designProjects(userId, mediaIds);
         }
 
-        if(null == projectMemberList){
+        if (null == projectMemberList) {
             projectMemberList = new ArrayList<>();
         }
 
@@ -124,12 +124,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
     @Override
     public ProjectMember getProjectByParams(Long targetProject, String userId) {
-        QueryWrapper<ProjectMember>queryWrapper = new QueryWrapper<>();
-        if(null!=targetProject){
-            queryWrapper.eq("project_id",targetProject);
+        QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
+        if (null != targetProject) {
+            queryWrapper.eq("project_id", targetProject);
         }
-        if(null!=userId){
-            queryWrapper.eq("user_id",userId);
+        if (null != userId) {
+            queryWrapper.eq("user_id", userId);
         }
         queryWrapper.last("limit 1");
         return null;
@@ -171,18 +171,23 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         List<ProjectMember> projectMemberList = null;
         if (roleCode.equals("admin")) {
             projectMemberList = memberMapper.adminProjects(mediaIds);
-        }else{
+        } else {
             //如果以上角色都不是的话直接查询此角色所属项目
             projectMemberList = memberMapper.getSaleProjects(userId, mediaIds);
         }
 
-        if(null == projectMemberList){
+        if (null == projectMemberList) {
             projectMemberList = new ArrayList<>();
         }
 
         return projectMemberList;
     }
 
+    @Override
+    public List<Long> getProjectByMap(String userId) {
+        return memberMapper.getProjectByMap(userId);
+    }
+
     //视频报表
     @Override
     public List<ProjectMember> getOwnProjects(List<Integer> mediaIds) {
@@ -192,14 +197,14 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
         //角色权限判断
         List<ProjectMember> projectMemberList = null;
-       if (roleCode.equals("admin")) {
+        if (roleCode.equals("admin")) {
             projectMemberList = memberMapper.adminProjects(mediaIds);
-        }else{
+        } else {
             //如果以上角色都不是的话直接查询此角色所属项目
             projectMemberList = memberMapper.designProjects(userId, mediaIds);
         }
 
-        if(null == projectMemberList){
+        if (null == projectMemberList) {
             projectMemberList = new ArrayList<>();
         }
 

+ 8 - 2
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -55,8 +55,14 @@ public class SampleTest {
     public void loadBytedanceCampaignData() {
 
 
-       // CorpWexinUtils.sendMessageByWeChatId("34585ddd4bd86e57756cf6a51b9443a5","测试消息发送");
-        interfaceService.getAppList(23212L,"493aedfee07d9c500c50077e7c808145");
+        CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(5975714L);
+
+        interfaceService.getCreativeList(oauthToken, null, null);
+               /* try {
+                 //   Thread.sleep(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }*/
 
 
 

+ 153 - 27
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/MaterialRefuseController.java

@@ -4,19 +4,21 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCreativeMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IMaterialRefuseService;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -29,21 +31,27 @@ public class MaterialRefuseController {
     @Autowired
     private IKuaiShouUpdateService updateService;
     @Autowired
-    private KuaiShouCreativeMapper creativeMapper;
+    private IKuaiShouCreativeService creativeService;
 
 
-    @PostMapping(value = "/getRefuseCreative")
-    public Map<String, Object> getRefuseCreative(@RequestBody JSONObject jsonObject) {
-        Map<String, Object> map = new HashMap<>();
+    @GetMapping(value = "/getRefuseCreative")
+    public Result<IPage<KuaiShouCreative>> getRefuseCreative(KuaiShouCreative creative,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
+        Result<IPage<KuaiShouCreative>> result = new Result<>();
         try {
-            List<JSONObject> list = materialRefuseService.getRefuseCreative(jsonObject.getLong("accountId"));
-            map.put("code", 0);
-            map.put("data", list);
+
+            QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(creative, req.getParameterMap());
+            Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
+            IPage<KuaiShouCreative> pageList = creativeService.page(page, queryWrapper);
+            result.setSuccess(true);
+            result.setResult(pageList);
+
         } catch (Exception e) {
-            map.put("code", -1);
-            e.printStackTrace();
+            result.setSuccess(false);
         }
-        return map;
+        return result;
     }
 
     @PostMapping(value = "/updateCreative")
@@ -82,19 +90,137 @@ public class MaterialRefuseController {
             return map;
         }
 
-        QueryWrapper<KuaiShouCreative> creativeQueryWrapper = new QueryWrapper<>();
-        creativeQueryWrapper.eq("account_id", accountId);
-        creativeQueryWrapper.eq("creative_id", jsonObject.getString("creativeId"));
-        creativeQueryWrapper.eq("unit_id", jsonObject.getString("unitId"));
-        creativeQueryWrapper.eq("campaign_id", jsonObject.getString("campaignId"));
-        int i = creativeMapper.delete(creativeQueryWrapper);
-        if (i > 0) {
-            map.put("code", 0);
-            map.put("message", "重审成功");
-            return map;
+        return null;
+    }
+
+
+    @PostMapping(value = "/batchUpdateCreative")
+    public Result<JSONObject> batchUpdateCreative(@RequestBody JSONObject jsonObject) {
+
+        Result<JSONObject> result = new Result<>();
+        JSONObject returnJson = new JSONObject();
+        if (Check.isNull(jsonObject)) {
+            result.setSuccess(false);
+            result.setMessage("入参为空");
+            return result;
         }
 
-        return null;
+        Long accountId = jsonObject.getLong("accountId");
+        QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("account_id", accountId);
+        queryWrapper.eq("media_id", 2);
+        queryWrapper.orderByDesc("create_time");
+        queryWrapper.last("limit 1");
+        CtopOauthToken ctopOauthToken = oauthTokenMapper.selectOne(queryWrapper);
+        if (Check.isNull(ctopOauthToken)) {
+            result.setSuccess(false);
+            result.setMessage("未获取到授权信息");
+            return result;
+        }
+
+        JSONArray creativeArr = jsonObject.getJSONArray("creativeArr");
+        Integer successCount = 0;
+        Integer failCount = 0;
+        if (!Check.isNull(creativeArr)) {
+
+            for (int i = 0; i < creativeArr.size(); i++) {
+                JSONObject creativeJson = creativeArr.getJSONObject(i);
+                if (!Check.isNull(creativeJson)) {
+                    Long creativeId = creativeJson.getLong("creativeId");
+                    JSONObject requestJson = new JSONObject();
+                    requestJson.put("creativeId", creativeId);
+                    System.err.println(creativeId);
+                    String description = creativeJson.getString("description");
+                    if (!Check.isNull(description)) {
+                        requestJson.put("description", convertMoString(description));
+                        Map<String, Object> creativeMap = updateService.updateCreative(ctopOauthToken.getAccessToken(), accountId, requestJson);
+                        Integer code = (Integer) creativeMap.get("code");
+                        if (code == 0) {
+                            successCount += 1;
+
+                        } else {
+                            failCount += 1;
+                        }
+                    }
+
+                }
+
+            }
+
+        }
+        returnJson.put("successCount", successCount);
+        returnJson.put("failCount", failCount);
+
+        result.setSuccess(true);
+        result.setResult(returnJson);
+        return result;
+    }
+
+
+    public static synchronized String convertMoString(String sMo) {
+
+        if (Check.isNull(sMo)) {
+            return null;
+        }
+        String newString = null;
+        try {
+            if (sMo.contains(",")) {
+                return sMo.replace(',', ',');
+            } else if (sMo.contains("~")) {
+                newString = sMo.replace('~', '~');
+            } else if (sMo.contains("。")) {
+                newString = sMo.replace('。', '.');
+            } else if (sMo.contains(";")) {
+                newString = sMo.replace(';', ';');
+            } else if (sMo.contains("!")) {
+                newString = sMo.replace("!", "!");
+
+            } else if (sMo.contains("?")) {
+                newString = sMo.replace('?', '?');
+
+            } else if (sMo.contains(":")) {
+                newString = sMo.replace(':', ':');
+
+            } else if (sMo.contains("“")) {
+                newString = sMo.replace('“', '"');
+
+            } else if (sMo.contains("”")) {
+                newString = sMo.replace('”', '"');
+
+            } else if (sMo.contains("<")) {
+                newString = sMo.replace('>', '》').replace('<', '《');
+            } else if (sMo.contains(",")) {
+                newString = sMo.replace(',', ',');
+            } else if (sMo.contains(".")) {
+                newString = sMo.replace('.', '。');
+            } else if (sMo.contains(";")) {
+                newString = sMo.replace(';', ';');
+            } else if (sMo.contains("!")) {
+                newString = sMo.replace("!", "!");
+
+            } else if (sMo.contains("?")) {
+                newString = sMo.replace('?', '?');
+
+            } else if (sMo.contains(":")) {
+                newString = sMo.replace(':', ':');
+
+            } else if (sMo.contains(""")) {
+                newString = sMo.replace('"', '“');
+
+            } else if (sMo.contains(""")) {
+                newString = sMo.replace('"', '”');
+            } else if (sMo.contains("《")) {
+                newString = sMo.replace('》', '>').replace('《', '<');
+            } else if (sMo.contains("~")) {
+                newString = sMo.replace('~', '~');
+            } else {
+                newString = sMo;
+            }
+
+        } catch (Exception ex) {
+            return sMo;
+        }
+        return newString;
     }
 
 }

+ 16 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java

@@ -116,6 +116,7 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
      */
     @Autowired
     private IKuaiShouGroupService groupService;
+
     @Override
     public Map<String, Object> updateUnitDayBudget(String token, Long advertiserId, Long unitId, Long dayBudget, String loginId) {
         Map<String, Object> returnMap = new HashMap<>();
@@ -484,14 +485,21 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
             header.put("Content-Type", "application/json");
             JSONObject params = new JSONObject();
 
-
+            params.put("advertiser_id", advertiserId);
             String creativeId = requestJson.getString("creativeId");
             String creativeName = requestJson.getString("creativeName");
             String description = requestJson.getString("description");
-            params.put("advertiser_id", advertiserId);
-            params.put("creative_id", creativeId);
-            params.put("creative_name", creativeName);
-            params.put("description", description);
+            if (!Check.isNull(creativeId)) {
+                params.put("creative_id", creativeId);
+            }
+            if (!Check.isNull(creativeName)) {
+                params.put("creative_name", creativeName);
+            }
+            if (!Check.isNull(description)) {
+                params.put("description", description);
+            }
+
+
             String result = HttpUtils.httpPostRequest(url, params, header);
             JSONObject resultJson = JSONObject.parseObject(result);
             if (!Check.isNull(resultJson)) {
@@ -500,6 +508,9 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                     returnMap.put("code", 0);
                     returnMap.put("success", true);
                     returnMap.put("message", "修改成功");
+                    Thread.sleep(100);
+                    interfaceService.getCreativeByCreativeId(token, advertiserId, Long.valueOf(creativeId));
+
                 } else {
                     log.error("修改广告创意状态失败,advertiserId:{},creativeId:{},返回信息:{}", advertiserId, creativeId, resultJson);
                     returnMap.put("code", -1);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/MaterialRefuseServiceImpl.java

@@ -22,6 +22,7 @@ public class MaterialRefuseServiceImpl implements IMaterialRefuseService {
 
     @Override
     public List<JSONObject> getRefuseCreative(Long accountId) {
+
         List<JSONObject> refuseCreativeList = materialRefuseMapper.selectRefuseCreativeByAccountId(accountId);
         return refuseCreativeList;
     }