0.0.0(内蒙）

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java

@@ -12,6 +12,7 @@ public class Kshpropertice implements Serializable {
     private String label;
 
     private String imgType;
+    private String imagePhoto;
     private String boderColor;
 
    /* @ApiModelProperty(value = "标签")

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KshServicePojo.java

@@ -73,7 +73,13 @@ public class KshServicePojo extends Model<KshServicePojo> {
     @TableField(exist = false)
     private int page;
 
-    @ApiModelProperty(value = "路由名称")
+    @ApiModelProperty(value = "每页多少")
     @TableField(exist = false)
     private int pageSize;
+
+    //双击节点查询 前端把类型传过来 后台做校验
+    @ApiModelProperty(value = "类型")
+    @TableField(exist = false)
+    private String objectType;
+
 }

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/NeiMengEntity/JdfxEntity.java

@@ -19,10 +19,10 @@ public class JdfxEntity implements Serializable {
     private String  timeEnd;
 
     @ApiModelProperty(value = "页码（默认1）")
-    private String  pageNumber ="1";
+    private String  pageNumber;
 
     @ApiModelProperty(value = "每页数量（默认10）")
-    private String  pageSize ="10";
+    private String  pageSize;
 
     @ApiModelProperty(value = "请求用户名")
     private String  qqyhm;

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/NeiMengEntity/JpgxEntity.java

@@ -11,9 +11,9 @@ public class JpgxEntity implements Serializable {
     @ApiModelProperty(value = "身份证号")
     private String  sfzh;
     @ApiModelProperty(value = "页码（默认1）")
-    private String  pageNumber ="1";
+    private String  pageNumber ;
     @ApiModelProperty(value = "每页数量（默认10）")
-    private String  pageSize ="10";
+    private String  pageSize ;
     @ApiModelProperty(value = "请求用户名")
     private String  qqyhm;
     @ApiModelProperty(value = "请求人身份证号")

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/NeiMengEntity/ShgxEntity.java

@@ -15,10 +15,10 @@ public class ShgxEntity implements Serializable {
     private String  type;
 
     @ApiModelProperty(value = "页码（默认1）")
-    private String  pageNum ="1";
+    private String  pageNum ;
 
     @ApiModelProperty(value = "每页数量（默认10）")
-    private String  pageSize="10";
+    private String  pageSize;
 
     @ApiModelProperty(value = "请求用户名")
     private String  qqyhm;

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/NeiMengEntity/TlfxEntity.java

@@ -20,10 +20,10 @@ public class TlfxEntity implements Serializable {
     private String  timeEnd;
 
     @ApiModelProperty(value = "页码（默认1）")
-    private String  pageNumber ="1";
+    private String  pageNumber ;
 
     @ApiModelProperty(value = "每页数量（默认10）")
-    private String  pageSize="10";
+    private String  pageSize;
 
     @ApiModelProperty(value = "请求用户名")
     private String  qqyhm;

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/NeiMengEntity/TlgxEntity.java

@@ -18,10 +18,10 @@ public class TlgxEntity implements Serializable {
     private String  timeEnd;
 
     @ApiModelProperty(value = "页码（默认1）")
-    private String  pageNumber ="1";
+    private String  pageNumber;
 
     @ApiModelProperty(value = "每页数量（默认10）")
-    private String  pageSize ="10";
+    private String  pageSize;
 
     @ApiModelProperty(value = "请求用户名")
     private String  qqyhm;

common/common_utils/src/main/java/com/founder/commonutils/util/JsonValidator.java

@@ -185,10 +185,14 @@ public class JsonValidator {
     }
     public static void main(String[] args){
         String s ="{\n" +
-                "\t\"param\":[\n" +
-                "\t\t{\"name\":\"身份证号\",\"id\":\"sfzh\",\"type\": \"text\"},{\"name\":\"类型\",\"id\":\"type\",\"type\":\"optional\",\"value\":[{\"lable\":\"配偶\",\"value\":\"01\"},{\"lable\":\"子女\",\"value\":\"02\"}]},{\"name\":\"开始时间\",\"id\":\"timeStart\",\"type\":\"time\",\"format\":\"yyyy-MM-dd\"},{\"name\":\"结束时间\",\"id\":\"timeEnd\",\"type\":\"time\",\"format\":\"yyyy-MM-dd\"}\n" +
+                "\t\"param\": [\n" +
+                "\t\t{\n" +
+                "\t\t\t\"name\": \"身份证号\",\n" +
+                "\t\t\t\"id\": \"sfzh\",\n" +
+                "\t\t\t\"type\": \"text\",\n" +
+                "\t\t\t\"flag\":[\"idcard\",\"aaaa\"]\n" +
+                "\t\t}\n" +
                 "\t]\n" +
-                "\t\n" +
                 "}";
         System.out.println(s+":"+new JsonValidator().validate(s));
     }

service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/KshServiceController.java

@@ -168,7 +168,66 @@ public class KshServiceController extends ApiController {
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("cjsj");
 
-        IPage page1 = kshService.page(page, queryWrapper);
+        IPage<KshServicePojo> page1 = kshService.page(page, queryWrapper);
+        //接收前端传过来的传参类型  类型去跟每条算例的json入参做判断
+        String objectType = kshServicePojo.getObjectType();
+        for (KshServicePojo record : page1.getRecords()) {
+            JSONObject object = JSONObject.parseObject(record.getParam());
+            JSONArray param = object.getJSONArray("param");
+            for (int i = 0; i < param.size(); i++) {
+                // 虚实关联 四码关联  涉案信息   加上下拉框选项 赋值给checked字段是什么类型返回回去
+                if (record.getSlname().equals("虚实关联")){
+                    if (param.getJSONObject(i).containsKey("checked")){
+                        if (objectType.equals("idcard")){
+                            param.getJSONObject(i).put("checked","01");
+                        }else if (objectType.equals("jz")){
+                            param.getJSONObject(i).put("checked","02");
+                        }else if (objectType.equals("hz")){
+                            param.getJSONObject(i).put("checked","03");
+                        }else if (objectType.equals("sjk")){
+                            param.getJSONObject(i).put("checked","04");
+                        }else if (objectType.equals("wlzh")||objectType.equals("wxid")||objectType.equals("qq")||objectType.equals("other")){
+                            param.getJSONObject(i).put("checked","05");
+                        }
+                    }
+                }
+                if (record.getSlname().equals("四码关联")) {
+                    if (param.getJSONObject(i).containsKey("checked")) {
+                        if (objectType.equals("sjk")){
+                            param.getJSONObject(i).put("checked","01");
+                        }else if (objectType.equals("imsi")){
+                            param.getJSONObject(i).put("checked","02");
+                        }else if (objectType.equals("imei")){
+                            param.getJSONObject(i).put("checked","03");
+                        }
+                    }
+                }
+                if (record.getSlname().equals("涉案信息")) {
+                    if (param.getJSONObject(i).containsKey("checked")) {
+                        if (objectType.equals("idcard")){
+                            param.getJSONObject(i).put("checked","01");
+                        }else if (objectType.equals("cph")){
+                            param.getJSONObject(i).put("checked","02");
+                        }else if (objectType.equals("aj")){
+                            param.getJSONObject(i).put("checked","03");
+                        }
+                    }
+                }
+                    //判断是param数组是否存在mold节点
+                if (param.getJSONObject(i).containsKey("mold")){
+                    //如果存在 获取mold数组判断是否存在前端传来的值类型
+                    JSONArray mold = param.getJSONObject(i).getJSONArray("mold");
+                    if (mold.contains(objectType)){
+                        System.out.println("存在");
+                        param.getJSONObject(i).put("flag","true");
+                    }
+                }
+            }
+            object.put("param",param);
+            record.setParam(object.toString());
+        }
+
+
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
     }