commit change pbx api addr

inspur-admin/src/main/resources/application.yml

@@ -12,7 +12,8 @@ inspur:
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
-  wsPath: ws://192.168.1.151:80/openapi/v1.0/subscribe?access_token=
+  # wsPath: ws://192.168.1.151:80/openapi/v1.0/subscribe?access_token=
+  wsPath: ws://10.219.166.91:80/openapi/v1.0/subscribe?access_token=
 
 # 开发环境配置
 server:
@@ -133,7 +134,8 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 pbx:
-  url: http://192.168.1.151:80
+  # url: http://192.168.1.151:80
+  url: http://10.219.166.91:80
   secret: nAIO3LtgcIJZ8GItx06YwTmJ5C3TbtsX
   clientId: GWJ4fFfZ0KDjO2UD8S2e6tL05MexHetI
   # 分机测试dev  正式环境用prod

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

@@ -1,6 +1,8 @@
 package com.inspur.service.impl;
 
 import java.util.List;
+import java.util.UUID;
+
 import com.inspur.common.utils.DateUtils;
 import com.inspur.domain.ElevatorInfo;
 import com.inspur.domain.ElevatorPersonInfo;
@@ -68,14 +70,14 @@ public class ElevatorInfoServiceImpl implements IElevatorInfoService
     public int insertElevatorInfo(ElevatorInfo elevatorInfo)
     {
         elevatorInfo.setCreateTime(DateUtils.getNowDate());
+        elevatorInfo.setDeviceId(UUID.randomUUID().toString().replace("-",""));
         int result = elevatorInfoMapper.insertElevatorInfo(elevatorInfo);
-        Long elevatorId = elevatorInfo.getId();
         List<ElevatorPersonInfo> personInfos = elevatorInfo.getPersonInfos();
         if (CollectionUtils.isEmpty(personInfos)) {
             return result;
         }
         for (ElevatorPersonInfo personInfo : personInfos) {
-            personInfo.setElevatorId(elevatorId.toString());
+            personInfo.setElevatorId(elevatorInfo.getDeviceId());
             personInfo.setUnitName(elevatorInfo.getUnitName());
             personInfo.setSafeCode(elevatorInfo.getSafeCode());
             personInfo.setPersonType(2L);

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

@@ -506,10 +506,13 @@ public class PBXServiceImpl implements IPBXService {
     private void updateOrderInfo(ElevatorWorkOrder workOrder, ElevatorInfo elevatorInfo, String dtmf,List<ElevatorPersonInfo> personInfoList) {
         // 社区信息
         workOrder.setRegion(elevatorInfo.getInArea());
+        workOrder.setRegionCode(elevatorInfo.getAreaCode());
         workOrder.setCommunity(elevatorInfo.getInVillage());
         workOrder.setBuilding(elevatorInfo.getInBuild());
         workOrder.setElevatorName(elevatorInfo.getName());
         workOrder.setSecurityCode(dtmf);
+        workOrder.setDeviceNo(elevatorInfo.getDeviceNo());
+        workOrder.setDeviceSn(elevatorInfo.getDeviceSn());
         workOrder.setMaintCompany(elevatorInfo.getUnitName());
         // 人员信息
         if (!CollectionUtils.isEmpty(personInfoList)) {

inspur-work/src/main/java/com/inspur/websoket/client/util/PBXWebSocketUtils.java

@@ -30,7 +30,8 @@ public class PBXWebSocketUtils {
             // 获取token
             String accessToken = ipbxService.getAccessToken();
             // String wsPath = InspurConfig.getWsPath();
-            String wsPath = "ws://192.168.1.151:80/openapi/v1.0/subscribe?access_token=";
+            // String wsPath = "ws://192.168.1.151:80/openapi/v1.0/subscribe?access_token=";
+            String wsPath = "ws://10.219.166.91:80/openapi/v1.0/subscribe?access_token=";
             PBXWebSocketClient webSocketClient = new PBXWebSocketClient(new URI(wsPath + accessToken));
             webSocketClient.connect();
             client = webSocketClient;

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

@@ -39,7 +39,7 @@
         where id = #{id}
     </select>
 
-    <select id="selectElevatorPersonInfoByElevatorId" parameterType="Long" resultMap="ElevatorPersonInfoResult">
+    <select id="selectElevatorPersonInfoByElevatorId" parameterType="java.lang.String" resultMap="ElevatorPersonInfoResult">
         <include refid="selectElevatorPersonInfoVo"/>
         where elevator_id = #{elevatorId}
     </select>