首页 发现 帮助
注册 登录
yeshijie
/
wlyy2.0
派生自 Amoy2/wlyy2.0
关注 1
点赞 0
派生 0
文件
浏览代码

配置文件修改，修改静态资源配置

yeshijie 7 年之前
父节点
80ff04d053
当前提交
ea8cc749b0
共有 6 个文件被更改，包括 31 次插入 和 271 次删除
合并视图 显示文件统计
  1. 1 0
      app/app-iot-server/src/main/java/com/yihu/ehr/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java
  2. 29 7
      app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/common/BaseService.java
  3. 1 1
      app/app-iot-server/src/main/resources/application.yml
  4. 0 68
      app/app-iot-server/src/main/webapp/front/views/detail.html
  5. 0 168
      app/app-iot-server/src/main/webapp/front/views/search.html
  6. 0 27
      app/app-iot-server/src/main/webapp/front/views/trace.html

+ 1 - 0
app/app-iot-server/src/main/java/com/yihu/ehr/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java
查看文件 

@ -55,6 +55,7 @@ public class EhrWebUsernamePasswordAuthenticationFilter extends AbstractAuthenti
 
     * @return
 
     * @return
 
     * @throws AuthenticationException
 
     * @throws AuthenticationException
 
     */
 
     */
 
    @Override
 
    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
 
    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
 
        if(this.postOnly && !request.getMethod().equals("POST")) {
 
        if(this.postOnly && !request.getMethod().equals("POST")) {
 
            throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
 
            throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());

+ 29 - 7
app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/common/BaseService.java
查看文件 

@ -2,25 +2,31 @@ package com.yihu.ehr.iot.service.common;
 
import com.fasterxml.jackson.core.JsonProcessingException;
 
import com.fasterxml.jackson.core.JsonProcessingException;
 
import com.fasterxml.jackson.databind.ObjectMapper;
 
import com.fasterxml.jackson.databind.ObjectMapper;
 
import com.yihu.ehr.iot.util.CurrentRequest;
 
import com.yihu.ehr.agModel.user.UserDetailModel;
 
import com.yihu.ehr.iot.model.AccessToken;
 
import com.yihu.ehr.iot.model.ListResult;
 
import com.yihu.ehr.iot.model.ObjectResult;
 
import com.yihu.ehr.iot.model.Result;
 
import com.yihu.ehr.iot.util.encode.AES;
 
import com.yihu.ehr.iot.util.encode.AES;
 
import com.yihu.ehr.iot.util.encode.Base64;
 
import com.yihu.ehr.iot.util.encode.Base64;
 
import com.yihu.ehr.iot.util.http.HttpHelper;
 
import com.yihu.ehr.iot.util.http.HttpHelper;
 
import com.yihu.ehr.iot.util.http.HttpResponse;
 
import com.yihu.ehr.iot.util.http.HttpResponse;
 
import com.yihu.ehr.iot.util.operator.StringUtil;
 
import com.yihu.ehr.iot.util.operator.StringUtil;
 
import com.yihu.ehr.iot.model.AccessToken;
 
import com.yihu.ehr.iot.model.ListResult;
 
import com.yihu.ehr.iot.model.ObjectResult;
 
import com.yihu.ehr.iot.model.Result;
 
import com.yihu.ehr.util.rest.Envelop;
 
import com.yihu.ehr.util.rest.Envelop;
 
import org.apache.commons.lang.ArrayUtils;
 
import org.apache.commons.lang.ArrayUtils;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.security.core.session.SessionInformation;
 
import org.springframework.security.core.session.SessionRegistry;
 
import org.springframework.web.context.request.RequestContextHolder;
 
import org.springframework.web.context.request.RequestContextHolder;
 
import org.springframework.web.context.request.ServletRequestAttributes;
 
import org.springframework.web.context.request.ServletRequestAttributes;
 
import javax.servlet.http.HttpServletRequest;
 
import javax.servlet.http.HttpServletRequest;
 
import java.io.*;
 
import java.io.*;
 
import java.util.*;
 
import java.util.Collection;
 
import java.util.HashMap;
 
import java.util.List;
 
import java.util.Map;
 
/**
 
/**
 
 * Serveice - 基类
 
 * Serveice - 基类
 
@ -51,7 +57,23 @@ public class BaseService {
 
    @Value("${app.oauth2OuterUrl}")
 
    @Value("${app.oauth2OuterUrl}")
 
    protected String oauth2OuterUrl;
 
    protected String oauth2OuterUrl;
 
    @Autowired
 
    @Autowired
 
    private CurrentRequest currentRequest;
 
    protected SessionRegistry sessionRegistry;
 
    @Autowired
 
    protected HttpServletRequest request;
 
    /**
 
     * 获取当前登录用户，当前已登录的用户都缓存在session中
 
     * @return
 
     */
 
    public UserDetailModel getCurrentUser(){
 
        String sessionId = request.getSession().getId();
 
        UserDetailModel user = null;
 
        SessionInformation sessionInformation = sessionRegistry.getSessionInformation(sessionId);
 
        if(null != sessionInformation.getPrincipal()){
 
            user = (UserDetailModel)sessionInformation.getPrincipal();
 
        }
 
        return user;
 
    }
 
    public String readFile(String filePath, String charSet) {
 
    public String readFile(String filePath, String charSet) {

+ 1 - 1
app/app-iot-server/src/main/resources/application.yml
查看文件 

@ -21,7 +21,7 @@ spring:
 
    name: app-iot-server
 
    name: app-iot-server
 
    message: App IOT Server
 
    message: App IOT Server
 
  resources:
 
  resources:
 
    static-locations: classpath:/
 
    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/front/,classpath:/
 
#    cache-period: 0
 
#    cache-period: 0

+ 0 - 68
app/app-iot-server/src/main/webapp/front/views/detail.html
查看文件 

@ -1,68 +0,0 @@
 
<!DOCTYPE html>
 
<html lang="en">
 
<head>
 
    <meta charset="UTF-8">
 
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
    <meta name="renderer" content="webkit">
 
    <meta http-equiv="Cache-Control" content="no-siteapp" />
 
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
    <!--[if lt IE 9]>
 
    <meta http-equiv="refresh" content="0;ie.html" />
 
    <![endif]-->
 
    <title>急救查询</title>
 
    <link href="../css/bootstrap.min14ed.css" rel="stylesheet">
 
    <link href="../css/index.css?v=2" rel="stylesheet">
 
    <style>
 
        p{
 
            padding-bottom: 10px;
 
        }
 
        p span:first-child{
 
            width: 100px;
 
            display: inline-block;
 
        }
 
        .line{
 
            border-bottom: 1px solid #ddd;
 
            padding-bottom: 10px;
 
        }
 
        .content{
 
            padding: 10px 20px 0;
 
        }
 
    </style>
 
</head>
 
<body>
 
    <div style="padding:20px 0px 20px 100px;">
 
        <div class="line">
 
            基本信息
 
        </div>
 
        <div class="content">
 
            <p><span class="color4">接警号码</span><span id="alarmTel"></span></p>
 
            <p><span class="color4">急救地址</span><span id="callAddress"></span></p>
 
            <p><span class="color4">患者人数</span><span id="patientNum"></span></p>
 
            <p><span class="color4">患者性别</span><span id="patientGender"></span></p>
 
            <p><span class="color4">主&#12288;&#12288;诉</span><span id="chiefComplaint"></span></p>
 
            <p><span class="color4">初步诊断</span><span id="disease"></span></p>
 
        </div>
 
        <div class="line">
 
            急救信息
 
        </div>
 
        <div class="content">
 
            <p><span class="color4">目&nbsp;&nbsp;的&nbsp;&nbsp;地</span><span id="callAddress1" class="main-color"></span></p>
 
            <p><span class="color4">派遣车辆</span><span id="carId"></span></p>
 
            <p><span class="color4">医&#12288;&#12288;生</span><span id="yisheng"></span></p>
 
            <p><span class="color4">护&#12288;&#12288;士</span><span id="hushi"></span></p>
 
            <p><span class="color4">司&#12288;&#12288;机</span><span id="siji"></span></p>
 
            <p><span class="color4">送达医院</span><span id="deliverAddress" class="main-color"></span></p>
 
        </div>
 
        <div class="line">
 
            调度员
 
        </div>
 
        <div class="content">
 
            <p><span class="color4">姓&#12288;&#12288;名</span><span id="realName"></span></p>
 
            <p><span class="color4">调度时间</span><span id="createDate"></span></p>
 
        </div>
 
    </div>
 
    <script src="../js/lib/plugins/require/require.js"></script>
 
    <script src="../js/common/config.js"></script>
 
    <script src="../js/scripts/detail.js?v=8"></script>
 
</body>
 
</html>

+ 0 - 168
app/app-iot-server/src/main/webapp/front/views/search.html
查看文件 

@ -1,168 +0,0 @@
 
<!DOCTYPE html>
 
<html lang="en">
 
<head>
 
    <meta charset="UTF-8">
 
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
    <meta name="renderer" content="webkit">
 
    <meta http-equiv="Cache-Control" content="no-siteapp" />
 
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
    <!--[if lt IE 9]>
 
    <meta http-equiv="refresh" content="0;ie.html" />
 
    <![endif]-->
 
    <title>急救查询</title>
 
    <link href="../css/bootstrap.min14ed.css" rel="stylesheet">
 
    <link href="../css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
 
    <link href="../css/index.css" rel="stylesheet">
 
    <style>
 
        .table-border tr {
 
            border-bottom: 1px solid #e2e2e2;
 
        }
 
        .dataTables_wrapper .bottom {
 
            margin-top: 10px;
 
        }
 
        .body-grey .bottom {
 
            padding: 0 15px;
 
        }
 
        .dataTables_wrapper .bottom:after {
 
            clear: both;
 
        }
 
        .dataTables_wrapper .bottom:after, .dataTables_wrapper .bottom:before {
 
            display: table;
 
            content: " ";
 
        }
 
        .dataTables_length, .dataTables_filter, .dataTables_info, .dataTables_paginate {
 
            margin-bottom: 10px;
 
            display: inline-block;
 
        }
 
        .dataTables_length, .dataTables_info {
 
            float: left;
 
        }
 
        .dataTables_info {
 
            line-height: 26px;
 
            margin-left: 10px;
 
        }
 
        .dataTables_filter, .dataTables_paginate {
 
            float: right;
 
        }
 
        .dataTables_length .layui-form-select {
 
            display: none;
 
        }
 
        .dataTables_length select, .dataTables_filter input[type=search] {
 
            width: 100px;
 
            height: 26px;
 
            border: 1px solid #ccc;
 
            padding: 0 5px;
 
            display: inline-block;
 
        }
 
        .dataTables_paginate a.paginate_button {
 
            border-radius: 2px;
 
            padding: 0 12px;
 
            background-color: #f1eff0;
 
        }
 
        .dataTables_paginate a, .dataTables_paginate > span > span {
 
            box-sizing: border-box;
 
            display: inline-block;
 
            min-width: 2em;
 
            height: 26px;
 
            line-height: 26px;
 
            border: 1px solid transparent;
 
            padding: 0 0.5em;
 
            margin-left: 6px;
 
            text-align: center;
 
            text-decoration: none;
 
            cursor: pointer;
 
        }
 
        .dataTables_paginate span a.current {
 
            color: white;
 
            background: #2e8ded;
 
        }
 
        .dataTables_length select {
 
            width: 60px;
 
            border-radius: 2px;
 
        }
 
        .table {
 
            width: 100%!important;
 
        }
 
        label {
 
            float: left;
 
            padding-right: 15px;
 
            padding-left: 15px;
 
        }
 
        .form-control{
 
            display: inline-block;
 
            width: auto;
 
            float: left;
 
        }
 
    </style>
 
</head>
 
<body>
 
    <div class="container-fluid">
 
        <div class="row-fluid">
 
            <div style="text-align:center;margin:10px 0 10px 0;">
 
                <div class="form-horizontal query-form">
 
                    <!-- 这里添加查询条件 -->
 
                    <div class="form-group">
 
                        <div class="col-xs-6">
 
                            <label class="control-label" for="startDate">急救时间</label>
 
                            <input id="startDate" type="text" class="form-control input-md laydate-icon" style="width: 150px">
 
                            <label class="control-label" for="endDate">至</label>
 
                            <input id="endDate" type="text" class="form-control input-md laydate-icon" style="width: 150px">
 
                        </div>
 
                        <div class="col-xs-6">
 
                            <label class="control-label " for="startDate">车牌号码</label>
 
                            <input id="carId" type="text" class="form-control input-md">
 
                        </div>
 
                    </div>
 
                    <div class="form-group">
 
                        <div class="col-xs-6">
 
                            <label class="control-label " for="startDate">呼救地点</label>
 
                            <input id="callAddress" type="text" class="form-control input-md" style="width: 345px">
 
                        </div>
 
                        <div class="col-xs-6">
 
                            <label class="control-label " for="startDate">送达医院</label>
 
                            <input id="deliverAddress" type="text" class="form-control input-md">
 
                            <button id="searchBtn" class="btn btn-primary">
 
                                <i class="glyphicon glyphicon-search"></i> 查询
 
                            </button>
 
                        </div>
 
                    </div>
 
                </div>
 
            </div>
 
            <table id="dateTable" class="table table-bordered table-striped">
 
                <thead>
 
                <tr>
 
                    <th>急救时间</th>
 
                    <th>接警电话</th>
 
                    <th>呼救地点</th>
 
                    <th>派遣救护车</th>
 
                    <th>送达医院</th>
 
                    <th>操作</th>
 
                </tr>
 
                </thead>
 
                <tbody>
 
                </tbody>
 
            </table>
 
        </div>
 
    </div>
 
    <script src="../js/lib/jquery.min.js"></script>
 
    <script src="../js/lib/plugins/dataTables/jquery.dataTables.js"></script>
 
    <script src="../js/lib/plugins/layer/layer.min.js"></script>
 
    <script src="../js/lib/plugins/layer/laydate/laydate.js"></script>
 
    <script src="../js/scripts/search.js?v=9"></script>
 
</body>
 
</html>

+ 0 - 27
app/app-iot-server/src/main/webapp/front/views/trace.html
查看文件 

@ -1,27 +0,0 @@
 
<!DOCTYPE html>
 
<html lang="en">
 
<head>
 
    <meta charset="UTF-8">
 
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
    <meta name="renderer" content="webkit">
 
    <meta http-equiv="Cache-Control" content="no-siteapp" />
 
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
    <!--[if lt IE 9]>
 
    <meta http-equiv="refresh" content="0;ie.html" />
 
    <![endif]-->
 
    <title>急救查询</title>
 
    <link href="../css/bootstrap.min14ed.css" rel="stylesheet">
 
    <link href="../css/index.css?v=2" rel="stylesheet">
 
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=mHjQLONxGpRtrZHZkxr9t3cD3n0HupQ0"></script>
 
</head>
 
<body>
 
    <div class="map-content">
 
        <div id="map" style="height:100%;width: 100%;">
 
        </div>
 
    </div>
 
    <script src="../js/lib/plugins/require/require.js"></script>
 
    <script src="../js/common/config.js"></script>
 
    <script src="../js/scripts/trace.js"></script>
 
</body>
 
</html>