Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/doc/api.md

@@ -9569,7 +9569,19 @@ data|object|数据对象
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
-dict|object|字典对象
+  appInfoFieldList|array|属性列表|数组
+   id|Long|序号，主键，自增长
+   datasetId|Long|应用数据集id
+   fieldCode|String|字段编码
+   fieldName|String|字段名称
+   fieldType|String|字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
+   dataType|String|数据类型（number.数字,string.字符串）
+   fieldValue|String|字段值
+   fieldLen|Integer|数据长度，默认128
+   fieldNull|Integer|是否允许为空，(0.否,1.是)
+   isList|Integer|字段是否列表显示(0.否,1.是)
+   fieldOrderNo|String|排序号
+   remark|String|备注
 
 **响应消息样例:**
 

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.app.model.vo;
 
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.AppDatasetEntity;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -33,4 +34,14 @@ public class AppDatasetVo extends BaseEntityLong {
 
     private List<Long> idList;
 
+    private List<String> fieldNameList;
+
+    private List<String> fieldValueList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppDatasetQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppDatasetQuery> andConditionList;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

 package com.mortals.xhx.module.app.web;
 
-import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.ZipUtil;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.AppFieldTypeEnum;
 import com.mortals.xhx.common.code.AppTypeEnum;
-import com.mortals.xhx.common.code.DataTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.app.model.AppEntity;
 import com.mortals.xhx.module.app.model.AppQuery;

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

 package com.mortals.xhx.module.app.web;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -24,15 +25,11 @@ import com.mortals.xhx.module.app.service.AppDatasetService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.Arrays;
-
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -63,6 +60,22 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
 
     @Override
     protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
+        if(!ObjectUtils.isEmpty(query.getOrConditionList())){
+            AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
+            appDatasetQuery.setAndConditionList(query.getOrConditionList());
+            appDatasetQuery.setAppId(query.getAppId());
+
+            PageInfo pageInfo = this.buildPageInfo(query);
+            Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context);
+            List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(datasetIdList)) {
+                query.setIdList(datasetIdList);
+            }
+            query.setOrConditionList(null);
+
+        }
+
+
         if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) {
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
             appDatasetQuery.setFieldCode(query.getFieldCode());
@@ -80,4 +93,25 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
         }
         super.doListBefore(query, model, context);
     }
+
+
+    public static void main(String[] args) {
+        ArrayList<AppDatasetQuery> list = new ArrayList<>();
+
+        AppDatasetQuery condition = new AppDatasetQuery();
+        condition.setFieldName("制定机关");
+        condition.setFieldValue("%四川省人民政府%");
+        list.add(condition);
+
+        condition = new AppDatasetQuery();
+        condition.setFieldName("标题");
+        condition.setFieldValue("%范性文件%");
+
+        list.add(condition);
+
+        AppDatasetEntity appDatasetEntity = new AppDatasetEntity();
+      //  appDatasetEntity.setAndConditionList(list);
+
+        System.out.println(JSON.toJSONString(appDatasetEntity));
+    }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -3,9 +3,9 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
+  "loginName": "admin",
+  "password": "admin",
+  "securityCode": "8888"
 }
 
 > {%
@@ -15,15 +15,30 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###自助终端应用数据集列表
 POST {{baseUrl}}/app/dataset/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "appId":20,
+  "appId": 20,
   "fieldName": "标题",
   "fieldValue": "管理办法",
-    "page":1,
-    "size":10
+  "page": 1,
+  "size": 10
+}
+
+###自助终端应用数据集列表1
+POST {{baseUrl}}/app/dataset/list
+Content-Type: application/json
+
+{
+  "appId": 20,
+  "orConditionList": [
+    {
+      "fieldName": "制定机关",
+      "fieldValue": "%四川省人民政府%"
+    }
+  ],
+  "page": 1,
+  "size": 10
 }
 
 
@@ -33,8 +48,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "appId":1,
-  "appInfoFieldList":[
+  "appId": 1,
+  "appInfoFieldList": [
     {
       "fieldCode": "title5",
       "fieldName": "标题5",
@@ -60,7 +75,6 @@ Content-Type: application/json
       "remark": "22222222222222"
     }
   ]
-
 }
 
 > {%