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

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

+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

+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/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());
     }