From a50eeca38aac03ba7a4fb9f27f73133936b8597a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:38:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/elegroup-batt-add.html | 498 ++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/elegroup-list-user.html | 150 +++++++
gx_tieta/WebRoot/mobil/elegroup-list.html | 143 +++++++
gx_tieta/WebRoot/mobil/elegroup-batt.html | 197 +++++++++
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 9
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 15
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 17
gx_tieta/WebRoot/mobil/js/battNav.js | 4
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java | 12
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 64 +++
gx_tieta/src/com/fgkj/dto/Battalarm_data.java | 32 +
11 files changed, 1,129 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/elegroup-batt-add.html b/gx_tieta/WebRoot/mobil/elegroup-batt-add.html
new file mode 100644
index 0000000..8d79ada
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-batt-add.html
@@ -0,0 +1,498 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>娣诲姞鍖呮満鏈烘埧鎴栬澶�</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+ <link rel="stylesheet" href="css/fgpanel.css">
+ <style type="text/css">
+ .tbl-container table{
+ color:#e61212!important;
+ }
+ </style>
+</head>
+<body>
+ <div data-role="page" id="pageone">
+ <!-- 闈㈡澘鍐呭 -->
+ <div class="fg-panel">
+ <form>
+ <div class="fg-panel-header">绛涢��</div>
+ <div class="fg-panel-content">
+ <fieldset data-role="controlgroup">
+ <p>鐪�</p>
+ <select id="mainteArea" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鏈烘埧绔欑偣</p>
+ <select id="homeName" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>钃勭數姹犵粍</p>
+ <select id="battgroup_name" data-mini="true">
+ <option value="0">鍏ㄩ儴</option>
+ </select>
+ </fieldset>
+ </div>
+ <div class="fg-panel-btn">
+ <a href="javascript:panel.hide(true);" data-role="button" id="submit" class="ui-btn ui-mini ui-btn-b ui-shadow">娣诲姞</a>
+ </div>
+ </form>
+ </div>
+
+ <!-- 澶撮儴鍐呭 -->
+ <div data-role="header" data-position="fixed">
+ <a href="elegroup-batt.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <h1>娣诲姞鍖呮満鏈烘埧鎴栬澶�</h1>
+ <a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+ <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>
+ <!-- 琛ㄦ牸瀹瑰櫒 -->
+ <div class="tbl-container"></div>
+ <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+ </table>
+ </div>
+ <!-- 椤佃剼鍐呭 -->
+ <div data-role="footer" data-position="fixed" data-theme="a">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">搴旂敤</a></li>
+ <li><a href="elegroup-batt.html" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
+ </ul>
+ </div>
+ </div>
+ <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+ <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+ <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦搴旂敤</a>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鍙栨秷搴旂敤</a>
+ </div>
+ </div>
+
+</body>
+
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="js/echarts.js"></script>
+<script type="text/javascript" src="js/eleAnalyse.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">
+
+ var data = new Date;
+ var arrTh = ['鍖呮満鏈烘埧', '鍖呮満鐢垫睜缁�'];
+ var dataArr = new Array();
+ dataArr = [];
+ var newArrTd = [];
+ var tblCon = $('.tbl-container');
+ var battProducer = "";
+ var Page = {
+ pageSize : 10,
+ pageCurr : 1,
+ pageAll : 0,
+ };
+
+ var startTime = "1980-01-01";
+ var endTime = new Date;
+
+ $(document).ready(function(){
+ $("#submit").click(function(){
+ searchDisCharage();
+ });
+ });
+
+
+ function searchDisCharage(){
+ loadshow();
+ arr=[];
+ for(i=0;i<100;i++){arr[i]=i*10}
+ createTbl(tblCon, arrTh, arr);
+ loadclose();
+ }
+
+
+ function judgepronextshow(){
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ console.info(Page.pageCurr);
+ if (pageNum!==1){//鏈夊椤�
+ if (Page.pageCurr==1){
+ setPageTurning(false, true); //褰撳墠椤典负1,闅愯棌宸﹁竟
+ }
+ else if (Page.pageCurr== pageNum)
+ {
+ setPageTurning(true, false); //褰撳墠椤典负鏈�鍚庝竴椤�,闅愯棌鍙宠竟
+ }
+ else
+ {
+ setPageTurning(true, true); //涓轰腑闂�,涓よ竟閮戒笉闅愯棌
+ }
+ }else{
+ setPageTurning(false, false);
+ } //鍙湁涓�椤�,闅愯棌涓よ竟
+ }
+
+
+ //鏋勯�犳煡璇㈡潯浠跺璞�
+ function createSearchForm(){
+ var temp={
+ page:{
+ pageCurr:Page.pageCurr,
+ pageSize:Page.pageSize,
+ },
+ binf:{
+ StationName1:$('#privince').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ BattGroupId:$('#battgroup_name').val(),
+ BattProducer:battProducer,
+ MonVolStd:"0",
+ MonCapStd:$('#moncap_std2').val(),
+ BattGroupName1:"",
+ BattProductDate:startTime,
+ BattProductDate1:endTime,
+ BattInUseDate:startTime,
+ BattInUseDate1:endTime,
+ },
+ uinf:{
+ UId:"0",
+ },
+ tdata:{
+ test_type:"0",
+ record_time:startTime,
+ record_time1:endTime,
+ test_starttype:"0",
+ },
+ mainf:{
+ /*
+ remark:"100",
+ maint_done_time:startTime,
+ maint_done_time1:endTime,
+ */
+ }
+ };
+ return temp;
+ }
+
+//椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#mainteArea");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName1,
+ txt:data.data[i-1].StationName1,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCity();
+ });
+
+
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+ function findCity(){
+ var data = {
+ StationName1: $("#mainteArea").val()
+ };
+ //console.info(data);
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#city");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCounty();
+ }
+ });
+ }
+
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ stationid:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName,
+ stationid:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+ var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").val(),
+ StationId: stationid
+ };
+
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchBattByStation",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.warn();
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#battgroup_name");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:0,
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].BattGroupId,
+ txt:data.data[i-1].BattGroupName,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+
+ }
+ });
+ }
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ $('#mainteArea').change(function(){
+ findCity();
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+ //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
+ $('#homeName').change(function(){
+ findserchByBattGroupNamebystationname();
+ });
+
+ //鏌ヨ鐢垫睜瀹归噺
+ $.post("BattInfAction_serchByMonCapStd",null,function(data){
+ data=data.result;
+ data=eval("("+data+")");
+ if(data.code==1 && data.data.length>0){
+ var $Omoncap_std2=$("#moncap_std2");
+ $Omoncap_std2.text=("");
+ console.info(data.data[1].MonCapStd);
+ var arr = new Array();
+ for(var i=0;i <= data.data.length;i++){
+ if(i == 0){
+ arr.push({
+ val:0,
+ txt:"鍏ㄩ儴(鍏�"+data.sum+")绉�"
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].MonCapStd,
+ txt:data.data[i-1].MonCapStd
+ });
+ }
+ }
+ updataSel($('#moncap_std2'),arr);
+ };
+ });
+
+
+
+
+ $(function() {
+ $('.pre-page').on('click', 'a', function() {
+ var isShowPre = true;
+ Page.pageSize = 10;
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize)
+ if(Page.pageCurr>1){
+ Page.pageCurr = Page.pageCurr - 1;
+ searchDisCharage();
+ }else {
+ searchDisCharage();
+ }
+ });
+
+ $('.next-page').on('click', 'a', function() {
+ var isShowNext = true;
+ Page.pageSize = 10;
+ console.info(Page.pageAll);
+ console.info(Page.pageSize);
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ if(Page.pageCurr<pageNum){
+ Page.pageCurr = Page.pageCurr + 1;
+ console.info(Page.pageCurr);
+ searchDisCharage()
+ }
+ });
+ });
+
+
+ // 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+ function setPageTurning(isShowPre, isShowNext) {
+ if(isShowPre) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+ $('.pre-page').show();
+ }else {
+ $('.pre-page').hide();
+ }
+
+ if(isShowNext) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+ $('.next-page').show();
+ }else {
+ $('.next-page').hide();
+ }
+ }
+
+ $('document').ready(function(){
+ panel.show();
+ });
+ </script>
+</html>
+
+
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-batt.html b/gx_tieta/WebRoot/mobil/elegroup-batt.html
new file mode 100644
index 0000000..603302f
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-batt.html
@@ -0,0 +1,197 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>宸叉坊鍔犲寘鏈烘満鎴�</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+
+</head>
+<body>
+ <div data-role="page" id="pageone">
+
+
+ <!-- 澶撮儴鍐呭 -->
+ <div data-role="header" data-position="fixed">
+ <a href="elegroup-list-user.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <h1>宸叉坊鍔犲寘鏈烘満鎴�</h1>
+
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+ <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>
+ <!-- 琛ㄦ牸瀹瑰櫒 -->
+ <div class="tbl-container"></div>
+ <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+ </table>
+ </div>
+ <!-- 椤佃剼鍐呭 -->
+ <div data-role="footer" data-position="fixed" data-theme="a">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
+ <li><a href="elegroup-batt-add.html" target="_top" data-role="button" data-icon="plus" data-transition="slide">娣诲姞</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+</body>
+
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="js/echarts.js"></script>
+<script type="text/javascript" src="js/eleAnalyse.js"></script>
+
+<script type="text/javascript">
+
+ var data = new Date;
+ var arrTh = ['鍖呮満鏈烘埧', '鍖呮満鐢垫睜缁�'];
+ var dataArr = new Array();
+ dataArr = [];
+ var newArrTd = [];
+ var tblCon = $('.tbl-container');
+ var battProducer = "";
+ var Page = {
+ pageSize : 10,
+ pageCurr : 1,
+ pageAll : 0,
+ };
+
+ var startTime = "1980-01-01";
+ var endTime = new Date;
+
+ $(document).ready(function(){
+
+ searchDisCharage();
+
+ });
+
+
+ function searchDisCharage(){
+ loadshow();
+
+ arr=[];
+ for(i=0;i<100;i++){arr[i]=i*10}
+ createTbl(tblCon, arrTh, arr);
+ loadclose();
+
+ }
+
+
+ function judgepronextshow(){
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ console.info(Page.pageCurr);
+ if (pageNum!==1){//鏈夊椤�
+ if (Page.pageCurr==1){
+ setPageTurning(false, true); //褰撳墠椤典负1,闅愯棌宸﹁竟
+ }
+ else if (Page.pageCurr== pageNum)
+ {
+ setPageTurning(true, false); //褰撳墠椤典负鏈�鍚庝竴椤�,闅愯棌鍙宠竟
+ }
+ else
+ {
+ setPageTurning(true, true); //涓轰腑闂�,涓よ竟閮戒笉闅愯棌
+ }
+ }else{
+ setPageTurning(false, false);
+ } //鍙湁涓�椤�,闅愯棌涓よ竟
+ }
+
+
+ //鏋勯�犳煡璇㈡潯浠跺璞�
+ function createSearchForm(){
+ var temp={
+ page:{
+ pageCurr:Page.pageCurr,
+ pageSize:Page.pageSize,
+ },
+ binf:{
+ StationName1:$('#privince').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ BattGroupId:$('#battgroup_name').val(),
+ BattProducer:battProducer,
+ MonVolStd:"0",
+
+ BattGroupName1:"",
+ BattProductDate:startTime,
+ BattProductDate1:endTime,
+ BattInUseDate:startTime,
+ BattInUseDate1:endTime,
+ },
+ uinf:{
+ UId:"0",
+ },
+ tdata:{
+ test_type:"0",
+ record_time:startTime,
+ record_time1:endTime,
+ test_starttype:"0",
+ },
+ mainf:{
+ /*
+ remark:"100",
+ maint_done_time:startTime,
+ maint_done_time1:endTime,
+ */
+ }
+ };
+ return temp;
+ }
+
+
+ $(function() {
+ $('.pre-page').on('click', 'a', function() {
+ var isShowPre = true;
+ Page.pageSize = 10;
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize)
+ if(Page.pageCurr>1){
+ Page.pageCurr = Page.pageCurr - 1;
+ searchDisCharage();
+ }else {
+ searchDisCharage();
+ }
+ });
+
+ $('.next-page').on('click', 'a', function() {
+ var isShowNext = true;
+ Page.pageSize = 10;
+ console.info(Page.pageAll);
+ console.info(Page.pageSize);
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ if(Page.pageCurr<pageNum){
+ Page.pageCurr = Page.pageCurr + 1;
+ console.info(Page.pageCurr);
+ searchDisCharage()
+ }
+ });
+ });
+
+
+ // 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+ function setPageTurning(isShowPre, isShowNext) {
+ if(isShowPre) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+ $('.pre-page').show();
+ }else {
+ $('.pre-page').hide();
+ }
+
+ if(isShowNext) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+ $('.next-page').show();
+ }else {
+ $('.next-page').hide();
+ }
+ }
+
+
+ </script>
+</html>
+
+
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-list-user.html b/gx_tieta/WebRoot/mobil/elegroup-list-user.html
new file mode 100644
index 0000000..1ae97b5
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-list-user.html
@@ -0,0 +1,150 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>鍖呮満缁勭敤鎴峰垪琛�</title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+ <body>
+ <div data-role="page" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="elegroup-list.html" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <h1>鍖呮満缁勭敤鎴峰垪琛�</h1>
+ </div>
+
+ <div data-role="content">
+ <ul class="breadcrumb"></ul>
+ <div id="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div data-role="footer" data-position="fixed">
+ <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+ </div>
+ </div>
+ </body>
+ <script type="text/javascript" src="js/battNav.js"></script>
+ <script type="text/javascript">
+ var citylist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("",null);
+ setCookie("",null);
+ seachAllCity();
+ });
+
+ // 鐐瑰嚮鍩庡競浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ city = getbatt(citylist,aLi);
+
+ var json=window.JSON.stringify(city);
+ setCookie("",json);
+ window.location.href="elegroup-batt.html";
+ });
+
+ });
+
+ // 瀹氫箟闈㈠寘灞戝鑸潯
+ /* $(function(){
+ var data = [
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:JumpElegroupListPage();', txt: 鍖呮満缁勫垪琛�'},
+ {url: 'javascript:;', txt: '鍖呮満缁勭敤鎴峰垪琛�'}
+ ];
+ addBreadCrumb($('.breadcrumb').eq(0),data);
+ }); */
+ var temp=getCookie("");
+ temp = JSON.parse(temp);
+ console.info(temp);
+ //鏌ヨ鎵�鏈夋満鎴�
+ function seachAllCity(){
+ loadshow();
+ var data = {
+ StationName1: temp.StationName1
+ };
+ console.info(data);
+ $.ajax({
+ type: "post",
+ url: "",
+ async:true,
+ dataType:'text',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(model.code == 1){
+ citylist = model.data;
+ createUl($('#battList'),model.data);
+ }else {
+ //alert(213);
+ $('#myPopup').popup('open');
+ }
+ loadclose();
+ },
+ error:function(){
+ loadclose();
+ }
+ });
+ }
+
+ /*
+ 澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+ @param ulCon ul鐨勫鍣�
+ @param dataList ul鐨勬暟鎹唴瀹�
+ */
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑ul
+ ulCon.find('ul').remove();
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName2+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刢ity
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-list.html b/gx_tieta/WebRoot/mobil/elegroup-list.html
new file mode 100644
index 0000000..6cc802f
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-list.html
@@ -0,0 +1,143 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>鍖呮満缁勫垪琛�</title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+ <body>
+ <div data-role="page" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="index.html" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <h1>鍖呮満缁勫垪琛�</h1>
+ </div>
+
+ <div data-role="content">
+ <ul class="breadcrumb"></ul>
+ <div id="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div data-role="footer" data-position="fixed">
+ <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+ </div>
+ </div>
+ </body>
+ <script type="text/javascript" src="js/battNav.js"></script>
+ <script type="text/javascript">
+ var stationlist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("",null);
+ setCookie("",null);
+ //seachAllStation();
+ });
+
+ // 鐐瑰嚮鏈烘埧浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ station = getbatt(stationlist,aLi);
+
+ var json=window.JSON.stringify(station);
+ setCookie("",json);
+ window.location.href="elegroup-list-user.html";
+ });
+
+ });
+
+ // 瀹氫箟闈㈠寘灞戝鑸潯
+ /* $(function(){
+ var data = [
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:;', txt: '鍖呮満缁勫垪琛�'}
+ ];
+ addBreadCrumb($('.breadcrumb').eq(0),data);
+ }); */
+
+ //鏌ヨ鎵�鏈夊競
+ function seachAllStation(){
+ loadshow();
+ $.ajax({
+ type: "post",
+ url: "",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(model.code == 1){
+ stationlist = model.data;
+ createUl($('#battList'),model.data);
+ }else {
+ //alert(213);
+ $('#myPopup').popup('open');
+ }
+ loadclose();
+ },
+ error:function(){
+ loadclose();
+ }
+ });
+ }
+
+ /*
+ 澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+ @param ulCon ul鐨勫鍣�
+ @param dataList ul鐨勬暟鎹唴瀹�
+ */
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑ul
+ ulCon.find('ul').remove();
+
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName1+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刡att
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/js/battNav.js b/gx_tieta/WebRoot/mobil/js/battNav.js
index 78867f6..2b08b84 100644
--- a/gx_tieta/WebRoot/mobil/js/battNav.js
+++ b/gx_tieta/WebRoot/mobil/js/battNav.js
@@ -25,3 +25,7 @@
setCookie("pages","2");
window.location.href="machineroomM.html";
}
+function JumpElegroupListPage(){
+ setCookie("pages","4");
+ window.location.href="elegroup-list.html";
+}
\ No newline at end of file
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 902fcfd..48d6397 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
+import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data;
import com.fgkj.dto.RoleLimit;
@@ -31,7 +32,13 @@
result=ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public String serchByCondition_ky(){
+ BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model=service.serchByCondition_ky(binf);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
public String serchByInfo(){
bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index 5fc087e..3471be0 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -552,6 +552,62 @@
return list;
}
+ // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public List serchByCondition_ky(Object obj) {
+ BattInf binf=(BattInf) obj;
+ String sql="";
+ String baseSql = "select distinct db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time "
+ + " ,stationname,stationname5,battgroupname"
+ + " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
+ + " where alm_cleared_type=0 ";
+ //鐢ㄤ簬鐢垫睜缁勬潯浠�
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";//鍏ㄩ儴
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";
+ if(binf.getBattGroupId()==0){
+ baseSql+=idSqlT;
+ }else{
+ baseSql+=idSqlF;
+ }
+ String endSql="order by db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.alm_start_time desc,db_alarm.tb_battalarm_data.monnum asc ";
+ sql=baseSql+endSql;
+ List list = DAOHelper.executeQuery(sql,DBUtil.getConn(),new Object[] {binf.getBattGroupId()}, new CallBack() {
+ public List getResults(ResultSet rs) {
+ List list = new ArrayList();
+ try {
+ while (rs.next()) {
+ String name="鏈煡"; //瀛樻斁鍛婅鍚嶇О
+ String type="鏈煡"; //瀛樻斁鍛婅绛夌骇
+
+ Battalarm_data adata = new Battalarm_data();
+ adata.setNum(rs.getInt("num"));
+ adata.setBattGroupId(rs.getInt("battGroupId"));
+ adata.setAlm_signal_id(rs.getInt("alm_signal_id"));
+ adata.setMonNum(rs.getInt("monNum"));
+ adata.setAlm_value(rs.getFloat("alm_value"));
+ adata.setAlm_level(rs.getInt("alm_level"));
+ adata.setAlm_is_confirmed(rs.getInt("alm_is_confirmed"));
+ adata.setAlm_confirmed_time(rs.getTimestamp("alm_confirmed_time"));
+ adata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
+ adata.setAlm_end_time(rs.getTimestamp("alm_end_time"));
+
+ adata.setStationname(rs.getString("stationName"));
+ adata.setBattGroupName(rs.getString("battGroupName"));
+ //battinf涓殑StationName8锛孲tationName9瀛樻斁鍛婅鍚嶇О鍜岀瓑绾�
+ name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
+ adata.setAlarmname(name);
+ type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
+ adata.setAlarmtype(type);
+ list.add(adata);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
// 3.2鐢垫睜鍛婅
/*
* 鏉′欢鎵�瀛樻斁鐨勪綅缃墠鍙帮細tb_batt_maint_inf
@@ -1997,7 +2053,11 @@
}*/
//List list=bimp.serchIn30(uinf);
//System.out.println(list.size());
- int nums=bimp.searchAlarmInStation(uinf);
- System.out.println(nums);
+ /*int nums=bimp.searchAlarmInStation(uinf);
+ System.out.println(nums);*/
+ List<Battalarm_data> list = bimp.serchByCondition_ky(binf);
+ for (Battalarm_data b : list) {
+ System.out.println(b);
+ }
}
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index f9bc254..dff7238 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -51,7 +51,7 @@
Connection conn=DBUtil.getConn();
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +
- " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time" +
+ " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time,station_xuhang_end_time" +
" ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3,tb_battinf.stationname5 " +
" from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf " +
" where tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
@@ -154,6 +154,7 @@
b.setStation_damp(rs.getFloat("station_damp"));
b.setStation_dooropen_start_time(rs.getTimestamp("station_dooropen_start_time"));
b.setStation_xuhang_start_time(rs.getTimestamp("station_xuhang_start_time"));
+ b.setStation_xuhang_end_time(rs.getTimestamp("station_xuhang_end_time"));
b.setStationName(rs.getString("stationName"));
b.setStationName1(rs.getString("stationName1"));
b.setStationName2(rs.getString("stationName2"));
@@ -303,29 +304,31 @@
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
+ binf.setStationName5("");
binf.setStationId("");
- binf.setBattGroupNum(36);
+ binf.setBattGroupNum(62);
User_inf uinf=new User_inf();
uinf.setUId(1002);
Page p=new Page();
p.setPageCurr(1);
p.setPageSize(10);
binf.setPage(p);
- /*List<Bts_station_state> list=bimpl.serchByCondition(binf);
+ List<Bts_station_state> list=bimpl.serchByCondition(binf);
for (Bts_station_state bs : list) {
//System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
System.out.println(bs);
}
- int nums=bimpl.serchByState(uinf);*/
+ //System.out.println(list.size());
+ //int nums=bimpl.serchByState(uinf);
/*BattMap_information bm=new BattMap_information();
bm.setStationId("42000570");
int nums=bimpl.serchByStationId(bm);*/
//int nums=bimpl.serchByState_diaozhan(uinf);
- BattMap_information bm=new BattMap_information();
+ /*BattMap_information bm=new BattMap_information();
bm.setStationId("42000366");
int nums=bimpl.serchByStationId_diaozhan(bm);
- System.out.println(nums);
+ System.out.println(nums);*/
}
diff --git a/gx_tieta/src/com/fgkj/dto/Battalarm_data.java b/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
index 0c47b75..d9de664 100644
--- a/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Battalarm_data.java
@@ -22,6 +22,9 @@
private String stationid;
private String stationname;
+ private String battGroupName;
+ private String alarmname;
+ private String alarmtype;
private String note;
public Battalarm_data() {
@@ -196,6 +199,30 @@
this.note = note;
}
+ public String getBattGroupName() {
+ return battGroupName;
+ }
+
+ public void setBattGroupName(String battGroupName) {
+ this.battGroupName = battGroupName;
+ }
+
+ public String getAlarmname() {
+ return alarmname;
+ }
+
+ public void setAlarmname(String alarmname) {
+ this.alarmname = alarmname;
+ }
+
+ public String getAlarmtype() {
+ return alarmtype;
+ }
+
+ public void setAlarmtype(String alarmtype) {
+ this.alarmtype = alarmtype;
+ }
+
@Override
public String toString() {
return "Battalarm_data [num=" + num + ", BattGroupId=" + BattGroupId
@@ -208,10 +235,13 @@
+ ", alm_confirmed_time=" + alm_confirmed_time
+ ", alm_cleared_type=" + alm_cleared_type + ", usr_Id="
+ usr_Id + ", stationid=" + stationid + ", stationname="
- + stationname + ", note=" + note + "]";
+ + stationname + ", battGroupName=" + battGroupName
+ + ", alarmname=" + alarmname + ", alarmtype=" + alarmtype
+ + ", note=" + note + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 6539372..7dea7e9 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -32,6 +32,7 @@
private int station_stat_xuhang;
private Date station_xuhang_start_time;
+ private Date station_xuhang_end_time;
private int station_xuhang_tlong;
private String note;
@@ -213,6 +214,13 @@
public void setStation_xuhang_start_time(Date station_xuhang_start_time) {
this.station_xuhang_start_time = station_xuhang_start_time;
}
+
+ public Date getStation_xuhang_end_time() {
+ return station_xuhang_end_time;
+ }
+ public void setStation_xuhang_end_time(Date station_xuhang_end_time) {
+ this.station_xuhang_end_time = station_xuhang_end_time;
+ }
public int getStation_xuhang_tlong() {
return station_xuhang_tlong;
}
@@ -244,7 +252,8 @@
+ station_dooropen_start_time + ", station_dooropen_tlong="
+ station_dooropen_tlong + ", station_stat_xuhang="
+ station_stat_xuhang + ", station_xuhang_start_time="
- + station_xuhang_start_time + ", station_xuhang_tlong="
+ + station_xuhang_start_time + ", station_xuhang_end_time="
+ + station_xuhang_end_time + ", station_xuhang_tlong="
+ station_xuhang_tlong + ", note=" + note + ", stationName="
+ stationName + ", stationName1=" + stationName1
+ ", stationName2=" + stationName2 + ", stationName3="
@@ -256,4 +265,5 @@
+
}
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index 089c074..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,7 +176,7 @@
//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ
public ServiceModel serchByCondition(Object obj){
model=new ServiceModel();
- List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
+ List list=dao.serchByCondition(obj);
if(list!=null && list.size()>1){
model.setCode(1);
model.setData(list);
@@ -186,6 +186,21 @@
}
return model;
}
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public ServiceModel serchByCondition_ky(Object obj){
+ model=new ServiceModel();
+ List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>1){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
public ServiceModel serchByInfo(Object obj){
--
Gitblit v1.9.1