From 5bacfa37d4746e9604c5cf8f22aa97954e26f8a7 Mon Sep 17 00:00:00 2001 From: Rue Ji Date: Thu, 26 Mar 2026 23:15:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DjobList.jsp?= =?UTF-8?q?=E4=B8=ADcompanyId=E5=8F=98=E9=87=8F=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sipai/controller/user/UserController.java | 4 ++++ src/main/webapp/jsp/user/jobList.jsp | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sipai/controller/user/UserController.java b/src/main/java/com/sipai/controller/user/UserController.java index b738062a..ae3b9486 100644 --- a/src/main/java/com/sipai/controller/user/UserController.java +++ b/src/main/java/com/sipai/controller/user/UserController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.activiti.engine.RepositoryService; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -864,6 +865,9 @@ public class UserController { public String getUsersByIds(HttpServletRequest request, Model model) { String userIds = request.getParameter("userIds"); List list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')"); + if (CollectionUtils.isNotEmpty(list)){ + list = list.stream().filter(u -> StringUtils.isNotBlank(u.getId())).collect(toList()); + } JSONArray json = JSONArray.fromObject(list); model.addAttribute("result", json); return "result"; diff --git a/src/main/webapp/jsp/user/jobList.jsp b/src/main/webapp/jsp/user/jobList.jsp index 00745b75..2fafbc06 100644 --- a/src/main/webapp/jsp/user/jobList.jsp +++ b/src/main/webapp/jsp/user/jobList.jsp @@ -20,7 +20,10 @@ src="<%=request.getContextPath()%>/node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js" charset="utf-8"> @@ -838,19 +1391,19 @@
- 进水累计 + 进水累计
- -- - m³ + -- +
- 出水累计 + 出水累计
- -- - m³ + -- +
@@ -861,19 +1414,19 @@
- 进水累计 + 进水累计
- -- - m³ + -- +
- 出水累计 + 出水累计
- -- - m³ + -- +
@@ -887,7 +1440,7 @@
污水流量7天日趋势
-
+
@@ -897,6 +1450,7 @@
+
@@ -1011,6 +1565,39 @@ + + +
+
+
企业概况
+
+ +
+
+
--
+
企业总数
+
+
+
--
+
接入总数
+
+
+
--
+
离线企业
+
+
+
--
+
总瞬时流量(m³/h)
+
+
+ + +
+ +
+
+
+
diff --git a/src/main/webapp/jsp/main_JS_Company2_init.jsp b/src/main/webapp/jsp/main_JS_Company2_init.jsp new file mode 100644 index 00000000..ad8e22c1 --- /dev/null +++ b/src/main/webapp/jsp/main_JS_Company2_init.jsp @@ -0,0 +1,398 @@ +<%@ page language="java" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ page import="com.sipai.entity.base.ServerObject" %> +<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %> + +<%@ page import="com.sipai.entity.base.MainConfig" %> +<% request.setAttribute("type_pro", MainConfig.type_pro); %> +<% request.setAttribute("type_safe", MainConfig.type_safe); %> +<% request.setAttribute("type_eff", MainConfig.type_eff); %> +<% request.setAttribute("type_pic", MainConfig.type_pic); %> + + + + + <%= ServerObject.atttable.get("TOPTITLE")%> + + + + + + + + + + + + + + +
+ +
+
+
+ <%--图片--%> + + +
+
+
+
+
+ 水量及电耗 +
+
+ +
+
-
+
-
+
+
+
-
+
-
+
+ +
+
-
+
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ 一车间 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+
+
+
+
+
+
+
+ 二车间 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+ - +
+
+
+
+
+
+
+
+
+
+ +
+ + + \ No newline at end of file