整合页面

src/cn/com/usky/iot/controller/Log.java

@@ -1,9 +1,15 @@
 package cn.com.usky.iot.controller;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
 import cn.com.usky.iot.entity.sys.SysLogDTO;
 import cn.com.usky.log.LogService;
+import cn.com.usky.utils.HttpServletRequestUtils;
 import cn.com.usky.utils.Page;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.tools.ant.taskdefs.condition.Http;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @author laowo
  * @version v1.0
@@ -23,13 +32,28 @@ public class Log {
     @Autowired
     private LogService logService;
 
+    @Autowired
+    private TokenAuthService tokenAuthService;
     @RequestMapping("queryLogList")
     @ResponseBody
     public String queryLogList(
+            HttpServletResponse response,
+            HttpServletRequest request,
             @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo
     ) {
-        Page<SysLogDTO> sysLogDTOPage = logService.queryLogList(pageSize, pageNo);
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            return json.toJSONString();
+
+        }
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        String vLoginname = o.getVLoginname();
+        Page<SysLogDTO> sysLogDTOPage = logService.queryLogList(pageSize, pageNo,vLoginname);
         String s = JSONObject.toJSON(sysLogDTOPage).toString();
         return s;
     }

src/cn/com/usky/log/LogService.java

@@ -6,5 +6,5 @@ import cn.com.usky.utils.Page;
 public interface LogService {
     void addLog(SysLogDTO dto);
 
-    Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo);
+    Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo, String vLoginname);
 }

src/cn/com/usky/log/LogServiceImpl.java

@@ -3,7 +3,6 @@ package cn.com.usky.log;
 
 import cn.com.usky.iot.entity.sys.SysLogDTO;
 import cn.com.usky.utils.Page;
-import org.aspectj.weaver.ast.Var;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -38,20 +37,19 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo) {
+    public Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo, String vLoginname) {
 
         List<SysLogDTO> list = hibernateTemplate.executeFind(new HibernateCallback() {
             @Override
             public Object doInHibernate(Session session) throws HibernateException, SQLException {
-                Query query = session.createQuery("from SysLogDTO ");
-
+                Query query = session.createQuery("from SysLogDTO t where t.userid='"+vLoginname+"'");
                 return query.list();
             }
         });
         List<SysLogDTO> listPage = hibernateTemplate.executeFind(new HibernateCallback() {
             @Override
             public Object doInHibernate(Session session) throws HibernateException, SQLException {
-                Query query = session.createQuery("from SysLogDTO ");
+                Query query = session.createQuery("from SysLogDTO t where t.userid='"+vLoginname+"'");
                 query.setFirstResult((pageNo - 1) * pageSize);
                 query.setMaxResults(pageSize);
                 return query.list();