commit prod

inspur-admin/src/main/java/com/inspur/web/controller/work/ElevatorInfoController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.inspur.common.annotation.Anonymous;
+import com.inspur.common.utils.StringUtils;
 import com.inspur.domain.ElevatorInfo;
 import com.inspur.service.IElevatorInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,7 +47,6 @@ public class ElevatorInfoController extends BaseController
     @Anonymous
     public TableDataInfo list(ElevatorInfo elevatorInfo)
     {
-        startPage();
         List<ElevatorInfo> list = elevatorInfoService.selectElevatorInfoList(elevatorInfo);
         return getDataTable(list);
     }

inspur-work/src/main/java/com/inspur/domain/ElevatorInfo.java

@@ -73,4 +73,9 @@ public class ElevatorInfo extends BaseEntity
     /** 维保人员列表 */
     private List<ElevatorPersonInfo> personInfos;
 
+    /** 接口查询参数-维保人员名称 */
+    private String handler;
+
+    private List<String> elevatorIds;
+
 }

inspur-work/src/main/java/com/inspur/mapper/ElevatorPersonInfoMapper.java

@@ -73,4 +73,11 @@ public interface ElevatorPersonInfoMapper
      * @param deviceId
      */
     public void deleteElevatorPersonInfoByDeviceId(@Param("deviceId") String deviceId);
+
+    /**
+     * 根据电梯负责人查询处电梯IDs
+     * @param personName
+     * @return
+     */
+    public List<String> selectElevatorIdsByHandler(@Param("personName") String personName);
 }

inspur-work/src/main/java/com/inspur/service/impl/ElevatorInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.inspur.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -8,6 +9,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.inspur.common.core.domain.AjaxResult;
 import com.inspur.common.utils.DateUtils;
+import com.inspur.common.utils.StringUtils;
 import com.inspur.domain.ElevatorInfo;
 import com.inspur.domain.ElevatorPersonInfo;
 import com.inspur.mapper.ElevatorInfoMapper;
@@ -19,6 +21,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import static com.inspur.common.utils.PageUtils.startPage;
+
 /**
  * 电梯信息Service业务层处理
  *
@@ -70,7 +74,18 @@ public class ElevatorInfoServiceImpl implements IElevatorInfoService
     @Override
     public List<ElevatorInfo> selectElevatorInfoList(ElevatorInfo elevatorInfo)
     {
-        return elevatorInfoMapper.selectElevatorInfoList(elevatorInfo);
+        List<ElevatorInfo> elevatorInfos = new ArrayList<>();
+        // 根据维保人员名称 查询所有电梯ID
+        if (!StringUtils.isEmpty(elevatorInfo.getHandler())) {
+            List<String> elevatorIds = elevatorPersonInfoMapper.selectElevatorIdsByHandler(elevatorInfo.getHandler());
+            if (CollectionUtils.isEmpty(elevatorIds)) {
+                return elevatorInfos;
+            }
+            elevatorInfo.setElevatorIds(elevatorIds);
+        }
+        startPage();
+        elevatorInfos = elevatorInfoMapper.selectElevatorInfoList(elevatorInfo);
+        return elevatorInfos;
     }
 
     /**

inspur-work/src/main/java/com/inspur/thrid/impl/PBXServiceImpl.java

@@ -276,10 +276,13 @@ public class PBXServiceImpl implements IPBXService {
         // bugfix 出现存在infos内容为IVR的情况 排除这类情况
         if (PBXConstant.IVR_CODE_SAFE_CODE.equals(dtmf) || PBXConstant.IVR_CODE_TRANSFER_CODE.equals(dtmf)
                 || PBXConstant.IVR_CODE_ERROR_SAFE_CODE.equals(dtmf) || PBXConstant.IVR_CODE_ERROR_NO_PERSON_CODE.equals(dtmf)
-                || PBXConstant.IVR_CODE_BUSY_CODE.equals(dtmf) || dtmf.length() > 6) {
+                || PBXConstant.IVR_CODE_BUSY_CODE.equals(dtmf)) {
             return;
         }
-        log.info("dtmfEvent,callId:{}",callId);
+        if (dtmf.length() > 6) {
+            log.info("dtmf length > 6, dtmf : {}",dtmf);
+        }
+        log.info("dtmfEvent,callId:{}", callId);
         /** 以#结束 通过info获取 begin  */
         /*String dtmf = wsDtmfMessage.getMsg().getInfo();
         String dtmfValue = redisCache.getCacheObject(PBXConstant.DTMF_KEY + callId);

inspur-work/src/main/resources/mapper/work/ElevatorInfoMapper.xml

@@ -40,6 +40,11 @@
             <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
             <if test="deviceSn != null  and deviceSn != ''"> and device_sn = #{deviceSn}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
+            <if test="elevatorIds != null"> and device_id in
+                <foreach item="elevatorId" collection="elevatorIds" open="(" separator="," close=")">
+                    #{elevatorId}
+                </foreach>
+            </if>
         </where>
     </select>
 

inspur-work/src/main/resources/mapper/work/ElevatorPersonInfoMapper.xml

@@ -96,6 +96,10 @@
         delete from ELEVATOR_EMERGENCY.elevator_person_info where elevator_id = #{deviceId}
     </delete>
 
+    <select id="selectElevatorIdsByHandler" parameterType="java.lang.String" resultType="java.lang.String">
+        select distinct elevator_id from ELEVATOR_EMERGENCY.elevator_person_info where person_name like concat('%', #{personName}, '%')
+    </select>
+
     <delete id="deleteElevatorPersonInfoByIds" parameterType="String">
         delete from ELEVATOR_EMERGENCY.elevator_person_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">