Pārlūkot izejas kodu

修改工作流任务

syh 4 gadi atpakaļ
vecāks
revīzija
2332ffe0cf

+ 3 - 2
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/entity/ActZprocess.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.activiti.entity;
 package org.jeecg.modules.activiti.entity;
 
 
-import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -105,6 +105,7 @@ public class ActZprocess {
     @ApiModelProperty(value = "授权的角色")
     @ApiModelProperty(value = "授权的角色")
 	private String roles;
 	private String roles;
 
 
-	@Dict(dicCode = "id", dictTable = "ctop_act_custom_form", dicText = "name")
 	private Long customTableId;
 	private Long customTableId;
+	@TableField(exist = false)
+	private String customTableName;
 }
 }

+ 8 - 8
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActZprocessServiceImpl.java

@@ -114,10 +114,8 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
             throw new JeecgBootException("没有业务表单数据");
             throw new JeecgBootException("没有业务表单数据");
         }
         }
         /*表单数据写入*/
         /*表单数据写入*/
-        Map<String, Object> busiData = actBusinessService.getBaseMapper().getBusiData(tableId, tableName);
-        for (String key : busiData.keySet()) {
-            params.put(key,busiData.get(key));
-        }
+        params.put("data",tableName);
+
         ProcessInstance pi = runtimeService.startProcessInstanceById(actBusiness.getProcDefId(), actBusiness.getId(), params);
         ProcessInstance pi = runtimeService.startProcessInstanceById(actBusiness.getProcDefId(), actBusiness.getId(), params);
         // 设置流程实例名称
         // 设置流程实例名称
         runtimeService.setProcessInstanceName(pi.getId(), actBusiness.getTitle());
         runtimeService.setProcessInstanceName(pi.getId(), actBusiness.getTitle());
@@ -168,10 +166,12 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
     public void sendActMessage(LoginUser fromUser, LoginUser toUser, ActBusiness act, String taskName, Boolean sendMessage, Boolean sendSms, Boolean sendEmail) {
     public void sendActMessage(LoginUser fromUser, LoginUser toUser, ActBusiness act, String taskName, Boolean sendMessage, Boolean sendSms, Boolean sendEmail) {
         String title = String.format("您有一个新的审批任务");
         String title = String.format("您有一个新的审批任务");
         Map<String, String> msgMap = Maps.newHashMap();
         Map<String, String> msgMap = Maps.newHashMap();
-                        /*流程名称:  ${bpm_name}
-催办任务:  ${bpm_task}
-催办时间 :    ${datetime}
-催办内容 :    ${remark}*/
+        /**
+         * 流程名称:  ${bpm_name}
+         * 催办任务:  ${bpm_task}
+         * 催办时间:  ${datetime}
+         * 催办内容:  ${remark}
+         */
         msgMap.put("bpm_name",act.getTitle());
         msgMap.put("bpm_name",act.getTitle());
         msgMap.put("bpm_task",taskName);
         msgMap.put("bpm_task",taskName);
         msgMap.put("datetime", DateUtils.now());
         msgMap.put("datetime", DateUtils.now());

+ 63 - 34
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.activiti.web;
 package org.jeecg.modules.activiti.web;
 
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.IdUtil;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.RuntimeService;
@@ -19,13 +20,11 @@ import org.jeecg.modules.activiti.service.Impl.ActBusinessServiceImpl;
 import org.jeecg.modules.activiti.service.Impl.ActZprocessServiceImpl;
 import org.jeecg.modules.activiti.service.Impl.ActZprocessServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -52,27 +51,26 @@ public class ActBusinessController {
     ISysBaseApi sysBaseAPI;
     ISysBaseApi sysBaseAPI;
     /*添加申请草稿状态*/
     /*添加申请草稿状态*/
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public Result add(HttpServletRequest request){
-        String procDefId = request.getParameter("procDefId");
-        String procDeTitle = request.getParameter("procDeTitle");
-        String tableName = request.getParameter("tableName");
-        /*保存业务表单数据到数据库表*/
-        String tableId = IdUtil.simpleUUID();
-        actBusinessService.saveApplyForm(tableId,request);
+    public Result add(@RequestBody JSONObject data){
+        String procDefId = data.getString("procDefId");
+        String procDeTitle = data.getString("procDeTitle");
+        Long tableId = data.getLong("tableId");
+        String formText = data.getString("formText");
+
         // 保存至我的申请业务
         // 保存至我的申请业务
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String username = sysUser.getUsername();
         String username = sysUser.getUsername();
         ActBusiness actBusiness = new ActBusiness();
         ActBusiness actBusiness = new ActBusiness();
         actBusiness.setUserId(username);
         actBusiness.setUserId(username);
-        actBusiness.setTableId(tableId);
+        actBusiness.setTableId(tableId+"");
         actBusiness.setProcDefId(procDefId);
         actBusiness.setProcDefId(procDefId);
-        String title = request.getParameter(ActivitiConstant.titleKey);
+        String title = data.getString(ActivitiConstant.titleKey);
         if (StrUtil.isNotBlank(title)){
         if (StrUtil.isNotBlank(title)){
             actBusiness.setTitle(title);
             actBusiness.setTitle(title);
         }else {
         }else {
             actBusiness.setTitle(procDeTitle);
             actBusiness.setTitle(procDeTitle);
         }
         }
-        actBusiness.setTableName(tableName);
+        actBusiness.setTableName(formText);
         actBusinessService.save(actBusiness);
         actBusinessService.save(actBusiness);
         return Result.ok();
         return Result.ok();
     }
     }
@@ -99,14 +97,11 @@ public class ActBusinessController {
     /*通过id删除草稿状态申请*/
     /*通过id删除草稿状态申请*/
     @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
     @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
     public Result delByIds(String ids){
     public Result delByIds(String ids){
-
         for(String id : ids.split(",")){
         for(String id : ids.split(",")){
             ActBusiness actBusiness = actBusinessService.getById(id);
             ActBusiness actBusiness = actBusinessService.getById(id);
-            if(actBusiness.getStatus()!=ActivitiConstant.STATUS_TO_APPLY){
+            if(!actBusiness.getStatus().equals(ActivitiConstant.STATUS_TO_APPLY)){
                 return Result.error("删除失败, 仅能删除草稿状态的申请");
                 return Result.error("删除失败, 仅能删除草稿状态的申请");
             }
             }
-            // 删除关联业务表
-            actBusinessService.deleteBusiness(actBusiness.getTableName(), actBusiness.getTableId());
             actBusinessService.removeById(id);
             actBusinessService.removeById(id);
         }
         }
         return Result.ok("删除成功");
         return Result.ok("删除成功");
@@ -120,22 +115,13 @@ public class ActBusinessController {
             return Result.error("actBusiness表中该id不存在");
             return Result.error("actBusiness表中该id不存在");
         }
         }
         String tableId = actBusiness.getTableId();
         String tableId = actBusiness.getTableId();
-        String tableName = actBusiness.getTableName();
         act.setTableId(tableId);
         act.setTableId(tableId);
-        Map<String, Object> busiData = actBusinessService.getBaseMapper().getBusiData(tableId, tableName);
-
-        if (MapUtil.isNotEmpty(busiData)&&busiData.get(ActivitiConstant.titleKey)!=null){
-            //如果表单里有 标题  更新一下
-            actBusiness.setTitle(busiData.get(ActivitiConstant.titleKey)+"");
-        }
         String processInstanceId = actZprocessService.startProcess(act);
         String processInstanceId = actZprocessService.startProcess(act);
         actBusiness.setProcInstId(processInstanceId);
         actBusiness.setProcInstId(processInstanceId);
         actBusiness.setStatus(ActivitiConstant.STATUS_DEALING);
         actBusiness.setStatus(ActivitiConstant.STATUS_DEALING);
         actBusiness.setResult(ActivitiConstant.RESULT_DEALING);
         actBusiness.setResult(ActivitiConstant.RESULT_DEALING);
         actBusiness.setApplyTime(new Date());
         actBusiness.setApplyTime(new Date());
         actBusinessService.updateById(actBusiness);
         actBusinessService.updateById(actBusiness);
-        //修改业务表的流程字段
-        actBusinessService.updateBusinessStatus(actBusiness.getTableName(), actBusiness.getTableId(),"启动");
         return Result.ok("操作成功");
         return Result.ok("操作成功");
     }
     }
     /*撤回申请*/
     /*撤回申请*/
@@ -161,11 +147,22 @@ public class ActBusinessController {
     public Result listData(ActBusiness param, HttpServletRequest request){
     public Result listData(ActBusiness param, HttpServletRequest request){
         LambdaQueryWrapper<ActBusiness> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ActBusiness> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.orderByDesc(ActBusiness::getCreateTime);
         queryWrapper.orderByDesc(ActBusiness::getCreateTime);
-        if (StrUtil.isNotBlank(param.getTitle())) queryWrapper.like(ActBusiness::getTitle,param.getTitle());
-        if (param.getStatus()!=null) queryWrapper.eq(ActBusiness::getStatus,param.getStatus());
-        if (param.getResult()!=null) queryWrapper.eq(ActBusiness::getResult,param.getResult());
-        if (StrUtil.isNotBlank(request.getParameter("createTime_begin"))) queryWrapper.ge(ActBusiness::getTitle,param.getTitle());
-        if (StrUtil.isNotBlank(request.getParameter("createTime_end"))) queryWrapper.le(ActBusiness::getTitle,param.getTitle());
+        if (StrUtil.isNotBlank(param.getTitle())) {
+            queryWrapper.like(ActBusiness::getTitle,param.getTitle());
+        }
+        if (param.getStatus()!=null){
+            queryWrapper.eq(ActBusiness::getStatus,param.getStatus());
+        }
+        if (param.getResult()!=null){
+            queryWrapper.eq(ActBusiness::getResult,param.getResult());
+        }
+        if (StrUtil.isNotBlank(request.getParameter("createTime_begin"))) {
+            queryWrapper.ge(ActBusiness::getTitle,param.getTitle());
+        }
+        if (StrUtil.isNotBlank(request.getParameter("createTime_end"))) {
+            queryWrapper.le(ActBusiness::getTitle,param.getTitle());
+        }
+
 
 
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         queryWrapper.eq(ActBusiness::getUserId,loginUser.getUsername());
         queryWrapper.eq(ActBusiness::getUserId,loginUser.getUsername());
@@ -194,4 +191,36 @@ public class ActBusinessController {
         });
         });
         return Result.ok(actBusinessList);
         return Result.ok(actBusinessList);
     }
     }
+
+    @PostMapping("update")
+    public Map<String,Object>updateBusiness(@RequestBody JSONObject data){
+        Map<String,Object>result = new HashMap<>();
+        Long id = data.getLong("id");
+        String tableName = data.getString("tableName");
+        ActBusiness business = actBusinessService.getById(id);
+        if(null == business){
+            ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+            return result;
+        }
+        business.setTableName(tableName);
+        actBusinessService.updateById(business);
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+        return result;
+    }
+
+    @PostMapping("delete")
+    public Map<String,Object>delete(@RequestBody JSONObject data){
+        Map<String,Object>result = new HashMap<>();
+        Long id = data.getLong("id");
+        String tableName = data.getString("tableName");
+        ActBusiness business = actBusinessService.getById(id);
+        if(null == business){
+            ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+            return result;
+        }
+        business.setTableName(tableName);
+        actBusinessService.updateById(business);
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+        return result;
+    }
 }
 }

+ 14 - 7
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActivitiProcessController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.activiti.web;
 package org.jeecg.modules.activiti.web;
 
 
+import cn.com.ctop.common.module.entity.ActCustomForm;
+import cn.com.ctop.common.module.service.IActCustomFormService;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -48,8 +50,6 @@ public class ActivitiProcessController {
     @Autowired
     @Autowired
     private RepositoryService repositoryService;
     private RepositoryService repositoryService;
     @Autowired
     @Autowired
-    private ObjectMapper objectMapper;
-    @Autowired
     private ActZprocessServiceImpl actZprocessService;
     private ActZprocessServiceImpl actZprocessService;
     @Autowired
     @Autowired
     private ActNodeServiceImpl actNodeService;
     private ActNodeServiceImpl actNodeService;
@@ -99,10 +99,20 @@ public class ActivitiProcessController {
         }
         }
         if(null!=list&&!list.isEmpty()){
         if(null!=list&&!list.isEmpty()){
             List<ActZprocess> getList = new ArrayList<>();
             List<ActZprocess> getList = new ArrayList<>();
+            for(ActZprocess zprocess :list){
+                ActCustomForm form = customFormService.getById(zprocess.getCustomTableId());
+                if(null!=form){
+                    zprocess.setCustomTableName(form.getName());
+                }
+                getList.add(zprocess);
+            }
+            return Result.ok(getList);
         }
         }
         return Result.ok(list);
         return Result.ok(list);
     }
     }
 
 
+    @Autowired
+    private IActCustomFormService customFormService;
     /*激活或挂起流程定义*/
     /*激活或挂起流程定义*/
     @RequestMapping(value = "/updateStatus")
     @RequestMapping(value = "/updateStatus")
     public Result updateStatus( String id, Integer status){
     public Result updateStatus( String id, Integer status){
@@ -110,12 +120,10 @@ public class ActivitiProcessController {
         ActZprocess actProcess = actZprocessService.getById(id);
         ActZprocess actProcess = actZprocessService.getById(id);
         if(status==1){
         if(status==1){
             //启动前检查一下 路由等信息是否齐全
             //启动前检查一下 路由等信息是否齐全
-            String routeName = actProcess.getRouteName();
-            String businessTable = actProcess.getBusinessTable();
-            if (StrUtil.isBlank(routeName)||StrUtil.isBlank(businessTable)){
+            Long tableId = actProcess.getCustomTableId();
+            if (null == tableId||tableId == 0){
                 return Result.error("未设置关联表单,点击编辑设置。");
                 return Result.error("未设置关联表单,点击编辑设置。");
             }
             }
-
             repositoryService.activateProcessDefinitionById(id, true, new Date());
             repositoryService.activateProcessDefinitionById(id, true, new Date());
         }else {
         }else {
             repositoryService.suspendProcessDefinitionById(id, true, new Date());
             repositoryService.suspendProcessDefinitionById(id, true, new Date());
@@ -196,7 +204,6 @@ public class ActivitiProcessController {
     }
     }
     @RequestMapping(value = "/updateInfo", method = RequestMethod.POST)
     @RequestMapping(value = "/updateInfo", method = RequestMethod.POST)
     public Result<Object> updateInfo(ActZprocess actProcess){
     public Result<Object> updateInfo(ActZprocess actProcess){
-
         ProcessDefinition pd = repositoryService.getProcessDefinition(actProcess.getId());
         ProcessDefinition pd = repositoryService.getProcessDefinition(actProcess.getId());
         if(pd==null){
         if(pd==null){
             return Result.error("流程定义不存在");
             return Result.error("流程定义不存在");

+ 23 - 3
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -10,6 +10,9 @@ import cn.com.ctop.common.module.message.handle.impl.EmailSendMsgHandle;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.crawler.modules.core.service.IKuaishouCrawlerService;
 import cn.com.ctop.crawler.modules.core.service.IKuaishouCrawlerService;
+import cn.com.ctop.crawler.modules.music.entity.MusicInfoKuaishou;
+import cn.com.ctop.crawler.modules.music.entity.MusicKuaishouType;
+import cn.com.ctop.crawler.modules.music.service.IMusicInfoKuaishouService;
 import cn.com.ctop.crawler.modules.music.service.IMusicKuaishouTypeService;
 import cn.com.ctop.crawler.modules.music.service.IMusicKuaishouTypeService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
@@ -18,6 +21,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertisePlanServi
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
@@ -273,8 +277,24 @@ public class SampleTest {
 //                musicKuaishouTypeService.save(kuaishouType);
 //                musicKuaishouTypeService.save(kuaishouType);
 //            }
 //            }
 //        }
 //        }
-        String llsid = "2000106667298730337";
-        String musicTypeString = crawlerService.getMusicList("200032",llsid);
-        System.out.println(musicTypeString);
+        List<MusicKuaishouType>musicKuaishouTypes = musicKuaishouTypeService.list();
+        if(null!=musicKuaishouTypes){
+            for (MusicKuaishouType type:musicKuaishouTypes) {
+                String llsid = "2000106667298730337";
+                String musicTypeString = crawlerService.getMusicList(type.getId()+"",llsid);
+                System.out.println(musicTypeString);
+                JSONArray musicList = JSONObject.parseObject(musicTypeString).getJSONArray("music");
+                if(null!=musicList&&!musicList.isEmpty()){
+                    for(int i=0;i<musicList.size();i++){
+                        JSONObject music = musicList.getJSONObject(i);
+                        MusicInfoKuaishou musicInfoKuaishou = new MusicInfoKuaishou(music,type.getId());
+                        musicInfoKuaishouService.saveOrUpdate(musicInfoKuaishou);
+                    }
+                }
+            }
+        }
+
     }
     }
+    @Autowired
+    private IMusicInfoKuaishouService musicInfoKuaishouService;
 }
 }

+ 106 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/music/entity/MusicInfoKuaishou.java

@@ -0,0 +1,106 @@
+package cn.com.ctop.crawler.modules.music.entity;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 快手音乐信息
+ * @author jeecg-boot
+ * @date   2020-09-15
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_music_info_kuaishou")
+@Accessors(chain = true)
+public class MusicInfoKuaishou {
+
+	/**id*/
+	@TableId
+    private String id;
+	private Long musicianUid;
+	private String image;
+	private Long chorus;
+	private Long duration;
+	private Long begin;
+	private Long end;
+	private String name;
+	private Integer type;
+	private String lrcUrl;
+	private String audioUrl;
+	private String avatarUrl;
+	private String snippetUrl;
+	private Long snippetDuration;
+	private Long singingCount;
+	private String url;
+	private String expTag;
+	private String imageUrl;
+	private Long photoCount;
+	private Long usageCount;
+	private String artist;
+	private Integer genreId;
+	private String lrc;
+	private Integer audioType;
+	private String isOriginal;
+	private Date createTime;
+	private Date updateTime;
+	private Long musicChannel;
+
+	public MusicInfoKuaishou(JSONObject music,Long channelType) {
+		this.musicianUid = music.getLong("musicianUid");
+		this.image = music.getString("image");
+		this.chorus = music.getLong("chorus");
+		this.duration = music.getLong("duration");
+		this.begin = music.getLong("begin");
+		this.end = music.getLong("end");
+		this.name = music.getString("name");
+		this.id = music.getString("id");
+		this.type = music.getInteger("type");
+		JSONArray lrcUrls = music.getJSONArray("lrcUrls");
+		if(null!=lrcUrls&&!lrcUrls.isEmpty()){
+			this.lrcUrl = lrcUrls.getJSONObject(0).getString("url");
+		}
+		JSONArray audioUrls = music.getJSONArray("audioUrls");
+		if(null!=audioUrls&&!audioUrls.isEmpty()){
+			this.audioUrl = audioUrls.getJSONObject(0).getString("url");
+		}
+		this.avatarUrl = music.getString("avatarUrl");
+		this.snippetUrl = music.getString("snippetUrls");
+		this.singingCount = music.getLong("singingCount");
+		this.snippetDuration = music.getLong("snippetDuration");
+		this.url = music.getString("url");
+		this.expTag = music.getString("expTag");
+		JSONArray imageUrls = music.getJSONArray("imageUrls");
+		if(null!=imageUrls&&!imageUrls.isEmpty()){
+			this.imageUrl = imageUrls.getJSONObject(0).getString("url");
+		}
+		this.photoCount = music.getLong("photoCount");
+		this.usageCount = music.getLong("usageCount");
+		this.artist = music.getString("artist");
+		this.genreId = music.getInteger("genreId");
+		this.lrc = music.getString("lrc");
+		this.audioType = music.getInteger("audioType");
+
+		Boolean isOriginal = music.getBoolean("isOriginal");
+		if(null == isOriginal){
+			isOriginal = false;
+		}
+		if(isOriginal){
+			this.isOriginal = "true";
+		}else{
+			this.isOriginal = "false";
+		}
+		this.createTime = new Date();
+		this.updateTime = new Date();
+		this.musicChannel = channelType;
+	}
+
+	public MusicInfoKuaishou() {
+
+	}
+}

+ 14 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/music/mapper/MusicInfoKuaishouMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.crawler.modules.music.mapper;
+
+import cn.com.ctop.crawler.modules.music.entity.MusicInfoKuaishou;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 快手音乐信息
+ * @author: jeecg-boot
+ * @date:   2020-09-15
+ * @cersion: V1.0
+ */
+public interface MusicInfoKuaishouMapper extends BaseMapper<MusicInfoKuaishou> {
+
+}

+ 5 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/music/mapper/xml/MusicInfoKuaishouMapper.xml

@@ -0,0 +1,5 @@
+<?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.crawler.modules.music.mapper.MusicInfoKuaishouMapper">
+
+</mapper>

+ 14 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/music/service/IMusicInfoKuaishouService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.crawler.modules.music.service;
+
+import cn.com.ctop.crawler.modules.music.entity.MusicInfoKuaishou;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 快手音乐信息
+ * @Author: jeecg-boot
+ * @Date:   2020-09-15
+ * @Version: V1.0
+ */
+public interface IMusicInfoKuaishouService extends IService<MusicInfoKuaishou> {
+
+}

+ 18 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/music/service/impl/MusicInfoKuaishouServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.crawler.modules.music.service.impl;
+
+import cn.com.ctop.crawler.modules.music.entity.MusicInfoKuaishou;
+import cn.com.ctop.crawler.modules.music.mapper.MusicInfoKuaishouMapper;
+import cn.com.ctop.crawler.modules.music.service.IMusicInfoKuaishouService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 快手音乐信息
+ * @author jeecg-boot
+ * @date   2020-09-15
+ * @version V1.0
+ */
+@Service
+public class MusicInfoKuaishouServiceImpl extends ServiceImpl<MusicInfoKuaishouMapper, MusicInfoKuaishou> implements IMusicInfoKuaishouService {
+
+}

+ 3 - 0
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceMonitoringLinksCheckJob.java

@@ -66,6 +66,9 @@ public class BytedanceMonitoringLinksCheckJob {
         boolean errorflag = false;
         boolean errorflag = false;
         String errorMsg = "";
         String errorMsg = "";
         String token = plan.getName().split("-")[0];
         String token = plan.getName().split("-")[0];
+        if(null!=token&&token.equals("衍生计划")){
+            token = plan.getName().split("-")[1];
+        }
         String tokenInfo = "surl_token="+token;
         String tokenInfo = "surl_token="+token;
         String appType = plan.getAppType();
         String appType = plan.getAppType();
 
 

+ 4 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java

@@ -674,10 +674,10 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         ChromeOptions chromeOptions = new ChromeOptions();
         ChromeOptions chromeOptions = new ChromeOptions();
-//        chromeOptions.addArguments("--headless");
-//        chromeOptions.addArguments("--no-sandbox");
-//        chromeOptions.addArguments("--disable-dev-shm-usage");
-//        chromeOptions.addArguments("--disable-gpu");
+        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--no-sandbox");
+        chromeOptions.addArguments("--disable-dev-shm-usage");
+        chromeOptions.addArguments("--disable-gpu");
         chromeOptions.addArguments("--window-size=1920,1080");
         chromeOptions.addArguments("--window-size=1920,1080");
         chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
         chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
         chromeOptions.setAcceptInsecureCerts(true);
         chromeOptions.setAcceptInsecureCerts(true);