Pārlūkot izejas kodu

分支第一次上传

jichaobo 3 gadi atpakaļ
vecāks
revīzija
5f4e3fbdeb

+ 109 - 0
WebRoot/QrCode.html

@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>扫码身份验证</title>
+</head>
+<style>
+    #code img{
+        margin: 0 auto;
+        padding-top: 10px;
+    }
+</style>
+<body>
+<div id="code" clas s="code"></div>
+
+</body>
+<script src="res/jquery/jquery-3.3.1.min.js"></script>
+<script src="qrcode.min.js"></script>
+<script>
+    var uuid;
+    const URL = document.location.protocol+"//"+window.location.host;
+    function createUniqueString() {
+        const timestamp = +new Date() + ''
+        const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+        return (+(randomNum + timestamp)).toString(32)
+    }
+
+    function newCode(str){
+        var qrcode = new QRCode(document.getElementById("code"), {
+            id: 'er_image',
+            width : 200,
+            height : 200
+        });
+        qrcode.makeCode(str);
+    }
+
+    // function qr_login(){
+    //     uuid = createUniqueString();
+    //     // uuid=res.value;
+    //     document.getElementById("code").innerHTML = "";
+    //     newCode(uuid+'ypzhxfytkjusky');
+    //     document.getElementById("code").title = '';
+    // };
+
+
+    var wsUri = "wss://qhome.usky.cn/wss/";
+    var websocket = null;
+    var initWebSocket = function() {
+        try{
+            websocket = new WebSocket(wsUri);
+            websocket.onopen = function()
+            {
+                var json = {};
+                json.actfrom = "loginpage";
+                json.action = "query_ercode";
+                websocket.send(JSON.stringify(json));
+                setInterval(function(){
+                    if(websocket != null)
+                        websocket.send(JSON.stringify(json));
+                },30000)
+
+            };
+
+            websocket.onmessage = function (evt)
+            {
+                console.log("Received:",evt.data);
+                var jData =  eval('(' + evt.data + ')');
+                if (jData.action=="query_ercode"){
+                    document.getElementById("code").innerHTML = "";
+                    var evm_loing = jData.value;
+                    newCode(""+evm_loing);
+                    document.getElementById("code").title = '';
+                }else if (jData.action=="loginphone"){
+                    var action = jData.action;
+                    var phonenumber = jData.phonenumber;
+                    // document.getElementById("action").value='';
+                    // document.getElementById("phonenumber").value='';
+                    // document.getElementById("action").value=action;
+                    // document.getElementById("phonenumber").value=phonenumber;
+                    location.href = URL + "/YtIoT/view/mainframe.jsp"
+
+                    // alert("ceshi");
+                    websocket = null;
+                }
+            };
+
+            websocket.onclose = function()
+            {
+                // 关闭 websocket
+                console.log('连接已关闭...');
+                // alert("连接已关闭...");
+            };
+
+
+        }catch(exception){
+            console.log("Exception:",exception);
+            (function(){})()
+        }
+    }
+
+    $(document).ready(function(){
+        // $("#login_ok").hide();
+        initWebSocket();
+    });
+
+
+    // qr_login()
+</script>
+</html>

+ 5 - 8
WebRoot/index.jsp

@@ -111,15 +111,10 @@
                 msg: '请输入验证码!'
             });
         }else {
-            var p = $("#password").val()
             var basePath = $("#basePath").val();
-            localStorage.setItem('V_LOGINNAME', $("#username").val() );
-            localStorage.setItem('V_PASSWORD', md5(p));
-
-
             var queryJson = new Object();
             queryJson.V_LOGINNAME = $("#username").val();
-            queryJson.V_PASSWORD = md5(p);
+            queryJson.V_PASSWORD = md5($("#password").val());
             queryJson.V_COMMAND = "LOGIN";
             queryJson.code =code;
             var qdata = "queryJson=" + JSON.stringify(queryJson);
@@ -131,12 +126,14 @@
                 success: function (result) {
                     var json = eval('(' + result + ')');
                     // alert('ceshi')
+                    sessionStorage.setItem('V_LOGINNAME',$("#username").val());
+                    sessionStorage.setItem('V_PASSWORD',$("#password").val());
                     if (json.login == 'true') {
                         if ($("#username").val() == "wjzn") {
                                 location.href = basePath + "view/frontpage/index.html"
                         } else {
-                            location.href = basePath + "index_QrCode.jsp";
-                            // location.href = basePath + json.href
+                            // location.href = basePath + "index_QrCode.jsp";
+                            location.href = basePath + json.href
                         }
                     } else {
                         if (json.login == 'false') {

BIN
out/production/YtIoT/cn/com/usky/iot/alarm/dao/YtiotVAlarmDao.class


BIN
out/production/YtIoT/cn/com/usky/iot/alarm/dao/YtiotVAlarmDaoImpl.class


BIN
out/production/YtIoT/cn/com/usky/iot/alarm/service/YtiotVAlarmServiceImpl.class


+ 41 - 39
src/cn/com/usky/iot/alarm/dao/YtiotVAlarmDao.java

@@ -6,75 +6,77 @@ import cn.com.usky.iot.entity.YearReport;
 import java.util.List;
 
 public interface YtiotVAlarmDao {
-	public int getCount(String tablename, String sqlwhere);
+    public int getCount(String tablename, String sqlwhere);
 
-	public List query(final String tablename, final String sqlwhere, final String order, final String dir,
-			final String start, final String limit);
+    public List query(final String tablename, final String sqlwhere, final String order, final String dir,
+                      final String start, final String limit);
 
-	public int getHJCount(String sqlwhere);
+    public int getHJCount(String sqlwhere);
 
-	public List HJQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
-	public List HJ2Query(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public List HJQuery(final String sqlwhere, final String order, final String dir, final String start,
+                        final String limit);
 
-	public int getSJCount(String sqlwhere);
+    public List HJ2Query(final String sqlwhere, final String order, final String dir, final String start,
+                         final String limit);
 
-	public List SJQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public int getSJCount(String sqlwhere);
 
-	public int getRTUCount(String sqlwhere);
+    public List SJQuery(final String sqlwhere, final String order, final String dir, final String start,
+                        final String limit);
 
-	public List RTUQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public int getRTUCount(String sqlwhere);
 
-	
-	public int getLiftCount(String sqlwhere);
+    public List RTUQuery(final String sqlwhere, final String order, final String dir, final String start,
+                         final String limit);
 
-	public List VideoAlarmQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
 
-	public List LiftQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public int getLiftCount(String sqlwhere);
 
-	public int getEFCount(String sqlwhere);
+    public List VideoAlarmQuery(final String sqlwhere, final String order, final String dir, final String start,
+                                final String limit);
 
-	public List EFireQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public List LiftQuery(final String sqlwhere, final String order, final String dir, final String start,
+                          final String limit);
 
-	public int getEFireCount(String sqlwhere);
+    public int getEFCount(String sqlwhere);
 
-	public int getDeviceCount(String sqlwhere);
+    public List EFireQuery(final String sqlwhere, final String order, final String dir, final String start,
+                           final String limit);
 
-	public List DeviceQuery(final String sqlwhere, final String order, final String dir, final String start,
-			final String limit);
+    public int getEFireCount(String sqlwhere);
 
-	public List queryBySQL(String sql);
+    public int getDeviceCount(String sqlwhere);
 
-	public void execSQL(String sql);
+    public List DeviceQuery(final String sqlwhere, final String order, final String dir, final String start,
+                            final String limit);
 
-	 int getVideoCount(String sqlwhere);
+    public List queryBySQL(String sql);
 
+    public void execSQL(String sql);
 
-	List<?> videoOfflienQuery(String hqlwhere, String order, String dir, String start, String limit);
+    int getVideoCount(String sqlwhere);
+
+
+    List<?> videoOfflienQuery(String hqlwhere, String order, String dir, String start, String limit);
 
     MonthReport getMonthReport(String buildCode, String month);
 
-	List<MonthReport> getTimeList(String queryJson);
+    List<MonthReport> getTimeList(String queryJson);
 
-	YearReport getYearReport(String buildCode, String month);
+    YearReport getYearReport(String buildCode, String month);
 
-	List<YearReport> getYearTimeList(String queryJson);
+    List<YearReport> getYearTimeList(String queryJson);
 
-	int getContracCount(String hhwhere);
+    int getContracCount(String hhwhere);
 
-	List<?> ContracQuery(String hhwhere, String order_str, String dir, String start, String limit);
+    List<?> ContracQuery(String hhwhere, String order_str, String dir, String start, String limit);
 
-	List<?> queryGroup(String hhwhere, String order_str, String dir, String start, String limit);
+    List<?> queryGroup(String hhwhere, String order_str, String dir, String start, String limit);
 
 
+    int getGroupCount(String hqlwhere);
 
-	int getGroupCount(String hqlwhere);
+    int getVideoofflienCount(String hqlwhere);
 
-	int getVideoofflienCount(String hqlwhere);
+    List getDeviceList(String tablename, String sqlwhere, String order, String dir, String start, String limit);
 }

+ 194 - 187
src/cn/com/usky/iot/alarm/dao/YtiotVAlarmDaoImpl.java

@@ -1,185 +1,185 @@
 package cn.com.usky.iot.alarm.dao;
 
-import java.util.List;
-
 import cn.com.usky.iot.entity.MonthReport;
 import cn.com.usky.iot.entity.YearReport;
-import org.hibernate.SQLQuery;
+import cn.com.usky.utils.DaoQuery;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-import cn.com.usky.utils.DaoQuery;
+import java.util.List;
 
 public class YtiotVAlarmDaoImpl extends HibernateDaoSupport implements YtiotVAlarmDao {
 
-	private DaoQuery daoQuery;
-
-	public DaoQuery getDaoQuery() {
-		return daoQuery;
-	}
-
-	public void setDaoQuery(DaoQuery daoQuery) {
-		this.daoQuery = daoQuery;
-	}
-
-	public String tbname(String name) {
-		if (name.equals("ytiot_v_hj"))
-			return "YtiotVHj";
-		if (name.equals("ytiot_v_sj"))
-			return "YtiotVSj";
-		if (name.equals("ytiot_v_rtu"))
-			return "YtiotVRtu";
-		if (name.equals("ytiot_v_video2017"))
-			return "YtiotVideoAlarm";
-		if(name.equals("ytiot_v_sync"))
-			return"YtiotVSync";
-		if(name.equals("ytiot_v_syncdata"))
-			return"YtiotVSyncData";
-		if(name.equals("ytiot_v_lift"))
-			return"YtiotVLift";
-		if(name.equals("ytiot_v_video2017s"))
-			return"YtiotVideoOffline";
-		return name;
-	}
-
-	@Override
-	public int getCount(String tablename, String sqlwhere) {
-		// TODO Auto-generated method stub
-		return daoQuery.getCount(tbname(tablename), sqlwhere);
-	}
-
-	@Override
-	public List query(String tablename, String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return daoQuery.query(tbname(tablename), sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public int getHJCount(String sqlwhere) {
-		// TODO Auto-generated method stub
-		return getCount("ytiot_v_hj", sqlwhere);
-	}
-
-	@Override
-	public int getEFCount(String sqlwhere) {
-		// TODO Auto-generated method stub
-		return getCount("ytiot_v_efire", sqlwhere);
-	}
-
-	@Override
-	public int getEFireCount(String sqlwhere) {
-		return daoQuery.getCount("YtiotVEfire", sqlwhere);
-	}
-
-	@Override
-	public List HJQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_hj", sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public List HJ2Query(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_hj2", sqlwhere, order, dir, start, limit);
-	}
-	
-	@Override
-	public int getSJCount(String sqlwhere) {
-		// TODO Auto-generated method stub
-		return getCount("ytiot_v_sj", sqlwhere);
-	}
-
-	@Override
-	public List SJQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_sj", sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public int getRTUCount(String sqlwhere) {
-		// TODO Auto-generated method stub
-		return getCount("ytiot_v_rtu", sqlwhere);
-	}
-
-	@Override
-	public List RTUQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_rtu", sqlwhere, order, dir, start, limit);
-	}
-	@Override
-	public List VideoAlarmQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_video2017", sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public int getLiftCount(String sqlwhere) {
-		// TODO Auto-generated method stub
-		return getCount("ytiot_v_lift", sqlwhere);
-	}
-
-	@Override
-	public List LiftQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("ytiot_v_lift", sqlwhere, order, dir, start, limit);
-	}
-	
-	@Override
-	public List EFireQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		// TODO Auto-generated method stub
-		return query("YtiotVEfire", sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public int getDeviceCount(String sqlwhere) {
-		return getCount("ytiot_v_sync", sqlwhere);
-	}
-
-	@Override
-	public List DeviceQuery(String sqlwhere, String order, String dir, String start, String limit) {
-		return query("YtiotVSync", sqlwhere, order, dir, start, limit);
-	}
-
-	@Override
-	public List queryBySQL(String sql) {
-		// TODO Auto-generated method stub
-		System.out.println(sql);
-		return daoQuery.queryBySQL(sql);
-	}
-
-	@Override
-	public void execSQL(String sql) {
-		// TODO Auto-generated method stub
+    private DaoQuery daoQuery;
+
+    public DaoQuery getDaoQuery() {
+        return daoQuery;
+    }
+
+    public void setDaoQuery(DaoQuery daoQuery) {
+        this.daoQuery = daoQuery;
+    }
+
+    public String tbname(String name) {
+        if (name.equals("ytiot_v_hj"))
+            return "YtiotVHj";
+        if (name.equals("ytiot_v_sj"))
+            return "YtiotVSj";
+        if (name.equals("ytiot_v_rtu"))
+            return "YtiotVRtu";
+        if (name.equals("ytiot_v_video2017"))
+            return "YtiotVideoAlarm";
+        if (name.equals("ytiot_v_sync"))
+            return "YtiotVSync";
+        if (name.equals("ytiot_v_syncdata"))
+            return "YtiotVSyncData";
+        if (name.equals("ytiot_v_lift"))
+            return "YtiotVLift";
+        if (name.equals("ytiot_v_video2017s"))
+            return "YtiotVideoOffline";
+        return name;
+    }
+
+    @Override
+    public int getCount(String tablename, String sqlwhere) {
+        // TODO Auto-generated method stub
+        return daoQuery.getCount(tbname(tablename), sqlwhere);
+    }
+
+    @Override
+    public List query(String tablename, String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return daoQuery.query(tbname(tablename), sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public int getHJCount(String sqlwhere) {
+        // TODO Auto-generated method stub
+        return getCount("ytiot_v_hj", sqlwhere);
+    }
+
+    @Override
+    public int getEFCount(String sqlwhere) {
+        // TODO Auto-generated method stub
+        return getCount("ytiot_v_efire", sqlwhere);
+    }
+
+    @Override
+    public int getEFireCount(String sqlwhere) {
+        return daoQuery.getCount("YtiotVEfire", sqlwhere);
+    }
+
+    @Override
+    public List HJQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_hj", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public List HJ2Query(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_hj2", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public int getSJCount(String sqlwhere) {
+        // TODO Auto-generated method stub
+        return getCount("ytiot_v_sj", sqlwhere);
+    }
+
+    @Override
+    public List SJQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_sj", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public int getRTUCount(String sqlwhere) {
+        // TODO Auto-generated method stub
+        return getCount("ytiot_v_rtu", sqlwhere);
+    }
+
+    @Override
+    public List RTUQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_rtu", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public List VideoAlarmQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_video2017", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public int getLiftCount(String sqlwhere) {
+        // TODO Auto-generated method stub
+        return getCount("ytiot_v_lift", sqlwhere);
+    }
+
+    @Override
+    public List LiftQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("ytiot_v_lift", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public List EFireQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return query("YtiotVEfire", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public int getDeviceCount(String sqlwhere) {
+        return getCount("ytiot_v_sync", sqlwhere);
+    }
+
+    @Override
+    public List DeviceQuery(String sqlwhere, String order, String dir, String start, String limit) {
+        return query("YtiotVSync", sqlwhere, order, dir, start, limit);
+    }
+
+    @Override
+    public List queryBySQL(String sql) {
+        // TODO Auto-generated method stub
+        System.out.println(sql);
+        return daoQuery.queryBySQL(sql);
+    }
+
+    @Override
+    public void execSQL(String sql) {
+        // TODO Auto-generated method stub
 //		System.out.println(sql);
-		daoQuery.execSQL(sql);
-	}
+        daoQuery.execSQL(sql);
+    }
 
-	/**
-	 * 获取数据数量
-	 * @param hqlwhere
-	 * @return
-	 */
+    /**
+     * 获取数据数量
+     *
+     * @param hqlwhere
+     * @return
+     */
 
-	@Override
-	public int getVideoCount(String hqlwhere) {
-		 return getCount("ytiot_v_video2017", hqlwhere);
-	}
+    @Override
+    public int getVideoCount(String hqlwhere) {
+        return getCount("ytiot_v_video2017", hqlwhere);
+    }
 
-	@Override
-	public List<?> videoOfflienQuery(String hqlwhere, String order, String dir, String start, String limit) {
-		return query("ytiot_v_video2017s", hqlwhere, order, dir, start, limit);
+    @Override
+    public List<?> videoOfflienQuery(String hqlwhere, String order, String dir, String start, String limit) {
+        return query("ytiot_v_video2017s", hqlwhere, order, dir, start, limit);
 
-	}
+    }
 
-	@Override
-	public MonthReport getMonthReport(String buildCode, String month) {
-		String sql="SELECT * FROM yt_t_month_report where company_code='"+buildCode+"' and event_time='"+month+"';";
-		MonthReport o = (MonthReport)getSession().createSQLQuery(sql).addEntity(MonthReport.class).uniqueResult();
-		return o;
-	}
+    @Override
+    public MonthReport getMonthReport(String buildCode, String month) {
+        String sql = "SELECT * FROM yt_t_month_report where company_code='" + buildCode + "' and event_time='" + month + "';";
+        MonthReport o = (MonthReport) getSession().createSQLQuery(sql).addEntity(MonthReport.class).uniqueResult();
+        return o;
+    }
 
     @Override
     public List<MonthReport> getTimeList(String queryJson) {
-        String sql="SELECT * FROM yt_t_month_report where company_code='"+queryJson+"' ORDER BY event_time desc;";
+        String sql = "SELECT * FROM yt_t_month_report where company_code='" + queryJson + "' ORDER BY event_time desc;";
 
         List list = getSession().createSQLQuery(sql).addEntity(MonthReport.class).list();
 
@@ -188,42 +188,49 @@ public class YtiotVAlarmDaoImpl extends HibernateDaoSupport implements YtiotVAla
 
     @Override
     public YearReport getYearReport(String buildCode, String month) {
-        String sql="SELECT * FROM yt_t_year_report where company_code='"+buildCode+"' and event_time='"+month+"';";
-        YearReport o = (YearReport)getSession().createSQLQuery(sql).addEntity(YearReport.class).uniqueResult();
+        String sql = "SELECT * FROM yt_t_year_report where company_code='" + buildCode + "' and event_time='" + month + "';";
+        YearReport o = (YearReport) getSession().createSQLQuery(sql).addEntity(YearReport.class).uniqueResult();
         return o;
     }
 
     @Override
     public List<YearReport> getYearTimeList(String queryJson) {
-        String sql="SELECT * FROM yt_t_year_report where company_code='"+queryJson+"' ORDER BY event_time desc;";
+        String sql = "SELECT * FROM yt_t_year_report where company_code='" + queryJson + "' ORDER BY event_time desc;";
 
         List list = getSession().createSQLQuery(sql).addEntity(YearReport.class).list();
 
         return list;
     }
 
-	@Override
-	public int getContracCount(String hhwhere) {
-		return daoQuery.getCount("YtiotContractEntity", hhwhere);
-	}
+    @Override
+    public int getContracCount(String hhwhere) {
+        return daoQuery.getCount("YtiotContractEntity", hhwhere);
+    }
+
+    @Override
+    public List<?> ContracQuery(String hhwhere, String order_str, String dir, String start, String limit) {
+        return query("YtiotContractEntity", hhwhere, order_str, dir, start, limit);
+    }
 
-	@Override
-	public List<?> ContracQuery(String hhwhere, String order_str, String dir, String start, String limit) {
-		return query("YtiotContractEntity", hhwhere, order_str, dir, start, limit);
-	}
+    @Override
+    public List<?> queryGroup(String hhwhere, String order_str, String dir, String start, String limit) {
+        return query("YtTGroupEntity", hhwhere, order_str, dir, start, limit);
+    }
 
-	@Override
-	public List<?> queryGroup(String hhwhere, String order_str, String dir, String start, String limit) {
-		return query("YtTGroupEntity", hhwhere, order_str, dir, start, limit);
-	}
+    @Override
+    public int getGroupCount(String hqlwhere) {
+        return daoQuery.getCount("YtTGroupEntity", hqlwhere);
+    }
+
+    @Override
+    public int getVideoofflienCount(String hqlwhere) {
+        return getCount("ytiot_v_video2017s", hqlwhere);
+    }
 
-	@Override
-	public int getGroupCount(String hqlwhere) {
-		return daoQuery.getCount("YtTGroupEntity", hqlwhere);
-	}
 
-	@Override
-	public int getVideoofflienCount(String hqlwhere) {
-		return getCount("ytiot_v_video2017s", hqlwhere);
-	}
+    @Override
+    public List getDeviceList(String tablename, String sqlwhere, String order, String dir, String start, String limit) {
+        // TODO Auto-generated method stub
+        return daoQuery.query(tablename, sqlwhere, order, dir, start, limit);
+    }
 }

+ 121 - 3
src/cn/com/usky/iot/alarm/service/YtiotVAlarmServiceImpl.java

@@ -3020,12 +3020,16 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 					sqlwhere = " where id="+id+" ";
 				}
 				int RowCount = ytiotVAlarmDao.getHJCount(hqlwhere);
+				List devcieList = ytiotVAlarmDao.getDeviceList("Sp_owner"," where u.owner_code="+device_code+"",null,null,null,null);
+				Sp_owner o = (Sp_owner)devcieList.get(0);
+				Integer deviceType = Integer.parseInt(o.getDwtype());
+				System.out.println("deviceType = " + deviceType);
 				if(RowCount>0) {
 					ytiotVAlarmDao.execSQL(" update ytiot_v_hj2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
-					System.out.println(" update ytiot_v_hj2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
+//					System.out.println(" update ytiot_v_hj2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
 					if (Integer.parseInt(confirmAll)==0){
 						HashMap<String, Object> map = new HashMap<>();
-						map.put("SubType",1);
+						map.put("SubType",deviceType);
 						map.put("DeviceId",device_code);
 						map.put("InsertId",id);
 						map.put("Confirmed",true);
@@ -3040,7 +3044,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 								Object[] objects = (Object[]) iterator.next();
 								HashMap<String, Object> map = new HashMap<>();
 								System.out.println(objects[0]);
-								map.put("SubType",1);
+								map.put("SubType",deviceType);
 								map.put("DeviceId",device_code);
 								map.put("InsertId",objects[0]);
 								map.put("Confirmed",true);
@@ -3117,6 +3121,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		String data2 = null;
 		JSONObject q_json = null;
 		JSONObject json = new JSONObject();
+		List pl_list = null;
 		json.put("action", "updateEf");
 		if(queryJson!=null) {
 			q_json = JSONObject.fromObject(queryJson);
@@ -3147,14 +3152,55 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 				if(Integer.parseInt(confirmAll)==1) {
 					hqlwhere = " where u.id.deviceCode='"+device_code+"' and u.id.name='"+name+"' and u.id.clzt=0";
 					sqlwhere = " where device_code='"+device_code+"' and name='"+name+"' and clzt=0";
+					String Sql="SELECT * from ytiot_v_efire WHERE device_code='"+device_code+"' and u.id.name='"+name+"' and u.id.clzt=0";
+					pl_list = ytiotVAlarmDao.queryBySQL(Sql);
 				}else {
 					hqlwhere = " where u.id.id="+id+" ";
 					sqlwhere = " where id="+id+" ";
 				}
+
+
 				int RowCount = ytiotVAlarmDao.getEFireCount(hqlwhere);
 //				System.out.println(sqlwhere);
+
+				List devcieList = ytiotVAlarmDao.getDeviceList("Sp_owner"," where u.owner_code="+device_code+"",null,null,null,null);
+				Sp_owner o = (Sp_owner)devcieList.get(0);
+				Integer deviceType = Integer.parseInt(o.getDwtype());
+				System.out.println("deviceType = " + deviceType);
 				if(RowCount>0) {
 					ytiotVAlarmDao.execSQL(" update ytiot_v_efire2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
+
+					if (Integer.parseInt(confirmAll)==0){
+						HashMap<String, Object> map = new HashMap<>();
+						map.put("SubType",deviceType);
+						map.put("DeviceId",device_code);
+						map.put("InsertId",id);
+						map.put("Confirmed",true);
+						com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+
+						com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+//					System.out.println("jsonObject = " + jsonObject);
+					}else{
+						if (pl_list.isEmpty()==false){
+							int Nrow = 0;
+							for(Iterator iterator = pl_list.iterator();iterator.hasNext();){
+								Object[] objects = (Object[]) iterator.next();
+								HashMap<String, Object> map = new HashMap<>();
+								System.out.println(objects[0]);
+								map.put("SubType",deviceType);
+								map.put("DeviceId",device_code);
+								map.put("InsertId",objects[0]);
+								map.put("Confirmed",true);
+								com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+								System.out.println(json1);
+								com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+								Nrow++;
+							}
+						}
+
+					}
+
+
 					json.put("activerow", RowCount);
 					json.put("success", "true");
 				}else {
@@ -3187,6 +3233,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		String confirmAll = null;
 		JSONObject q_json = null;
 		JSONObject json = new JSONObject();
+		List pl_list = null;
 		json.put("action", "updateSj");
 		if(queryJson!=null) {
 			q_json = JSONObject.fromObject(queryJson);
@@ -3215,14 +3262,49 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 				if(Integer.parseInt(confirmAll)==1) {
 					hqlwhere = " where u.id.deviceCode='"+device_code+"' and u.id.name='"+name+"' and u.id.status='"+status+"' and u.id.clzt=0";
 					sqlwhere = " where device_code='"+device_code+"' and name='"+name+"' and status='"+status+"' and clzt=0";
+					String Sql="SELECT * from ytiot_v_sj WHERE device_code='"+device_code+"' and u.id.name='"+name+"' and u.id.status='"+status+"' and u.id.clzt=0";
+					pl_list = ytiotVAlarmDao.queryBySQL(Sql);
 				}else {
 					hqlwhere = " where u.id.id="+id+" ";
 					sqlwhere = " where id="+id+" ";
 				}
 				int RowCount = ytiotVAlarmDao.getSJCount(hqlwhere);
+				List devcieList = ytiotVAlarmDao.getDeviceList("Sp_owner"," where u.owner_code="+device_code+"",null,null,null,null);
+				Sp_owner o = (Sp_owner)devcieList.get(0);
+				Integer deviceType = Integer.parseInt(o.getDwtype());
 //				System.out.println(sqlwhere);
 				if(RowCount>0) {
 					ytiotVAlarmDao.execSQL(" update ytiot_v_sj2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
+					if (Integer.parseInt(confirmAll)==0){
+						HashMap<String, Object> map = new HashMap<>();
+						map.put("SubType",deviceType);
+						map.put("DeviceId",device_code);
+						map.put("InsertId",id);
+						map.put("Confirmed",true);
+						com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+
+						com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+//					System.out.println("jsonObject = " + jsonObject);
+					}else{
+						if (pl_list.isEmpty()==false){
+							int Nrow = 0;
+							for(Iterator iterator = pl_list.iterator();iterator.hasNext();){
+								Object[] objects = (Object[]) iterator.next();
+								HashMap<String, Object> map = new HashMap<>();
+//								System.out.println(objects[0]);
+								map.put("SubType",deviceType);
+								map.put("DeviceId",device_code);
+								map.put("InsertId",objects[0]);
+								map.put("Confirmed",true);
+								com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+								System.out.println(json1);
+								com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+								Nrow++;
+							}
+						}
+
+					}
+
 					json.put("activerow", RowCount);
 					json.put("success", "true");
 				}else {
@@ -3256,6 +3338,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		String confirmAll = null;
 		JSONObject q_json = null;
 		JSONObject json = new JSONObject();
+		List pl_list = null;
 		json.put("action", "updateSj");
 		if(queryJson!=null) {
 			q_json = JSONObject.fromObject(queryJson);
@@ -3284,14 +3367,49 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 				if(Integer.parseInt(confirmAll)==1) {
 					hqlwhere = " where u.id.deviceCode='"+device_code+"' and u.id.name='"+name+"' and u.id.status='"+status+"' and u.id.clzt=0";
 					sqlwhere = " where device_code='"+device_code+"' and name='"+name+"' and status='"+status+"' and clzt=0";
+					String Sql="SELECT * from ytiot_v_rtu WHERE device_code='"+device_code+"' and u.id.name='"+name+"' and u.id.status='"+status+"' and u.id.clzt=0";
+					pl_list = ytiotVAlarmDao.queryBySQL(Sql);
 				}else {
 					hqlwhere = " where u.id.id="+id+" ";
 					sqlwhere = " where id="+id+" ";
 				}
 				int RowCount = ytiotVAlarmDao.getRTUCount(hqlwhere);
+				List devcieList = ytiotVAlarmDao.getDeviceList("Sp_owner"," where u.owner_code="+device_code+"",null,null,null,null);
+				Sp_owner o = (Sp_owner)devcieList.get(0);
+				Integer deviceType = Integer.parseInt(o.getDwtype());
 //				System.out.println(sqlwhere);
 				if(RowCount>0) {
 					ytiotVAlarmDao.execSQL(" update ytiot_v_rtu2 set clwb='"+clwb+"', clnr='"+clnr+"', clzt=1 , clsj=now(), clr='"+V_LOGINNAME+"' "+sqlwhere);
+					if (Integer.parseInt(confirmAll)==0){
+						HashMap<String, Object> map = new HashMap<>();
+						map.put("SubType",deviceType);
+						map.put("DeviceId",device_code);
+						map.put("InsertId",id);
+						map.put("Confirmed",true);
+						com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+
+						com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+//					System.out.println("jsonObject = " + jsonObject);
+					}else{
+						if (pl_list.isEmpty()==false){
+							int Nrow = 0;
+							for(Iterator iterator = pl_list.iterator();iterator.hasNext();){
+								Object[] objects = (Object[]) iterator.next();
+								HashMap<String, Object> map = new HashMap<>();
+//								System.out.println(objects[0]);
+								map.put("SubType",deviceType);
+								map.put("DeviceId",device_code);
+								map.put("InsertId",objects[0]);
+								map.put("Confirmed",true);
+								com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject(map);
+								System.out.println(json1);
+								com.alibaba.fastjson.JSONObject jsonObject = HttpClientUtils.doPost("http://47.98.201.187:55335/report", null,json1);
+								Nrow++;
+							}
+						}
+
+					}
+
 					json.put("activerow", RowCount);
 					json.put("success", "true");
 				}else {