listenv1

src/main/java/com/uas/platform/b2b/manage/controller/ListenController.java

@@ -0,0 +1,43 @@
+package com.uas.platform.b2b.manage.controller;
+
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
+import com.uas.platform.b2b.manage.model.Listen;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.PageParams;
+import com.uas.platform.b2b.manage.service.ListenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 监控数据查询接口
+ * @Author: huj
+ * @Date: Created in 17:56 2018/11/27.
+ */
+@RequestMapping("/listen")
+@RestController
+public class ListenController {
+
+    @Autowired
+    ListenService listenService;
+
+    /**
+     * 分页查询
+     * @return
+     */
+    @RequestMapping("/list")
+    public PageResultBean<Listen> findAll(PageParams params, String keyword, HttpServletRequest request) {
+        PageInfo info = new PageInfo(params);
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        info.setSort(sort);
+        if (!StringUtils.isEmpty(keyword)) {
+            keyword = keyword.trim();
+        }
+        PageResultBean resultBean = new PageResultBean(listenService.findAll(info, keyword));
+        return resultBean;
+    }
+}

src/main/java/com/uas/platform/b2b/manage/dao/ListenDao.java

@@ -0,0 +1,16 @@
+package com.uas.platform.b2b.manage.dao;
+
+import com.uas.platform.b2b.manage.model.Listen;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: huj
+ * @Date: Created in 16:28 2018/11/27.
+ */
+@Repository
+public interface ListenDao extends JpaRepository<Listen, Long>, JpaSpecificationExecutor<Listen> {
+
+    Listen findByMacAddress(String macAddress);
+}

src/main/java/com/uas/platform/b2b/manage/model/Listen.java

@@ -0,0 +1,60 @@
+package com.uas.platform.b2b.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @Author: huj
+ * @Date: Created in 16:04 2018/11/27.
+ */
+@Table(name = "listen$erp", indexes = {@Index(name = "unique_mac_address",
+        columnList = "mac_address", unique = true)})
+@Entity
+public class Listen {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "mac_address")
+    String macAddress;
+
+    @Column(name = "name", length = 2000)
+    String name;
+
+    @Column(name = "date")
+    Date date;
+
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    public void setMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

src/main/java/com/uas/platform/b2b/manage/service/ListenService.java

@@ -0,0 +1,18 @@
+package com.uas.platform.b2b.manage.service;
+
+import com.uas.platform.b2b.manage.model.Listen;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import org.springframework.data.domain.Page;
+
+/**
+ * @Author: huj
+ * @Date: Created in 17:58 2018/11/27.
+ */
+public interface ListenService {
+
+    /**
+     * 查询所有
+     * @return
+     */
+    Page<Listen> findAll(PageInfo info, String keyword);
+}

src/main/java/com/uas/platform/b2b/manage/service/impl/ListenServiceImpl.java

@@ -0,0 +1,35 @@
+package com.uas.platform.b2b.manage.service.impl;
+
+
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.ListenDao;
+import com.uas.platform.b2b.manage.model.Listen;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.service.ListenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: huj
+ * @Date: Created in 16:31 2018/11/27.
+ */
+@Service
+public class ListenServiceImpl implements ListenService {
+
+    @Autowired
+    ListenDao listenDao;
+
+    /**
+     * 查询所有
+     *
+     * @return
+     */
+    @Override
+    public Page<Listen> findAll(PageInfo info, String keyword) {
+        if (!StringUtils.isEmpty(keyword)) {
+
+        }
+            return null;
+    }
+}

src/main/resources/conf/jdbc.properties

@@ -6,7 +6,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.password=select
 
 #txcloud
-jdbc.url=jdbc:mysql://172.21.0.2:3306/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+jdbc.url=jdbc:mysql://10.1.51.62:3309/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
 jdbc.username=root
 jdbc.password=select111***
 

src/main/webapp/WEB-INF/views/normal/enterprise.html

@@ -67,6 +67,7 @@
                 <li><a href="/invite" class="link-mall">邀请注册记录</a></li>
 				<li><a href="/notice" class="link-mall">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
+				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/views/normal/index.html

@@ -43,6 +43,7 @@
 					<li><a href="/invite" class="link-mall">邀请注册记录</a></li>
 					<li><a href="/notice" class="link-mall">发货提醒</a></li>
 					<li><a href="/statisticsChart">数据统计</a></li>
+					<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

src/main/webapp/WEB-INF/views/normal/inviteList.html

@@ -118,6 +118,7 @@
                 <li><a href="/invite" class="active">邀请注册记录</a></li>
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart">数据统计</a></li>
+                <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/views/normal/listen.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="Content-Language" Content="zh-CN">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="author" content="优软科技">
+    <meta name="Keywords" content="优软,优软云,优企云服,SAAS,UAS,ERP,企业管理">
+    <meta name="baidu-site-verification" content="tamBdrxeYx" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=8">
+    <meta http-equiv="Expires" content="0">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache, must-revalidate">
+    <meta http-equiv="Cache" content="no-cache">
+    <link href="static/img/icon/icon_32.png" rel="icon" type="image/x-icon" />
+    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet"
+          href="static/lib/fontawesome/css/font-awesome.min.css" />
+    <link rel="stylesheet" href="static/lib/bootstrap-tour/css/bootstrap-tour.min.css" />
+    <link rel="stylesheet" href="static/css/common.css" />
+    <link rel="stylesheet" href="static/css/enterprise.css" />
+    <link rel="stylesheet" href="static/css/pagination.css">
+    <title>UAS轮询监控</title>
+</head>
+<body>
+<style>
+    #loadingDiv {
+        position: absolute;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        /*background: #000000;*/
+        opacity: 0.3;
+        filter: alpha(opacity=80);
+        z-index: 10000;
+        display: none;
+    }
+    #loadingImg {
+        position: absolute;
+        cursor: wait;
+        left: 45%;
+        top: 50%;
+        width: auto;
+        height: auto;
+    }
+</style>
+<div id="loadingDiv">
+    <div id="loadingImg">
+        <img src="../static/images/waiting.gif"/>
+    </div>
+</div>
+<!-- nav start -->
+<nav id="nav" class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <a href="/" id="logo"><img src="static/img/logo.png" alt="" height="25px" /></a>
+        </div>
+        <div class="collapse navbar-collapse">
+            <div class="nav navbar-nav navbar-left">
+                <li><a href="/enterprise" class="link-b2b">企业列表</a></li>
+                <li><a href="/logList" class="link-mall">B2B日志</a></li>
+                <li><a href="/schedularList" class="link-mall">UAS轮询地址</a></li>
+                <li><a href="/invite" class="link-mall">邀请注册记录</a></li>
+                <li><a href="/notice" class="link-mall">发货提醒</a></li>
+                <li><a href="/statisticsChart">数据统计</a></li>
+                <li><a href="/listen" class="active">UAS轮询监控</a></li>
+            </div>
+            <ul class="nav navbar-nav navbar-right x-login">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle"><i class="fa fa-user"></i> <span class="title"></span></a>
+                </li>
+                <li><a href="#" class="link-logout">退出</a></li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<!-- nav end -->
+
+<!-- section start -->
+<section>
+    <div class="container">
+        <div class="section-title">
+            <h3>企业列表</h3>
+        </div>
+    </div>
+    <div class="search">
+        <div class="search-title" style="float: right">
+            <input id="enterprise-total" style="width: 100px; border:0;outline:0;background: #F7F7F8" readonly>
+        </div>
+        <div class="input-group">
+            <input type="text" id="keyword" class="form-control" placeholder="请输入名称、地址、UU号或营业执照搜索"><span class="input-group-addon" id="p_search">搜索</span>
+        </div>
+    </div>
+    <table class="table table-striped table-hover">
+        <thead id="enterprise-head">
+        <th class="text-center" width="50">序号</th>
+        <th class="text-center" width="80">UU</th>
+        <th class="text-center" width="200">企业名称</th>
+        <th class="text-center" width="300">企业地址</th>
+        <th class="text-center" width="150">营业执照</th>
+        <th class="text-center" width="120">注册时间</th>
+        <th class="text-center" width="80">操作</th>
+        </thead>
+        <tbody id="enterprise-body">
+        </tbody>
+        <div id="page"></div>
+    </table>
+    <div id="m-page" class="m-style"></div>
+</section>
+<!-- section end -->
+
+</body>
+<script type="text/javascript" src="static/lib/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="static/lib/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="static/lib/bootstrap-tour/js/bootstrap-tour.min.js"></script>
+<script type="text/javascript" src="static/js/account/enterprise.js"></script>
+<script type="text/javascript" src="static/js/index/app.js"></script>
+<script type="text/javascript" src="static/js/common/common.js"></script>
+</html>

src/main/webapp/WEB-INF/views/normal/logList.html

@@ -87,6 +87,7 @@
 				<li><a href="/invite" class="link-mall">邀请注册记录</a></li>
 				<li><a href="/notice" class="link-mall">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
+				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/views/normal/noticeList.html

@@ -71,6 +71,7 @@
 				<li><a href="/invite" class="link-mall">邀请注册记录</a></li>
 				<li><a href="/notice" class="active">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
+				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/views/normal/schedularList.html

@@ -97,6 +97,7 @@
                 <li><a href="/invite" class="link-mall">邀请注册记录</a></li>
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart">数据统计</a></li>
+                <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/views/normal/statisticsChart.html

@@ -77,6 +77,7 @@
                 <li><a href="/invite" class="link-mall">邀请注册记录</a></li>
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart" class="active">数据统计</a></li>
+                <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/webmvc.xml

@@ -63,6 +63,7 @@
 	<mvc:view-controller path="/notice" view-name="noticeList" />
     <mvc:view-controller path="/notice_detail" view-name="noticeDetail" />
 	<mvc:view-controller path="/statisticsChart" view-name="statisticsChart" />
+	<mvc:view-controller path="/listen" view-name="listen" />
 	<mvc:interceptors>
 		<!-- SSO过滤 -->
 		<mvc:interceptor>