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

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

@@ -265,11 +265,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
    }
    public List<Map<String,Object>>getNewList(String deviceSn,String day){
        SimpleDateFormat sdf = new SimpleDateFormat();
        if (StringUtils.isBlank(day)){
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            Date date = new Date();
            day = dateFormat.format(date);
            day = DateUtil.getStringDateShort();
        }
        String sql = "SELECT * FROM base_yxdevice_index WHERE sn = '"+deviceSn+"' AND create_time LIKE '"+day+"%' AND lon != 0 AND lat != 0 ORDER BY create_time DESC limit 1";
        return jdbcTemplate.queryForList(sql);