Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     String selectUpUnitByParam(@Param("id")String biz_org_code);
     
-    int selectPersonListCount(Map<String, Object> map);
+    int selectPersonListCount(@Param("map")Map<String, Object> map);
 
     List<Map<String, Object>> selectPersonList(@Param("map")Map<String, Object> map);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -57,18 +57,28 @@
                                      on u.sequence_nbr = g.instance_id
 
                                  where
-                                     u.biz_org_type = 'person'
+                                          u.biz_org_type = 'person'
                                    AND
-                                     u.is_delete = 0
-
-                                 GROUP BY
-                                     u.sequence_nbr ,
-                                     u.biz_org_name ,
-                                     u.biz_org_code
-                                 order by u.rec_date desc
-                             )a where a.sequenceNbr is not null
-
-    </select>
+                                        u.is_delete = 0
+                                        <if test="map.bizOrgName != null">
+                                            AND u.biz_org_name like concat('%',#{map.bizOrgName},'%')
+                                        </if>
+                                        <if test="map.personNumber!= null">
+                                            AND v.field_value like concat('%',#{map.personNumber},'%')
+                                        </if>
+                                        <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
+                                            AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
+                                        </if>
+                                        GROUP BY
+                                        u.sequence_nbr ,
+                                        u.biz_org_name ,
+                                        u.biz_org_code
+                                        order by u.rec_date desc
+                                        )a where a.sequenceNbr is not null
+                                        <if test="map.fieldsValue != null">
+                                            <foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>
+                                        </if>
+                                </select>
 
     <!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm  -->
     <select id="selectPersonList" resultType="Map">

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

@@ -403,14 +403,14 @@ public class AlertCalledController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
     public ResponseModel<Object> getContact() {
 
-        if (redisUtils.hasKey(RedisKey.CONTACT_USER)) {
-            Object obj = redisUtils.get(RedisKey.CONTACT_USER);
-            return ResponseHelper.buildResponse(obj);
-        } else {
+//        if (redisUtils.hasKey(RedisKey.CONTACT_USER)) {
+//            Object obj = redisUtils.get(RedisKey.CONTACT_USER);
+//            return ResponseHelper.buildResponse(obj);
+//        } else {
             List<Map<String, String>> contactName = iAlertCalledService.getContactName();
-            redisUtils.set(RedisKey.CONTACT_USER, contactName, time);
+           // redisUtils.set(RedisKey.CONTACT_USER, contactName, time);
             return ResponseHelper.buildResponse(contactName);
-        }
+        
     }
 
     /**
@@ -441,7 +441,7 @@ public class AlertCalledController extends BaseController {
         AlarmGiveStatisticsDto dto = new AlarmGiveStatisticsDto();
         LambdaQueryWrapper<AlertCalled> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.isNull(AlertCalled::getFatherAlert);
-        queryWrapper.eq(AlertCalled::getAlertStatus, true);
+        queryWrapper.eq(AlertCalled::getAlertStatus, false);
         queryWrapper.eq(AlertCalled::getIsDelete, false);
         Integer alertNum = iAlertCalledService.getBaseMapper().selectCount(queryWrapper);
         dto.setAlarmNum(alertNum);

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

@@ -67,6 +67,8 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 
+import ch.qos.logback.core.joran.conditional.IfAction;
+
 /**
  * 警情接警记录 服务实现类
  *
@@ -849,8 +851,14 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 //       firefightersName.addAll(contactNames);
 		List<Map<String, String>> list = orgUsrServiceImpl.getPersonSimpleDetail();
 		list.stream().forEach(i->{
-		String phone = QRCodeUtil.generateQRCode()+"@"+ i.get("phone").toString();
-		i.replace("phone", phone);
+			String phone="";
+	    if(i.containsKey("phone")) {
+	    	phone = QRCodeUtil.generateQRCode()+"@"+ i.get("phone").toString();
+	    	i.replace("phone", phone);
+	    }else {
+	    	phone = QRCodeUtil.generateQRCode()+"@"+ phone;
+	    	i.put("phone", phone);
+	    }
 		});		
 		return list;
 	}