Merge branch 'dev' of liubing/wlyy2.0 into dev

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

@@ -99,6 +99,8 @@ public class PatientDeviceController extends BaseController {
                if (flagDevice == false){
                    return write(-1,"请填写投放地址");
                }
                //注册设备地址
                deviceDetailService.registerToWlyy(device);
            }
            //修改设备表中{"1":"0", "2":"0"}的绑定次数 和其他绑定信息
            deviceDetailService.updateAfterBinding(device,new Date(),flag);

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

@@ -394,14 +394,14 @@ public class DeviceService {
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                            content_notice += tmp.getString("indexName")+"、";
                        }
                    }
                    if (org.apache.commons.lang3.StringUtils.isNotBlank(content_notice)){
                        content_notice.substring(0,content_notice.length()-2);
                        content_notice = content_notice.substring(0,content_notice.length()-1);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                        messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
@@ -474,18 +474,18 @@ public class DeviceService {
                    message.put("relation_code",messageDO.getRelationCode());
                    message.put("content_type",42);
                    message.put("content_notice","");
                    String content_notice = null;
                    String content_notice = "";
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                            content_notice += tmp.getString("indexName")+"、";
                        }
                    }
                    if (org.apache.commons.lang3.StringUtils.isNotBlank(content_notice)){
                        content_notice.substring(0,content_notice.length()-2);
                        content_notice = content_notice.substring(0,content_notice.length()-1);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                        messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
                }

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

@@ -157,18 +157,18 @@ public class DeviceUploadService {
                    message.put("relation_code",messageDO.getRelationCode());
                    message.put("content_type",42);
                    message.put("content_notice","");
                    String content_notice = null;
                    String content_notice = "";
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                            content_notice += tmp.getString("indexName")+"、";
                        }
                    }
                    if (StringUtils.isNotBlank(content_notice)){
                        content_notice.substring(0,content_notice.length()-2);
                        content_notice = content_notice.substring(0,content_notice.length()-1);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                        messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
                }