警情报送事发单位保存进ES 查询时加去重

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -350,18 +351,6 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyUsers(orgUnitId));
     }
 
-    /**
-     * 根据名称模糊匹配
-     *
-     * @param name
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getList", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配", notes = "根据名称模糊匹配")
-    public ResponseModel<List<ESOrgUsrDto>> selectById(HttpServletRequest request, String name) throws Exception {
-        return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
-    }
 
     /**
      * 根据名称模糊匹配
@@ -372,7 +361,7 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getdataList/unit", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配单位", notes = "根据名称模糊匹配单位")
-    public ResponseModel<List<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
+    public ResponseModel<Set<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
         return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import javax.annotation.PostConstruct;
 
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -125,7 +127,7 @@ public class ESOrgUsrService {
      *
      */
     @SuppressWarnings({ "rawtypes" })
-	public List<ESOrgUsrDto> queryByKeys(String name)
+	public Set<ESOrgUsrDto> queryByKeys(String name)
     {
     	 //创建builder
     	FuzzyQueryBuilder queryBuilder =null;
@@ -135,7 +137,7 @@ public class ESOrgUsrService {
         	queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name);
        }
          Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
-        List<ESOrgUsrDto> list = new LinkedList<>();
+        Set<ESOrgUsrDto> list = new LinkedHashSet<>();
 			search.forEach(esOrgUsrDto->{				
 				list.add(esOrgUsrDto);
 			});

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -10,6 +10,9 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -122,6 +125,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 	@Autowired
 	private EmqKeeper emqKeeper;
 
+	@Autowired
+	ESOrgUsrService eSOrgUsrService;
+	
 	@Value("${mqtt.topic.command.alert.notice}")
 	private String topic;
 
@@ -424,6 +430,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				 * 同步保存ES
 				 */
 				eSAlertCalledService.saveAlertCalledToES(alertCalled);
+
+				// 事发单位保存进ES
+
+				if(!ValidationUtil.isEmpty(alertCalled.getUnitInvolved())) {
+					OrgUsr orgUsr = new OrgUsr();
+					orgUsr.setSequenceNbr(-1L);
+					orgUsr.setBizOrgName(alertCalled.getUnitInvolved());
+					eSOrgUsrService.saveAlertCalledToES(orgUsr);
+				}
+
+
 			}
 		//	toSendCompletePoliceSituationMatch(alertCalled.getSequenceNbr());
 			return alertCalledObjsDto;