--

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -80,7 +80,16 @@ public class ImUtil {
		String response = HttpClientUtil.postBody(imAddr,params);
		return response;
	}
	
	public String sendPcManageMessageToPc(String clientType, String message) {
		String imAddr = im_host + "api/v2/message/cloudCarePcManageMessage";
		JSONObject params = new JSONObject();
		params.put("clientType", clientType);
		params.put("message", message);
		String response = HttpClientUtil.postBody(imAddr,params);
		return response;
	}
	/**
	 * 发送消息
	 * @param senderId 发送者的code

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

@@ -215,6 +215,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        message.put("OrderStatus","new");
        message.put("order_id",assistanceDO.getId());
        message.put("content_type",40);
        for (BaseDoctorDO doctorDO:doctorDOS){
            try {
                imUtill.sendMDTSocketMessageToDoctor(doctorDO.getId(),message.toString());
@@ -223,7 +224,9 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            }
        }
        //pc管理端端推送消息
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(assistanceDO.getId(),null);
@@ -692,8 +695,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        message.put("OrderStatus","finish");
        message.put("order_id",assistanceDO.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        emergencyAssistanceDao.save(assistanceDO);
        String failMsg = "当前救助工单已取消";
        result.put(ResponseContant.resultFlag, ResponseContant.success);
@@ -760,8 +763,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        message.put("OrderStatus","finish");
        message.put("order_id",assistanceDO.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(orderId,null);
    }
@@ -883,8 +886,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        message.put("OrderStatus","finish");
        message.put("order_id",assistanceDO.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        result = getOrderDetail(orderId,null);
        return result;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -227,8 +227,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            }
        }
        //pc管理端端推送消息
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtil.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        result.put("resultFlag", 1);
        result.put("resultMsg",orderDO);
@@ -469,8 +469,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        message.put("OrderStatus","finish");
        message.put("order_id",orderDO.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtil.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        result = getSecurityOrderDetail(orderId,null);
        return result;
    }
@@ -807,8 +807,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        message.put("OrderStatus","finish");
        message.put("order_id",orderDO.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtil.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
//        Consult consult = consultDao.queryByRelationCode(orderId);
//        // 发送微信模板消息，通知居民工单已取消（smyyyqx-上门预约已取消）
//
@@ -952,8 +952,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        message.put("OrderStatus","finish");
        message.put("order_id",one.getId());
        message.put("content_type",40);
        PcManageWebSocketService.broadCast(message.toString());
//        PcManageWebSocketService.broadCast(message.toString());
        imUtil.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        return getSecurityOrderDetail(orderId,null);
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PcManageWebSocketService.java

@@ -16,14 +16,14 @@ public class PcManageWebSocketService {
    private static Collection<PcManageWebSocketServer> servers = Collections.synchronizedCollection(new ArrayList<PcManageWebSocketServer>());
    public static void broadCast(String msg){
        for (PcManageWebSocketServer serverTmp : servers) {
            try {
                serverTmp.sendMessage(msg);
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    public static void broadCast(String msg){//改到im中
//        for (PcManageWebSocketServer serverTmp : servers) {
//            try {
//                serverTmp.sendMessage(msg);
//            } catch (IOException e) {
//                e.printStackTrace();
//            }
//        }
    }
    public static int getTotal(){