upd

com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/UfiServiceImpl.java

@@ -67,6 +67,11 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
 		
 		String devnum = para.get("devnum");//devid
 		if(devnum==null) devnum="";
+
+        String lastcntmStart = para.get("lastcntmStart");	//创建时间查询
+        String lastcntmEnd = para.get("lastcntmEnd");
+        if(lastcntmStart==null||lastcntmStart.equals("-1")) lastcntmStart="";
+        if(lastcntmEnd==null||lastcntmEnd.equals("-1")) lastcntmEnd="";
 		
 		String pageSize = para.get("rows");//页大小
 		String curPage = para.get("page");//当前页
@@ -97,6 +102,8 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
 		paramap.put("remk", remk);
 		paramap.put("grpid", grpid);
 		paramap.put("devid", devnum);
+		paramap.put("lastcntmStart", lastcntmStart);
+		paramap.put("lastcntmEnd", lastcntmEnd);
 		paramap.put("sort", para.get("sort"));
 		paramap.put("order", para.get("order"));
 		
@@ -1627,7 +1634,11 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
         String remk = para.get("remk");
         String celladr = para.get("celladr");
         String orgTm = para.get("orgid");
-		List<Object[]> result = new ArrayList<Object[]>();
+
+        String lastcntmStart = para.get("lastcntmStart");	//创建时间查询
+        String lastcntmEnd = para.get("lastcntmEnd");
+
+        List<Object[]> result = new ArrayList<Object[]>();
 		
 //		if(!ProjectTools.isEmpty(grpid) && !"-1".equals(grpid)){
 			Object[] colTitle = new Object[11];
@@ -1706,8 +1717,21 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
                 if(!ProjectTools.isEmpty(celladr)) {
                     sql+=  " and celladdress like '%"+celladr+"%'";
                 }
-				
-				List<Map<String,Object>> devLst = RCPService.getMifiService().getMapList(sql);
+                try {
+                    SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMddHHmmss");
+                    if(!ProjectTools.isEmpty(lastcntmStart) && !lastcntmStart.equals("-1")){
+                        long start = sdf2.parse(lastcntmStart).getTime();
+                        sql += " AND lastcntm >= "+start;
+                    }
+                    if(!ProjectTools.isEmpty(lastcntmEnd) && !lastcntmEnd.equals("-1")){
+                        long end = sdf2.parse(lastcntmEnd).getTime();
+                        sql += " AND lastcntm <= "+end;
+                    }
+                } catch (ParseException e) {
+                    throw new RuntimeException(e);
+                }
+
+                List<Map<String,Object>> devLst = RCPService.getMifiService().getMapList(sql);
 				if(devLst != null && devLst.size()>0)
 				{
 					for(int i=0;i<devLst.size();i++){

com.sharemao.web.manager/src/main/webapp/view/module/ufi.jsp

@@ -110,7 +110,12 @@
 			<li>
 				<label>${langstr.device_38}</label>
 				<input class="easyui-textbox" id="remark">
-			</li>			
+			</li>
+				<li>
+					<label>上次请求</label>
+					<input class="easyui-datebox" id="timeStart" data-options="editable:false"/> -
+					<input class="easyui-datebox" id="timeEnd" data-options="editable:false"/>
+				</li>
 		</ul>
 		<span style="float:right;padding-right:20px;">
 			<a href="#" class="easyui-linkbutton" iconCls="icon-search-green" plain="true" onclick="getList()">搜索</a>
@@ -735,6 +740,16 @@
                 getList();
             }
         });
+        $('#timeStart').datebox({
+            onSelect: function (date) {
+                $("#timeStart").val(dayformatter(date)+"000000");
+            }
+        });
+        $('#timeEnd').datebox({
+            onSelect: function (date) {
+                $("#timeEnd").val(dayformatter(date)+"235959");
+            }
+        });
 	});
 	
 	function edit(title){
@@ -798,6 +813,10 @@
 		$('#grpid').combobox('setText', "${langstr.com_1}");
 		$("#remark").textbox('setValue',"");
 		$("#celladr").textbox('setValue',"");
+        $("#timeStart").val("-1");
+        $("#timeEnd").val("-1");
+        $('#timeStart').datebox('setText', "");
+        $('#timeEnd').datebox('setText', "");
 		getList();
 	}
 	
@@ -807,7 +826,9 @@
 		"remk":$('#remark').textbox('getValue'),
 		"devstat":$('#devstat').combobox('getValue'),
 		"netmode":$('#netmode').combobox('getValue'),
-		"celladr":$('#celladr').textbox('getValue')};
+		"celladr":$('#celladr').textbox('getValue'),
+		"lastcntmStart":$('#timeStart').val(),
+		"lastcntmEnd":$('#timeEnd').val()};
 		$('#common-table').datagrid('load',params);
 	}
 	
@@ -918,13 +939,17 @@
         var devstat = $('#devstat').combobox('getValue');
         var netmode = $('#netmode').combobox('getValue');
         var celladr = $('#celladr').textbox('getValue');
+        var lastcntmStart = $('#timeStart').val();
+        var lastcntmEnd = $('#timeEnd').val();
         var params = "orgid=" + encodeURIComponent(orgid) +
             "&devnum=" + encodeURIComponent(devnum) +
             "&grpid=" + encodeURIComponent(grpid) +
             "&remk=" + encodeURIComponent(remk) +
             "&devstat=" + encodeURIComponent(devstat) +
             "&netmode=" + encodeURIComponent(netmode) +
-            "&celladr=" + encodeURIComponent(celladr);
+            "&celladr=" + encodeURIComponent(celladr) +
+            "&lastcntmStart=" + encodeURIComponent(lastcntmStart) +
+            "&lastcntmEnd=" + encodeURIComponent(lastcntmEnd);
 		window.location = "${ctx}/ufi/export.do?"+params;
     }
     

com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/AuthCtrl.java

@@ -44,14 +44,14 @@ public class AuthCtrl
 		String cursn=para.get("sn");
 		session.setAttribute("cursn", cursn);//当前设备编号
 
-        /*if(!Tools.isEmpty(cursn)&&getDevtype(cursn)==16)
+        if(!Tools.isEmpty(cursn)&&getDevtype(cursn)==16)
 		{
             String url="http://dy.yunjia99.cn/user/index.do?&sn="+cursn;
             url = URLEncoder.encode(url);
             log.info("url="+url);
             String path = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb06cf14f96dd7149&redirect_uri=" + url + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
             return new TextView(path);
-		}*/
+		}
 		
 		String openid = (String) session.getAttribute("openid");	// 获取用户微信openid
 		String accessToken="";
@@ -92,13 +92,13 @@ public class AuthCtrl
 				String defaultdev =dataJson.getString("defaultdev");
 				if(Tools.isEmpty(defaultdev)) {
                     defaultdev = cursn;
-                } /*else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
+                } else if(!Tools.isEmpty(defaultdev)&&getDevtype(defaultdev)==16) {
                     String url="http://dy.yunjia99.cn/user/index.do";
                     url = URLEncoder.encode(url);
                     log.info("url="+url);
                     String path = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb06cf14f96dd7149&redirect_uri=" + url + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
                     return new TextView(path);
-                }*/
+                }
 				session.setAttribute("defaultdev", defaultdev);	// 默认设备
 				/*if(Tools.isEmpty(defaultdev)) {
 					return new TextView("/device/getDevInfo.do");
@@ -217,7 +217,7 @@ public class AuthCtrl
         log.info("signret:"+signret);
     }
 
-    /*private int getDevtype(String cursn){
+    private int getDevtype(String cursn){
         Map<String, String> para = new HashMap<>();
         para.put("devid", cursn);
         String devTypeResult = GzhUtil.sendPost(Constants.m3IntAddr + "/device/getDevType.do", para);
@@ -236,7 +236,7 @@ public class AuthCtrl
             log.info(Tools.getExceptionMessage( e));
         }
         return 0;
-    }*/
+    }
 	
 	/**
 	 * 用户登陆界面，登陆后将微信号自动绑定到用户账号