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

business/push-service/src/main/java/com/yihu/jw/push/service/GetuiService.java

@@ -155,6 +155,7 @@ public class GetuiService {
                    "component="+json.getString("platform")+"/io.dcloud.PandoraEntry;S.UP-OL-SU=true;" +
                    "S.title="+json.getString("title")+";" +
                    "S.content="+json.getString("body")+";" +
                    "S.payload="+json.getString("payload")+";" +
                    "S.url="+json.getString("url")+";end";
            notification1.setIntent(intent);

business/push-service/src/main/java/com/yihu/jw/push/util/GetuiUtil.java

@@ -108,7 +108,7 @@ public class GetuiUtil {
//            System.out.println("个推推送失败：code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg());
//        }
//        String cid = "d2fee750dcdf7a2567444b1d4f629305";
        String cid = "a7fff64dd3dfd12ee43a1b94f3266cfa";
        String cid = "d0e395d2e04b1da6f45a4f700883297d";
        String title = "ios11:49标题";
        String body = "安卓离线展示的内容";
        String url = "https://www.baidu.com/";
@@ -165,6 +165,7 @@ public class GetuiUtil {
                    "component="+json.getString("platform")+"/io.dcloud.PandoraEntry;S.UP-OL-SU=true;" +
                    "S.title="+json.getString("title")+";" +
                    "S.content="+json.getString("body")+";" +
                    "S.payload="+json.getString("payload")+";" +
                    "S.url="+json.getString("url")+";end";
            notification1.setIntent(intent);

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

@@ -1186,9 +1186,8 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
        }
        if (StringUtils.isNotBlank(day)){
            sql +=" and create_time>='"+day+" 00:00:00' and create_time<'"+day+" 23:59:59' ";
        }else   {
            sql +=" order by create_time desc ";
        }
        sql +=" order by create_time desc ";
        sql +=" limit 1 ";
        List<BasePatientStepDo> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BasePatientStepDo.class));
        if (list.size()>0){

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

@@ -298,7 +298,7 @@ public class PatientHealthIndexService extends BaseJpaService<DevicePatientHealt
                        obj.put("value1", data);
                        obj.put("time1", recordDate);
                        obj.put("id1", id);
                        obj.put("deviceSn1", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("2")) {
                        obj.put("value2", data);
@@ -310,31 +310,31 @@ public class PatientHealthIndexService extends BaseJpaService<DevicePatientHealt
                        obj.put("value3", data);
                        obj.put("time3", recordDate);
                        obj.put("id3", id);
                        obj.put("deviceSn3", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("4")) {
                        obj.put("value4", data);
                        obj.put("time4", recordDate);
                        obj.put("id4", id);
                        obj.put("deviceSn4", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("5")) {
                        obj.put("value5", data);
                        obj.put("time5", recordDate);
                        obj.put("id5", id);
                        obj.put("deviceSn5", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("6")) {
                        obj.put("value6", data);
                        obj.put("time6", recordDate);
                        obj.put("id6", id);
                        obj.put("deviceSn6", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("7")) {
                        obj.put("value7", data);
                        obj.put("time7", recordDate);
                        obj.put("id7", id);
                        obj.put("deviceSn7", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    }
                    

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

@@ -2414,6 +2414,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        if (listMapsOrder.size() > 0) {
                            for (Map<String, Object> stringObjectMap : listMapsOrder) {
                                tmp.put("orderId", stringObjectMap.get("id"));
                                tmp.put("orderType", 20);
                            }
                            tmp.put("eCall", 1);
                        } else {
@@ -2448,7 +2449,18 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        object.put("info", tmp);
                        break;
                    default:
                        String patientId = (String) list.get(i).get("id");
                        sql = " select ord.id from base_system_dict_entry dict LEFT JOIN base_security_monitoring_order ord " +
                                " on dict.code = ord.topic_item COLLATE utf8_unicode_ci and ord.status=" + SecurityMonitoringOrderDO.Status.apply.getType() + " where dict.dict_code='service_item' " +
                                "and dict.remark='security' and ord.patient='" + patientId + "' and dict.code='"+topicItem+"' ";
                        List<String> listOrderId = jdbcTemplate.queryForList(sql,String.class);
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, deviceSn,false);
                        if (listOrderId.size()>0){
                            object.put("orderId",listOrderId.get(0));
                            object.put("orderType", 22);
                        }else {
                            object.put("orderId","");
                        }
                        break;
                }
                object.put("patientInfo", patientTmp);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -158,11 +158,11 @@ public class StatisticsService {
        // activity-1   活动浏览次数
        // activity-2   公艺课程播放
        String sql = " select type,num from base_child_activity_click where type in(1,2)";
        String sql = " SELECT activity_type, COUNT(id) FROM base_activity_click WHERE activity_type IN (1, 2) GROUP BY activity_type";
        List<Map<String, Object>> lists = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> tmp : lists) {
            Integer num = Integer.parseInt(tmp.get("num").toString());
            res.put("activity_" + tmp.get("type").toString(), num);
            Integer num = Integer.parseInt(tmp.get("id").toString());
            res.put("activity_" + tmp.get("activity_type").toString(), num);
        }
        //activity-3 幼儿活动报名-总数
@@ -289,11 +289,11 @@ public class StatisticsService {
            // activity-1   活动浏览次数
            // activity-2   公艺课程播放
            String sql = " select type,num from base_child_activity_click where type in(1,2)";
            String sql = " SELECT activity_type, COUNT(id) FROM base_activity_click WHERE activity_type IN (1, 2) GROUP BY activity_type";
            List<Map<String, Object>> lists = jdbcTemplate.queryForList(sql);
            for (Map<String, Object> tmp : lists) {
                Integer num = Integer.parseInt(tmp.get("num").toString());
                res.put("activity_" + tmp.get("type").toString(), num);
                Integer num = Integer.parseInt(tmp.get("id").toString());
                res.put("activity_" + tmp.get("activity_type").toString(), num);
            }
            /*幼儿活动报名 总数*/

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

@@ -273,10 +273,12 @@ public class YsDeviceService {
    public void updateOnLineStatus(String str){
        if (StringUtils.isNotBlank(str)){
            JSONObject bodyJsonObj = JSONObject.parseObject(str);
            String deviceSN = "";//设备SN
            if (bodyJsonObj!=null&&bodyJsonObj.containsKey("header")){
                JSONObject headerJsonObject = bodyJsonObj.getJSONObject("header");
                deviceSN = headerJsonObject.getString("deviceId");
            }
            if (bodyJsonObj!=null&&bodyJsonObj.containsKey("body")){
                JSONObject bodyJsonObj2 = bodyJsonObj.getJSONObject("body");
                String deviceSN = bodyJsonObj2.getString("devSerial");//设备SN
                DeviceDetail deviceDetail = deviceDetailDao.findBySn(deviceSN);
                dataPushLogUtil.savePushLog(deviceSN,bodyJsonObj.toJSONString(bodyJsonObj,SerializerFeature.WriteMapNullValue),"跌倒监护摄像头数据接收");
                dataPushLogUtil.updContactStatus(deviceSN,1,false);

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

@@ -245,61 +245,56 @@ public class PatientDeviceService {
        String startTimeDevice2 =  DateUtil.getPreTime(endTime,-60*2+"");
        try {
            List<String> lostSN = new ArrayList<>();
            List<String> onContact = new ArrayList<>();
            /*******************未失联**/
           //血糖仪，血压计。30天内有数据上传，则改为未失联
//            String sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (1,2) and EXISTS ( " +
//                    "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
//                    " BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"') ";
//            List<String> devices = jdbcTemplate.queryForList(sql,String.class) ;
//            if (devices.size() > 0) {
//                onContact.addAll(devices);
//            }
//
//            //智能拐杖。手表2天内有数据上传，则改为未失联**
//            sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (4,16) and EXISTS ( " +
//                    "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
//                    " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
            //清除消息
            String sql = " select distinct dp.device_sn from device_data_push_log dp where  dp.create_time " +
                    " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
            List<String> devices = jdbcTemplate.queryForList(sql,String.class) ;
            if (devices.size() > 0) {
                onContact.addAll(devices);
            }
            /***************失联**/
            //血糖仪、血压**/
            sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (1,2) and not EXISTS ( " +
                    "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
                    " BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"') ";
            devices = jdbcTemplate.queryForList(sql,String.class) ;
            if (devices.size() > 0) {
                lostSN.addAll(devices);
            }
            //智能拐杖、手表 睡眠带
            sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (4,13,16) and not EXISTS ( " +
                    "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
                    " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
            devices = jdbcTemplate.queryForList(sql,String.class) ;
            if (devices.size() > 0) {
                lostSN.addAll(devices);
            }
            if (onContact.size()>0){
//                wlyyDeviceDao.updateByContactStatus(1,new Date(),onContact);
                //如果在线 将之前的离线消息全部清除
                systemMessageDao.delMessageByRelationCode(onContact);
            }
            if (lostSN.size()>0){
                wlyyDeviceDao.updateByContactStatus(0,new Date(),lostSN);
                deviceLostMessageUtil.deviceLostMessage(lostSN);
            }
        List<String> lostSN = new ArrayList<>();
        List<String> onContact = new ArrayList<>();
        /*******************未失联**/
        //血糖仪，血压计。30天内有数据上传，则改为未失联
//        String sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (1,2) and EXISTS ( " +
//                "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
//                " BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"') ";
//        List<String> devices = jdbcTemplate.queryForList(sql,String.class) ;
//        if (devices.size() > 0) {
//            onContact.addAll(devices);
//        }
//
//        //智能拐杖。手表2天内有数据上传，则改为未失联**
//        sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (4,16) and EXISTS ( " +
//                "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.create_time " +
//                " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
        } catch (Exception e) {
            logger.info(e.getMessage());
        //清除消息
        String sql = " select distinct dp.device_sn from device_data_push_log dp where  dp.create_time " +
                " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"' and dp.device_sn is not null ";
        List<String> devices = jdbcTemplate.queryForList(sql,String.class) ;
        if (devices.size() > 0) {
            onContact.addAll(devices);
        }
        /***************失联**/
        //血糖仪、血压**/
        sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (1,2) and not EXISTS ( " +
                "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.device_sn is not null and dp.create_time " +
                " BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"') ";
        devices = jdbcTemplate.queryForList(sql,String.class) ;
        if (devices.size() > 0) {
            lostSN.addAll(devices);
        }
        //智能拐杖、手表 睡眠带
        sql = " SELECT pd.device_sn FROM base.wlyy_patient_device pd  where pd.del=0 and pd.category_code in (4,13,16) and not EXISTS ( " +
                "select dp.device_sn from device_data_push_log dp where dp.device_sn = pd.device_sn and dp.device_sn is not null and dp.create_time " +
                " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
        devices = jdbcTemplate.queryForList(sql,String.class) ;
        if (devices.size() > 0) {
            lostSN.addAll(devices);
        }
        if (onContact.size()>0){
//            wlyyDeviceDao.updateByContactStatus(1,new Date(),onContact);
            //如果在线 将之前的离线消息全部清除
            systemMessageDao.delMessageByRelationCode(onContact);
        }
        if (lostSN.size()>0){
            wlyyDeviceDao.updateByContactStatus(0,new Date(),lostSN);
            deviceLostMessageUtil.deviceLostMessage(lostSN);
        }
    }