Skip to content

M
map-parent
Commit 2e8685b6 by 宋珺琪
Options

寄递bug处理、出入境分析和房屋档案的添加(内蒙）

parent 3038344d
Showing with 230 additions and 35 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/kshEntity/KshServiceCache.java
......@@ -70,7 +70,7 @@ public class KshServiceCache implements Serializable {
private int pageSize;
@ApiModelProperty(value = "导出时间格式转换备用字段")
@ApiModelProperty(value = "导出时间格式转换备用字段/节点个数")
@TableField(exist = false)
private String byzd1;
}
common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ParamsEntity/NmDataEnum.java
......@@ -15,7 +15,10 @@ public enum NmDataEnum {
GET_MYJYDAXXSJHM("/001/005", MyJyDaxx.class),// 教育档案
GET_MYAJDAXX("/001/006", MyAjDaxx.class),// 案件档案
GET_MYAJDAXXAll("/001/006", MyAjDaxxAll.class),// 案件档案案件信息
GET_MYWPDAXX("/001/003", com.founder.api.moudles.MeiyaInterface.model.MyWpDaxx.class);// 物品档案
GET_MYWPDAXX("/001/003", com.founder.api.moudles.MeiyaInterface.model.MyWpDaxx.class),// 物品档案
GET_CRJFX("/006/004", CrjfxResult.class),// 出入境分析
GET_FWDAXX("/001/004", FwdaResult.class);// 房屋档案
private final String url;
......
common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ResultEntity/CrjfxResult.java 0 → 100644
package com.founder.commonutils.model.nmDataEntity.ResultEntity;
import com.founder.commonutils.model.nmDataEntity.ParamsEntity.NmEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 出入境分析
*/
@Data
public class CrjfxResult extends NmEntity {
@ApiModelProperty(value = "证件类型")
private String ZJLX;
@ApiModelProperty(value = "证件类型名称")
private String ZJLXMC;
@ApiModelProperty(value = "证件号码")
private String ZJHM;
@ApiModelProperty(value = "出入境标识")
private String CRJBZ;
@ApiModelProperty(value = "出境时间")
private String CJSJ;
@ApiModelProperty(value = "停留有效期")
private String TLYXQ;
@ApiModelProperty(value = "出入境人员类别")
private String CRJRYLB;
@ApiModelProperty(value = "目的地")
private String MDD;
@ApiModelProperty(value = "信息登记时间")
private String XXDJSJ;
@ApiModelProperty(value = "出入境证件类型")
private String CRJZJLX;
@ApiModelProperty(value = "出入境证件号码")
private String CRJZJHM;
}
common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ResultEntity/FwdaResult.java 0 → 100644
package com.founder.commonutils.model.nmDataEntity.ResultEntity;
import com.founder.commonutils.model.nmDataEntity.ParamsEntity.NmEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 房屋档案
*/
@Data
public class FwdaResult extends NmEntity {
@ApiModelProperty(value = "地址ID")
private String DZID;
@ApiModelProperty(value = "证件号码")
private String ZJHM;
@ApiModelProperty(value = "手机号码")
private String SJHM;
@ApiModelProperty(value = "姓名")
private String NM;
@ApiModelProperty(value = "地址")
private String DZ;
@ApiModelProperty(value = "最小时间")
private String SJ_MIN;
@ApiModelProperty(value = "最大时间")
private String SJ_MAX;
@ApiModelProperty(value = "楼房_小区名称")
private String CSSQ;
@ApiModelProperty(value = "楼房_楼栋号")
private String CSLD;
@ApiModelProperty(value = "楼房_单元号")
private String CSDY;
@ApiModelProperty(value = "楼房_门牌号")
private String CSMPH;
@ApiModelProperty(value = "经度")
private String LON;
@ApiModelProperty(value = "纬度")
private String LAT;
@ApiModelProperty(value = "省份区划")
private String SFQH;
@ApiModelProperty(value = "省份区划名称")
private String SFQHMC;
@ApiModelProperty(value = "疑似搬离")
private String YDBL;
@ApiModelProperty(value = "疑似搬入")
private String YSBR;
}
common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java
......@@ -158,7 +158,10 @@ public class SysLogAspect {
try {
result = proceedingJoinPoint.proceed();
if (!StringUtils.isEmpty(result)) {
sysLog.setContent(result.toString());
//如果是 多维情报_查询可视化服务列表信息的返回参数的话 设置为null 数据太多容易报错
if (request.getRequestURL().toString().contains("/KshService/queryKshCache")){
sysLog.setContent(null);
}else sysLog.setContent(result.toString());
}
} catch (
Throwable throwable) {
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/CenterMyController.java
......@@ -14,9 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
/**
......@@ -89,4 +88,44 @@ public class CenterMyController {
}
}
@PostMapping(value = "/006/004")
@OperLog(czxxLbdm = "01" , yymcJyqk = "0206",czxxJyqk = "出入境分析")
@ApiOperation(value = "出入境分析")
public MapRestResult center_new006004(HttpServletRequest request,String sfzh) {
//时间写死 当前时间的前一年时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar c = Calendar.getInstance();
c.setTime(new Date());
Date end = c.getTime();
String dqrq= format.format(end);//当前日期
c.add(Calendar.YEAR, -1);
Date start = c.getTime();
String startDay = format.format(start);//前一年
Map map1 = new HashMap();
MyRequestParams myRequestParams = new MyRequestParams();
myRequestParams.setFrequency("1");
myRequestParams.setSfzh(sfzh);
myRequestParams.setTimeStart(startDay);
myRequestParams.setTimeEnd(dqrq);
Map<String, Object> myResultMap = nmDataUtil.getDataOfResult(request, NmDataEnum.GET_CRJFX,JSONObject.parseObject(JSONObject.toJSONString(myRequestParams)));
map1.put("data",myResultMap.get("rows"));
return MapRestResult.build(200, "ok", 1, map1);
}
@PostMapping(value = "/001/004")
@OperLog(czxxLbdm = "01" , yymcJyqk = "0206",czxxJyqk = "房屋档案")
@ApiOperation(value = "房屋档案")
public MapRestResult center_new001004(HttpServletRequest request, String sfzh) {
Map map1 = new HashMap();
MyRequestParams myRequestParams = new MyRequestParams();
myRequestParams.setSfzh(sfzh);
Map<String, Object> myResultMap = nmDataUtil.getDataOfResult(request, NmDataEnum.GET_FWDAXX,JSONObject.parseObject(JSONObject.toJSONString(myRequestParams)));
map1.put("data",myResultMap.get("rows"));
return MapRestResult.build(200, "ok", 1, map1);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java
......@@ -919,35 +919,44 @@ public class KshSlServiceController {
//获取jdInfo 酒店信息
JSONArray jdInfo = arr.getJSONArray("jdInfo");
// String[] strarray1 = String.valueOf(jdInfo.getJSONObject(0)).split(","); //遇到逗号就分割
String zzsj = arr.getString("zzsj");//最早关系构造时间
String zjsj = arr.getString("zjsj"); //最近关系构建时间
for (int j = 0; j < jdInfo.size(); j++) {
if (jdInfo.size()>0){
for (int j = 0; j < jdInfo.size(); j++) {
JSONObject arr1 = jdInfo.getJSONObject(i);
String companyId = arr1.getString("companyId");//酒店编码
//nodes
HnTbStRygxDTO mergeDTOgjd = node(companyId+zjhm, xm +"\n"+ zjhm, "idcard", getPhoto(zjhm, request).get("photo"), null);
nodes.add(mergeDTOgjd);
sumup.add(companyId+zjhm);
JSONObject arr1 = jdInfo.getJSONObject(j);
String companyId = arr1.getString("companyId");//酒店编码
//nodes
HnTbStRygxDTO mergeDTOgjd = node(zjhm, xm +"\n"+ zjhm, "idcard", getPhoto(zjhm, request).get("photo"), null);
nodes.add(mergeDTOgjd);
sumup.add(zjhm);
HnTbStRygxDTO mergeDTOgjd1 = node(companyId, companyId, "other",null, null);
nodes.add(mergeDTOgjd1);
sumup.add(companyId);
HnTbStRygxDTO mergeDTOgjd1 = node(companyId, companyId, "other",null, null);
nodes.add(mergeDTOgjd1);
sumup.add(companyId);
//根节点指向酒店信息
kshlinks link = link(tzgxEntity.getObjNum(), companyId, "", zjsj, tzgxEntity.getObjNum(), "idcard", companyId, "other", "科兴", "同住关系", zjsj);
re.add(link);
//酒店指向zjhm
kshlinks link1 = link(companyId, companyId+zjhm, gx+":"+count + "次"+ zjsj, zjsj, companyId, "other", zjhm, "idcard", "科兴", "同住关系", zjsj);
re.add(link1);
//根节点指向酒店信息
kshlinks link = link(tzgxEntity.getObjNum(), companyId, "", zjsj, tzgxEntity.getObjNum(), "idcard", companyId, "other", "科兴", "同住关系", zjsj);
re.add(link);
//酒店指向zjhm
kshlinks link1 = link(companyId, zjhm, gx+":"+count + "次"+ zjsj, zjsj, companyId, "other", zjhm, "idcard", "科兴", "同住关系", zjsj);
re.add(link1);
}
}
}
kshdata.setNodes(nodes);
kshdata.setLinks(re);
dataSumup.setList(sumup);
//对nodes去重
ArrayList<HnTbStRygxDTO> collect1 = nodes.stream().
collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(HnTbStRygxDTO::getId))), ArrayList::new));
kshdata.setNodes(collect1);
//对links去重
ArrayList<kshlinks> collect2 = re.stream()
.collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getSource() + ";" + o.getTarget()))), ArrayList::new));
kshdata.setLinks(collect2);
//对sumup去重
List<String> collect = sumup.stream().distinct().collect(Collectors.toList());
dataSumup.setList(collect);
dataSumup.setName("同住关系");
result.setKshdata(kshdata);
result.setDataSumup(dataSumup);
......@@ -1677,7 +1686,12 @@ public class KshSlServiceController {
//分组 取通话次数最多的
Map<String, List<TlfxResult.PageData>> collect = objects.stream().collect(Collectors.groupingBy(TlfxResult.PageData::getAnotherPhone));
Set<String> strings = collect.keySet();
//分组后降序
LinkedHashMap<String, List<TlfxResult.PageData>> collect1 = collect.entrySet().stream()
.sorted(Comparator.comparing((Map.Entry<String, List<TlfxResult.PageData>> e) -> e.getValue().size()).reversed())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
(v1, v2) -> v1, LinkedHashMap::new));
Set<String> strings = collect1.keySet();
//获取前五个通话次数最多的
int j =0;
......@@ -1771,14 +1785,15 @@ public class KshSlServiceController {
List<String> sumup = new ArrayList<>();
List<HnTbStRygxDTO> nodes = new ArrayList<>();
List<kshlinks> re = new ArrayList<>();
System.out.println("寄递分析看这里+++++++++++++++++================"+objects);
/* //根据手机号去重
ArrayList<JdfxResult.RealDataMaplist> collect =
objects.stream().collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(JdfxResult.RealDataMaplist::getReph))), ArrayList::new));*/
if (objects.size()>0){
//根据手机分组
Map<String, List<JdfxResult.RealDataMaplist>> collect1 = objects.stream().collect(Collectors.groupingBy(JdfxResult.RealDataMaplist::getReph));
//根据收件者手机号码分组
Map<String, List<JdfxResult.RealDataMaplist>> collect1 = objects.stream().filter(s->StringUtils.isNotEmpty(s.getReph())).collect(Collectors.groupingBy(JdfxResult.RealDataMaplist::getReph));
Set<String> strings = collect1.keySet();
int i =0;
for (String string : strings) {
......@@ -1791,7 +1806,7 @@ public class KshSlServiceController {
HnTbStRygxDTO node = node(reph, rece+"\n"+reph, "sjk", null, null);
nodes.add(node);
sumup.add(reph);
kshlinks link = link(jdfxEntity.getSjh(), reph, fitm, fitm, jdfxEntity.getSjh(), "sjk", reph, "sjk", "科兴", "寄递分析", fitm);
kshlinks link = link(jdfxEntity.getSjh(), reph, "寄件"+fitm, fitm, jdfxEntity.getSjh(), "sjk", reph, "sjk", "科兴", "寄递分析", fitm);
re.add(link);
i=i+1;
}
......@@ -1799,9 +1814,31 @@ public class KshSlServiceController {
break;
}
}
// 根据寄件者手机分组
Map<String, List<JdfxResult.RealDataMaplist>> collect3 = objects.stream().filter(s->StringUtils.isNotEmpty(s.getSeph())).collect(Collectors.groupingBy(JdfxResult.RealDataMaplist::getSeph));
Set<String> strings3 = collect3.keySet();
int q =0;
for (String string : strings3) {
if (!sumup.contains(string) && !string.equals(sjh)){
// String reph = collect1.get(string).get(0).getReph();//收件者手机号码
String seph = collect3.get(string).get(0).getSeph();//寄件者手机号
String rece = collect3.get(string).get(0).getRece(); //收件者名称
String fitm = collect3.get(string).get(0).getFitm(); //首次发现时间
String dvnm = collect3.get(string).get(0).getDvnm();//快递单号
HnTbStRygxDTO node = node(seph, getXm(seph,request)+"\n"+seph, "sjk", null, null);
nodes.add(node);
sumup.add(seph);
kshlinks link = link(jdfxEntity.getSjh(), seph, "收件"+fitm, fitm, jdfxEntity.getSjh(), "sjk", seph, "sjk", "科兴", "寄递分析", fitm);
re.add(link);
q=q+1;
}
if (q==5){
break;
}
}
//根据地址分组
Map<String, List<JdfxResult.RealDataMaplist>> collect2 = objects.stream().collect(Collectors.groupingBy(JdfxResult.RealDataMaplist::getRead));
/* //根据地址分组
Map<String, List<JdfxResult.RealDataMaplist>> collect2 = objects.stream().filter(s->StringUtils.isNotEmpty(s.getRead())).collect(Collectors.groupingBy(JdfxResult.RealDataMaplist::getRead));
Set<String> strings1 = collect2.keySet();
int j =0;
for (String string : strings1) {
......@@ -1821,8 +1858,7 @@ public class KshSlServiceController {
if (j==5){
break;
}
}
}*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
dataSumup.setList(sumup);
......@@ -2329,7 +2365,7 @@ public class KshSlServiceController {
public String RYDA = "http://26.13.101.72:8999/center_new/001/001";
//获取照片
//根据身份证获取照片
public Map<String, String> getPhoto(String zjhm, HttpServletRequest request) {
Map<String, String> map = new HashMap<>();
SysUser sysUser = (SysUser) request.getAttribute("user");
......@@ -2370,6 +2406,34 @@ public class KshSlServiceController {
}
//根据手机号获取姓名
public String getXm(String sjh, HttpServletRequest request) {
Map<String, String> map = new HashMap<>();
SysUser sysUser = (SysUser) request.getAttribute("user");
map.put("number", sjh);
map.put("type", "01");
map.put("qqyhm", sysUser.getTrueName());
map.put("qqrsfzh", sysUser.getIdentitycard());
map.put("qqip", NetworkUtil.getIpAddr(request));
String s = null;
try {
s = HttpUtil.doPost(WPDA, map, getToken(request));
JSONObject object = JSONObject.parseObject(s);
String xm="";
//获取data数组
JSONArray data = object.getJSONArray("data");
if (data.size()>0){
JSONObject arr = data.getJSONObject(0);
xm = arr.getString("XM");
}
return xm;
} catch (Exception e) {
e.printStackTrace();
return "";
}
}
@OperLog(message = "获取案件名称", operation = OperationType.QUERY)
@PostMapping("/getAjnam")
......
service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/KshServiceController.java
......@@ -490,6 +490,8 @@ public class KshServiceController extends ApiController {
listResult.stream().forEach(q->{
q.setKshdata(JSON.parseObject(q.getKshdataString(), KsjResultPojo.class));
q.setByzd1(String.valueOf(q.getKshdata().getNodes().size()));
});
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
......
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