zhongrj
2023-06-05 bdf552ba7e1d435f8e37e4ac19cc1985dc9e8caf
feign 调用数据返回类型修改
5 files modified
20 ■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClient.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClientFallback.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallImplImplClient.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClient.java
@@ -29,7 +29,7 @@
     * @return
     */
    @GetMapping(CREATE_OUT_CALL_TASK_JOB_HANDLER)
    Object createOutCallTaskJobHandler(@RequestParam("isOver") String isOver,
    String createOutCallTaskJobHandler(@RequestParam("isOver") String isOver,
                                               @RequestParam("taskScheduleTime") String taskScheduleTime,
                                               @RequestParam("personNumber") String personNumber,
                                               @RequestParam("day") String day);
@@ -43,7 +43,7 @@
     * @return
     */
    @GetMapping(TEST_OUT_CALL)
    Object testOutCall(@RequestParam("isOver") String isOver,
    String testOutCall(@RequestParam("isOver") String isOver,
                       @RequestParam("taskScheduleTime") String taskScheduleTime,
                       @RequestParam("personNumber") String personNumber,
                       @RequestParam("day") String day);
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClientFallback.java
@@ -10,12 +10,12 @@
@Component
public class OutCallClientFallback implements OutCallClient {
    @Override
    public Object createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
        return null;
    }
    @Override
    public Object testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
        return null;
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallImplImplClient.java
@@ -25,7 +25,7 @@
    @Override
    @GetMapping(CREATE_OUT_CALL_TASK_JOB_HANDLER)
    public Object createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
        Map<String, Object> map = new HashMap<>();
        map.put("isOver",isOver);
        map.put("taskScheduleTime",taskScheduleTime);
@@ -44,7 +44,7 @@
     * @return
     */
    @Override
    public Object testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
        Map<String, Object> map = new HashMap<>();
        map.put("isOver",isOver);
        map.put("taskScheduleTime",taskScheduleTime);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java
@@ -15,7 +15,7 @@
     * @param map
     * @return
     */
    Object createTask(Map<String,Object> map);
    String createTask(Map<String,Object> map);
    /**
     * 获取通话详情
@@ -67,5 +67,5 @@
     * @param params
     * @return
     */
    Object createCallTaskByParam(Map<String, Object> params);
    String createCallTaskByParam(Map<String, Object> params);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -69,7 +69,7 @@
     * @return
     */
    @Override
    public Object createTask(Map<String,Object> map) {
    public String createTask(Map<String,Object> map) {
        List<Map<String, String>> params = (List<Map<String, String>>) map.get("list");
        String requestUrl = url + CREATE_TASK_URL;
        LocalDateTime now = LocalDateTime.now();
@@ -320,7 +320,7 @@
     * @return
     */
    @Override
    public Object createCallTaskByParam(Map<String, Object> params) {
    public String createCallTaskByParam(Map<String, Object> params) {
        // 自动创建任务的 4个条件  1:呼叫人数  2:调度时间  3:是否超汛限  4:多少天内呼叫过的不呼叫(天数)
        //1. 调用中台接口查询出所有需要发任务的水库巡查责任人相关信息(该处需要将是否超汛限条件传入)
        JSONArray jsonArray = getZtWaterMangerData(params);