BUG修复 202108201613

WebRoot/WEB-INF/spring-servlet.xml

@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:task="http://www.springframework.org/schema/task"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:task="http://www.springframework.org/schema/task"
        xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-
+       xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
    http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-   ">
+http://www.springframework.org/schema/websocket
+        http://www.springframework.org/schema/websocket/spring-websocket.xsd">
     <!-- 默认的注解映射的支持 -->
-    <mvc:annotation-driven/>
+    <mvc:annotation-driven>
+        <!-- 消息转换器,解决responseBody返回中外乱码问题 -->
+        <mvc:message-converters register-defaults="true">
+            <bean class="org.springframework.http.converter.StringHttpMessageConverter">
+                <property name="supportedMediaTypes" value="text/plain;charset=UTF-8" />
+            </bean>
+        </mvc:message-converters>
+    </mvc:annotation-driven>
     <!--启用自动扫描  -->
     <context:component-scan base-package="cn.com.usky.iot.controller"/>
     <!-- 后台任务 -->
-
     <context:component-scan base-package="cn.com.usky.iot.task"/>
     <task:annotation-driven scheduler="qbScheduler" mode="proxy"/>
     <task:scheduler id="qbScheduler" pool-size="10"/>
@@ -1385,7 +1391,6 @@
         <property name="LogServiceImpl">
             <ref bean="LogServiceImpl"/>
         </property>
-
     </bean>
 
 

WebRoot/WEB-INF/web.xml

@@ -4,17 +4,6 @@
          id="WebApp_ID" version="3.0">
     <display-name>YtIoT</display-name>
 
-    <filter>
-        <filter-name>XssSqlFilter</filter-name>
-        <filter-class>cn.com.usky.filter.XssFilter1</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>XssSqlFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-    </filter-mapping>
-
-
 
     <filter>
         <display-name>SetCharacterEncoding</display-name>
@@ -34,6 +23,18 @@
         <filter-name>SetCharacterEncoding</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
+
+    <filter>
+        <filter-name>XssSqlFilter</filter-name>
+        <filter-class>cn.com.usky.filter.XssFilter1</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>XssSqlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+
+
     <servlet>
         <servlet-name>mvc</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>

WebRoot/dfmz_index.jsp

@@ -18,7 +18,7 @@
 <script>
 	var webInit = function(){
 		sessionStorage.setItem('V_LOGINNAME','dfmz');
-		sessionStorage.setItem('V_PASSWORD','dfmz123');
+		sessionStorage.setItem('V_PASSWORD','1d1a627cc4b9fb8c07c9bda48e9fa150');
 		document.getElementsByTagName("body")[0].style.height = document.body.scrollHeight+"px";
 		document.getElementsByTagName("body")[0].style.width  = document.body.scrollWidth+"px";
 		document.getElementsByTagName("body")[0].innerHTML='<iframe id="frame_frontpage" frameborder=0 width="100%" height="100%" allowtransparency="true" scrolling=auto src="view/mainframe.jsp"></iframe>';

WebRoot/mhxf_index.jsp

@@ -18,7 +18,7 @@
 <script>
 	var webInit = function(){
 		sessionStorage.setItem('V_LOGINNAME','mhxf');
-		sessionStorage.setItem('V_PASSWORD','mhxf123');
+		sessionStorage.setItem('V_PASSWORD','51d033909e06d26690b613e347cedd2d');
 		document.getElementsByTagName("body")[0].style.height = document.body.scrollHeight+"px";
 		document.getElementsByTagName("body")[0].style.width  = document.body.scrollWidth+"px";
 		document.getElementsByTagName("body")[0].innerHTML='<iframe id="frame_frontpage" frameborder=0 width="100%" height="100%" allowtransparency="true" scrolling=auto src="view/mainframe.jsp"></iframe>';

WebRoot/view/frontpage/scripts/company.js

@@ -295,7 +295,7 @@ var draw_buinding = function () {
         $("#company_building").removeClass('company_building');
         $("#company_building").addClass('company_building_on');
         var company_building = document.getElementById('company_building');
-        company_building.innerHTML = '<iframe id="myIframe" name="thingjs" src="http://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9" style="width:146%;height:123%;border:1px solid #0082ff;"></iframe>';
+        company_building.innerHTML = '<iframe id="myIframe" name="thingjs" src="https://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9" style="width:146%;height:123%;border:1px solid #0082ff;"></iframe>';
 
         var t1 = window.setTimeout(function () {
             //     console.log(buildingStore);

WebRoot/view/scripts/log.html

@@ -11,6 +11,7 @@
     <script src="https://unpkg.com/element-ui/lib/index.js"></script>
     <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     <style>
+<<<<<<< HEAD
     .el-table {
         background: transparent !important;
     }
@@ -86,11 +87,17 @@
         display: none;
     }
 	html,body,#app{
+=======
+        html,
+        body,
+        #app {
+>>>>>>> 6d16855fb9a830c488d691f333de87ec768f6456
             width: 100%;
             height: 100%;
             padding: 0;
-			margin:0;
-	}
+            margin: 0;
+        }
+        
         .home {
             width: 100%;
             height: 100%;
@@ -143,9 +150,7 @@
                 <el-table :data="tableData" border style="width: 100%" height="100%">
                     <el-table-column type="index" align="center" width="50" label="序号">
                     </el-table-column>
-                    <el-table-column align="center" v-for="(item, ind) in typeList[typeFree].tableDataHeader" :key="ind" :prop="item.prop" :label="item.name">
-					  <template slot-scope="scope">{{item.prop === 'operateType' ? (scope.row[item.prop] == 1 ? '查询': scope.row[item.prop] == 2 ? '添加' : scope.row[item.prop] == 3 ? '修改' : scope.row[item.prop] ==  4 ? '删除' :'') : item.prop === 'logType' ? (scope.row[item.prop] == 1 ? '登录日志': scope.row[item.prop] == 2 ? '操作日志' : '') : scope.row[item.prop]}}</template>
-                    </el-table-column>
+                    <el-table-column align="center" v-for="(item, ind) in typeList[typeFree].tableDataHeader" :key="ind" :prop="item.prop" :label="item.name"></el-table-column>
                 </el-table>
             </el-row>
             <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[30, 50, 100, 150]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
@@ -189,14 +194,15 @@
                     }, {
                         prop: "createTime",
                         name: "创建时间"
-                    }, {
-                        prop: "updateBy",
-                        name: "更新人"
-                    }, {
-                        prop: "updateTime",
-                        name: "更新时间"
+                            // }, {
+                            //     prop: "updateBy",
+                            //     name: "更新人"
+                            // }, {
+                            //     prop: "updateTime",
+                            //     name: "更新时间"
                     }, ],
-                    url: "http://47.111.81.118:8080/YtIoT/iot/log/queryLogList",
+                    //TODO 改成线上地址
+                    url: "http://::1:8080/YtIoT/iot/log/queryLogList",
                     inputList: [
                         //     {
                         //     prop: "unit",
@@ -235,11 +241,21 @@
                 };
                 Object.assign(data, this.inputObj)
                 let res = await axios.get(
-                    this.typeList[this.typeFree].url + "?current=" + this.currentPage + "&pageSize=" + this.pageSize
+                    this.typeList[this.typeFree].url + "?pageNo=" + this.currentPage + "&pageSize=" + this.pageSize
                 );
-				console.log(res)
-				console.log(res.data.pageList)
-                this.tableData = res.data.pageList;
+                console.log(res)
+                console.log(res.data.pageList)
+                this.tableData = res.data.pageList.map(val => {
+                    return {
+                        ...val,
+                        operateType: val.operateType  ==  1  ?  '查询' :  val.operateType  ==  2  ?  '添加'  : val.operateType  ==  3  ?  '修改' :  val.operateType  ?  '删除'  : '',
+                        logType: val.logType  ==  1  ?  '登录日志' :  val.logType  ==  2  ?  '操作日志'  :  '',
+                        logContent: val.logContent == 1 ? '单位详情页数据获取' : val.logContent == 2 ? '电器火灾告警处理' : val.logContent == 3 ? '水警告警处理' : val.logContent == 4 ? 'RTU告警处理' : val.logContent == 5 ? '视频告警处理' : val.logContent == 6 ? '视频离线告警处理' : val.logContent == 7 ? '用户登录' : '',
+                        createTime: new Date(val.createTime.time).toLocaleString('chinese', {
+                            hour12: false
+                        })
+                    }
+                });
                 this.total = res.data.totalCount;
             },
             // dosomething(jsondata) {

src/cn/com/usky/filter/XssHttpServletRequestWrapper.java

@@ -26,6 +26,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
     /**
      * 覆盖getParameterValues方法，将参数名和参数值都做xss过滤
      */
+    @Override
     public String[] getParameterValues(String parameter) {
         String[] values = super.getParameterValues(parameter);
         if (values==null)  {

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

@@ -414,7 +414,7 @@ public class AlarmViewController {
         return mav;
     }
 
-    @AutoLog("电气火灾告警处理")
+    @AutoLog("2")
     @RequestMapping(value = "/updateEf", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateEf(@RequestParam(value = "queryJson", required = false) String queryJson,
                                  HttpServletRequest request) {
@@ -445,7 +445,7 @@ public class AlarmViewController {
         }
         return mav;
     }
-    @AutoLog("水警告警处理")
+    @AutoLog("3")
     @RequestMapping(value = "/updateSj", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateSj(@RequestParam(value = "queryJson", required = false) String queryJson,
                                  HttpServletRequest request) {
@@ -476,7 +476,7 @@ public class AlarmViewController {
         }
         return mav;
     }
-    @AutoLog("RTU告警处理")
+    @AutoLog("4")
     @RequestMapping(value = "/updateRtu", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateRtu(@RequestParam(value = "queryJson", required = false) String queryJson,
                                   HttpServletRequest request) {
@@ -514,7 +514,7 @@ public class AlarmViewController {
      * @param queryJson
      * @return
      */
-    @AutoLog("视频告警处理")
+    @AutoLog("5")
     @RequestMapping(value = "/updateVideo", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateVideo(@RequestParam(value = "queryJson", required = false) String queryJson,
                                     HttpServletRequest request) {
@@ -549,7 +549,7 @@ public class AlarmViewController {
      * @param queryJson
      * @return
      */
-    @AutoLog("视频离线告警处理")
+    @AutoLog("6")
     @RequestMapping(value = "/updateVideoOffline ", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateVideoOffline(@RequestParam(value = "queryJson", required = false) String queryJson,
                                            HttpServletRequest request) {

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

@@ -67,7 +67,7 @@ public class FrontpageController {
         return mav;
     }
 
-    @AutoLog("单位详情页数据获取")
+    @AutoLog("1")
     @RequestMapping(value = "/getCurrentObjectListByCompanyId", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView getCurrentObjectListByCompanyId(@RequestParam(value = "queryJson", required = false) String queryJson,
                                                         HttpServletRequest request

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

@@ -9,16 +9,18 @@ import cn.com.usky.log.LogService;
 import cn.com.usky.utils.HttpServletRequestUtils;
 import cn.com.usky.utils.Page;
 import com.alibaba.fastjson.JSONObject;
+import net.sf.json.JSON;
 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;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author laowo
@@ -31,30 +33,44 @@ import javax.servlet.http.HttpServletResponse;
 public class Log {
     @Autowired
     private LogService logService;
-
     @Autowired
     private TokenAuthService tokenAuthService;
-    @RequestMapping("queryLogList")
+
+    @RequestMapping(value = "queryLogList", method = {RequestMethod.GET})
     @ResponseBody
     public String queryLogList(
             HttpServletResponse response,
             HttpServletRequest request,
             @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo
-    ) {
+    ) throws UnsupportedEncodingException {
         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();
+            return null;
 
         }
         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();
+        Page<SysLogDTO> sysLogDTOPage = logService.queryLogList(pageSize, pageNo, vLoginname);
+        //  String s = JSONObject.toJSON(sysLogDTOPage).toString();
+        // 两者缺一不可，缺setCharacterEncoding，则中文变成“???”
+        //缺setContentType，则中文变成“骞夸??...”
+        //   response.setCharacterEncoding("UTF-8");
+
+        //  response.setContentType("text/html");
+        //    byte[] utf8Bytes = s.getBytes("UTF-8");
+//然后用utf-8 对这个字节数组解码成新的字符串
+        //     String utf8Str = new String(utf8Bytes, "UTF-8");
+
+
+        //  byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
+        net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(sysLogDTOPage);
+        String s = jsonObject.toString();
+
         return s;
     }
 

src/cn/com/usky/iot/controller/login/LoginController.java

@@ -39,7 +39,7 @@ public class LoginController extends BaseReController {
 
     @RequestMapping("tolgin")
     @ResponseBody
-    @AutoLog("用户登录")
+    @AutoLog("7")
     public String login(@RequestParam("queryJson") String queryJson) {
         String sessionCheckNumber = (String) session.getAttribute("checkNumber");
         JSONObject jsonObject = JSONObject.fromObject(queryJson);

src/cn/com/usky/iot/entity/sys/SysLogDTO.hbm.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>

src/cn/com/usky/iot/xjeventprocessing/service/YtiotXjEventProcessingServicesImpl.java

@@ -342,6 +342,7 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 		JSONObject q_json = null;		
 		JSONArray jSONArray = new JSONArray();
 		JSONArray jSONArray1 = new JSONArray();
+		JSONArray jSONArray3 = new JSONArray();
 		JSONObject json = new JSONObject();
 		json.put("action", "getEventProcessingList");
 		if(queryJson!=null) {
@@ -551,14 +552,14 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 		}
 
 
-		Map map = new HashMap();
+		Map map3 = new HashMap();
 		//人员总数量
 		if(V_LOGINNAME!=null) {
 			zsl_hqlwhere = " where u."+fieldname("data2")+"='"+V_LOGINNAME+"' and u."+fieldname("zn")+" in (4,5,6,7)";
 //						System.out.println(xjrysl_hqlwhere);
 			int zrs = ytiotXjInspectorsDao.getCount(zsl_hqlwhere);
 //						System.out.println(xjrysl);
-			map.put("zrs", zrs);
+			map3.put("zrs", zrs);
 //							System.out.println("测试0"+zrs);
 
 		}
@@ -570,9 +571,9 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 //						System.out.println(jrrw_hqlwhere);
 			int jrsj = ytiotXjEventProcessingDao.getCount(jrrw_hqlwhere);
 //						System.out.println("总数"+jrsj);
-			map.put("jrsj", jrsj);
+			map3.put("jrsj", jrsj);
 		}else {
-			map.put("jrsj", 0);
+			map3.put("jrsj", 0);
 		}
 
 		//超时事件
@@ -580,9 +581,9 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 			csrw_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=5";
 //						System.out.println(jrrw_hqlwhere);
 			int cssj = ytiotXjEventProcessingDao.getCount(csrw_hqlwhere);
-			map.put("cssj", cssj);
+			map3.put("cssj", cssj);
 		}else {
-			map.put("cssj", 0);
+			map3.put("cssj", 0);
 		}
 
 		//今日解决
@@ -590,13 +591,13 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 			jrjj_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=4 and u.shTime like '%"+dqsj+"%'";
 //						System.out.println(jrrw_hqlwhere);
 			int jrjj = ytiotXjEventProcessingDao.getCount(jrjj_hqlwhere);
-			map.put("jrjj", jrjj);
+			map3.put("jrjj", jrjj);
 		}else {
-			map.put("jrjj", 0);
+			map3.put("jrjj", 0);
 		}
-		JSONObject jSONObject = JSONObject.fromObject(map);
-		jSONArray.add(jSONObject);
-		json.put("RESULT2", jSONArray);
+		JSONObject jSONObject3 = JSONObject.fromObject(map3);
+		jSONArray3.add(jSONObject3);
+		json.put("RESULT2", jSONArray3);
 
 		return json.toString();
 	}

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

@@ -49,7 +49,7 @@ public class LogServiceImpl implements LogService {
         List<SysLogDTO> listPage = hibernateTemplate.executeFind(new HibernateCallback() {
             @Override
             public Object doInHibernate(Session session) throws HibernateException, SQLException {
-                Query query = session.createQuery("from SysLogDTO t where t.userid='"+vLoginname+"'");
+                Query query = session.createQuery("from SysLogDTO t where t.userid='"+vLoginname+"' order by t.createTime DESC");
                 query.setFirstResult((pageNo - 1) * pageSize);
                 query.setMaxResults(pageSize);
                 return query.list();