Commit a3e34900 by yangyang

快手接口(湖南)

parent 403303fb
package com.founder.commonutils.model.newPublicEntity;
package com.founder.commonutils.model.newPublicEntity.trailEntity;
......@@ -19,6 +19,8 @@ import lombok.Data;
@SuppressWarnings("serial")
@TableName("tb_yw_dzqq_kuaishou_active_info")
public class TbYwDzqqKuaishouActiveInfo{
@ApiModelProperty(value = "主键编号")
private String xxzjbh;
/**
* 活动时间
*/
......
package com.founder.commonutils.model.newPublicEntity.trailEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* (tb_yw_dzqq_kuaishou_info)表实体类
*
* @author yy
* @since 2023-03-02
*/
@Data
@SuppressWarnings("serial")
@TableName("tb_yw_dzqq_kuaishou_info")
public class TbYwDzqqKuaishouInfo {
@ApiModelProperty(value = "快手手机号")
private String phoneNumber;
@ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "用户证件号")
private String identitycard;
@ApiModelProperty(value = "快手号")
private String kwaiNumber;
@ApiModelProperty(value = "用户名")
private String userName;
@ApiModelProperty(value = "真实姓名")
private String realName;
}
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.TbYwDzqqKuaishouActiveInfo;
import com.founder.commonutils.model.newPublicEntity.trailEntity.TbYwDzqqKuaishouActiveInfo;
import com.founder.commonutils.model.vo.param.SkTrailParam;
import com.founder.commonutils.model.vo.param.SkTrailSaveParam;
import com.founder.commonutils.model.vo.response.SkTrailVO;
......@@ -244,6 +244,8 @@ public class SkTrailController extends ApiController implements ExcelControllerI
map = interfaceAPI.getJdcGjNaotu(sktrailParam.getLikeValue(),sktrailParam.getKssj(),sktrailParam.getJssj(),sktrailParam.getPage(),sktrailParam.getPageSize());
list = (List<SkTrailVO>) map.get("rows");
return new MapRestResult(200, "OK", map.get("total"), list);
}else if(sktrailParam.getLikeField().equals("ksgj")){
list = interfaceAPI.getKsgjXx(sktrailParam.getLikeValue(),sktrailParam.getKssj(),sktrailParam.getJssj(),sktrailParam.getPage(),sktrailParam.getPageSize());
}
}catch (Exception e){
return new MapRestResult(201, "error", list.size(),e);
......
......@@ -4,16 +4,19 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.founder.commonutils.model.newPublicEntity.*;
import com.founder.commonutils.model.newPublicEntity.trailEntity.TbYwDzqqKuaishouActiveInfo;
import com.founder.commonutils.model.vo.response.SkTrailVO;
import com.founder.commonutils.util.*;
import com.founder.publicapi.mapper.mysqlMapper.KsInfoTrailMapper;
import com.founder.publicapi.mapper.mysqlMapper.KsTrailMapper;
import com.founder.publicapi.mapper.mysqlMapper.SkTrailMapper;
import com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper;
import com.founder.publicapi.service.SkPointlocationService;
import lombok.SneakyThrows;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
......@@ -52,6 +55,11 @@ public class InterfaceAPI {
private RestTemplate restTemplate;
@Autowired
private SkTrailMapper skTrailMapper;
@Autowired
private KsTrailMapper ksTrailMapper;
@Autowired
private KsInfoTrailMapper ksInfoTrailMapper;
/**
* 获取民航进出港信息
*
......@@ -910,6 +918,69 @@ public class InterfaceAPI {
}
/**
* 获取寄递信息
*
* @param sjhm
* @param page
* @param rows
* @return
*/
public List<SkTrailVO> getKsgjXx(String sjhm, String startDate,
String endDate,
@RequestParam(value = "page",
defaultValue = "1") int page,
@RequestParam(value = "rows",
defaultValue = "1000") int rows) {
List<SkTrailVO> listResult = new ArrayList<>();
// 去kuaishou_info表中匹配通过手机号匹配到userid
QueryWrapper queryWrapperInfo = new QueryWrapper();
queryWrapperInfo.like(StringUtils.isNotEmpty(sjhm),"phone_number",sjhm);
String userId = ksInfoTrailMapper.selectOne(queryWrapperInfo).getUserId();
List<TbYwDzqqKuaishouActiveInfo> listAll = new ArrayList<>();
if(StringUtils.isNotBlank(userId)){
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("user_id", userId);
queryWrapper.ge("str_to_date(active_time,'%Y-%m-%d %H:%i:%s')", startDate);
queryWrapper.le("str_to_date(active_time,'%Y-%m-%d %H:%i:%s')", endDate);
queryWrapper.orderByDesc("active_time");
listAll = ksTrailMapper.selectList(queryWrapper);
}
// 返回数据与前端一致
List<SkTrail> points = new ArrayList<>();
listAll.stream().forEach(p->{
if(StringUtils.isNotBlank(p.getLongitudeLatitude())){
// 经纬度处理
String xy[] = p.getLongitudeLatitude().split(",");
SkTrail skTrailDa = new SkTrail();
skTrailDa.setX(xy[0]);
skTrailDa.setY(xy[1]);
skTrailDa.setXxzjbh(p.getXxzjbh());
skTrailDa.setAddress(p.getActiveLocation());
skTrailDa.setTime(DateUtil.getTimeStamp(p.getActiveTime()));
skTrailDa.setDate(p.getActiveTime());
skTrailDa.setObjecttype("ksgj");
skTrailDa.setObjectname("快手轨迹");
skTrailDa.setObjectvalue(sjhm);
skTrailDa.setStatus("1");
points.add(skTrailDa);
}
});
if(points.size()>0){
SkTrailVO skTrailVO = new SkTrailVO();
skTrailVO.setObjectvalue(sjhm);
skTrailVO.setObjecttype("ksgj");
skTrailVO.setObjectname("快手轨迹");
skTrailVO.setKssj(startDate);
skTrailVO.setJssj(endDate);
skTrailVO.setPoints(points);
listResult.add(skTrailVO);
}
return listResult;
}
/**
* 功能描述: JSONArray根据时间字段排序
* @author FengChaoTao
* @date 2022/4/6 18:06
......
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.trailEntity.TbYwDzqqKuaishouInfo;
import org.springframework.stereotype.Component;
/**
* (TbYwDzqqKuaishouActiveInfo)表数据库访问层
*
* @author yy
* @since 2022-02-21
*/
@Component
public interface KsInfoTrailMapper extends BaseMapper<TbYwDzqqKuaishouInfo> {
}
......@@ -2,7 +2,7 @@ package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.TbYwDzqqKuaishouActiveInfo;
import com.founder.commonutils.model.newPublicEntity.trailEntity.TbYwDzqqKuaishouActiveInfo;
import org.springframework.stereotype.Component;
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment