Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -462,14 +462,14 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            if (StringUtils.isBlank(doctorDO.getDoctorLat()) || StringUtils.isBlank(doctorDO.getDoctorLon())) {
                continue;
            }
            double distanceTmp = countDistance.getDistance(Double.parseDouble(assistanceDO.getServeLat()),Double.parseDouble(assistanceDO.getServeLon()),Double.parseDouble(doctorDO.getDoctorLat()),Double.parseDouble(doctorDO.getDoctorLon()));
//            double distanceTmp = countDistance.getDistance(Double.parseDouble(assistanceDO.getServeLat()),Double.parseDouble(assistanceDO.getServeLon()),Double.parseDouble(doctorDO.getDoctorLat()),Double.parseDouble(doctorDO.getDoctorLon()));
            otherDoctorDistanceObj = new JSONObject();
            otherDoctorDistanceObj.put("doctor",doctorDO.getId());
            otherDoctorDistanceObj.put("doctorName",doctorDO.getName());
            otherDoctorDistanceObj.put("doctorAddress",doctorDO.getDoctorLocateAddress());
            otherDoctorDistanceObj.put("doctorLon",doctorDO.getDoctorLon());
            otherDoctorDistanceObj.put("doctorLat",doctorDO.getDoctorLat());
            otherDoctorDistanceObj.put("distance",distanceTmp);//两点距离
            otherDoctorDistanceObj.put("distance",null);//两点距离
            otherDoctorDistance.add(otherDoctorDistanceObj);
            origins.append(doctorDO.getDoctorLat()+","+doctorDO.getDoctorLon()+"|");
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -293,6 +293,8 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
            if ("16".equals(type)) {   //判断设备是不是拐杖，如果是拐杖，需要保存围栏地址
                devicePatientDevice.setSafeAreaGz(safeAreaGz);
            }
            DeviceDetail deviceDetail = deviceDetailDao.findBySn(sn);
            devicePatientDevice.setDeviceType(deviceDetail.getDeviceType());
            patientDeviceDao.save(devicePatientDevice);
        }else {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YunXunDeviceService.java

@@ -41,7 +41,7 @@ public class YunXunDeviceService {
        if(!StringUtil.isBlank(phone3)){
            order += ","+phone3;
        }
        String instruction = "[IC*"+sn+"*"+hex10To16(order.length())+"]";
        String instruction = "[IC*"+sn+"*"+hex10To16(order.length())+"*"+order+"]";
        sendInstruction(sn,instruction);
    }

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/endpoint/DeviceController.java

@@ -114,10 +114,10 @@ public class DeviceController {
                    continue;
                }else {
                    if ("健康设备".equals(deviceType)){
                        deviceType = "1";
                        deviceType = "0";
                    }
                    else if ("安防设备".equals(deviceType)){
                        deviceType= "0";
                        deviceType= "1";
                    }
                    else {
                        errorMsgMap.put(deviceCode,"不支持该设备种类");
@@ -154,7 +154,7 @@ public class DeviceController {
            map.put("failedNum", rows-1 - correctLs.size() );
            map.put("errorData", JSON.toJSONString(errorMsgMap, SerializerFeature.WriteMapNullValue));
            System.out.println(map);
            return success();
            return write(200,JSON.toJSONString(map,SerializerFeature.WriteMapNullValue));
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "操作失败！");

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/device/YunXunDeviceService.java

@@ -41,7 +41,7 @@ public class YunXunDeviceService {
        if(!StringUtil.isBlank(phone3)){
            order += ","+phone3;
        }
        String instruction = "[IC*"+sn+"*"+hex10To16(order.length())+"]";
        String instruction = "[IC*"+sn+"*"+hex10To16(order.length())+"*"+order+"]";
        sendInstruction(sn,instruction);
    }