|
@@ -3780,3 +3780,70 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
|
|
|
map.put("position", id.getPosition());
|
|
|
map.put("status", id.getStatus());
|
|
|
map.put("time", df.format(id.getTime()));
|
|
|
+ map.put("vidoe", id.getVideo());
|
|
|
+ //报告内容
|
|
|
+ map.put("fullname", id.getName()+","+id.getData4());
|
|
|
+ map.put("data", id.getNcmd().equals("0")?"离线":"在线" );
|
|
|
+
|
|
|
+
|
|
|
+ if((id.getClr().length()>0)
|
|
|
+ &&(ulist.size()>0)){
|
|
|
+ for(int j=0;j<ulist.size();j++) {
|
|
|
+ YtiotVUserphone po = (YtiotVUserphone)ulist.get(j);
|
|
|
+ YtiotVUserphoneId poid = po.getId();
|
|
|
+ if(id.getClr().equals(poid.getPhone())) {
|
|
|
+ cl_name = poid.getUsername();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ map.put("clr_name", cl_name.length()>0?cl_name:id.getClr());
|
|
|
+ JSONObject jSONObject = JSONObject.fromObject(map);
|
|
|
+ jSONArray.add(jSONObject);
|
|
|
+ }
|
|
|
+ json.put("RESULT", jSONArray);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return json.toString();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 处理电梯
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public String updateLift(String queryJson) throws Exception {
|
|
|
+ // TODO Auto-generated method stub
|
|
|
+ String V_LOGINNAME = null;
|
|
|
+ String V_PASSWORD = null;
|
|
|
+ int E_STATUS=-1;
|
|
|
+ String clwb = null;
|
|
|
+ String clnr = null;
|
|
|
+ String id = null;
|
|
|
+ String status = null;
|
|
|
+ String ncmd = null;
|
|
|
+ String device_code = null;
|
|
|
+ String name = null;
|
|
|
+ String confirmAll = null;
|
|
|
+ JSONObject q_json = null;
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
+ json.put("action", "updateSj");
|
|
|
+ if(queryJson!=null) {
|
|
|
+ q_json = JSONObject.fromObject(queryJson);
|
|
|
+ clwb = q_json.has("clwb")?q_json.getString("clwb"):null;
|
|
|
+ clnr = q_json.has("clnr")?q_json.getString("clnr"):null;
|
|
|
+ id = q_json.has("id")?q_json.getString("id"):null;
|
|
|
+ status = q_json.has("status")?q_json.getString("status"):null;
|
|
|
+ ncmd = q_json.has("ncmd")?q_json.getString("ncmd"):null;
|
|
|
+ device_code = q_json.has("device_code")?q_json.getString("device_code"):null;
|
|
|
+ name = q_json.has("name")?q_json.getString("name"):null;
|
|
|
+ confirmAll = q_json.has("confirmAll")?q_json.getString("confirmAll"):null;
|
|
|
+ V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
|
|
|
+ V_PASSWORD = q_json.has("V_PASSWORD")?q_json.getString("V_PASSWORD"):null;
|
|
|
+ System.out.println("ncmb+++"+ncmd);
|
|
|
+ }
|
|
|
+ if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
|
|
|
+ List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
|
|
|
+ +MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
|