首页跳转告警页

AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/spcAlarmServiceImpl.java

@@ -31,7 +31,6 @@ public class spcAlarmServiceImpl extends GenericManagerImpl<Alarm, String>  impl
 
 	@Override
 	public Page<Alarm> list(List<DaoCriteria> criterias, CommonPageable commonPageable) {
-		
 		 BaseQuerySpecification<Alarm> spec = new BaseQuerySpecification<>(criterias);
 	        Page<Alarm> page = iAlarmDao.findAll(spec, commonPageable);       
 	        return page;

AmosBankService/src/main/java/com/yeejoin/amos/spc/business/controller/AlarmController.java

 package com.yeejoin.amos.spc.business.controller;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -47,21 +43,25 @@ public class AlarmController extends BaseController {
             @ApiParam(value = "查询条件")
             @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
-          
-    	//获取当前登录人的公司code
-		ReginParams reginParams	=getSelectedOrgInfo();
-		DaoCriteria criteria =new DaoCriteria();
-		criteria.setValue( reginParams.getCompany().getOrgCode() + "%");
-		criteria.setOperator(QueryOperatorEnum.LIKE.getName());
-		criteria.setPropertyName("orgCode");
-    	
+
+        //获取当前登录人的公司code
+        ReginParams reginParams = getSelectedOrgInfo();
+        DaoCriteria criteria = new DaoCriteria();
+        criteria.setValue(reginParams.getCompany().getOrgCode() + "%");
+        criteria.setOperator(QueryOperatorEnum.LIKE.getName());
+        criteria.setPropertyName("orgCode");
+
+        List<CommonRequest> collect = queryRequests.stream().filter(x -> x.getName().equals("sourceId") && x.getValue().toString().contains(",")).collect(Collectors.toList());
+        if (collect.size() == 1) {
+            queryRequests = toNewQuery(queryRequests, collect.get(0));
+        }
+
         List<DaoCriteria> criterias = buildDaoCriterias(queryRequests);
         criterias.add(criteria);
         Sort sort = new Sort(Sort.Direction.DESC, "updateDate");
         commonPageable.setSort(sort);
         Page<Alarm> list = iAlarmService.list(criterias, commonPageable);
         return CommonResponseUtil.success(list);
-
     }
 
     @SuppressWarnings("unused")
@@ -73,12 +73,12 @@ public class AlarmController extends BaseController {
 //        if (!maps.isEmpty()) {
 //            code = maps.get("code");
 //        }
-        
+
         //获取当前登录人公司orgcode
-        ReginParams reginParams =getSelectedOrgInfo();
-        
-        String code=reginParams.getCompany().getOrgCode();
-        
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        String code = reginParams.getCompany().getOrgCode();
+
 
         List<Map<String, Object>> listdate2 = new ArrayList<>();
         List<String> listd = new ArrayList<>();
@@ -168,4 +168,19 @@ public class AlarmController extends BaseController {
 
         return CommonResponseUtil.success(listdate2);
     }
+
+    private List<CommonRequest> toNewQuery(List<CommonRequest> queryRequests, CommonRequest commonRequest) {
+        List<CommonRequest> newQueryRequests = new ArrayList();
+        List<Object> strings = Arrays.asList(commonRequest.getValue().toString().split(","));
+        strings.forEach(
+                x -> {
+                    CommonRequest newQuery = new CommonRequest();
+                    newQuery.setName(commonRequest.getName());
+                    newQuery.setType(commonRequest.getType());
+                    newQuery.setValue(x);
+                    newQueryRequests.add(newQuery);
+                }
+        );
+        return newQueryRequests;
+    }
 }
\ No newline at end of file