From 6c955bced91e431cb6dbd255257d3dafd1dc6cf2 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 二月 2026 09:59:20 +0800
Subject: [PATCH] 地磅抓拍页面修改
---
fzzy-igdss-web/src/main/java/com/fzzy/security/WeighbridgeSnapController.java | 13 ------
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/WeighbridgeSnap.java | 48 ++++--------------------
fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html | 4 +-
fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js | 4 +-
fzzy-igdss-web/src/main/resources/static/security/weighbridgeSnap/weighbridgeSnap.js | 24 +----------
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 4 +-
fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js | 4 +-
fzzy-igdss-web/src/main/resources/templates/security/weighbridgeSnap.html | 14 +-----
8 files changed, 22 insertions(+), 93 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/WeighbridgeSnap.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/WeighbridgeSnap.java
index 40b2644..26c2e95 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/WeighbridgeSnap.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/WeighbridgeSnap.java
@@ -1,11 +1,15 @@
package com.fzzy.igds.domain;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.persistence.Column;
+import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -16,12 +20,11 @@
* @since 2026/02/25
*/
@Data
-//@Entity
-//@Table(name = "d_weighbridge_snap")
-//@TableName("d_weighbridge_snap")
-//@EqualsAndHashCode(callSuper = false)
+@Entity
+@Table(name = "d_weighbridge_snap")
+@TableName("d_weighbridge_snap")
+@EqualsAndHashCode(callSuper = false)
public class WeighbridgeSnap extends BizBaseEntity implements Serializable {
-
/**
*
@@ -36,10 +39,6 @@
@TableField("dept_id")
private String deptId;
- @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
- @TableField("depot_id")
- private String depotId;
-
@Column(name = "ser_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炶澶�'")
@TableField("ser_id")
private String serId;
@@ -48,49 +47,18 @@
@TableField("name")
private String name;
- // 鏋氫妇 WarnType
- @Column(name = "biz_type", columnDefinition = "varchar(20) COMMENT '涓氬姟绫诲瀷'")
- @TableField("biz_type")
- private String bizType;
-
- @Column(name = "info", columnDefinition = "varchar(5) COMMENT '鎶撴媿鍐呭'")
- @TableField("info")
- private String info;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "time", columnDefinition = "datetime COMMENT '鎶撴媿鏃堕棿'")
@TableField("time")
private Date time;
- @Column(name = "notice_result", columnDefinition = "varchar(5) COMMENT '閫氱煡缁撴灉'")
- @TableField("notice_result")
- private String noticeResult = "涓嶆帹閫�";
-
- @Column(name = "notice_user", columnDefinition = "varchar(50) COMMENT '閫氱煡浜�,澶氫汉鐢ㄩ�楀彿闅斿紑'")
- @TableField("notice_user")
- private String noticeUser;
-
- @Column(name = "complete_user", columnDefinition = "varchar(50) COMMENT '澶勭悊浜�'")
- @TableField("complete_user")
- private String completeUser;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(name = "complete_time", columnDefinition = "datetime COMMENT '澶勭悊鏃堕棿'")
- @TableField("complete_time")
- private Date completeTime;
-
@Column(name = "tags", columnDefinition = "varchar(100) COMMENT '鏍囩锛堝寘鍚溅鐗屽拰杞﹁締绫诲瀷锛�'")
@TableField("tags")
private String tags;
- @Column(name = "food_variety", columnDefinition = "varchar(7) COMMENT '绮鍝佺'")
- @TableField("food_variety")
- private String foodVariety;
-
@Column(name = "weight", columnDefinition = "decimal(20,2) COMMENT '绉伴噸閲嶉噺(鍗曚綅KG)'")
@TableField("weight")
private Double weight = 0.0;
-
@Column(name = "remark", columnDefinition = "varchar(200) COMMENT '澶囨敞璇存槑'")
@TableField("remark")
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/WeighbridgeSnapController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/WeighbridgeSnapController.java
index caf9519..9367599 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/WeighbridgeSnapController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/WeighbridgeSnapController.java
@@ -5,7 +5,6 @@
import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
-import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.Company;
@@ -22,9 +21,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Slf4j
@Controller
@@ -94,16 +91,6 @@
//搴撳尯鏁版嵁
model.addAttribute("deptList", depts);
model.addAttribute("defaultDeptId", defaultDeptId);
-
- //涓氬姟绫诲瀷鏁版嵁
- List<Map<String, String>> bizTypeList = new ArrayList<>();
- for (WarnType type : WarnType.values()) {
- Map<String, String> item = new HashMap<>();
- item.put("code", type.getCode());
- item.put("msg", type.getMsg());
- bizTypeList.add(item);
- }
- model.addAttribute("bizTypeList", bizTypeList);
//鍏徃鏁版嵁
model.addAttribute("companyList", companies);
model.addAttribute("defaultCompany", defaultCompany);
diff --git a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
index 029e3cd..c96f037 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
@@ -270,11 +270,11 @@
</div>
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span>${getCameraName(record.serId) || record.serId || ''}</span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span>${formatDate(record.time)}</span>
</div>
diff --git a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
index 25cf58b..3fd097b 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -263,11 +263,11 @@
</div>
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span>${getCameraName(record.cameraId) || record.cameraId || ''}</span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span>${formatDate(record.snapTime)}</span>
</div>
diff --git a/fzzy-igdss-web/src/main/resources/static/security/weighbridgeSnap/weighbridgeSnap.js b/fzzy-igdss-web/src/main/resources/static/security/weighbridgeSnap/weighbridgeSnap.js
index f6c4a42..75a8956 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/weighbridgeSnap/weighbridgeSnap.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/weighbridgeSnap/weighbridgeSnap.js
@@ -270,18 +270,18 @@
</div>
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span>${getCameraName(record.serId) || record.serId || ''}</span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span>${formatDate(record.time)}</span>
</div>
</div>
<div class="meta-item">
<i class="layui-icon layui-icon-component"></i>
- <span>${getTypeName(record.bizType) || record.bizType || ''}</span>
+ <span>${(record.weight || 0).toFixed(2)}KG</span>
</div>
</div>
</div>
@@ -309,24 +309,6 @@
}
return null;
}
-
-/**
- * 鏍规嵁涓氬姟绫诲瀷缂栫爜鑾峰彇涓氬姟绫诲瀷鍚嶇О
- * @param {string} bizType - 涓氬姟绫诲瀷缂栫爜
- * @returns {string|null} 涓氬姟绫诲瀷鍚嶇О鎴杗ull
- */
-function getTypeName(bizType) {
- if (typeof bizTypeList !== 'undefined' && Array.isArray(bizTypeList) && bizType) {
- // 鏌ユ壘鍖归厤鐨勪笟鍔＄被鍨嬪璞�
- var type = bizTypeList.find(function(item) {
- return item.code === bizType;
- });
- // 杩斿洖涓氬姟绫诲瀷鍚嶇О锛屽鏋滄壘涓嶅埌鍒欒繑鍥瀗ull
- return type ? type.msg : null;
- }
- return null;
-}
-
/**
* 鏍煎紡鍖栨棩鏈�
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index 3588b6e..68f7f7e 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -89,11 +89,11 @@
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span th:text="${eventInfo.serId}"></span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span th:text="${eventInfo.time != null ? #dates.format(eventInfo.time, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span>
</div>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
index 03fbda7..f4cadf9 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
@@ -95,13 +95,13 @@
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span th:text="${snapRecord.cameraId}"></span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span th:text="${snapRecord.snapTime != null ? #dates.format(snapRecord.snapTime, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span>
</div>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/weighbridgeSnap.html b/fzzy-igdss-web/src/main/resources/templates/security/weighbridgeSnap.html
index da9c86a..9e03fd1 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/weighbridgeSnap.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/weighbridgeSnap.html
@@ -85,25 +85,18 @@
<div class="gallery-meta">
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 60%">
<i class="layui-icon layui-icon-video"></i>
<span th:text="${weighbridgeSnap.serId}"></span>
</div>
- <div class="meta-item" style="width: 50%">
+ <div class="meta-item" style="min-width: 40%">
<i class="layui-icon layui-icon-date"></i>
<span th:text="${weighbridgeSnap.time != null ? #dates.format(weighbridgeSnap.time, 'yyyy-MM-dd HH:mm') : '鏃犳椂闂�'}"></span>
</div>
</div>
<div class="meta-item">
<i class="layui-icon layui-icon-component"></i>
- <th:block th:with="matchedTypes=${bizTypeList.?[code == #root.weighbridgeSnap.bizType]}">
- <th:block th:if="${!#lists.isEmpty(matchedTypes)}">
- <span th:text="${matchedTypes[0].msg}"></span>
- </th:block>
- <th:block th:if="${#lists.isEmpty(matchedTypes)}">
- <span th:text="${weighbridgeSnap.bizType}"></span>
- </th:block>
- </th:block>
+ <span th:text="${#numbers.formatDecimal(weighbridgeSnap.weight ?: 0.0, 1, 2)} + 'KG'"></span>
</div>
</div>
</div>
@@ -133,7 +126,6 @@
<script th:inline="javascript">
var cameraList = [[${cameraList}]];
var deptList = [[${deptList}]];
- var bizTypeList = [[${bizTypeList}]];
var companyList = [[${companyList}]];
var currentPage = [[${currentPage}]];
var totalItems = [[${totalItems}]];
--
Gitblit v1.9.3