加设备code

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/DoctorMessageService.java

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.*;
@@ -579,10 +580,15 @@ public class DoctorMessageService {
    public ObjEnvelop getRepairMessageListById(Integer id){
        String sql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,UNIX_TIMESTAMP(re.deal_time) dealTimeNum,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo,re.feedback,re.img " +
                " from base_device_repair re left join base_patient p on re.bind_user = p.id where re.type = 0 and re.id = "+id;
        Map<String, Object> map = jdbcTemplate.queryForMap(sql);
        Long l1 = (Long) map.get("dealTimeNum");
        map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
        return ObjEnvelop.getSuccess("获取成功",map);
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        Map<String, Object> map = new HashMap<>();
        if(!ObjectUtils.isEmpty(list)){
            map = list.get(0);
            Long l1 = (Long) map.get("dealTimeNum");
            map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
            return ObjEnvelop.getSuccess("获取成功",map);
        }
        return ObjEnvelop.getError("无数据");
    }
}

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

@@ -2666,12 +2666,15 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject();
                String deviceSn = "";
                List<String> deviceSns = jdbcTemplate.queryForList("select pd.device_sn from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItemTmp + "',dd.service_topic)", String.class);
                String deviceCode = "";
                List<Map<String, Object>> deviceSns = jdbcTemplate.queryForList("select pd.device_sn,pd.category_code from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItemTmp + "',dd.service_topic)");
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                    deviceSn = deviceSns.get(0).get("device_sn").toString();
                    deviceCode = deviceSns.get(0).get("category_code").toString();
                }
                object.put("deviceSn", deviceSn);
                object.put("deviceCode", deviceCode);
                switch (topicItem) {
                    case "actionTrack":
@@ -2712,14 +2715,17 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            for (int i = 0; i < list.size(); i++) {
                Map<String, Object> patientTmp = list.get(i);
                String deviceSn = "";
                List<String> deviceSns = jdbcTemplate.queryForList("select pd.device_sn from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItem + "',dd.service_topic)", String.class);
                String deviceCode = "";
                List<Map<String, Object>> deviceSns = jdbcTemplate.queryForList("select pd.device_sn,pd.category_code from wlyy_patient_device pd INNER JOIN dm_device dd " +
                        " on pd.device_id = dd.id where  pd.user = '" + patientTmp.get("id").toString() + "' and pd.del=0  and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItem + "',dd.service_topic)");
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                    deviceSn = deviceSns.get(0).get("device_sn").toString();
                    deviceCode = deviceSns.get(0).get("category_code").toString();
                }
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", null,false);
                object.put("deviceSn", deviceSn);
                object.put("patientInfo", patientTmp);
                object.put("deviceCode", deviceCode);
                monitorInfos.add(object);
            }
            result.put("topicInfo", monitorInfos);