代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -596,10 +596,10 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        String sqlLife= "SELECT COUNT(*) from base_life_care_order where `status` = 2";
        String sqlEmergency= "SELECT COUNT(*) from base_emergency_assistance_order where `status` = 0";
        String sqlSecurity= "SELECT COUNT(*) from base_security_monitoring_order where `status` = 7 ";
        String sqlDevice = "SELECT category_code deviceFlag, IFNULL(online_status,0) status from wlyy_patient_device ";
        String sqlDevice = "SELECT pd.category_code deviceFlag, IFNULL(d.contact_status,0) status from wlyy_patient_device pd,wlyy_devices d";
        for (Map<String,Object> map:list){
            String paientId = map.get("id").toString();
            String filterDevice = " WHERE user = '"+paientId+"' ORDER BY deviceFlag,status desc";
            String filterDevice = " WHERE pd.device_sn = d.device_code and pd.user = '"+paientId+"' ORDER BY deviceFlag,status desc";
            String idcardNo = map.get("idcard") + "";
            Date birthday = DateUtil.strToDate(map.get("birthday").toString());
            Integer age = IdCardUtil.getAgeByIdcardOrBirthday(idcardNo,birthday);

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

@@ -111,7 +111,7 @@ public class OnenetController extends BaseController{
    }
    @ApiOperation("触发器消息通知接收--废弃")
    @ApiOperation("添加onenet设备")
    @RequestMapping(value = "addDevice",method = {RequestMethod.GET})
    public String addDevice() {
        try {
@@ -123,6 +123,19 @@ public class OnenetController extends BaseController{
        }
    }
    @ApiOperation("同步设备信息")
    @RequestMapping(value = "sysDevice",method = {RequestMethod.POST})
    public String sysDevice(Integer page) {
        try {
            onenetService.sysDevice(page);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"addDevice failure");
        }
    }
    @ApiOperation("触发器消息通知接收--废弃")
    @RequestMapping(value = "triggerMessage",method = {RequestMethod.POST,RequestMethod.GET})
    public String triggerMessage(@RequestBody String body) {

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

@@ -242,7 +242,7 @@ public class OnenetService {
            List<OnenetDevice> onenetDeviceList = new ArrayList<>();
            JSONArray jsonArray = jsonObject.getJSONObject("data").getJSONArray("devices");
            for (int i=0;i<jsonArray.size();i++){
                JSONObject json = jsonArray.getJSONObject(0);
                JSONObject json = jsonArray.getJSONObject(i);
                String sn = json.getString("rg_id");
                String id = json.getString("id");
                OnenetDevice device = onenetDeviceDao.findBySn(sn);