新增用地预审与选址统计和台账查询接口

src/main/java/com/chinadci/neo4j/controller/IndexStatisticsController.java

@@ -51,6 +51,19 @@ public class IndexStatisticsController {
     }
 
 
+    @ApiOperation(value = "建设项目用地预审与选址意见书统计分析及业务台账查询接口")
+    @PostMapping("/ysxz/analysis")
+    public ServiceResult getYsxzAnalysis(
+            @RequestParam(name = "address",required = false) @ApiParam(value = "指标值查询地址") String address,
+            @RequestParam(name = "test",required = false) @ApiParam(value = "是否测试") boolean test,
+            @RequestParam(name = "type",required = false)@ApiParam(value = "分析类型：1统计分析；2业务台账") Integer type,
+            @RequestBody() @ApiParam(value = "查询参数",required = true)ParamNode paramNode,
+            PageableRequest pageableRequest
+    ) {
+        return indexService.getYsxzAnalysis(address,paramNode,test,type,pageableRequest);
+    }
+
+
 
 //    @ApiOperation(value = "统计分析-总览情况")
 //    @PostMapping("/jsyd/analysis/overview")

src/main/java/com/chinadci/neo4j/dao/dataObject/ParamNode.java

@@ -24,10 +24,94 @@ public class ParamNode {
     private String xmmc;
     private String pzwh;
     private String ydlx;
-    private String dimajspzt;
+    private String spjb;
+//    案件审批状态
+    private String dim_ajspzt;
 
     private String xzjsydzblx;
 
+//    项目类型
+    private String hyfl;
+
+//    办理情形
+    private String sbslxx_blqxing;
+
+//    案卷编号
+    private String sxjbxx_ajbh;
+//    项目名称
+    private String sxjbxx_xmmc;
+//    预审批准文号
+    private String bjxx_yswh_zg;
+
+//    预审办理阶段
+    private String sbslxx_ysbljd;
+
+    private String dim_ajzt;
+
+    public String getSpjb() {
+        return spjb;
+    }
+
+    public void setSpjb(String spjb) {
+        this.spjb = spjb;
+    }
+
+    public String getHyfl() {
+        return hyfl;
+    }
+
+    public void setHyfl(String hyfl) {
+        this.hyfl = hyfl;
+    }
+
+    public String getSbslxx_blqxing() {
+        return sbslxx_blqxing;
+    }
+
+    public void setSbslxx_blqxing(String sbslxx_blqxing) {
+        this.sbslxx_blqxing = sbslxx_blqxing;
+    }
+
+    public String getSxjbxx_ajbh() {
+        return sxjbxx_ajbh;
+    }
+
+    public void setSxjbxx_ajbh(String sxjbxx_ajbh) {
+        this.sxjbxx_ajbh = sxjbxx_ajbh;
+    }
+
+    public String getSxjbxx_xmmc() {
+        return sxjbxx_xmmc;
+    }
+
+    public void setSxjbxx_xmmc(String sxjbxx_xmmc) {
+        this.sxjbxx_xmmc = sxjbxx_xmmc;
+    }
+
+    public String getBjxx_yswh_zg() {
+        return bjxx_yswh_zg;
+    }
+
+    public void setBjxx_yswh_zg(String bjxx_yswh_zg) {
+        this.bjxx_yswh_zg = bjxx_yswh_zg;
+    }
+
+    public String getSbslxx_ysbljd() {
+        return sbslxx_ysbljd;
+    }
+
+    public void setSbslxx_ysbljd(String sbslxx_ysbljd) {
+        this.sbslxx_ysbljd = sbslxx_ysbljd;
+    }
+
+    public String getDim_ajzt() {
+        return dim_ajzt;
+    }
+
+    public void setDim_ajzt(String dim_ajzt) {
+        this.dim_ajzt = dim_ajzt;
+    }
+
     public String getXzjsydzblx() {
         return xzjsydzblx;
     }
@@ -36,12 +120,12 @@ public class ParamNode {
         this.xzjsydzblx = xzjsydzblx;
     }
 
-    public String getDimajspzt() {
-        return dimajspzt;
+    public String getDim_ajspzt() {
+        return dim_ajspzt;
     }
 
-    public void setDimajspzt(String dimajspzt) {
-        this.dimajspzt = dimajspzt;
+    public void setDim_ajspzt(String dim_ajspzt) {
+        this.dim_ajspzt = dim_ajspzt;
     }
 
     public String getTjzd() {

src/main/java/com/chinadci/neo4j/service/IndexService.java

@@ -2305,6 +2305,8 @@ public class IndexService {
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 
+
+
     /**
      * 用地分析
      * @return
@@ -2400,6 +2402,141 @@ public class IndexService {
                 }
                 String r = "";
                 String serviceid = "jsyd_ywtz";
+//                String token = "d5sRuNHNzdK5Hhw3EXYUjvDsPPASRk6E";
+                url = buildUrlWithParams(url,paramInfo);
+                r =HttpMethodUtil.doPostForYtgz(url);
+                System.out.println(r);
+                if (r!=null&&r.length()>0){
+                    if(r.contains("第三方接口报错")){
+                        Map errorMap = new HashMap();
+                        String message = r+";url:"+url+";"+json.toString();
+                        errorMap.put("error",message);
+                        res.add(errorMap);
+                        logger.info("指标值查询失败:"+message);
+                        return new ServiceResult(EXTERNAL_SERVICE_ERROR,message);
+                    }
+                    JSONObject js = JSON.parseObject(r);
+                    JSONObject dataInfo = (JSONObject) js.get("data");
+                    Integer total = dataInfo.get("total")!=null?(Integer) dataInfo.get("total"):10000;
+                    JSONArray dataArray = (JSONArray) dataInfo.get("list");
+                    if (dataArray!=null&&!dataArray.isEmpty()){
+                        List<Map> values = JSONObject.parseArray(dataArray.toJSONString(), Map.class);
+                        PageInfo pageInfo = getPageInfo(pagenum,pagesize,values);
+                        return new ServiceResult(values,
+                                pagenum,
+                                pagesize,
+                                Long.valueOf(total));
+                    }
+                }
+            }catch (Exception e){
+                Map errorMap = new HashMap();
+                String message = "本地服务报错："+e.getMessage()+";url:"+address+";"+paramInfo.toString();
+                errorMap.put("error",message);
+                res.add(errorMap);
+                return new ServiceResult(res);
+            }
+            return new ServiceResult(res);
+        }
+        return new ServiceResult(res);
+    }
+
+
+    /**
+     * 预审与选址
+     * @return
+     */
+    public ServiceResult getYsxzAnalysis(String address, ParamNode paramNode,boolean test,Integer type,PageableRequest pageableRequest){
+
+        int pagenum = pageableRequest.getPagenum() == null ? 1 : pageableRequest.getPagenum();
+        int pagesize = pageableRequest.getPagesize() == null ? 20 : pageableRequest.getPagesize();
+        List res = new ArrayList();
+        if(test){
+            Map map1 = new HashMap();
+            Map map2 = new HashMap();
+            map1.put("tjzd","批准用地总面积");
+            map1.put("tjwd","国家批准");
+            map1.put("bplx","单独选址项目用地");
+            map1.put("szds","广州市");
+            map1.put("szgx","越秀区");
+            map1.put("sjcxzd","pzsj");
+            map1.put("qssj","2025-01-01");
+            map1.put("jssj","2025-04-30");
+            map1.put("zbz","100");
+            map1.put("zbdw","亩");
+            map2.put("tjzd","批准用地总面积");
+            map2.put("tjwd","省级批准");
+            map2.put("bplx","单独选址项目用地");
+            map2.put("szds","广州市");
+            map2.put("szgx","越秀区");
+            map2.put("sjcxzd","pzsj");
+            map2.put("qssj","2025-01-01");
+            map2.put("jssj","2025-04-30");
+            map2.put("zbz","200");
+            map2.put("zbdw","亩");
+            List datas = new ArrayList();
+            datas.add(map1);
+            datas.add(map2);
+            return new ServiceResult(datas);
+
+        }
+//        统计分析
+        else if(type!=null&&type==1){
+            Map paramInfo = getYsxzParamInfo(paramNode,1,pagesize,pagenum);
+            String url = "https://ythpt.nr.gdgov.cn/ebus/apifbgj/yyztyfb/bi/magic/web/magic/web/ysxz_tjfx";
+            if (address!=null&&address.length()>0){
+                url = address;
+            }
+            String json = JSON.toJSONString(paramInfo);
+            try{
+                if (address!=null&&address.length()>0&&!address.equals("null")){
+                    url = address;
+                }
+                String r = "";
+                String serviceid = "jsyd_tjfx";
+//                String token = "d5sRuNHNzdK5Hhw3EXYUjvDsPPASRk6E";
+                url = buildUrlWithParams(url,paramInfo);
+                r =HttpMethodUtil.doPostForYtgz(url);
+                System.out.println(r);
+                if (r!=null&&r.length()>0){
+                    if(r.contains("第三方接口报错")){
+                        Map errorMap = new HashMap();
+                        String message = r+";url:"+url+";"+json.toString();
+                        errorMap.put("error",message);
+                        res.add(errorMap);
+                        logger.info("指标值查询失败:"+message);
+                        return new ServiceResult(EXTERNAL_SERVICE_ERROR,message);
+                    }
+
+                    JSONObject js = JSON.parseObject(r);
+                    JSONArray dataArray = (JSONArray) js.get("data");
+                    if (dataArray!=null&&!dataArray.isEmpty()){
+                        List<Map> values = JSONObject.parseArray(dataArray.toJSONString(), Map.class);
+                        return new ServiceResult(values);
+                    }
+                }
+            }catch (Exception e){
+                Map errorMap = new HashMap();
+                String message = "本地服务报错："+e.getMessage()+";url:"+address+";"+paramInfo.toString();
+                errorMap.put("error",message);
+                res.add(errorMap);
+                return new ServiceResult(res);
+            }
+            return new ServiceResult(res);
+        }
+//        台账查询
+        else if(type!=null&&type==2){
+            Map paramInfo = getYsxzParamInfo(paramNode,2,pagesize,pagenum);
+            String url = "https://ythpt.nr.gdgov.cn/ebus/apifbgj/yyztyfb/bi/magic/web/magic/web/ysxz_ywtz";
+            if (address!=null&&address.length()>0){
+                url = address;
+            }
+            String json = JSON.toJSONString(paramInfo);
+            try{
+                if (address!=null&&address.length()>0&&!address.equals("null")){
+                    url = address;
+                }
+                String r = "";
+                String serviceid = "jsyd_ywtz";
 //                String token = "d5sRuNHNzdK5Hhw3EXYUjvDsPPASRk6E";
                 url = buildUrlWithParams(url,paramInfo);
                 r =HttpMethodUtil.doPostForYtgz(url);
@@ -2708,6 +2845,7 @@ public class IndexService {
             res.put("ajbh",paramNode.getAjbh());
             res.put("pzwh",paramNode.getPzwh());
             res.put("bplx",paramNode.getBplx());
+            res.put("spjb",paramNode.getSpjb());
             res.put("xmmc",paramNode.getXmmc());
             res.put("ydlx",paramNode.getYdlx());
             res.put("szds",paramNode.getSzds());
@@ -2715,7 +2853,39 @@ public class IndexService {
             res.put("sjcxzd",paramNode.getSjcxzd());
             res.put("qssj",paramNode.getQssj());
             res.put("jssj",paramNode.getJssj());
-            res.put("dimajspzt",paramNode.getDimajspzt());
+            res.put("dim_ajspzt",paramNode.getDim_ajspzt());
+            res.put("size",pageSize);
+            res.put("page",pageNum);
+        }
+        return res;
+    }
+
+    private Map<String,Object> getYsxzParamInfo(ParamNode paramNode,int type,int pageSize,int pageNum){
+        Map res = new HashMap();
+        if(type==1){
+            res.put("tjzd",paramNode.getTjzd());
+            res.put("tjwd",paramNode.getTjwd());
+            res.put("hyfl",paramNode.getBplx());
+            res.put("szds",paramNode.getSzds());
+            res.put("szqx",paramNode.getSzqx());
+            res.put("sjcxzd",paramNode.getSjcxzd());
+            res.put("qssj",paramNode.getQssj());
+            res.put("jssj",paramNode.getJssj());
+            res.put("sbslxx_blqxing",paramNode.getSbslxx_blqxing());
+        }
+        else {
+            res.put("sxjbxx_ajbh",paramNode.getSxjbxx_ajbh());
+            res.put("sxjbxx_xmmc",paramNode.getSxjbxx_xmmc());
+            res.put("bjxx_yswh_zg",paramNode.getBjxx_yswh_zg());
+            res.put("sbslxx_blqxing",paramNode.getSbslxx_blqxing());
+            res.put("sbslxx_ysbljd",paramNode.getSbslxx_ysbljd());
+            res.put("hyfl",paramNode.getHyfl());
+            res.put("dim_ajzt",paramNode.getDim_ajzt());
+            res.put("szds",paramNode.getSzds());
+            res.put("szqx",paramNode.getSzqx());
+            res.put("qssj",paramNode.getQssj());
+            res.put("jssj",paramNode.getJssj());
+            res.put("sjcxzd",paramNode.getSjcxzd());
             res.put("size",pageSize);
             res.put("page",pageNum);
         }