update:将飞书对接代码移动到对接模块中
This commit is contained in:
+6
-5
@@ -1,14 +1,15 @@
|
|||||||
package com.jero.modules.feishu.controller;
|
package com.jero.modules.docking.feishu.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.modules.feishu.dto.BotMessageDto;
|
import com.jero.modules.docking.feishu.dto.BotMessageDto;
|
||||||
import com.jero.modules.feishu.dto.InstanceDto;
|
import com.jero.modules.docking.feishu.dto.InstanceDto;
|
||||||
import com.jero.modules.feishu.service.IFeiShuDockingService;
|
import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
|
||||||
import com.jero.modules.feishu.vo.definition.ApprovalsDefinitionVo;
|
import com.jero.modules.docking.feishu.vo.definition.ApprovalsDefinitionVo;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.dto;
|
package com.jero.modules.docking.feishu.dto;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.dto;
|
package com.jero.modules.docking.feishu.dto;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+4
-4
@@ -1,10 +1,10 @@
|
|||||||
package com.jero.modules.feishu.service;
|
package com.jero.modules.docking.feishu.service;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.modules.feishu.dto.BotMessageDto;
|
import com.jero.modules.docking.feishu.dto.BotMessageDto;
|
||||||
import com.jero.modules.feishu.dto.InstanceDto;
|
import com.jero.modules.docking.feishu.dto.InstanceDto;
|
||||||
import com.jero.modules.feishu.vo.definition.ApprovalsDefinitionVo;
|
import com.jero.modules.docking.feishu.vo.definition.ApprovalsDefinitionVo;
|
||||||
|
|
||||||
public interface IFeiShuDockingService {
|
public interface IFeiShuDockingService {
|
||||||
|
|
||||||
+11
-10
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.service.impl;
|
package com.jero.modules.docking.feishu.service.impl;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
@@ -12,14 +12,14 @@ import com.jero.common.system.util.JwtUtil;
|
|||||||
import com.jero.common.system.vo.SysDictItemCore;
|
import com.jero.common.system.vo.SysDictItemCore;
|
||||||
import com.jero.common.util.RedisUtil;
|
import com.jero.common.util.RedisUtil;
|
||||||
import com.jero.common.util.oConvertUtils;
|
import com.jero.common.util.oConvertUtils;
|
||||||
import com.jero.modules.feishu.dto.BotMessageDto;
|
import com.jero.modules.docking.feishu.dto.BotMessageDto;
|
||||||
import com.jero.modules.feishu.dto.InstanceDto;
|
import com.jero.modules.docking.feishu.dto.InstanceDto;
|
||||||
import com.jero.modules.feishu.service.IFeiShuDockingService;
|
import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
|
||||||
import com.jero.modules.feishu.vo.bot.BotMessageVo;
|
import com.jero.modules.docking.feishu.vo.bot.BotMessageVo;
|
||||||
import com.jero.modules.feishu.vo.definition.*;
|
import com.jero.modules.docking.feishu.vo.definition.*;
|
||||||
import com.jero.modules.feishu.vo.instance.ApprovalsInstanceVo;
|
import com.jero.modules.docking.feishu.vo.instance.ApprovalsInstanceVo;
|
||||||
import com.jero.modules.feishu.vo.instance.InstanceLink;
|
import com.jero.modules.docking.feishu.vo.instance.InstanceLink;
|
||||||
import com.jero.modules.feishu.vo.instance.InstanceTask;
|
import com.jero.modules.docking.feishu.vo.instance.InstanceTask;
|
||||||
import com.jero.modules.system.entity.*;
|
import com.jero.modules.system.entity.*;
|
||||||
import com.jero.modules.system.service.*;
|
import com.jero.modules.system.service.*;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -35,6 +35,7 @@ import org.springframework.http.ResponseEntity;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
import org.springframework.web.util.UriComponentsBuilder;
|
import org.springframework.web.util.UriComponentsBuilder;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -570,7 +571,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String translateDictValue(String code, String text, String table, String key, List<com.jero.common.system.vo.SysDictItemCore> listDict) {
|
private String translateDictValue(String code, String text, String table, String key, List<SysDictItemCore> listDict) {
|
||||||
if (oConvertUtils.isEmpty(key)) {
|
if (oConvertUtils.isEmpty(key)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.bot;
|
package com.jero.modules.docking.feishu.vo.bot;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.definition;
|
package com.jero.modules.docking.feishu.vo.definition;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.definition;
|
package com.jero.modules.docking.feishu.vo.definition;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.definition;
|
package com.jero.modules.docking.feishu.vo.definition;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.definition;
|
package com.jero.modules.docking.feishu.vo.definition;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.definition;
|
package com.jero.modules.docking.feishu.vo.definition;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package com.jero.modules.feishu.vo.instance;
|
package com.jero.modules.docking.feishu.vo.instance;
|
||||||
|
|
||||||
import com.jero.modules.feishu.vo.definition.DefinitionI18nResources;
|
import com.jero.modules.docking.feishu.vo.definition.DefinitionI18nResources;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.instance;
|
package com.jero.modules.docking.feishu.vo.instance;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.jero.modules.feishu.vo.instance;
|
package com.jero.modules.docking.feishu.vo.instance;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
+1
-3
@@ -1,10 +1,8 @@
|
|||||||
package com.jero.modules.feishu.vo.instance;
|
package com.jero.modules.docking.feishu.vo.instance;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务列表
|
* 任务列表
|
||||||
*/
|
*/
|
||||||
Reference in New Issue
Block a user