修改事件推送接口;

修改算法库;
添加推送算法平台接口
master
吴顺杰 2 years ago
parent cdadc19726
commit 18bda31f1b

@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventAccess;
import com.ruoyi.pt.service.IBEventAccessService; import com.ruoyi.pt.service.IBEventAccessService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.pt.domain.BEventProgressPush; import com.ruoyi.pt.entity.BEventProgressPush;
import com.ruoyi.pt.service.IBEventProgressPushService; import com.ruoyi.pt.service.IBEventProgressPushService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.pt.entity.CaseInfo;
import com.ruoyi.pt.domain.CaseInfo;
import com.ruoyi.pt.service.ICaseInfoService; import com.ruoyi.pt.service.ICaseInfoService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pt.domain.Events; import com.ruoyi.pt.entity.Events;
import com.ruoyi.pt.service.EventsService; import com.ruoyi.pt.service.EventsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

@ -2,6 +2,7 @@ package com.ruoyi.pt.controller;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pt.service.CasesImportService;
import com.ruoyi.pt.service.RemoteCallsService; import com.ruoyi.pt.service.RemoteCallsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* *
@ -26,6 +28,9 @@ public class RemoteCallsController extends BaseController {
@Resource @Resource
private RemoteCallsService remoteCallsService; private RemoteCallsService remoteCallsService;
@Resource
private CasesImportService casesImportService;
/** /**
* accessToken * accessToken
* *
@ -49,4 +54,29 @@ public class RemoteCallsController extends BaseController {
remoteCallsService.imports(); remoteCallsService.imports();
return success(); return success();
} }
/**
* events_import
*
* @return
*/
@ApiOperation(value = "获取社会治理中心增量事件保存到events_import表")
@GetMapping("/getEventDate")
public AjaxResult getEventDate() {
remoteCallsService.getEventDate();
return success();
}
/**
*
*
* @return
*/
@ApiOperation(value = "算法处理所有数据")
@GetMapping("/urgentAlgorithm")
public AjaxResult urgentAlgorithm() {
List<String> list = casesImportService.findDate();
list.forEach(x -> remoteCallsService.urgentAlgorithm(x));
return success();
}
} }

@ -1,11 +1,9 @@
package com.ruoyi.pt.domain; package com.ruoyi.pt.entity;
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.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -85,7 +83,7 @@ public class BEventAccess implements Serializable {
* *
* yyyy-MM-dd HH:mm:ss * yyyy-MM-dd HH:mm:ss
*/ */
@Excel(name = "事件发⽣时间,格式为: yyyy-MM - dd HH:mm:ss") @Excel(name = "事件发⽣时间,格式为: yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "事件发⽣时间,格式为: yyyy-MM - dd HH:mm:ss") @ApiModelProperty(value = "事件发⽣时间,格式为: yyyy-MM - dd HH:mm:ss")
private String eventTime; private String eventTime;

@ -1,15 +1,12 @@
package com.ruoyi.pt.domain; package com.ruoyi.pt.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
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.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable; import java.io.Serializable;

@ -1,4 +1,4 @@
package com.ruoyi.pt.domain; package com.ruoyi.pt.entity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;

@ -0,0 +1,127 @@
package com.ruoyi.pt.entity;
import cn.hutool.core.annotation.Alias;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.pt.entity.response.CasesEventExtImportResponse;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* (CasesImport)
*
* @author wu
* @since 2023-12-26 10:40:44
*/
@ApiModel("CasesImport表实体类")
@TableName(value = "cases_import")
@Data
public class CasesImport implements Serializable {
private static final long serialVersionUID = 690827189481452659L;
/**
*
*/
@TableField(value = "innerEventId")
@Alias("innerEventIds")
private String innerEventId;
/**
*
*/
@TableField(value = "CASE_SERIAL")
@Alias("innerEventId")
private String caseSerial;
/**
*
*/
@TableField(value = "CASE_TYPE")
@Alias("msgTypeName")
private String caseType;
@TableField(exist = false)
@Alias("eventExt")
private String eventExt;
/**
*
*/
@TableField(value = "CASE_ACCORD")
@Alias("scenceTypeName")
private String caseAccord;
/**
*
*/
@TableField(value = "CASE_TITLE")
@Alias("title")
private String caseTitle;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "CASE_DATE")
@Alias("eventTime")
private Date caseDate;
/**
*
*/
@TableField(value = "CASE_CONTENT")
@Alias("content")
private String caseContent;
/**
*
*/
@TableField(value = "CASE_LNGLAT")
@Alias("eventCoordinate")
private String caseLnglat;
/**
*
*/
@TableField(value = "CASE_ADDRESS")
@Alias("eventPlaceName")
private String caseAddress;
/**
*
*/
@TableField(value = "IS_URGENT")
private Integer isUrgent;
/**
*
*/
@TableField(value = "CREATOR_NAME")
@Alias("eventCreator")
private String creatorName;
/**
*
*/
@TableField(value = "CREATOR_TEL")
@Alias("eventCreatorTel")
private String creatorTel;
/**
*
*/
@TableField(value = "ID")
@Alias("id")
@TableId
private String id;
}

@ -1,4 +1,4 @@
package com.ruoyi.pt.domain; package com.ruoyi.pt.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@ -98,5 +98,12 @@ public class Events implements Serializable {
@TableField(value = "relationNums") @TableField(value = "relationNums")
private String relationNums; private String relationNums;
/**
*
*/
@ApiModelProperty(value = "紧急概率")
@TableField(value = "urgentPercent")
private Float urgentPercent;
} }

@ -1,6 +1,5 @@
package com.ruoyi.pt.domain.dto; package com.ruoyi.pt.entity.dto;
import cn.hutool.core.annotation.Alias;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;

@ -0,0 +1,30 @@
package com.ruoyi.pt.entity.response;
import cn.hutool.core.annotation.Alias;
import lombok.Data;
import java.io.Serializable;
/**
* @author wu
* @since 2023/12/26 16:08
*/
@Data
public class CasesEventExtImportResponse implements Serializable {
private static final long serialVersionUID = -2836563404223704758L;
@Alias("eventCreator")
private String eventCreator;
@Alias("eventCreatorTel")
private String eventCreatorTel;
@Alias("scenceTypeName")
private String scenceTypeName;
@Alias("contentEncrypted")
private Boolean contentEncrypted;
@Alias("scenceType")
private String scenceType;
}

@ -1,4 +1,4 @@
package com.ruoyi.pt.domain.response; package com.ruoyi.pt.entity.response;
import lombok.Data; import lombok.Data;
@ -14,6 +14,8 @@ import java.io.Serializable;
public class RemoteCallsAccessTokenResponse implements Serializable { public class RemoteCallsAccessTokenResponse implements Serializable {
private static final long serialVersionUID = 651569707080963635L;
private String accessToken; private String accessToken;
private String tokenType; private String tokenType;

@ -1,4 +1,4 @@
package com.ruoyi.pt.domain.response; package com.ruoyi.pt.entity.response;
import lombok.Data; import lombok.Data;
@ -13,6 +13,8 @@ import java.io.Serializable;
@Data @Data
public class RemoteCallsResponse implements Serializable { public class RemoteCallsResponse implements Serializable {
private static final long serialVersionUID = 2791564077447430991L;
private Boolean success; private Boolean success;
private String errorCode; private String errorCode;

@ -0,0 +1,29 @@
package com.ruoyi.pt.entity.response;
import lombok.Data;
import java.io.Serializable;
/**
*
*
* @author wu
* @since 2023/12/15 23:49
*/
@Data
public class RemoteEventResponse implements Serializable {
private static final long serialVersionUID = 1483725724309018586L;
private Boolean success;
private String errorCode;
private String errorMsg;
private Object data;
private String requestId;
}

@ -3,7 +3,7 @@ package com.ruoyi.pt.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventAccess;
/** /**
* Mapper * Mapper

@ -3,8 +3,7 @@ package com.ruoyi.pt.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventProgressPush;
import com.ruoyi.pt.domain.BEventProgressPush;
/** /**
* Mapper * Mapper

@ -1,7 +1,7 @@
package com.ruoyi.pt.mapper; package com.ruoyi.pt.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.pt.domain.CaseInfo; import com.ruoyi.pt.entity.CaseInfo;
/** /**
* Mapper * Mapper

@ -0,0 +1,30 @@
package com.ruoyi.pt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.pt.entity.CasesImport;
import java.util.List;
/**
* (CasesImport)访
*
* @author wu
* @since 2023-12-26 10:40:44
*/
public interface CasesImportMapper extends BaseMapper<CasesImport> {
/**
* id
*
* @return
*/
Long findIdDesc();
/**
*
*
* @return
*/
List<String> findDate();
}

@ -1,7 +1,7 @@
package com.ruoyi.pt.mapper; package com.ruoyi.pt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.pt.domain.Events; import com.ruoyi.pt.entity.Events;
/** /**
* (Events)访 * (Events)访

@ -0,0 +1,43 @@
package com.ruoyi.pt.quartz;
import com.ruoyi.pt.service.RemoteCallsService;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
/**
*
*
* @author wu
* @since 2023/12/26 16:19
*/
@Component
@EnableAsync
public class PushQuartz {
@Resource
private RemoteCallsService remoteCallsService;
@Scheduled(cron = "0 0 1 * * * ?")
public void pushData() {
// 获取社会治理中心增量事件保存到events_import表
remoteCallsService.getEventDate();
// 获取昨天的数据
LocalDate localDate = LocalDate.now();
LocalDate yesterday = localDate.minusDays(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String yesterdayStr = yesterday.format(formatter);
// 紧急事件接口
remoteCallsService.urgentAlgorithm(yesterdayStr);
// 群体事件接口
remoteCallsService.groupAlgorithm();
// 同人事件接口
remoteCallsService.onepersonAlgorithm();
// 推送
remoteCallsService.imports();
}
}

@ -0,0 +1,30 @@
package com.ruoyi.pt.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.pt.entity.CasesImport;
import java.util.List;
/**
* (CasesImport)
*
* @author wu
* @since 2023-12-26 10:40:44
*/
public interface CasesImportService extends IService<CasesImport> {
/**
* id
*
* @return
*/
Long findIdDesc();
/**
*
*
* @return
*/
List<String> findDate();
}

@ -1,7 +1,7 @@
package com.ruoyi.pt.service; package com.ruoyi.pt.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.pt.domain.Events; import com.ruoyi.pt.entity.Events;
/** /**
* (Events) * (Events)

@ -3,7 +3,7 @@ package com.ruoyi.pt.service;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventAccess;
/** /**
* Service * Service

@ -3,8 +3,7 @@ package com.ruoyi.pt.service;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventProgressPush;
import com.ruoyi.pt.domain.BEventProgressPush;
/** /**
* Service * Service

@ -1,7 +1,7 @@
package com.ruoyi.pt.service; package com.ruoyi.pt.service;
import java.util.List; import java.util.List;
import com.ruoyi.pt.domain.CaseInfo; import com.ruoyi.pt.entity.CaseInfo;
/** /**
* Service * Service

@ -19,4 +19,25 @@ public interface RemoteCallsService {
* *
*/ */
void imports(); void imports();
/**
* events_import
*/
void getEventDate();
/**
*
* @param localDate yyyy-MM-dd
*/
void urgentAlgorithm(String localDate);
/**
*
*/
void groupAlgorithm();
/**
*
*/
void onepersonAlgorithm();
} }

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.pt.mapper.BEventAccessMapper; import com.ruoyi.pt.mapper.BEventAccessMapper;
import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.entity.BEventAccess;
import com.ruoyi.pt.service.IBEventAccessService; import com.ruoyi.pt.service.IBEventAccessService;
/** /**

@ -3,13 +3,10 @@ package com.ruoyi.pt.service.impl;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.pt.domain.BEventAccess;
import com.ruoyi.pt.mapper.BEventAccessMapper;
import com.ruoyi.pt.service.IBEventAccessService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.pt.mapper.BEventProgressPushMapper; import com.ruoyi.pt.mapper.BEventProgressPushMapper;
import com.ruoyi.pt.domain.BEventProgressPush; import com.ruoyi.pt.entity.BEventProgressPush;
import com.ruoyi.pt.service.IBEventProgressPushService; import com.ruoyi.pt.service.IBEventProgressPushService;
/** /**

@ -4,7 +4,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.pt.mapper.CaseInfoMapper; import com.ruoyi.pt.mapper.CaseInfoMapper;
import com.ruoyi.pt.domain.CaseInfo; import com.ruoyi.pt.entity.CaseInfo;
import com.ruoyi.pt.service.ICaseInfoService; import com.ruoyi.pt.service.ICaseInfoService;
/** /**

@ -0,0 +1,40 @@
package com.ruoyi.pt.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.pt.mapper.CasesImportMapper;
import com.ruoyi.pt.entity.CasesImport;
import com.ruoyi.pt.service.CasesImportService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (CasesImport)
*
* @author wu
* @since 2023-12-26 10:40:44
*/
@Service("casesImportService")
public class CasesImportServiceImpl extends ServiceImpl<CasesImportMapper, CasesImport> implements CasesImportService {
/**
* id
*
* @return
*/
@Override
public Long findIdDesc() {
return baseMapper.findIdDesc();
}
/**
*
*
* @return
*/
@Override
public List<String> findDate() {
return baseMapper.findDate();
}
}

@ -2,7 +2,7 @@ package com.ruoyi.pt.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.pt.mapper.EventsMapper; import com.ruoyi.pt.mapper.EventsMapper;
import com.ruoyi.pt.domain.Events; import com.ruoyi.pt.entity.Events;
import com.ruoyi.pt.service.EventsService; import com.ruoyi.pt.service.EventsService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

@ -1,14 +1,18 @@
package com.ruoyi.pt.service.impl; package com.ruoyi.pt.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.pt.domain.Events; import com.ruoyi.pt.entity.CasesImport;
import com.ruoyi.pt.domain.dto.RemoteCallsDTO; import com.ruoyi.pt.entity.Events;
import com.ruoyi.pt.domain.response.RemoteCallsResponse; import com.ruoyi.pt.entity.dto.RemoteCallsDTO;
import com.ruoyi.pt.entity.response.RemoteCallsResponse;
import com.ruoyi.pt.entity.response.RemoteEventResponse;
import com.ruoyi.pt.service.CasesImportService;
import com.ruoyi.pt.service.EventsService; import com.ruoyi.pt.service.EventsService;
import com.ruoyi.pt.service.RemoteCallsService; import com.ruoyi.pt.service.RemoteCallsService;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -18,6 +22,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -46,6 +52,9 @@ public class RemoteCallsServiceImpl implements RemoteCallsService {
@Resource @Resource
private EventsService eventsService; private EventsService eventsService;
@Resource
private CasesImportService casesImportService;
/** /**
* map * map
* *
@ -70,7 +79,6 @@ public class RemoteCallsServiceImpl implements RemoteCallsService {
Map<String, Object> form = getMapValue(); Map<String, Object> form = getMapValue();
String body = HttpRequest.post(url + "/auth/oauth/token").form(form).execute().body(); String body = HttpRequest.post(url + "/auth/oauth/token").form(form).execute().body();
RemoteCallsResponse res = JSONUtil.toBean(body, RemoteCallsResponse.class); RemoteCallsResponse res = JSONUtil.toBean(body, RemoteCallsResponse.class);
log.info(body);
return res.getData().getAccessToken(); return res.getData().getAccessToken();
} }
@ -84,7 +92,19 @@ public class RemoteCallsServiceImpl implements RemoteCallsService {
Page<Events> page = new Page<>(1, 100); Page<Events> page = new Page<>(1, 100);
// 创建查询条件 // 创建查询条件
QueryWrapper<Events> queryWrapper = new QueryWrapper<>(); QueryWrapper<Events> queryWrapper = new QueryWrapper<>();
queryWrapper.isNotNull("innerEventId").and(wrapper -> wrapper.ne("innerEventId", "")); // 获取昨天的日期
LocalDate localDate = LocalDate.now();
LocalDate yesterday = localDate.minusDays(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String yesterdayStr = yesterday.format(formatter);
queryWrapper.isNotNull("innerEventId")
.and(wrapper -> wrapper.ne("innerEventId", ""))
.and(wrapper -> wrapper.gt("eventTime", yesterdayStr))
.and(wrapper -> wrapper
.nested(i -> i.eq("scenceType", "3").gt("urgentPercent", 0.994))
.or()
.ne("scenceType", "3")
);
// 创建SimpleDateFormat对象指定日期格式为yyyy-MM-dd HH:mm:ss // 创建SimpleDateFormat对象指定日期格式为yyyy-MM-dd HH:mm:ss
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 循环获取所有数据 // 循环获取所有数据
@ -102,11 +122,7 @@ public class RemoteCallsServiceImpl implements RemoteCallsService {
x.setEventTime(eventTime); x.setEventTime(eventTime);
}); });
String jsonStr = JSONUtil.toJsonStr(dtos); String jsonStr = JSONUtil.toJsonStr(dtos);
String body = HttpRequest.post(url + "/gateway/event/event/eventData/imports") String body = HttpRequest.post(url + "/gateway/event/event/eventData/imports").header("Authorization", "Bearer " + accessToken).body(jsonStr).execute().body();
.header("Authorization", "Bearer " + accessToken)
.body(jsonStr)
.execute().body();
log.info(body);
// 判断是否还有下一页 // 判断是否还有下一页
if (dataPage.getPages() > dataPage.getCurrent()) { if (dataPage.getPages() > dataPage.getCurrent()) {
// 设置下一页的页码 // 设置下一页的页码
@ -117,4 +133,74 @@ public class RemoteCallsServiceImpl implements RemoteCallsService {
} }
} }
/**
* events_import
*/
@Override
public void getEventDate() {
Long id = casesImportService.findIdDesc();
if (id == null) {
id = 0L;
}
saveDate(id);
}
/**
*
*
* @param localDate yyyy-MM-dd
*/
@Override
public void urgentAlgorithm(String localDate) {
Map<String, Object> body = new HashMap<>();
body.put("data", localDate);
String bodyStr = JSONUtil.toJsonStr(body);
HttpRequest.post("http://localhost:9003/urgent_algorithm").body(bodyStr).execute().body();
log.info(localDate);
}
/**
*
*/
@Override
public void groupAlgorithm() {
Map<String, Object> body = new HashMap<>();
body.put("data", 3);
String bodyStr = JSONUtil.toJsonStr(body);
HttpRequest.post("http://localhost:9003/group_algorithm").body(bodyStr).execute().body();
}
/**
*
*/
@Override
public void onepersonAlgorithm() {
Map<String, Object> body = new HashMap<>();
body.put("data", 30);
String bodyStr = JSONUtil.toJsonStr(body);
HttpRequest.post("http://localhost:9003/oneperson_algorithm").body(bodyStr).execute().body();
}
/**
* events_import
*
* @param id id
*/
public void saveDate(Long id) {
Map<String, Object> form = new HashMap<>();
form.put("id", id);
form.put("size", 5000);
String body = HttpRequest.get(url + "/event/event/getEventAddListById").form(form).execute().body();
RemoteEventResponse res = JSONUtil.toBean(body, RemoteEventResponse.class);
Map<String, Object> map = JSONUtil.parseObj(res.getData());
Object records = map.get("records");
String recordsStr = JSONUtil.toJsonStr(records);
List<CasesImport> list = JSONUtil.toList(recordsStr, CasesImport.class);
if (CollectionUtil.isNotEmpty(list)) {
casesImportService.saveBatch(list);
id = casesImportService.findIdDesc();
saveDate(id);
}
}
} }

@ -10,7 +10,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/public_platform?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/eventanalyticsdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: 123456 password: 123456
# 从库数据源 # 从库数据源

@ -36,6 +36,7 @@ logging:
level: level:
com.ruoyi: debug com.ruoyi: debug
org.springframework: warn org.springframework: warn
com.ruoyi.pt.mapper: warn
# 用户配置 # 用户配置
user: user:
@ -102,7 +103,7 @@ token:
# MyBatis配置 # MyBatis配置
mybatis-plus: mybatis-plus:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.entity
# 配置mapper的扫描找到所有的mapper.xml映射文件 # 配置mapper的扫描找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件
@ -128,7 +129,7 @@ xss:
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*
remote: remote:
url: http://4.15.24.101:10443 url: https://4.15.24.101:10443
appKey: 7ae6c089a348b3565af38313f5610968 appKey: 7ae6c089a348b3565af38313f5610968
appSecret: 633e549c5b382cb8da14e36d9eeca3bc appSecret: 633e549c5b382cb8da14e36d9eeca3bc
grantType: client_credentials grantType: client_credentials

@ -0,0 +1,21 @@
<?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="com.ruoyi.pt.mapper.CasesImportMapper">
<select id="findIdDesc" resultType="java.lang.Long">
select id from cases_import
order by id desc limit 1
</select>
<select id="findDate" resultType="java.lang.String">
SELECT DISTINCT
DATE_FORMAT( case_date, '%Y-%m-%d' ) AS formattedDate
FROM
cases_import
ORDER BY
formattedDate;
</select>
</mapper>
Loading…
Cancel
Save