*）少提交文件

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -27,13 +27,17 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 警情接警记录
@@ -143,44 +147,11 @@ public class AlertCalledController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
-
         Page<AlertCalled> pageBean;
-        QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
-        Class<? extends AlertCalled> aClass = alertCalled.getClass();
-        alertCalledQueryWrapper.eq("is_delete", 0);
-        alertCalledQueryWrapper.orderByDesc("call_time");
-        if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) {
-            alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
-        }
-        if (alertCalled.getIsFatherAlert()) { // 0：接警；1：处警
-            alertCalledQueryWrapper.isNull("father_alert");
-        } else {
-            alertCalledQueryWrapper.isNotNull("father_alert");
-        }
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Object o = field.get(alertCalled);
-                if (o != null) {
-                    Class<?> type = field.getType();
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if (type.equals(Integer.class)) {
-                        Integer fileValue = (Integer) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(String.class)) {
-                        String fileValue = (String) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Boolean.class) && !"IS_FATHER_ALERT".equals(name)) {
-                        Boolean fileValue = (Boolean) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException("系统异常");
-            }
-        });
         IPage<AlertCalled> page;
+        QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
+        setQueryWrapper(alertCalledQueryWrapper, alertCalled);
+
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
@@ -200,18 +171,32 @@ public class AlertCalledController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
     public ResponseModel list(AlertCalled alertCalled) {
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
+        setQueryWrapper(alertCalledQueryWrapper, alertCalled);
+
+        List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper);
+        return CommonResponseUtil.success(list);
+    }
+
+    private QueryWrapper setQueryWrapper(QueryWrapper queryWrapper, AlertCalled alertCalled){
         Class<? extends AlertCalled> aClass = alertCalled.getClass();
-        alertCalledQueryWrapper.eq("is_delete", 0);
-        alertCalledQueryWrapper.orderByDesc("call_time");
+        queryWrapper.eq("is_delete", 0);
+        queryWrapper.orderByDesc("call_time");
         if (alertCalled.getCallTimeStart() != null && alertCalled.getCallTimeEnd() != null) {
-            alertCalledQueryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
+            queryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd());
         }
         if (alertCalled.getIsFatherAlert()) { // 0：接警；1：处警
-            alertCalledQueryWrapper.isNull("father_alert");
-        } else {
-            alertCalledQueryWrapper.isNotNull("father_alert");
+            queryWrapper.isNull("father_alert");
         }
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+        if (!ValidationUtil.isEmpty(alertCalled.getAlertSourceCodeStr())){
+            String[] arr = alertCalled.getAlertSourceCodeStr().split(",");
+            List<String> collect = Arrays.stream(arr).collect(Collectors.toList());
+            queryWrapper.in("alert_source_code", collect);
+        }
+        Stream<Field> fieldStream = Arrays.stream(aClass.getDeclaredFields()).filter(field -> {
+            String name = NameUtils.camel2Underline(field.getName());
+            return !("IS_FATHER_ALERT".equals(name) || "ALERT_SOURCE_CODE_STR".equals(name));
+        });
+        fieldStream.forEach(field -> {
             try {
                 field.setAccessible(true);
                 Object o = field.get(alertCalled);
@@ -220,13 +205,13 @@ public class AlertCalledController extends BaseController {
                     String name = NameUtils.camel2Underline(field.getName());
                     if (type.equals(Integer.class)) {
                         Integer fileValue = (Integer) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
+                        queryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Boolean.class) && !"IS_FATHER_ALERT".equals(name)) {
+                        queryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Boolean.class)) {
                         Boolean fileValue = (Boolean) field.get(alertCalled);
-                        alertCalledQueryWrapper.eq(name, fileValue);
+                        queryWrapper.eq(name, fileValue);
                     }
                 }
             } catch (Exception e) {
@@ -234,7 +219,6 @@ public class AlertCalledController extends BaseController {
                 throw new RuntimeException("系统异常");
             }
         });
-        List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper);
-        return CommonResponseUtil.success(list);
+        return queryWrapper;
     }
 }
\ No newline at end of file