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") 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); 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> 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> 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} 业务类型名称或null */ function getTypeName(bizType) { if (typeof bizTypeList !== 'undefined' && Array.isArray(bizTypeList) && bizType) { // 查找匹配的业务类型对象 var type = bizTypeList.find(function(item) { return item.code === bizType; }); // 返回业务类型名称，如果找不到则返回null return type ? type.msg : null; } return null; } /** * 格式化日期 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> 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> 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}]];
