新增需求管理功能，接口前端

pm-admin/src/main/java/com/pm/web/controller/device/DeviceAlarmController.java

@@ -0,0 +1,440 @@
+package com.pm.web.controller.device;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.pm.common.annotation.Log;
+import com.pm.common.core.controller.BaseController;
+import com.pm.common.core.domain.AjaxResult;
+import com.pm.common.enums.BusinessType;
+import com.pm.common.config.PageData;
+import com.pm.common.utils.poi.ExcelUtilPageData;
+import com.pm.subsystem.service.IDeviceAlarmService;
+import com.pm.subsystem.service.IDeviceServiceOrderService;
+import com.pm.common.core.page.TableDataInfo;
+import com.pm.common.utils.SecurityUtils;
+import com.pm.common.utils.DateUtils;
+import com.pm.common.utils.StringUtils;
+
+/**
+ * 设备告警Controller
+ *
+ * @author lxf
+ * @date 2025-01-06
+ */
+@RestController
+@RequestMapping("/device/alarms")
+public class DeviceAlarmController extends BaseController
+{
+    @Autowired
+    private IDeviceAlarmService deviceAlarmService;
+
+    @Autowired
+    private IDeviceServiceOrderService serviceOrderService;
+
+    /**
+     * 查询设备告警列表
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:list')")
+    @GetMapping("/list")
+    public TableDataInfo list()
+    {
+        PageData pd = this.getPageData();
+        startPage();
+        List<PageData> list = deviceAlarmService.selectDeviceAlarmList(pd);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取设备告警详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(deviceAlarmService.selectDeviceAlarmById(id));
+    }
+
+    /**
+     * 新增设备告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:add')")
+    @Log(title = "设备告警", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PageData pd)
+    {
+        // 生成告警ID
+        pd.put("alarmId", "ALM" + System.currentTimeMillis());
+        pd.put("alarmTime", DateUtils.getNowDate());
+        pd.put("alarmStatus", 1); // 活动中
+        pd.put("isReset", 0); // 未复位
+        pd.put("isNotified", 0); // 未通知
+        pd.put("alarmCount", 1);
+        pd.put("firstAlarmTime", DateUtils.getNowDate());
+        pd.put("lastAlarmTime", DateUtils.getNowDate());
+        return toAjax(deviceAlarmService.insertDeviceAlarm(pd));
+    }
+
+    /**
+     * 修改设备告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:edit')")
+    @Log(title = "设备告警", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PageData pd)
+    {
+        return toAjax(deviceAlarmService.updateDeviceAlarm(pd));
+    }
+
+    /**
+     * 删除设备告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:remove')")
+    @Log(title = "设备告警", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(deviceAlarmService.deleteDeviceAlarmByIds(ids));
+    }
+
+    /**
+     * 告警复位
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:reset')")
+    @Log(title = "设备告警复位", businessType = BusinessType.UPDATE)
+    @PostMapping("/reset")
+    public AjaxResult reset(@RequestBody PageData pd)
+    {
+        pd.put("resetTime", DateUtils.getNowDate());
+        pd.put("resetUser", SecurityUtils.getUsername());
+
+        // 插入复位记录
+        PageData resetRecord = new PageData();
+        resetRecord.put("resetId", "RST" + System.currentTimeMillis());
+        resetRecord.put("alarmId", pd.getString("alarmId"));
+        resetRecord.put("deviceCode", pd.getString("deviceCode"));
+        resetRecord.put("resetType", "MANUAL");
+        resetRecord.put("resetTime", pd.get("resetTime"));
+        resetRecord.put("resetUser", pd.getString("resetUser"));
+        resetRecord.put("resetReason", pd.getString("resetReason"));
+        resetRecord.put("resetRemark", pd.getString("resetRemark"));
+        deviceAlarmService.insertAlarmResetRecord(resetRecord);
+
+        return toAjax(deviceAlarmService.resetDeviceAlarm(pd));
+    }
+
+    /**
+     * 批量告警复位
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:reset')")
+    @Log(title = "批量告警复位", businessType = BusinessType.UPDATE)
+    @PostMapping("/batchReset")
+    public AjaxResult batchReset(@RequestBody Map<String, List<String>> params)
+    {
+        List<String> alarmIds = params.get("alarmIds");
+        if (alarmIds == null || alarmIds.isEmpty()) {
+            return error("请选择要复位的告警");
+        }
+        return toAjax(deviceAlarmService.batchResetDeviceAlarm(alarmIds));
+    }
+
+    /**
+     * 获取告警统计信息
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping("/statistics")
+    public AjaxResult getStatistics()
+    {
+        PageData pd = this.getPageData();
+        Map<String, Object> stats = deviceAlarmService.getAlarmStatistics(pd);
+        return success(stats);
+    }
+
+    /**
+     * 获取告警趋势数据
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping("/trend")
+    public AjaxResult getTrend()
+    {
+        PageData pd = this.getPageData();
+        List<Map<String, Object>> trend = deviceAlarmService.getAlarmTrend(pd);
+        return success(trend);
+    }
+
+    /**
+     * 创建服务单
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:createOrder')")
+    @Log(title = "创建服务单", businessType = BusinessType.OTHER)
+    @PostMapping("/createOrder")
+    public AjaxResult createServiceOrder(@RequestBody PageData pd)
+    {
+        try {
+            // 获取告警信息
+            PageData alarmInfo = deviceAlarmService.selectDeviceAlarmByAlarmId(pd.getString("alarmId"));
+            if (alarmInfo == null) {
+                return error("告警信息不存在");
+            }
+
+            // 检查是否已创建服务单
+            if (StringUtils.isNotEmpty(alarmInfo.getString("serviceOrderId"))) {
+                return error("该告警已创建服务单");
+            }
+
+            // 创建服务单
+            PageData orderPd = new PageData();
+            String orderId = "ORD" + System.currentTimeMillis();
+            orderPd.put("orderId", orderId);
+            orderPd.put("alarmId", pd.getString("alarmId"));
+            orderPd.put("deviceCode", alarmInfo.getString("deviceCode"));
+            orderPd.put("deviceName", alarmInfo.getString("deviceName"));
+            orderPd.put("orderType", pd.getString("REPAIR"));
+            orderPd.put("orderTitle", "告警处理-" + alarmInfo.getString("alarmMessage"));
+            orderPd.put("orderContent", pd.getString("orderContent"));
+            orderPd.put("priority", pd.getString( "NORMAL"));
+            orderPd.put("orderStatus", "PENDING");
+            orderPd.put("reporter", SecurityUtils.getUsername());
+            orderPd.put("reportTime", DateUtils.getNowDate());
+            orderPd.put("estimatedDuration", pd.get("estimatedDuration"));
+            orderPd.put("remark", pd.getString("remark"));
+
+            int result = serviceOrderService.insertServiceOrder(orderPd);
+            if (result > 0) {
+                // 更新告警的服务单ID
+                PageData updatePd = new PageData();
+                updatePd.put("id", alarmInfo.get("id"));
+                updatePd.put("serviceOrderId", orderId);
+                deviceAlarmService.updateDeviceAlarm(updatePd);
+
+                Map<String, Object> resultMap = new HashMap<>();
+                resultMap.put("orderId", orderId);
+                resultMap.put("msg", "服务单创建成功");
+                return success(resultMap);
+            } else {
+                return error("服务单创建失败");
+            }
+        } catch (Exception e) {
+            logger.error("创建服务单失败", e);
+            return error("创建服务单失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 批量创建服务单
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:createOrder')")
+    @Log(title = "批量创建服务单", businessType = BusinessType.OTHER)
+    @PostMapping("/batchCreateOrder")
+    public AjaxResult batchCreateServiceOrder(@RequestBody Map<String, Object> params)
+    {
+        List<String> alarmIds = (List<String>) params.get("alarmIds");
+        if (alarmIds == null || alarmIds.isEmpty()) {
+            return error("请选择要创建服务单的告警");
+        }
+
+        int successCount = 0;
+        int failCount = 0;
+        List<String> failedAlarms = new ArrayList<>();
+
+        for (String alarmId : alarmIds) {
+            PageData pd = new PageData();
+            pd.put("alarmId", alarmId);
+            pd.put("orderType", params.get("orderType"));
+            pd.put("priority", params.get("priority"));
+            pd.put("orderContent", params.get("orderContent"));
+
+            try {
+                AjaxResult result = createServiceOrder(pd);
+                if (result.get("code").equals(200)) {
+                    successCount++;
+                } else {
+                    failCount++;
+                    failedAlarms.add(alarmId);
+                }
+            } catch (Exception e) {
+                failCount++;
+                failedAlarms.add(alarmId);
+            }
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("successCount", successCount);
+        result.put("failCount", failCount);
+        result.put("failedAlarms", failedAlarms);
+
+        if (failCount == 0) {
+            return AjaxResult.success("批量创建服务单成功", result);
+        } else if (successCount == 0) {
+            return AjaxResult.error("批量创建服务单失败");
+        } else {
+            return AjaxResult.success("部分服务单创建成功", result);
+        }
+    }
+
+    /**
+     * 获取服务单信息
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping("/order/{orderId}")
+    public AjaxResult getServiceOrder(@PathVariable("orderId") String orderId)
+    {
+        PageData order = serviceOrderService.selectServiceOrderByOrderNo(orderId);
+        if (order == null) {
+            return error("服务单不存在");
+        }
+        return success(order);
+    }
+
+    /**
+     * 导出设备告警数据
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:export')")
+    @Log(title = "设备告警", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response)
+    {
+        try {
+            PageData pd = this.getPageData();
+            List<PageData> list = deviceAlarmService.selectDeviceAlarmList(pd);
+            String filename = "设备告警记录";
+            String[] titles = {
+                    "告警ID,alarmId",
+                    "设备编码,deviceCode",
+                    "设备名称,deviceName",
+                    "子系统类型,subsystemType",
+                    "点位编码,pointCode",
+                    "点位名称,pointName",
+                    "空间名称,spaceName",
+                    "楼栋名称,buildingName",
+                    "楼层名称,floorName",
+                    "告警类型,alarmType",
+                    "告警级别,alarmLevel",
+                    "告警值,alarmValue",
+                    "限制值,limitValue",
+                    "单位,unit",
+                    "告警时间,alarmTime",
+                    "恢复时间,recoveryTime",
+                    "告警状态,alarmStatus",
+                    "复位状态,isReset",
+                    "复位时间,resetTime",
+                    "复位用户,resetUser",
+                    "告警消息,alarmMessage",
+                    "服务单ID,serviceOrderId"
+            };
+            ExcelUtilPageData.exportXLSX(response, null, null, filename, titles, list);
+        } catch (Exception e) {
+            logger.error("导出设备告警数据失败", e);
+        }
+    }
+
+    /**
+     * 获取告警复位记录
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping("/resetRecords/{alarmId}")
+    public AjaxResult getResetRecords(@PathVariable("alarmId") String alarmId)
+    {
+        List<PageData> records = deviceAlarmService.selectAlarmResetRecords(alarmId);
+        return success(records);
+    }
+
+    /**
+     * 确认告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:confirm')")
+    @Log(title = "确认告警", businessType = BusinessType.UPDATE)
+    @PostMapping("/confirm")
+    public AjaxResult confirmAlarm(@RequestBody PageData pd)
+    {
+        pd.put("confirmUser", SecurityUtils.getUsername());
+        pd.put("confirmTime", DateUtils.getNowDate());
+        return toAjax(deviceAlarmService.confirmAlarm(pd));
+    }
+
+    /**
+     * 屏蔽告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:mask')")
+    @Log(title = "屏蔽告警", businessType = BusinessType.UPDATE)
+    @PostMapping("/mask")
+    public AjaxResult maskAlarm(@RequestBody PageData pd)
+    {
+        pd.put("maskUser", SecurityUtils.getUsername());
+        pd.put("maskTime", DateUtils.getNowDate());
+        return toAjax(deviceAlarmService.maskAlarm(pd));
+    }
+
+    /**
+     * 取消屏蔽告警
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:mask')")
+    @Log(title = "取消屏蔽告警", businessType = BusinessType.UPDATE)
+    @PostMapping("/unmask/{alarmId}")
+    public AjaxResult unmaskAlarm(@PathVariable("alarmId") String alarmId)
+    {
+        PageData pd = new PageData();
+        pd.put("alarmId", alarmId);
+        pd.put("alarmStatus", 1); // 恢复到活动状态
+
+        // 查询告警信息
+        PageData alarmInfo = deviceAlarmService.selectDeviceAlarmByAlarmId(alarmId);
+        if (alarmInfo == null) {
+            return error("告警信息不存在");
+        }
+
+        // 更新告警状态
+        PageData updatePd = new PageData();
+        updatePd.put("id", alarmInfo.get("id"));
+        updatePd.put("alarmStatus", 1);
+
+        return toAjax(deviceAlarmService.updateDeviceAlarm(updatePd));
+    }
+
+    /**
+     * 获取告警详情（包含处理记录）
+     */
+    @PreAuthorize("@ss.hasPermi('device:alarm:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult getDetail(@PathVariable("id") Long id)
+    {
+        Map<String, Object> result = new HashMap<>();
+
+        // 获取告警基本信息
+        PageData alarmInfo = deviceAlarmService.selectDeviceAlarmById(id);
+        if (alarmInfo == null) {
+            return error("告警信息不存在");
+        }
+        result.put("alarmInfo", alarmInfo);
+
+        // 获取复位记录
+        String alarmId = alarmInfo.getString("alarmId");
+        List<PageData> resetRecords = deviceAlarmService.selectAlarmResetRecords(alarmId);
+        result.put("resetRecords", resetRecords);
+
+        // 获取关联的服务单信息
+        String serviceOrderId = alarmInfo.getString("serviceOrderId");
+        if (StringUtils.isNotEmpty(serviceOrderId)) {
+            PageData serviceOrder = serviceOrderService.selectServiceOrderByOrderNo(serviceOrderId);
+            result.put("serviceOrder", serviceOrder);
+
+            // 获取服务单操作记录
+            List<PageData> orderRecords = serviceOrderService.selectOrderOperateRecords(serviceOrderId);
+            result.put("orderRecords", orderRecords);
+        }
+
+        return success(result);
+    }
+}

pm-admin/src/main/java/com/pm/web/controller/device/DeviceConfigurationController.java

@@ -0,0 +1,364 @@
+package com.pm.web.controller.device;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Random;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.pm.common.annotation.Log;
+import com.pm.common.core.controller.BaseController;
+import com.pm.common.core.domain.AjaxResult;
+import com.pm.common.enums.BusinessType;
+import com.pm.common.config.PageData;
+import com.pm.common.core.page.TableDataInfo;
+
+/**
+ * 设备组态Controller
+ * 
+ * @author lxf
+ * @date 2025-06-11
+ */
+@RestController
+@RequestMapping("/device/configuration")
+public class DeviceConfigurationController extends BaseController
+{
+    /**
+     * 查询设备组态列表（模拟数据）
+     */
+    @GetMapping("/list")
+    public TableDataInfo list()
+    {
+        PageData pd = this.getPageData();
+        List<Map<String, Object>> list = new ArrayList<>();
+        
+        // 模拟设备数据
+        String[] deviceCodes = {"HVAC001", "HVAC002", "FA001", "CH001", "WS001", "EL001", "PD001", "LT001", "HVAC003", "FA002"};
+        String[] deviceNames = {"1号空调机组", "2号空调机组", "新风机组1", "冷水机组1", "供水泵1", "客梯1", "配电柜1", "照明回路1", "3号空调机组", "新风机组2"};
+        String[] subsystemTypes = {"hvac", "hvac", "fresh_air", "cooling_heating", "water_system", "elevator", "power_distribution", "lighting", "hvac", "fresh_air"};
+        String[] spaceNames = {"1楼大厅", "2楼办公区", "1楼大厅", "地下室", "地下室", "1-8楼", "配电室", "1楼大厅", "3楼办公区", "2楼办公区"};
+        
+        Random random = new Random();
+        
+        for (int i = 0; i < deviceCodes.length; i++) {
+            Map<String, Object> device = new HashMap<>();
+            device.put("deviceCode", deviceCodes[i]);
+            device.put("deviceName", deviceNames[i]);
+            device.put("subsystemType", subsystemTypes[i]);
+            device.put("spaceName", spaceNames[i]);
+            device.put("status", String.valueOf(random.nextInt(3))); // 0-离线, 1-正常, 2-故障
+            device.put("isOnline", random.nextBoolean());
+            device.put("alarmCount", random.nextInt(5));
+            device.put("lastUpdateTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            
+            list.add(device);
+        }
+        
+        // 分页处理
+        int pageNum = 1;
+        int pageSize = 10;
+        int startIndex = (pageNum - 1) * pageSize;
+        int endIndex = Math.min(startIndex + pageSize, list.size());
+        
+        List<Map<String, Object>> pageList = list.subList(startIndex, endIndex);
+        
+        TableDataInfo dataTable = new TableDataInfo();
+        dataTable.setRows(pageList);
+        dataTable.setTotal(list.size());
+        dataTable.setCode(200);
+        dataTable.setMsg("查询成功");
+        
+        return dataTable;
+    }
+
+    /**
+     * 获取设备详细信息
+     */
+    @GetMapping("/{deviceCode}")
+    public AjaxResult getInfo(@PathVariable("deviceCode") String deviceCode)
+    {
+        Map<String, Object> device = new HashMap<>();
+        device.put("deviceCode", deviceCode);
+        device.put("deviceName", "设备名称_" + deviceCode);
+        device.put("subsystemType", "hvac");
+        device.put("spaceName", "1楼大厅");
+        device.put("status", "1");
+        device.put("isOnline", true);
+        device.put("manufacturer", "海尔");
+        device.put("model", "KFRD-50LW");
+        device.put("installDate", "2023-06-01");
+        device.put("warrantyDate", "2025-06-01");
+        
+        return AjaxResult.success(device);
+    }
+
+    /**
+     * 获取设备点位列表
+     */
+    @GetMapping("/points/{deviceCode}")
+    public AjaxResult getDevicePoints(@PathVariable("deviceCode") String deviceCode)
+    {
+        List<Map<String, Object>> pointList = new ArrayList<>();
+        Random random = new Random();
+        
+        // 根据设备类型生成不同的点位
+        if (deviceCode.startsWith("HVAC")) {
+            // 空调设备点位
+            String[] pointCodes = {"AI001", "AI002", "AI003", "AO001", "DI001", "DO001", "DO002"};
+            String[] pointNames = {"送风温度", "回风温度", "送风湿度", "风阀开度", "运行状态", "启停控制", "模式切换"};
+            String[] pointTypes = {"AI", "AI", "AI", "AO", "DI", "DO", "DO"};
+            String[] units = {"°C", "°C", "%", "%", "", "", ""};
+            
+            for (int i = 0; i < pointCodes.length; i++) {
+                Map<String, Object> point = new HashMap<>();
+                point.put("pointCode", pointCodes[i]);
+                point.put("pointName", pointNames[i]);
+                point.put("pointType", pointTypes[i]);
+                point.put("unit", units[i]);
+                
+                // 根据点位类型生成不同的值
+                if ("AI".equals(pointTypes[i])) {
+                    if (pointNames[i].contains("温度")) {
+                        point.put("currentValue", new BigDecimal(random.nextDouble() * 10 + 20).setScale(1, RoundingMode.HALF_UP));
+                        point.put("minValue", 15.0);
+                        point.put("maxValue", 35.0);
+                    } else {
+                        point.put("currentValue", new BigDecimal(random.nextDouble() * 20 + 40).setScale(1, RoundingMode.HALF_UP));
+                        point.put("minValue", 30.0);
+                        point.put("maxValue", 70.0);
+                    }
+                } else if ("AO".equals(pointTypes[i])) {
+                    point.put("currentValue", new BigDecimal(random.nextDouble() * 100).setScale(0, RoundingMode.HALF_UP));
+                    point.put("minValue", 0.0);
+                    point.put("maxValue", 100.0);
+                } else {
+                    point.put("currentValue", random.nextBoolean() ? 1 : 0);
+                    point.put("minValue", 0);
+                    point.put("maxValue", 1);
+                }
+                
+                point.put("alarmStatus", random.nextInt(10) < 2); // 20%概率告警
+                point.put("updateTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                
+                pointList.add(point);
+            }
+        } else if (deviceCode.startsWith("FA")) {
+            // 新风设备点位
+            String[] pointCodes = {"AI001", "AI002", "AO001", "DI001", "DO001"};
+            String[] pointNames = {"新风温度", "新风湿度", "风机频率", "过滤网状态", "风机启停"};
+            String[] pointTypes = {"AI", "AI", "AO", "DI", "DO"};
+            String[] units = {"°C", "%", "Hz", "", ""};
+            
+            for (int i = 0; i < pointCodes.length; i++) {
+                Map<String, Object> point = new HashMap<>();
+                point.put("pointCode", pointCodes[i]);
+                point.put("pointName", pointNames[i]);
+                point.put("pointType", pointTypes[i]);
+                point.put("unit", units[i]);
+                
+                if ("AI".equals(pointTypes[i])) {
+                    if (pointNames[i].contains("温度")) {
+                        point.put("currentValue", new BigDecimal(random.nextDouble() * 15 + 15).setScale(1, RoundingMode.HALF_UP));
+                    } else {
+                        point.put("currentValue", new BigDecimal(random.nextDouble() * 30 + 40).setScale(1, RoundingMode.HALF_UP));
+                    }
+                } else if ("AO".equals(pointTypes[i])) {
+                    point.put("currentValue", new BigDecimal(random.nextDouble() * 30 + 20).setScale(1, RoundingMode.HALF_UP));
+                    point.put("minValue", 0.0);
+                    point.put("maxValue", 50.0);
+                } else {
+                    point.put("currentValue", random.nextBoolean() ? 1 : 0);
+                }
+                
+                point.put("alarmStatus", random.nextInt(10) < 1);
+                point.put("updateTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                
+                pointList.add(point);
+            }
+        }
+        
+        return AjaxResult.success(pointList);
+    }
+
+    /**
+     * 获取点位详细信息
+     */
+    @GetMapping("/point/{pointCode}")
+    public AjaxResult getPointDetail(@PathVariable("pointCode") String pointCode)
+    {
+        Map<String, Object> point = new HashMap<>();
+        Random random = new Random();
+        
+        point.put("pointCode", pointCode);
+        point.put("pointName", "点位名称_" + pointCode);
+        point.put("pointType", pointCode.startsWith("AI") ? "AI" : pointCode.startsWith("AO") ? "AO" : pointCode.startsWith("DI") ? "DI" : "DO");
+        point.put("currentValue", new BigDecimal(random.nextDouble() * 100).setScale(1, RoundingMode.HALF_UP));
+        point.put("unit", pointCode.startsWith("AI") && pointCode.endsWith("001") ? "°C" : "%");
+        point.put("minValue", 0.0);
+        point.put("maxValue", 100.0);
+        point.put("alarmStatus", false);
+        point.put("updateTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        point.put("description", "点位描述信息");
+        
+        return AjaxResult.success(point);
+    }
+
+    /**
+     * 获取点位实时数据
+     */
+    @GetMapping("/point/realtime/{pointCode}")
+    public AjaxResult getPointRealTimeData(@PathVariable("pointCode") String pointCode)
+    {
+        Map<String, Object> data = new HashMap<>();
+        Random random = new Random();
+        
+        data.put("pointCode", pointCode);
+        data.put("value", new BigDecimal(random.nextDouble() * 100).setScale(2, RoundingMode.HALF_UP));
+        data.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        data.put("quality", "GOOD");
+        
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 获取点位历史数据
+     */
+    @GetMapping("/point/history")
+    public AjaxResult getPointHistoryData()
+    {
+        PageData pd = this.getPageData();
+        List<Map<String, Object>> historyData = new ArrayList<>();
+        Random random = new Random();
+        
+        // 生成24小时的历史数据
+        long currentTime = System.currentTimeMillis();
+        for (int i = 0; i < 24; i++) {
+            Map<String, Object> data = new HashMap<>();
+            data.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(currentTime - i * 3600000)));
+            data.put("value", new BigDecimal(random.nextDouble() * 20 + 20).setScale(2, RoundingMode.HALF_UP));
+            data.put("quality", "GOOD");
+            
+            historyData.add(0, data); // 逆序插入，保证时间顺序
+        }
+        
+        return AjaxResult.success(historyData);
+    }
+
+    /**
+     * 发送控制指令
+     */
+    @Log(title = "设备控制", businessType = BusinessType.UPDATE)
+    @PostMapping("/control")
+    public AjaxResult sendControlCommand(@RequestBody PageData pd)
+    {
+        String pointCode = pd.getString("pointCode");
+        Object controlValue = pd.get("controlValue");
+        String executeTime = pd.getString("executeTime");
+        String remark = pd.getString("remark");
+        
+        // 模拟控制指令下发
+        Map<String, Object> result = new HashMap<>();
+        result.put("commandId", "CMD_" + System.currentTimeMillis());
+        result.put("pointCode", pointCode);
+        result.put("controlValue", controlValue);
+        result.put("executeTime", executeTime);
+        result.put("status", "SUCCESS");
+        result.put("message", "控制指令下发成功");
+        result.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        
+        return AjaxResult.success("控制指令下发成功", result);
+    }
+
+    /**
+     * 获取设备组态图
+     */
+    @GetMapping("/schema/{deviceCode}")
+    public AjaxResult getDeviceSchema(@PathVariable("deviceCode") String deviceCode)
+    {
+        Map<String, Object> schema = new HashMap<>();
+        
+        // 模拟组态图数据
+        schema.put("deviceCode", deviceCode);
+        schema.put("schemaType", "SVG");
+        schema.put("schemaUrl", "/static/schema/" + deviceCode + ".svg");
+        schema.put("width", 800);
+        schema.put("height", 600);
+        
+        // 组态图元素
+        List<Map<String, Object>> elements = new ArrayList<>();
+        Map<String, Object> element1 = new HashMap<>();
+        element1.put("id", "temp_display");
+        element1.put("type", "text");
+        element1.put("x", 100);
+        element1.put("y", 50);
+        element1.put("pointCode", "AI001");
+        element1.put("format", "{value}°C");
+        elements.add(element1);
+        
+        schema.put("elements", elements);
+        
+        return AjaxResult.success(schema);
+    }
+
+    /**
+     * 获取点位告警信息
+     */
+    @GetMapping("/point/alarms/{pointCode}")
+    public AjaxResult getPointAlarms(@PathVariable("pointCode") String pointCode)
+    {
+        List<Map<String, Object>> alarms = new ArrayList<>();
+        Random random = new Random();
+        
+        if (random.nextBoolean()) {
+            Map<String, Object> alarm = new HashMap<>();
+            alarm.put("alarmId", "ALM_" + System.currentTimeMillis());
+            alarm.put("pointCode", pointCode);
+            alarm.put("alarmType", "HIGH_LIMIT");
+            alarm.put("alarmLevel", "WARNING");
+            alarm.put("alarmTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            alarm.put("alarmValue", 35.5);
+            alarm.put("limitValue", 35.0);
+            alarm.put("message", "温度超上限");
+            alarm.put("status", "ACTIVE");
+            
+            alarms.add(alarm);
+        }
+        
+        return AjaxResult.success(alarms);
+    }
+
+    /**
+     * 获取点位控制记录
+     */
+    @GetMapping("/point/controls/{pointCode}")
+    public AjaxResult getPointControlRecords(@PathVariable("pointCode") String pointCode)
+    {
+        List<Map<String, Object>> records = new ArrayList<>();
+        Random random = new Random();
+        
+        for (int i = 0; i < 5; i++) {
+            Map<String, Object> record = new HashMap<>();
+            record.put("recordId", "CTL_" + (System.currentTimeMillis() - i * 1000));
+            record.put("pointCode", pointCode);
+            record.put("controlValue", random.nextInt(100));
+            record.put("executeTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis() - i * 3600000)));
+            record.put("operator", "操作员" + (i + 1));
+            record.put("status", random.nextBoolean() ? "SUCCESS" : "FAILED");
+            record.put("remark", "控制备注" + (i + 1));
+            
+            records.add(record);
+        }
+        
+        return AjaxResult.success(records);
+    }
+}

pm-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.pm</groupId>
             <artifactId>pm-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.pm</groupId>
+            <artifactId>pm-system</artifactId>
+        </dependency>
 
     </dependencies>
 

pm-system/pom.xml

@@ -7,6 +7,18 @@
         <groupId>com.pm</groupId>
         <version>3.8.8</version>
     </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>pm-system</artifactId>
@@ -22,6 +34,21 @@
             <groupId>com.pm</groupId>
             <artifactId>pm-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+            <version>5.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

pm-system/src/main/java/com/pm/sms/AlertService.java

@@ -0,0 +1,33 @@
+package com.pm.sms;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 双通道调度器
+ */
+public class AlertService {
+    private final SmsGateway smsGateway;
+
+    public AlertService(SmsGateway smsGateway) {
+        this.smsGateway = smsGateway;
+    }
+
+    public void handleDeviceAlert(Device device, String errorCode) {
+        String message = String.format(
+            "[IBMS报警] %s-%s 发生故障！\n设备：%s\n代码：%s\n时间：%s",
+            device.getDeviceCode(),
+            device.getDeviceName(),
+            device.getBrand(),
+            errorCode,
+            LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+        );
+        
+        smsGateway.sendAlert(getRecipientPhone(), message);
+    }
+    
+    private String getRecipientPhone() {
+        // 从数据库或配置获取接收人手机号
+        return "";
+    }
+}

pm-system/src/main/java/com/pm/sms/ApiSmsSender.java

@@ -0,0 +1,39 @@
+package com.pm.sms;
+
+import ch.qos.logback.classic.Logger;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+// 网线通道 - API方式
+public class ApiSmsSender implements SmsSender {
+    private static final String API_URL = "https://sms.provider.com/send";
+    
+    @Override
+    public boolean sendAlert(String phone, String message) {
+        try {
+            HttpClient client = HttpClient.newHttpClient();
+            String jsonBody = String.format(
+                "{\"key\":\"YOUR_API_KEY\",\"phone\":\"%s\",\"msg\":\"%s\"}", 
+                phone, URLEncoder.encode(message, "UTF-8"));
+            
+            HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(API_URL))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .build();
+            
+            HttpResponse<String> response = client.send(
+                request, HttpResponse.BodyHandlers.ofString());
+            
+            return response.statusCode() == 200;
+        } catch (Exception e) {
+            Logger log = null;
+            log.error("API短信发送失败", e);
+            return false;
+        }
+    }
+}

pm-system/src/main/java/com/pm/sms/Device.java

@@ -0,0 +1,101 @@
+package com.pm.sms;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备基础信息表
+ */
+@Data
+public class Device {
+    /**
+     * 设备ID
+     */
+    private Long id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型(空调/新风/配电等)
+     */
+    private String deviceType;
+
+    /**
+     * 子系统类型
+     */
+    private String subsystemType;
+
+    /**
+     * 所属空间ID
+     */
+    private Long spaceId;
+
+    /**
+     * 所属空间名称
+     */
+    private String spaceName;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 序列号
+     */
+    private String serialNumber;
+
+    /**
+     * 生产日期
+     */
+    private Date manufactureDate;
+
+    /**
+     * 安装日期
+     */
+    private Date installDate;
+
+    /**
+     * 保修期(月)
+     */
+    private Integer warrantyPeriod;
+
+    /**
+     * 状态(0-禁用,1-正常,2-故障)
+     */
+    private Integer status;
+
+    /**
+     * 是否在线
+     */
+    private Integer isOnline;
+
+    /**
+     * 设备描述
+     */
+    private String description;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

pm-system/src/main/java/com/pm/sms/GsmSmsSender.java

@@ -0,0 +1,40 @@
+package com.pm.sms;
+
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+// 手机卡通道 - GSM Modem
+public class GsmSmsSender{
+
+//    private SerialPort serialPort;
+//
+//    public GsmSmsSender(String comPort) throws Exception {
+//        CommPortIdentifier portId = CommPortIdentifier.getPortIdentifier(comPort);
+//        serialPort = (SerialPort) portId.open("SMS_Modem", 2000);
+//        serialPort.setSerialPortParams(9600, 8, 1, 0);
+//    }
+
+    public boolean sendAlert(String phone, String message) {
+//        try (OutputStream os = serialPort.getOutputStream()) {
+        try{
+            OutputStream os =new FileOutputStream("sms_alert.txt");
+            // AT指令集操作
+            String cmd = "AT+CMGF=1\r";  // 设置为文本模式
+            os.write(cmd.getBytes());
+            Thread.sleep(1000);
+
+            cmd = "AT+CMGS=\"" + phone + "\"\r";
+            os.write(cmd.getBytes());
+            Thread.sleep(1000);
+
+            os.write(message.getBytes());
+            os.write(0x1A);  // Ctrl+Z结束
+            os.flush();
+
+            return true;
+        } catch (Exception e) {
+           // log.error("GSM短信发送失败", e);
+            return false;
+        }
+    }
+}

pm-system/src/main/java/com/pm/sms/SmsGateway.java

@@ -0,0 +1,23 @@
+package com.pm.sms;
+
+public class SmsGateway {
+    private final SmsSender primarySender;  // 主通道（API）
+    private final SmsSender backupSender;   // 备用通道（GSM）
+    
+    public SmsGateway() throws Exception {
+        this.primarySender = new ApiSmsSender();
+        this.backupSender = new SmsSender() {
+            @Override
+            public boolean sendAlert(String phone, String message) {
+                return false;
+            }
+        };
+    }
+    
+    public void sendAlert(String phone, String message) {
+        if (!primarySender.sendAlert(phone, message)) {
+            System.out.println("主通道失败，切换备用通道");
+           // backupSender.sendAlert(phone, message);
+        }
+    }
+}

pm-system/src/main/java/com/pm/sms/SmsMonitor.java

@@ -0,0 +1,29 @@
+package com.pm.sms;
+
+
+import ch.qos.logback.classic.Logger;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SmsMonitor implements SmsSender{
+    @Around("execution(* SmsGateway.sendAlert(..))")
+    public Object logSmsSend(ProceedingJoinPoint pjp) throws Throwable {
+        long start = System.currentTimeMillis();
+        Logger log = null;
+        try {
+            Object result = pjp.proceed();
+            log.info("短信发送成功 | 耗时:{}ms", System.currentTimeMillis()-start);
+            return result;
+        } catch (Throwable e) {
+            log.error("短信发送失败", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public boolean sendAlert(String phone, String message) {
+        return false;
+    }
+}

pm-system/src/main/java/com/pm/sms/SmsSender.java

@@ -0,0 +1,5 @@
+package com.pm.sms;
+
+public interface SmsSender {
+    boolean sendAlert(String phone, String message);
+}

pm-system/src/main/java/com/pm/subsystem/mapper/DeviceAlarmMapper.java

@@ -0,0 +1,134 @@
+package com.pm.subsystem.mapper;
+
+import java.util.List;
+import java.util.Map;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备告警Mapper接口
+ *
+ * @author lxf
+ * @date 2025-06-11
+ */
+public interface DeviceAlarmMapper
+{
+    /**
+     * 查询设备告警
+     *
+     * @param id 设备告警主键
+     * @return 设备告警
+     */
+    public PageData selectDeviceAlarmById(Long id);
+
+    /**
+     * 查询设备告警列表
+     *
+     * @param pd 设备告警
+     * @return 设备告警集合
+     */
+    public List<PageData> selectDeviceAlarmList(PageData pd);
+
+    /**
+     * 新增设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    public int insertDeviceAlarm(PageData pd);
+
+    /**
+     * 修改设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    public int updateDeviceAlarm(PageData pd);
+
+    /**
+     * 删除设备告警
+     *
+     * @param id 设备告警主键
+     * @return 结果
+     */
+    public int deleteDeviceAlarmById(Long id);
+
+    /**
+     * 批量删除设备告警
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDeviceAlarmByIds(Long[] ids);
+
+    /**
+     * 根据告警ID查询告警
+     *
+     * @param alarmId 告警ID
+     * @return 告警信息
+     */
+    public PageData selectDeviceAlarmByAlarmId(String alarmId);
+
+    /**
+     * 告警复位
+     *
+     * @param pd 复位参数
+     * @return 结果
+     */
+    public int resetDeviceAlarm(PageData pd);
+
+    /**
+     * 批量告警复位
+     *
+     * @param alarmIds 告警ID列表
+     * @return 结果
+     */
+    public int batchResetDeviceAlarm(List<String> alarmIds);
+
+    /**
+     * 获取告警统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    public Map<String, Object> getAlarmStatistics(PageData pd);
+
+    /**
+     * 获取告警趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    public List<Map<String, Object>> getAlarmTrend(PageData pd);
+
+    /**
+     * 插入告警复位记录
+     *
+     * @param pd 复位记录
+     * @return 结果
+     */
+    public int insertAlarmResetRecord(PageData pd);
+
+    /**
+     * 查询告警复位记录
+     *
+     * @param alarmId 告警ID
+     * @return 复位记录列表
+     */
+    public List<PageData> selectAlarmResetRecords(String alarmId);
+
+    /**
+     * 确认告警
+     *
+     * @param pd 确认参数
+     * @return 结果
+     */
+    public int confirmAlarm(PageData pd);
+
+    /**
+     * 屏蔽告警
+     *
+     * @param pd 屏蔽参数
+     * @return 结果
+     */
+    public int maskAlarm(PageData pd);
+}

pm-system/src/main/java/com/pm/subsystem/mapper/DeviceServiceOrderMapper.java

@@ -0,0 +1,174 @@
+package com.pm.subsystem.mapper;
+
+import java.util.List;
+import java.util.Map;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备服务工单Mapper接口
+ *
+ * @author lxf
+ * @date 2025-06-11
+ */
+public interface DeviceServiceOrderMapper
+{
+    /**
+     * 查询设备服务工单
+     *
+     * @param id 设备服务工单主键
+     * @return 设备服务工单
+     */
+    public PageData selectServiceOrderById(Long id);
+
+    /**
+     * 查询设备服务工单列表
+     *
+     * @param pd 设备服务工单
+     * @return 设备服务工单集合
+     */
+    public List<PageData> selectServiceOrderList(PageData pd);
+
+    /**
+     * 新增设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    public int insertServiceOrder(PageData pd);
+
+    /**
+     * 修改设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    public int updateServiceOrder(PageData pd);
+
+    /**
+     * 删除设备服务工单
+     *
+     * @param id 设备服务工单主键
+     * @return 结果
+     */
+    public int deleteServiceOrderById(Long id);
+
+    /**
+     * 批量删除设备服务工单
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteServiceOrderByIds(Long[] ids);
+
+    /**
+     * 根据工单号查询工单
+     *
+     * @param orderId 工单ID
+     * @return 工单信息
+     */
+    public PageData selectServiceOrderByOrderNo(String orderId);
+
+    /**
+     * 分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    public int assignServiceOrder(PageData pd);
+
+    /**
+     * 接单
+     *
+     * @param pd 接单参数
+     * @return 结果
+     */
+    public int acceptServiceOrder(PageData pd);
+
+    /**
+     * 完成工单
+     *
+     * @param pd 完成参数
+     * @return 结果
+     */
+    public int completeServiceOrder(PageData pd);
+
+    /**
+     * 评价工单
+     *
+     * @param pd 评价参数
+     * @return 结果
+     */
+    public int evaluateServiceOrder(PageData pd);
+
+    /**
+     * 关闭工单
+     *
+     * @param pd 关闭参数
+     * @return 结果
+     */
+    public int closeServiceOrder(PageData pd);
+
+    /**
+     * 获取工单统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    public Map<String, Object> getOrderStatistics(PageData pd);
+
+    /**
+     * 获取工单趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    public List<Map<String, Object>> getOrderTrend(PageData pd);
+
+    /**
+     * 查询我的工单列表
+     *
+     * @param pd 查询参数
+     * @return 工单列表
+     */
+    public List<PageData> selectMyServiceOrderList(PageData pd);
+
+    /**
+     * 插入工单操作记录
+     *
+     * @param pd 操作记录
+     * @return 结果
+     */
+    public int insertOrderOperateRecord(PageData pd);
+
+    /**
+     * 查询工单操作记录
+     *
+     * @param orderId 工单ID
+     * @return 操作记录列表
+     */
+    public List<PageData> selectOrderOperateRecords(String orderId);
+
+    /**
+     * 更新工单状态
+     *
+     * @param pd 状态参数
+     * @return 结果
+     */
+    public int updateOrderStatus(PageData pd);
+
+    /**
+     * 查询超时工单
+     *
+     * @param pd 查询参数
+     * @return 超时工单列表
+     */
+    public List<PageData> selectTimeoutOrders(PageData pd);
+
+    /**
+     * 批量分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    public int batchAssignServiceOrders(PageData pd);
+}

pm-system/src/main/java/com/pm/subsystem/service/IDeviceAlarmService.java

@@ -0,0 +1,134 @@
+package com.pm.subsystem.service;
+
+import java.util.List;
+import java.util.Map;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备告警Service接口
+ *
+ * @author lxf
+ * @date 2025-01-06
+ */
+public interface IDeviceAlarmService
+{
+    /**
+     * 查询设备告警
+     *
+     * @param id 设备告警主键
+     * @return 设备告警
+     */
+    public PageData selectDeviceAlarmById(Long id);
+
+    /**
+     * 查询设备告警列表
+     *
+     * @param pd 设备告警
+     * @return 设备告警集合
+     */
+    public List<PageData> selectDeviceAlarmList(PageData pd);
+
+    /**
+     * 新增设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    public int insertDeviceAlarm(PageData pd);
+
+    /**
+     * 修改设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    public int updateDeviceAlarm(PageData pd);
+
+    /**
+     * 批量删除设备告警
+     *
+     * @param ids 需要删除的设备告警主键集合
+     * @return 结果
+     */
+    public int deleteDeviceAlarmByIds(Long[] ids);
+
+    /**
+     * 删除设备告警信息
+     *
+     * @param id 设备告警主键
+     * @return 结果
+     */
+    public int deleteDeviceAlarmById(Long id);
+
+    /**
+     * 根据告警ID查询告警
+     *
+     * @param alarmId 告警ID
+     * @return 告警信息
+     */
+    public PageData selectDeviceAlarmByAlarmId(String alarmId);
+
+    /**
+     * 告警复位
+     *
+     * @param pd 复位参数
+     * @return 结果
+     */
+    public int resetDeviceAlarm(PageData pd);
+
+    /**
+     * 批量告警复位
+     *
+     * @param alarmIds 告警ID列表
+     * @return 结果
+     */
+    public int batchResetDeviceAlarm(List<String> alarmIds);
+
+    /**
+     * 获取告警统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    public Map<String, Object> getAlarmStatistics(PageData pd);
+
+    /**
+     * 获取告警趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    public List<Map<String, Object>> getAlarmTrend(PageData pd);
+
+    /**
+     * 插入告警复位记录
+     *
+     * @param pd 复位记录
+     * @return 结果
+     */
+    public int insertAlarmResetRecord(PageData pd);
+
+    /**
+     * 查询告警复位记录
+     *
+     * @param alarmId 告警ID
+     * @return 复位记录列表
+     */
+    public List<PageData> selectAlarmResetRecords(String alarmId);
+
+    /**
+     * 确认告警
+     *
+     * @param pd 确认参数
+     * @return 结果
+     */
+    public int confirmAlarm(PageData pd);
+
+    /**
+     * 屏蔽告警
+     *
+     * @param pd 屏蔽参数
+     * @return 结果
+     */
+    public int maskAlarm(PageData pd);
+}

pm-system/src/main/java/com/pm/subsystem/service/IDeviceServiceOrderService.java

@@ -0,0 +1,174 @@
+package com.pm.subsystem.service;
+
+import java.util.List;
+import java.util.Map;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备服务工单Service接口
+ *
+ * @author lxf
+ * @date 2025-01-06
+ */
+public interface IDeviceServiceOrderService
+{
+    /**
+     * 查询设备服务工单
+     *
+     * @param id 设备服务工单主键
+     * @return 设备服务工单
+     */
+    public PageData selectServiceOrderById(Long id);
+
+    /**
+     * 查询设备服务工单列表
+     *
+     * @param pd 设备服务工单
+     * @return 设备服务工单集合
+     */
+    public List<PageData> selectServiceOrderList(PageData pd);
+
+    /**
+     * 新增设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    public int insertServiceOrder(PageData pd);
+
+    /**
+     * 修改设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    public int updateServiceOrder(PageData pd);
+
+    /**
+     * 批量删除设备服务工单
+     *
+     * @param ids 需要删除的设备服务工单主键集合
+     * @return 结果
+     */
+    public int deleteServiceOrderByIds(Long[] ids);
+
+    /**
+     * 删除设备服务工单信息
+     *
+     * @param id 设备服务工单主键
+     * @return 结果
+     */
+    public int deleteServiceOrderById(Long id);
+
+    /**
+     * 根据工单号查询工单
+     *
+     * @param orderId 工单ID
+     * @return 工单信息
+     */
+    public PageData selectServiceOrderByOrderNo(String orderId);
+
+    /**
+     * 分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    public int assignServiceOrder(PageData pd);
+
+    /**
+     * 接单
+     *
+     * @param pd 接单参数
+     * @return 结果
+     */
+    public int acceptServiceOrder(PageData pd);
+
+    /**
+     * 完成工单
+     *
+     * @param pd 完成参数
+     * @return 结果
+     */
+    public int completeServiceOrder(PageData pd);
+
+    /**
+     * 评价工单
+     *
+     * @param pd 评价参数
+     * @return 结果
+     */
+    public int evaluateServiceOrder(PageData pd);
+
+    /**
+     * 关闭工单
+     *
+     * @param pd 关闭参数
+     * @return 结果
+     */
+    public int closeServiceOrder(PageData pd);
+
+    /**
+     * 获取工单统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    public Map<String, Object> getOrderStatistics(PageData pd);
+
+    /**
+     * 获取工单趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    public List<Map<String, Object>> getOrderTrend(PageData pd);
+
+    /**
+     * 查询我的工单列表
+     *
+     * @param pd 查询参数
+     * @return 工单列表
+     */
+    public List<PageData> selectMyServiceOrderList(PageData pd);
+
+    /**
+     * 插入工单操作记录
+     *
+     * @param pd 操作记录
+     * @return 结果
+     */
+    public int insertOrderOperateRecord(PageData pd);
+
+    /**
+     * 查询工单操作记录
+     *
+     * @param orderId 工单ID
+     * @return 操作记录列表
+     */
+    public List<PageData> selectOrderOperateRecords(String orderId);
+
+    /**
+     * 更新工单状态
+     *
+     * @param pd 状态参数
+     * @return 结果
+     */
+    public int updateOrderStatus(PageData pd);
+
+    /**
+     * 查询超时工单
+     *
+     * @param pd 查询参数
+     * @return 超时工单列表
+     */
+    public List<PageData> selectTimeoutOrders(PageData pd);
+
+    /**
+     * 批量分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    public int batchAssignServiceOrders(PageData pd);
+}

pm-system/src/main/java/com/pm/subsystem/service/impl/DeviceAlarmServiceImpl.java

@@ -0,0 +1,202 @@
+package com.pm.subsystem.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.pm.subsystem.mapper.DeviceAlarmMapper;
+import com.pm.subsystem.service.IDeviceAlarmService;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备告警Service业务层处理
+ *
+ * @author lxf
+ * @date 2025-01-06
+ */
+@Service
+public class DeviceAlarmServiceImpl implements IDeviceAlarmService
+{
+    @Autowired
+    private DeviceAlarmMapper deviceAlarmMapper;
+
+    /**
+     * 查询设备告警
+     *
+     * @param id 设备告警主键
+     * @return 设备告警
+     */
+    @Override
+    public PageData selectDeviceAlarmById(Long id)
+    {
+        return deviceAlarmMapper.selectDeviceAlarmById(id);
+    }
+
+    /**
+     * 查询设备告警列表
+     *
+     * @param pd 设备告警
+     * @return 设备告警
+     */
+    @Override
+    public List<PageData> selectDeviceAlarmList(PageData pd)
+    {
+        return deviceAlarmMapper.selectDeviceAlarmList(pd);
+    }
+
+    /**
+     * 新增设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    @Override
+    public int insertDeviceAlarm(PageData pd)
+    {
+        return deviceAlarmMapper.insertDeviceAlarm(pd);
+    }
+
+    /**
+     * 修改设备告警
+     *
+     * @param pd 设备告警
+     * @return 结果
+     */
+    @Override
+    public int updateDeviceAlarm(PageData pd)
+    {
+        return deviceAlarmMapper.updateDeviceAlarm(pd);
+    }
+
+    /**
+     * 批量删除设备告警
+     *
+     * @param ids 需要删除的设备告警主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceAlarmByIds(Long[] ids)
+    {
+        return deviceAlarmMapper.deleteDeviceAlarmByIds(ids);
+    }
+
+    /**
+     * 删除设备告警信息
+     *
+     * @param id 设备告警主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceAlarmById(Long id)
+    {
+        return deviceAlarmMapper.deleteDeviceAlarmById(id);
+    }
+
+    /**
+     * 根据告警ID查询告警
+     *
+     * @param alarmId 告警ID
+     * @return 告警信息
+     */
+    @Override
+    public PageData selectDeviceAlarmByAlarmId(String alarmId)
+    {
+        return deviceAlarmMapper.selectDeviceAlarmByAlarmId(alarmId);
+    }
+
+    /**
+     * 告警复位
+     *
+     * @param pd 复位参数
+     * @return 结果
+     */
+    @Override
+    public int resetDeviceAlarm(PageData pd)
+    {
+        return deviceAlarmMapper.resetDeviceAlarm(pd);
+    }
+
+    /**
+     * 批量告警复位
+     *
+     * @param alarmIds 告警ID列表
+     * @return 结果
+     */
+    @Override
+    public int batchResetDeviceAlarm(List<String> alarmIds)
+    {
+        return deviceAlarmMapper.batchResetDeviceAlarm(alarmIds);
+    }
+
+    /**
+     * 获取告警统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    @Override
+    public Map<String, Object> getAlarmStatistics(PageData pd)
+    {
+        return deviceAlarmMapper.getAlarmStatistics(pd);
+    }
+
+    /**
+     * 获取告警趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    @Override
+    public List<Map<String, Object>> getAlarmTrend(PageData pd)
+    {
+        return deviceAlarmMapper.getAlarmTrend(pd);
+    }
+
+    /**
+     * 插入告警复位记录
+     *
+     * @param pd 复位记录
+     * @return 结果
+     */
+    @Override
+    public int insertAlarmResetRecord(PageData pd)
+    {
+        return deviceAlarmMapper.insertAlarmResetRecord(pd);
+    }
+
+    /**
+     * 查询告警复位记录
+     *
+     * @param alarmId 告警ID
+     * @return 复位记录列表
+     */
+    @Override
+    public List<PageData> selectAlarmResetRecords(String alarmId)
+    {
+        return deviceAlarmMapper.selectAlarmResetRecords(alarmId);
+    }
+
+    /**
+     * 确认告警
+     *
+     * @param pd 确认参数
+     * @return 结果
+     */
+    @Override
+    public int confirmAlarm(PageData pd)
+    {
+        return deviceAlarmMapper.confirmAlarm(pd);
+    }
+
+    /**
+     * 屏蔽告警
+     *
+     * @param pd 屏蔽参数
+     * @return 结果
+     */
+    @Override
+    public int maskAlarm(PageData pd)
+    {
+        return deviceAlarmMapper.maskAlarm(pd);
+    }
+}

pm-system/src/main/java/com/pm/subsystem/service/impl/DeviceServiceOrderServiceImpl.java

@@ -0,0 +1,262 @@
+package com.pm.subsystem.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.pm.subsystem.mapper.DeviceServiceOrderMapper;
+import com.pm.subsystem.service.IDeviceServiceOrderService;
+import com.pm.common.config.PageData;
+
+/**
+ * 设备服务工单Service业务层处理
+ *
+ * @author lxf
+ * @date 2025-01-06
+ */
+@Service
+public class DeviceServiceOrderServiceImpl implements IDeviceServiceOrderService
+{
+    @Autowired
+    private DeviceServiceOrderMapper serviceOrderMapper;
+
+    /**
+     * 查询设备服务工单
+     *
+     * @param id 设备服务工单主键
+     * @return 设备服务工单
+     */
+    @Override
+    public PageData selectServiceOrderById(Long id)
+    {
+        return serviceOrderMapper.selectServiceOrderById(id);
+    }
+
+    /**
+     * 查询设备服务工单列表
+     *
+     * @param pd 设备服务工单
+     * @return 设备服务工单
+     */
+    @Override
+    public List<PageData> selectServiceOrderList(PageData pd)
+    {
+        return serviceOrderMapper.selectServiceOrderList(pd);
+    }
+
+    /**
+     * 新增设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    @Override
+    public int insertServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.insertServiceOrder(pd);
+    }
+
+    /**
+     * 修改设备服务工单
+     *
+     * @param pd 设备服务工单
+     * @return 结果
+     */
+    @Override
+    public int updateServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.updateServiceOrder(pd);
+    }
+
+    /**
+     * 批量删除设备服务工单
+     *
+     * @param ids 需要删除的设备服务工单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteServiceOrderByIds(Long[] ids)
+    {
+        return serviceOrderMapper.deleteServiceOrderByIds(ids);
+    }
+
+    /**
+     * 删除设备服务工单信息
+     *
+     * @param id 设备服务工单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteServiceOrderById(Long id)
+    {
+        return serviceOrderMapper.deleteServiceOrderById(id);
+    }
+
+    /**
+     * 根据工单号查询工单
+     *
+     * @param orderId 工单ID
+     * @return 工单信息
+     */
+    @Override
+    public PageData selectServiceOrderByOrderNo(String orderId)
+    {
+        return serviceOrderMapper.selectServiceOrderByOrderNo(orderId);
+    }
+
+    /**
+     * 分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    @Override
+    public int assignServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.assignServiceOrder(pd);
+    }
+
+    /**
+     * 接单
+     *
+     * @param pd 接单参数
+     * @return 结果
+     */
+    @Override
+    public int acceptServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.acceptServiceOrder(pd);
+    }
+
+    /**
+     * 完成工单
+     *
+     * @param pd 完成参数
+     * @return 结果
+     */
+    @Override
+    public int completeServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.completeServiceOrder(pd);
+    }
+
+    /**
+     * 评价工单
+     *
+     * @param pd 评价参数
+     * @return 结果
+     */
+    @Override
+    public int evaluateServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.evaluateServiceOrder(pd);
+    }
+
+    /**
+     * 关闭工单
+     *
+     * @param pd 关闭参数
+     * @return 结果
+     */
+    @Override
+    public int closeServiceOrder(PageData pd)
+    {
+        return serviceOrderMapper.closeServiceOrder(pd);
+    }
+
+    /**
+     * 获取工单统计信息
+     *
+     * @param pd 查询参数
+     * @return 统计信息
+     */
+    @Override
+    public Map<String, Object> getOrderStatistics(PageData pd)
+    {
+        return serviceOrderMapper.getOrderStatistics(pd);
+    }
+
+    /**
+     * 获取工单趋势数据
+     *
+     * @param pd 查询参数
+     * @return 趋势数据
+     */
+    @Override
+    public List<Map<String, Object>> getOrderTrend(PageData pd)
+    {
+        return serviceOrderMapper.getOrderTrend(pd);
+    }
+
+    /**
+     * 查询我的工单列表
+     *
+     * @param pd 查询参数
+     * @return 工单列表
+     */
+    @Override
+    public List<PageData> selectMyServiceOrderList(PageData pd)
+    {
+        return serviceOrderMapper.selectMyServiceOrderList(pd);
+    }
+
+    /**
+     * 插入工单操作记录
+     *
+     * @param pd 操作记录
+     * @return 结果
+     */
+    @Override
+    public int insertOrderOperateRecord(PageData pd)
+    {
+        return serviceOrderMapper.insertOrderOperateRecord(pd);
+    }
+
+    /**
+     * 查询工单操作记录
+     *
+     * @param orderId 工单ID
+     * @return 操作记录列表
+     */
+    @Override
+    public List<PageData> selectOrderOperateRecords(String orderId)
+    {
+        return serviceOrderMapper.selectOrderOperateRecords(orderId);
+    }
+
+    /**
+     * 更新工单状态
+     *
+     * @param pd 状态参数
+     * @return 结果
+     */
+    @Override
+    public int updateOrderStatus(PageData pd)
+    {
+        return serviceOrderMapper.updateOrderStatus(pd);
+    }
+
+    /**
+     * 查询超时工单
+     *
+     * @param pd 查询参数
+     * @return 超时工单列表
+     */
+    @Override
+    public List<PageData> selectTimeoutOrders(PageData pd)
+    {
+        return serviceOrderMapper.selectTimeoutOrders(pd);
+    }
+
+    /**
+     * 批量分配工单
+     *
+     * @param pd 分配参数
+     * @return 结果
+     */
+    @Override
+    public int batchAssignServiceOrders(PageData pd)
+    {
+        return serviceOrderMapper.batchAssignServiceOrders(pd);
+    }
+}

pm-system/src/main/resources/mapper/device/DeviceAlarmMapper.xml

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pm.subsystem.mapper.DeviceAlarmMapper">
+
+    <resultMap type="com.pm.common.config.PageData" id="DeviceAlarmResult">
+    </resultMap>
+
+    <sql id="selectDeviceAlarmVo">
+        select id, alarm_id, device_code, device_name, subsystem_type,
+               point_code, point_name, space_id, space_name,
+               building_id, building_name, floor_id, floor_name,
+               alarm_type, alarm_level, alarm_value, limit_value, unit,
+               alarm_time, recovery_time, alarm_status, is_reset,
+               reset_time, reset_user, reset_remark, priority,
+               alarm_count, first_alarm_time, last_alarm_time,
+               alarm_message, alarm_description, source_system,
+               service_order_id, is_notified, notify_time, notify_users,
+               create_time, update_time
+        from device_alarm2
+    </sql>
+
+    <select id="selectDeviceAlarmById" parameterType="Long" resultMap="DeviceAlarmResult">
+        <include refid="selectDeviceAlarmVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectDeviceAlarmList" parameterType="com.pm.common.config.PageData" resultMap="DeviceAlarmResult">
+        <include refid="selectDeviceAlarmVo"/>
+        <where>
+            <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="alarmId != null and alarmId != ''"> and alarm_id = #{alarmId}</if>
+            <if test="subsystemType != null and subsystemType != ''"> and subsystem_type = #{subsystemType}</if>
+            <if test="pointCode != null and pointCode != ''"> and point_code = #{pointCode}</if>
+            <if test="spaceId != null and spaceId != ''"> and space_id = #{spaceId}</if>
+            <if test="buildingId != null and buildingId != ''"> and building_id = #{buildingId}</if>
+            <if test="floorId != null and floorId != ''"> and floor_id = #{floorId}</if>
+            <if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if>
+            <if test="alarmLevel != null and alarmLevel != ''"> and alarm_level = #{alarmLevel}</if>
+            <if test="alarmStatus != null"> and alarm_status = #{alarmStatus}</if>
+            <if test="isReset != null"> and is_reset = #{isReset}</if>
+            <if test="isNotified != null"> and is_notified = #{isNotified}</if>
+            <if test="beginTime != null and beginTime != ''"> and alarm_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and alarm_time &lt;= #{endTime}</if>
+        </where>
+        order by alarm_time desc
+    </select>
+
+    <select id="selectDeviceAlarmByAlarmId" parameterType="String" resultMap="DeviceAlarmResult">
+        <include refid="selectDeviceAlarmVo"/>
+        where alarm_id = #{alarmId}
+    </select>
+
+    <insert id="insertDeviceAlarm" parameterType="com.pm.common.config.PageData">
+        insert into device_alarm2
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="alarmId != null">alarm_id,</if>
+            <if test="deviceCode != null">device_code,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="subsystemType != null">subsystem_type,</if>
+            <if test="pointCode != null">point_code,</if>
+            <if test="pointName != null">point_name,</if>
+            <if test="spaceId != null">space_id,</if>
+            <if test="spaceName != null">space_name,</if>
+            <if test="buildingId != null">building_id,</if>
+            <if test="buildingName != null">building_name,</if>
+            <if test="floorId != null">floor_id,</if>
+            <if test="floorName != null">floor_name,</if>
+            <if test="alarmType != null">alarm_type,</if>
+            <if test="alarmLevel != null">alarm_level,</if>
+            <if test="alarmValue != null">alarm_value,</if>
+            <if test="limitValue != null">limit_value,</if>
+            <if test="unit != null">unit,</if>
+            <if test="alarmTime != null">alarm_time,</if>
+            <if test="alarmStatus != null">alarm_status,</if>
+            <if test="priority != null">priority,</if>
+            <if test="alarmMessage != null">alarm_message,</if>
+            <if test="alarmDescription != null">alarm_description,</if>
+            <if test="sourceSystem != null">source_system,</if>
+            <if test="firstAlarmTime != null">first_alarm_time,</if>
+            <if test="lastAlarmTime != null">last_alarm_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="alarmId != null">#{alarmId},</if>
+            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="subsystemType != null">#{subsystemType},</if>
+            <if test="pointCode != null">#{pointCode},</if>
+            <if test="pointName != null">#{pointName},</if>
+            <if test="spaceId != null">#{spaceId},</if>
+            <if test="spaceName != null">#{spaceName},</if>
+            <if test="buildingId != null">#{buildingId},</if>
+            <if test="buildingName != null">#{buildingName},</if>
+            <if test="floorId != null">#{floorId},</if>
+            <if test="floorName != null">#{floorName},</if>
+            <if test="alarmType != null">#{alarmType},</if>
+            <if test="alarmLevel != null">#{alarmLevel},</if>
+            <if test="alarmValue != null">#{alarmValue},</if>
+            <if test="limitValue != null">#{limitValue},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="alarmTime != null">#{alarmTime},</if>
+            <if test="alarmStatus != null">#{alarmStatus},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="alarmMessage != null">#{alarmMessage},</if>
+            <if test="alarmDescription != null">#{alarmDescription},</if>
+            <if test="sourceSystem != null">#{sourceSystem},</if>
+            <if test="firstAlarmTime != null">#{firstAlarmTime},</if>
+            <if test="lastAlarmTime != null">#{lastAlarmTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDeviceAlarm" parameterType="com.pm.common.config.PageData">
+        update device_alarm2
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="alarmType != null">alarm_type = #{alarmType},</if>
+            <if test="alarmLevel != null">alarm_level = #{alarmLevel},</if>
+            <if test="alarmValue != null">alarm_value = #{alarmValue},</if>
+            <if test="limitValue != null">limit_value = #{limitValue},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
+            <if test="alarmStatus != null">alarm_status = #{alarmStatus},</if>
+            <if test="isReset != null">is_reset = #{isReset},</if>
+            <if test="resetTime != null">reset_time = #{resetTime},</if>
+            <if test="resetUser != null">reset_user = #{resetUser},</if>
+            <if test="resetRemark != null">reset_remark = #{resetRemark},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="alarmCount != null">alarm_count = #{alarmCount},</if>
+            <if test="lastAlarmTime != null">last_alarm_time = #{lastAlarmTime},</if>
+            <if test="alarmMessage != null">alarm_message = #{alarmMessage},</if>
+            <if test="alarmDescription != null">alarm_description = #{alarmDescription},</if>
+            <if test="serviceOrderId != null">service_order_id = #{serviceOrderId},</if>
+            <if test="isNotified != null">is_notified = #{isNotified},</if>
+            <if test="notifyTime != null">notify_time = #{notifyTime},</if>
+            <if test="notifyUsers != null">notify_users = #{notifyUsers},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDeviceAlarmById" parameterType="Long">
+        delete from device_alarm2 where id = #{id}
+    </delete>
+
+    <delete id="deleteDeviceAlarmByIds" parameterType="Long">
+        delete from device_alarm2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="resetDeviceAlarm" parameterType="com.pm.common.config.PageData">
+        update device_alarm2
+        set is_reset = 1,
+            reset_time = #{resetTime},
+            reset_user = #{resetUser},
+            reset_remark = #{resetRemark}
+        where alarm_id = #{alarmId}
+          and is_reset = 0
+    </update>
+
+    <update id="batchResetDeviceAlarm" parameterType="List">
+        update device_alarm2
+        set is_reset = 1,
+        reset_time = now()
+        where alarm_id in
+        <foreach item="alarmId" collection="list" open="(" separator="," close=")">
+            #{alarmId}
+        </foreach>
+        and is_reset = 0
+    </update>
+
+    <select id="getAlarmStatistics" parameterType="com.pm.common.config.PageData" resultType="map">
+        select
+        count(1) as totalCount,
+        sum(case when alarm_status = 1 then 1 else 0 end) as activeCount,
+        sum(case when alarm_status = 0 then 1 else 0 end) as recoveredCount,
+        sum(case when alarm_status = 2 then 1 else 0 end) as confirmedCount,
+        sum(case when alarm_status = 3 then 1 else 0 end) as maskedCount,
+        sum(case when is_reset = 1 then 1 else 0 end) as resetCount,
+        sum(case when alarm_level = 'CRITICAL' then 1 else 0 end) as criticalCount,
+        sum(case when alarm_level = 'MAJOR' then 1 else 0 end) as majorCount,
+        sum(case when alarm_level = 'MINOR' then 1 else 0 end) as minorCount,
+        sum(case when alarm_level = 'WARNING' then 1 else 0 end) as warningCount,
+        sum(case when alarm_level = 'INFO' then 1 else 0 end) as infoCount
+        from device_alarm2
+        <where>
+            <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="subsystemType != null and subsystemType != ''"> and subsystem_type = #{subsystemType}</if>
+            <if test="buildingId != null and buildingId != ''"> and building_id = #{buildingId}</if>
+            <if test="beginTime != null and beginTime != ''"> and alarm_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and alarm_time &lt;= #{endTime}</if>
+        </where>
+    </select>
+
+    <select id="getAlarmTrend" parameterType="com.pm.common.config.PageData" resultType="map">
+        select
+        date_format(alarm_time, '%Y-%m-%d') as date,
+        count(1) as count,
+        alarm_level,
+        alarm_type
+        from device_alarm2
+        <where>
+            <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="subsystemType != null and subsystemType != ''"> and subsystem_type = #{subsystemType}</if>
+            <if test="beginTime != null and beginTime != ''"> and alarm_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and alarm_time &lt;= #{endTime}</if>
+        </where>
+        group by date_format(alarm_time, '%Y-%m-%d'), alarm_level, alarm_type
+        order by date
+    </select>
+
+    <insert id="insertAlarmResetRecord" parameterType="com.pm.common.config.PageData">
+        insert into device_alarm_reset
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resetId != null">reset_id,</if>
+            <if test="alarmId != null">alarm_id,</if>
+            <if test="deviceCode != null">device_code,</if>
+            <if test="resetType != null">reset_type,</if>
+            <if test="resetTime != null">reset_time,</if>
+            <if test="resetUser != null">reset_user,</if>
+            <if test="resetReason != null">reset_reason,</if>
+            <if test="resetRemark != null">reset_remark,</if>
+            <if test="beforeStatus != null">before_status,</if>
+            <if test="afterStatus != null">after_status,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resetId != null">#{resetId},</if>
+            <if test="alarmId != null">#{alarmId},</if>
+            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="resetType != null">#{resetType},</if>
+            <if test="resetTime != null">#{resetTime},</if>
+            <if test="resetUser != null">#{resetUser},</if>
+            <if test="resetReason != null">#{resetReason},</if>
+            <if test="resetRemark != null">#{resetRemark},</if>
+            <if test="beforeStatus != null">#{beforeStatus},</if>
+            <if test="afterStatus != null">#{afterStatus},</if>
+        </trim>
+    </insert>
+
+    <select id="selectAlarmResetRecords" parameterType="String" resultMap="DeviceAlarmResult">
+        select id, reset_id, alarm_id, device_code, reset_type, reset_time,
+               reset_user, reset_reason, reset_remark, before_status, after_status, create_time
+        from device_alarm_reset
+        where alarm_id = #{alarmId}
+        order by reset_time desc
+    </select>
+
+    <update id="confirmAlarm" parameterType="com.pm.common.config.PageData">
+        update device_alarm2
+        set alarm_status = 2
+        where alarm_id = #{alarmId}
+          and alarm_status = 1
+    </update>
+
+    <update id="maskAlarm" parameterType="com.pm.common.config.PageData">
+        update device_alarm2
+        set alarm_status = 3
+        where alarm_id = #{alarmId}
+    </update>
+
+</mapper>

pm-system/src/main/resources/mapper/device/DeviceServiceOrderMapper.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pm.subsystem.mapper.DeviceServiceOrderMapper">
+
+    <resultMap type="com.pm.common.config.PageData" id="ServiceOrderResult">
+    </resultMap>
+
+    <sql id="selectServiceOrderVo">
+        select id, order_id, alarm_id, device_code, device_name,
+               order_type, order_title, order_content, priority, order_status,
+               reporter, report_time, assignee, assign_time,
+               handler, handle_time, complete_time,
+               estimated_duration, actual_duration, cost,
+               remark, attachments, create_time, update_time
+        from device_service_order
+    </sql>
+
+    <select id="selectServiceOrderById" parameterType="Long" resultMap="ServiceOrderResult">
+        <include refid="selectServiceOrderVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectServiceOrderList" parameterType="com.pm.common.config.PageData" resultMap="ServiceOrderResult">
+        <include refid="selectServiceOrderVo"/>
+        <where>
+            <if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
+            <if test="alarmId != null and alarmId != ''"> and alarm_id = #{alarmId}</if>
+            <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="orderType != null and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="orderTitle != null and orderTitle != ''"> and order_title like concat('%', #{orderTitle}, '%')</if>
+            <if test="priority != null and priority != ''"> and priority = #{priority}</if>
+            <if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
+            <if test="reporter != null and reporter != ''"> and reporter = #{reporter}</if>
+            <if test="assignee != null and assignee != ''"> and assignee = #{assignee}</if>
+            <if test="handler != null and handler != ''"> and handler = #{handler}</if>
+            <if test="beginTime != null and beginTime != ''"> and create_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and create_time &lt;= #{endTime}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectServiceOrderByOrderNo" parameterType="String" resultMap="ServiceOrderResult">
+        <include refid="selectServiceOrderVo"/>
+        where order_id = #{orderNo}
+    </select>
+
+    <insert id="insertServiceOrder" parameterType="com.pm.common.config.PageData">
+        insert into device_service_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">order_id,</if>
+            <if test="alarmId != null">alarm_id,</if>
+            <if test="deviceCode != null">device_code,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="orderTitle != null">order_title,</if>
+            <if test="orderContent != null">order_content,</if>
+            <if test="priority != null">priority,</if>
+            <if test="orderStatus != null">order_status,</if>
+            <if test="reporter != null">reporter,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="estimatedDuration != null">estimated_duration,</if>
+            <if test="cost != null">cost,</if>
+            <if test="remark != null">remark,</if>
+            <if test="attachments != null">attachments,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">#{orderId},</if>
+            <if test="alarmId != null">#{alarmId},</if>
+            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="orderTitle != null">#{orderTitle},</if>
+            <if test="orderContent != null">#{orderContent},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="reporter != null">#{reporter},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="estimatedDuration != null">#{estimatedDuration},</if>
+            <if test="cost != null">#{cost},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="attachments != null">#{attachments},</if>
+        </trim>
+    </insert>
+
+    <update id="updateServiceOrder" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="orderTitle != null">order_title = #{orderTitle},</if>
+            <if test="orderContent != null">order_content = #{orderContent},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="assignee != null">assignee = #{assignee},</if>
+            <if test="assignTime != null">assign_time = #{assignTime},</if>
+            <if test="handler != null">handler = #{handler},</if>
+            <if test="handleTime != null">handle_time = #{handleTime},</if>
+            <if test="completeTime != null">complete_time = #{completeTime},</if>
+            <if test="estimatedDuration != null">estimated_duration = #{estimatedDuration},</if>
+            <if test="actualDuration != null">actual_duration = #{actualDuration},</if>
+            <if test="cost != null">cost = #{cost},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="attachments != null">attachments = #{attachments},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteServiceOrderById" parameterType="Long">
+        delete from device_service_order where id = #{id}
+    </delete>
+
+    <delete id="deleteServiceOrderByIds" parameterType="Long">
+        delete from device_service_order where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="assignServiceOrder" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set order_status = 'PROCESSING',
+            assignee = #{assignee},
+            assign_time = #{assignTime},
+            handler = #{handler}
+        where order_id = #{orderNo}
+          and order_status = 'PENDING'
+    </update>
+
+    <update id="acceptServiceOrder" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set handle_time = #{handleTime}
+        where order_id = #{orderNo}
+          and order_status = 'PROCESSING'
+          and handler = #{handler}
+    </update>
+
+    <update id="completeServiceOrder" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set order_status = 'COMPLETED',
+            complete_time = #{completeTime},
+            actual_duration = #{actualDuration},
+            remark = #{remark}
+        where order_id = #{orderNo}
+          and order_status = 'PROCESSING'
+    </update>
+
+    <update id="evaluateServiceOrder" parameterType="com.pm.common.config.PageData">
+        <!-- 由于表结构中没有评价相关字段，这里只更新备注 -->
+        update device_service_order
+        set remark = concat(ifnull(remark, ''), ' 评价：', #{evaluateContent})
+        where order_id = #{orderNo}
+        and order_status = 'COMPLETED'
+    </update>
+
+    <update id="closeServiceOrder" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set order_status = 'CANCELLED',
+            remark = concat(ifnull(remark, ''), ' 关闭原因：', #{closeReason})
+        where order_id = #{orderNo}
+    </update>
+
+    <select id="getOrderStatistics" parameterType="com.pm.common.config.PageData" resultType="map">
+        select
+        count(1) as totalCount,
+        sum(case when order_status = 'PENDING' then 1 else 0 end) as pendingCount,
+        sum(case when order_status = 'PROCESSING' then 1 else 0 end) as processingCount,
+        sum(case when order_status = 'COMPLETED' then 1 else 0 end) as completedCount,
+        sum(case when order_status = 'CANCELLED' then 1 else 0 end) as cancelledCount,
+        sum(case when priority = 'URGENT' then 1 else 0 end) as urgentCount,
+        sum(case when priority = 'HIGH' then 1 else 0 end) as highCount,
+        sum(case when priority = 'NORMAL' then 1 else 0 end) as normalCount,
+        sum(case when priority = 'LOW' then 1 else 0 end) as lowCount,
+        avg(actual_duration) as avgDuration,
+        sum(cost) as totalCost
+        from device_service_order
+        <where>
+            <if test="handler != null and handler != ''"> and handler = #{handler}</if>
+            <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="beginTime != null and beginTime != ''"> and create_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and create_time &lt;= #{endTime}</if>
+        </where>
+    </select>
+
+    <select id="getOrderTrend" parameterType="com.pm.common.config.PageData" resultType="map">
+        select
+        date_format(create_time, '%Y-%m-%d') as date,
+        count(1) as totalCount,
+        sum(case when order_status = 'COMPLETED' then 1 else 0 end) as completedCount,
+        sum(case when order_status = 'CANCELLED' then 1 else 0 end) as cancelledCount,
+        order_type
+        from device_service_order
+        <where>
+            <if test="beginTime != null and beginTime != ''"> and create_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and create_time &lt;= #{endTime}</if>
+        </where>
+        group by date_format(create_time, '%Y-%m-%d'), order_type
+        order by date
+    </select>
+
+    <select id="selectMyServiceOrderList" parameterType="com.pm.common.config.PageData" resultMap="ServiceOrderResult">
+        <include refid="selectServiceOrderVo"/>
+        <where>
+            and (reporter = #{userId} or handler = #{userId} or assignee = #{userId})
+            <if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
+            <if test="beginTime != null and beginTime != ''"> and create_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and create_time &lt;= #{endTime}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <insert id="insertOrderOperateRecord" parameterType="com.pm.common.config.PageData">
+        <!-- 由于没有单独的操作记录表，这里使用更新备注的方式记录 -->
+        update device_service_order
+        set remark = concat(ifnull(remark, ''), ' [', #{operateTime}, '] ', #{operateUser}, ': ', #{operateContent})
+        where order_id = #{orderNo}
+    </insert>
+
+    <select id="selectOrderOperateRecords" parameterType="String" resultType="map">
+        <!-- 由于没有单独的操作记录表，返回工单的基本操作信息 -->
+        select
+        'CREATE' as operateType,
+        reporter as operateUser,
+        report_time as operateTime,
+        '创建工单' as operateContent
+        from device_service_order
+        where order_id = #{orderNo}
+        union all
+        select
+        'ASSIGN' as operateType,
+        assignee as operateUser,
+        assign_time as operateTime,
+        concat('分配给：', handler) as operateContent
+        from device_service_order
+        where order_id = #{orderNo} and assign_time is not null
+        union all
+        select
+        'COMPLETE' as operateType,
+        handler as operateUser,
+        complete_time as operateTime,
+        '完成工单' as operateContent
+        from device_service_order
+        where order_id = #{orderNo} and complete_time is not null
+        order by operateTime desc
+    </select>
+
+    <update id="updateOrderStatus" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set order_status = #{orderStatus}
+        where order_id = #{orderNo}
+    </update>
+
+    <select id="selectTimeoutOrders" parameterType="com.pm.common.config.PageData" resultMap="ServiceOrderResult">
+        <include refid="selectServiceOrderVo"/>
+        where order_status in ('PENDING', 'PROCESSING')
+        and estimated_duration is not null
+        and timestampdiff(MINUTE, create_time, now()) > estimated_duration
+    </select>
+
+    <update id="batchAssignServiceOrders" parameterType="com.pm.common.config.PageData">
+        update device_service_order
+        set order_status = 'PROCESSING',
+        assignee = #{assignee},
+        assign_time = #{assignTime},
+        handler = #{handler}
+        where order_id in
+        <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+        and order_status = 'PENDING'
+    </update>
+
+</mapper>

pm_ui/src/api/device/configuration.js

@@ -0,0 +1,87 @@
+// 设备组态API接口
+// 文件路径: src/api/device/configuration.js
+
+import request from '@/utils/request'
+
+// 查询设备组态列表
+export function getDeviceConfigurationList(query) {
+    return request({
+        url: '/device/configuration/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 获取设备详细信息
+export function getDeviceConfiguration(deviceCode) {
+    return request({
+        url: '/device/configuration/' + deviceCode,
+        method: 'get'
+    })
+}
+
+// 获取设备点位列表
+export function getDevicePoints(deviceCode) {
+    return request({
+        url: '/device/configuration/points/' + deviceCode,
+        method: 'get'
+    })
+}
+
+// 获取点位详细信息
+export function getPointDetail(pointCode) {
+    return request({
+        url: '/device/configuration/point/' + pointCode,
+        method: 'get'
+    })
+}
+
+// 获取点位实时数据
+export function getPointRealTimeData(pointCode) {
+    return request({
+        url: '/device/configuration/point/realtime/' + pointCode,
+        method: 'get'
+    })
+}
+
+// 获取点位历史数据
+export function getPointHistoryData(query) {
+    return request({
+        url: '/device/configuration/point/history',
+        method: 'get',
+        params: query
+    })
+}
+
+// 发送控制指令
+export function sendControlCommand(data) {
+    return request({
+        url: '/device/configuration/control',
+        method: 'post',
+        data: data
+    })
+}
+
+// 获取设备组态图
+export function getDeviceSchema(deviceCode) {
+    return request({
+        url: '/device/configuration/schema/' + deviceCode,
+        method: 'get'
+    })
+}
+
+// 获取点位告警信息
+export function getPointAlarms(pointCode) {
+    return request({
+        url: '/device/configuration/point/alarms/' + pointCode,
+        method: 'get'
+    })
+}
+
+// 获取点位控制记录
+export function getPointControlRecords(pointCode) {
+    return request({
+        url: '/device/configuration/point/controls/' + pointCode,
+        method: 'get'
+    })
+}

pm_ui/src/views/device/basic/index.vue

@@ -225,7 +225,7 @@
         v-model="detailVisible"
         title="设备监控"
         direction="rtl"
-        size="50%"
+        size="80%"
     >
       <el-tabs v-model="activeTab">
         <el-tab-pane label="设备详情" name="detail">
@@ -244,26 +244,348 @@
             <el-descriptions-item label="序列号">{{currentDevice.serialNumber}}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
+
         <el-tab-pane label="设备组态" name="configuration">
-          <!-- 设备组态内容 -->
+          <div class="configuration-container">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-card>
+                  <template #header>
+                    <div class="card-header">
+                      <span>设备参数配置</span>
+                    </div>
+                  </template>
+                  <el-form label-width="120px">
+                    <el-form-item label="运行模式">
+                      <el-select v-model="configData.runMode" placeholder="请选择">
+                        <el-option label="自动模式" value="auto"></el-option>
+                        <el-option label="手动模式" value="manual"></el-option>
+                        <el-option label="节能模式" value="energy"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="温度设定">
+                      <el-input-number v-model="configData.tempSetting" :min="16" :max="30" :step="0.5"></el-input-number>
+                      <span style="margin-left: 10px;">℃</span>
+                    </el-form-item>
+                    <el-form-item label="湿度设定">
+                      <el-slider v-model="configData.humiditySetting" :min="30" :max="80" show-input></el-slider>
+                    </el-form-item>
+                    <el-form-item label="风速调节">
+                      <el-radio-group v-model="configData.fanSpeed">
+                        <el-radio label="low">低速</el-radio>
+                        <el-radio label="medium">中速</el-radio>
+                        <el-radio label="high">高速</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-form>
+                </el-card>
+              </el-col>
+              <el-col :span="12">
+                <el-card>
+                  <template #header>
+                    <div class="card-header">
+                      <span>设备控制点位</span>
+                    </div>
+                  </template>
+                  <el-table :data="controlPoints" style="width: 100%">
+                    <el-table-column prop="pointName" label="点位名称" width="120"></el-table-column>
+                    <el-table-column prop="pointType" label="类型" width="80"></el-table-column>
+                    <el-table-column prop="currentValue" label="当前值"></el-table-column>
+                    <el-table-column label="操作" width="100">
+                      <template #default="scope">
+                        <el-switch v-if="scope.row.pointType === '开关'" v-model="scope.row.status"></el-switch>
+                        <el-input-number v-else size="small" v-model="scope.row.currentValue" :min="0" :max="100"></el-input-number>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-card>
+              </el-col>
+            </el-row>
+          </div>
         </el-tab-pane>
+
         <el-tab-pane label="设备告警" name="alarm">
-          <!-- 设备告警内容 -->
+          <div class="alarm-container">
+            <el-row class="mb8">
+              <el-col :span="24">
+                <el-button type="primary" size="small" @click="handleAlarmAck">批量确认</el-button>
+                <el-button type="warning" size="small" @click="handleAlarmExport">导出告警</el-button>
+                <el-tag class="ml10" type="danger">未处理: {{unhandledAlarms}}</el-tag>
+                <el-tag class="ml10" type="warning">处理中: {{processingAlarms}}</el-tag>
+                <el-tag class="ml10" type="success">已处理: {{handledAlarms}}</el-tag>
+              </el-col>
+            </el-row>
+            <el-table :data="alarmList" @selection-change="handleAlarmSelection" stripe>
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="alarmTime" label="告警时间" width="160" sortable></el-table-column>
+              <el-table-column prop="alarmLevel" label="告警级别" width="100">
+                <template #default="scope">
+                  <el-tag :type="getAlarmLevelType(scope.row.alarmLevel)">
+                    {{scope.row.alarmLevel}}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="alarmType" label="告警类型" width="120"></el-table-column>
+              <el-table-column prop="alarmContent" label="告警内容" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="status" label="状态" width="100">
+                <template #default="scope">
+                  <el-tag :type="getAlarmStatusType(scope.row.status)">
+                    {{scope.row.status}}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="150">
+                <template #default="scope">
+                  <el-button link type="primary" size="small" @click="handleAlarmDetail(scope.row)">详情</el-button>
+                  <el-button link type="primary" size="small" @click="handleAlarmConfirm(scope.row)">确认</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
         </el-tab-pane>
-        <el-tab-pane label="控制纪录" name="control">
-          <!-- 控制纪录内容 -->
+
+        <el-tab-pane label="控制记录" name="control">
+          <div class="control-container">
+            <el-form :inline="true" class="mb8">
+              <el-form-item label="时间范围">
+                <el-date-picker
+                    v-model="controlDateRange"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="queryControlRecords">查询</el-button>
+              </el-form-item>
+            </el-form>
+            <el-table :data="controlRecords" stripe>
+              <el-table-column prop="controlTime" label="控制时间" width="160"></el-table-column>
+              <el-table-column prop="operator" label="操作人" width="100"></el-table-column>
+              <el-table-column prop="controlType" label="控制类型" width="120"></el-table-column>
+              <el-table-column prop="controlPoint" label="控制点" width="150"></el-table-column>
+              <el-table-column prop="beforeValue" label="控制前值" width="100"></el-table-column>
+              <el-table-column prop="afterValue" label="控制后值" width="100"></el-table-column>
+              <el-table-column prop="result" label="执行结果" width="100">
+                <template #default="scope">
+                  <el-tag :type="scope.row.result === '成功' ? 'success' : 'danger'">
+                    {{scope.row.result}}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
+            </el-table>
+          </div>
         </el-tab-pane>
+
         <el-tab-pane label="实时数据" name="realtime">
-          <!-- 实时数据内容 -->
+          <div class="realtime-container">
+            <el-row :gutter="20">
+              <el-col :span="8" v-for="(item, index) in realtimeData" :key="index">
+                <el-card class="mb20">
+                  <div class="realtime-item">
+                    <div class="item-header">
+                      <i :class="item.icon" :style="{color: item.color}"></i>
+                      <span class="item-title">{{item.name}}</span>
+                    </div>
+                    <div class="item-value">
+                      <span class="value">{{item.value}}</span>
+                      <span class="unit">{{item.unit}}</span>
+                    </div>
+                    <div class="item-info">
+                      <span :class="['status', item.status]">{{item.statusText}}</span>
+                      <span class="update-time">更新时间: {{item.updateTime}}</span>
+                    </div>
+                  </div>
+                </el-card>
+              </el-col>
+            </el-row>
+            <el-card>
+              <template #header>
+                <div class="card-header">
+                  <span>实时趋势图</span>
+                  <el-button-group style="float: right;">
+                    <el-button size="small" @click="changeChartPeriod('5m')">5分钟</el-button>
+                    <el-button size="small" @click="changeChartPeriod('30m')">30分钟</el-button>
+                    <el-button size="small" @click="changeChartPeriod('1h')">1小时</el-button>
+                  </el-button-group>
+                </div>
+              </template>
+              <div id="realtimeChart" style="height: 300px;">
+                <!-- 这里应该集成图表库如ECharts -->
+                <el-empty description="实时趋势图区域"></el-empty>
+              </div>
+            </el-card>
+          </div>
         </el-tab-pane>
+
         <el-tab-pane label="历史数据" name="instant">
-          <!-- 历史数据内容 -->
+          <div class="history-container">
+            <el-form :inline="true" class="mb8">
+              <el-form-item label="数据点">
+                <el-select v-model="historyQuery.dataPoint" placeholder="请选择数据点" multiple>
+                  <el-option label="温度" value="temperature"></el-option>
+                  <el-option label="湿度" value="humidity"></el-option>
+                  <el-option label="电压" value="voltage"></el-option>
+                  <el-option label="电流" value="current"></el-option>
+                  <el-option label="功率" value="power"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间范围">
+                <el-date-picker
+                    v-model="historyDateRange"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="queryHistoryData">查询</el-button>
+                <el-button type="success" @click="exportHistoryData">导出</el-button>
+              </el-form-item>
+            </el-form>
+            <el-table :data="historyData" stripe max-height="400">
+              <el-table-column prop="recordTime" label="记录时间" width="160" sortable></el-table-column>
+              <el-table-column prop="temperature" label="温度(℃)" width="100"></el-table-column>
+              <el-table-column prop="humidity" label="湿度(%)" width="100"></el-table-column>
+              <el-table-column prop="voltage" label="电压(V)" width="100"></el-table-column>
+              <el-table-column prop="current" label="电流(A)" width="100"></el-table-column>
+              <el-table-column prop="power" label="功率(kW)" width="100"></el-table-column>
+              <el-table-column prop="energy" label="能耗(kWh)" width="100"></el-table-column>
+            </el-table>
+            <div class="history-chart mt20">
+              <el-card>
+                <template #header>
+                  <span>历史趋势分析</span>
+                </template>
+                <div id="historyChart" style="height: 300px;">
+                  <el-empty description="历史趋势图区域"></el-empty>
+                </div>
+              </el-card>
+            </div>
+          </div>
         </el-tab-pane>
+
         <el-tab-pane label="自动抄表" name="meter">
-          <!-- 自动抄表内容 -->
+          <div class="meter-container">
+            <el-row class="mb8">
+              <el-col :span="24">
+                <el-button type="primary" @click="handleManualRead">手动抄表</el-button>
+                <el-button type="success" @click="handleMeterExport">导出数据</el-button>
+                <span style="margin-left: 20px;">
+                  自动抄表周期:
+                  <el-select v-model="meterConfig.period" size="small" style="width: 120px;">
+                    <el-option label="每小时" value="hourly"></el-option>
+                    <el-option label="每天" value="daily"></el-option>
+                    <el-option label="每周" value="weekly"></el-option>
+                    <el-option label="每月" value="monthly"></el-option>
+                  </el-select>
+                </span>
+              </el-col>
+            </el-row>
+            <el-table :data="meterData" stripe>
+              <el-table-column prop="meterTime" label="抄表时间" width="160"></el-table-column>
+              <el-table-column prop="meterType" label="表计类型" width="100">
+                <template #default="scope">
+                  <el-tag>{{scope.row.meterType}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="lastReading" label="上次读数" width="120"></el-table-column>
+              <el-table-column prop="currentReading" label="本次读数" width="120"></el-table-column>
+              <el-table-column prop="usage" label="用量" width="100">
+                <template #default="scope">
+                  <span style="color: #409EFF;">{{scope.row.usage}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="unit" label="单位" width="80"></el-table-column>
+              <el-table-column prop="status" label="状态" width="100">
+                <template #default="scope">
+                  <el-tag :type="scope.row.status === '正常' ? 'success' : 'warning'">
+                    {{scope.row.status}}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="remark" label="备注"></el-table-column>
+            </el-table>
+            <el-row :gutter="20" class="mt20">
+              <el-col :span="12">
+                <el-card>
+                  <template #header>
+                    <span>能耗统计</span>
+                  </template>
+                  <el-descriptions :column="2">
+                    <el-descriptions-item label="本月电量">12,345 kWh</el-descriptions-item>
+                    <el-descriptions-item label="本月水量">456 m³</el-descriptions-item>
+                    <el-descriptions-item label="同比增长">+5.2%</el-descriptions-item>
+                    <el-descriptions-item label="环比增长">+2.1%</el-descriptions-item>
+                  </el-descriptions>
+                </el-card>
+              </el-col>
+              <el-col :span="12">
+                <el-card>
+                  <template #header>
+                    <span>费用预估</span>
+                  </template>
+                  <el-descriptions :column="2">
+                    <el-descriptions-item label="本月电费">¥8,641.5</el-descriptions-item>
+                    <el-descriptions-item label="本月水费">¥1,824.0</el-descriptions-item>
+                    <el-descriptions-item label="预计总费用">¥10,465.5</el-descriptions-item>
+                    <el-descriptions-item label="费用预警">正常</el-descriptions-item>
+                  </el-descriptions>
+                </el-card>
+              </el-col>
+            </el-row>
+          </div>
         </el-tab-pane>
+
         <el-tab-pane label="事件记录" name="event">
-          <!-- 事件记录内容 -->
+          <div class="event-container">
+            <el-form :inline="true" class="mb8">
+              <el-form-item label="事件类型">
+                <el-select v-model="eventQuery.type" placeholder="全部类型">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="系统事件" value="system"></el-option>
+                  <el-option label="操作事件" value="operation"></el-option>
+                  <el-option label="告警事件" value="alarm"></el-option>
+                  <el-option label="维护事件" value="maintenance"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间范围">
+                <el-date-picker
+                    v-model="eventDateRange"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="queryEvents">查询</el-button>
+              </el-form-item>
+            </el-form>
+            <el-timeline>
+              <el-timeline-item
+                  v-for="(event, index) in eventList"
+                  :key="index"
+                  :timestamp="event.eventTime"
+                  placement="top"
+                  :type="getEventType(event.type)"
+              >
+                <el-card>
+                  <h4>{{event.title}}</h4>
+                  <p>{{event.content}}</p>
+                  <p style="margin-top: 10px;">
+                    <el-tag size="small" :type="getEventType(event.type)">{{event.type}}</el-tag>
+                    <span style="margin-left: 10px; color: #909399;">操作人: {{event.operator}}</span>
+                  </p>
+                </el-card>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
         </el-tab-pane>
       </el-tabs>
     </el-drawer>
@@ -297,7 +619,156 @@ function handleDetail(row) {
   detailVisible.value = true;
 }
 
+//================
+// 新增的响应式数据
+const configData = ref({
+  runMode: 'auto',
+  tempSetting: 25,
+  humiditySetting: 60,
+  fanSpeed: 'medium'
+});
+
+const controlPoints = ref([
+  { pointName: '电源开关', pointType: '开关', currentValue: '开启', status: true },
+  { pointName: '温度设定', pointType: '模拟量', currentValue: 25 },
+  { pointName: '风速控制', pointType: '模拟量', currentValue: 50 },
+  { pointName: '新风阀门', pointType: '开关', currentValue: '关闭', status: false }
+]);
+
+const alarmList = ref([
+  { alarmTime: '2025-06-12 14:30:25', alarmLevel: '严重', alarmType: '温度异常', alarmContent: '设备温度超过设定阈值，当前温度32℃', status: '未处理' },
+  { alarmTime: '2025-06-12 13:15:10', alarmLevel: '警告', alarmType: '通信故障', alarmContent: '设备通信中断超过5分钟', status: '处理中' },
+  { alarmTime: '2025-06-12 10:20:30', alarmLevel: '一般', alarmType: '维护提醒', alarmContent: '设备运行时间已达到维护周期', status: '已处理' }
+]);
+
+const unhandledAlarms = ref(1);
+const processingAlarms = ref(1);
+const handledAlarms = ref(1);
+
+const controlDateRange = ref([]);
+const controlRecords = ref([
+  { controlTime: '2025-06-12 14:00:00', operator: '张三', controlType: '手动控制', controlPoint: '温度设定', beforeValue: '26℃', afterValue: '25℃', result: '成功', remark: '用户反馈温度过高' },
+  { controlTime: '2025-06-12 12:30:00', operator: '系统', controlType: '自动调节', controlPoint: '风速控制', beforeValue: '30%', afterValue: '50%', result: '成功', remark: '根据负荷自动调节' }
+]);
+
+const realtimeData = ref([
+  { name: '室内温度', value: 25.3, unit: '℃', icon: 'el-icon-sunny', color: '#E6A23C', status: 'normal', statusText: '正常', updateTime: '14:35:20' },
+  { name: '室内湿度', value: 58, unit: '%', icon: 'el-icon-drop', color: '#409EFF', status: 'normal', statusText: '正常', updateTime: '14:35:20' },
+  { name: '设备功率', value: 3.85, unit: 'kW', icon: 'el-icon-lightning', color: '#67C23A', status: 'normal', statusText: '正常', updateTime: '14:35:20' },
+  { name: '运行电流', value: 16.5, unit: 'A', icon: 'el-icon-battery-full', color: '#F56C6C', status: 'normal', statusText: '正常', updateTime: '14:35:20' },
+  { name: '累计能耗', value: 1256.8, unit: 'kWh', icon: 'el-icon-chart-line', color: '#909399', status: 'normal', statusText: '正常', updateTime: '14:35:20' },
+  { name: 'CO2浓度', value: 456, unit: 'ppm', icon: 'el-icon-wind-power', color: '#00CED1', status: 'normal', statusText: '正常', updateTime: '14:35:20' }
+]);
+
+const historyQuery = ref({
+  dataPoint: []
+});
+
+const historyDateRange = ref([]);
+const historyData = ref([
+  { recordTime: '2025-06-12 14:00:00', temperature: 25.2, humidity: 58, voltage: 220, current: 16.4, power: 3.61, energy: 3.61 },
+  { recordTime: '2025-06-12 13:00:00', temperature: 25.5, humidity: 57, voltage: 221, current: 16.6, power: 3.67, energy: 3.67 },
+  { recordTime: '2025-06-12 12:00:00', temperature: 26.1, humidity: 55, voltage: 219, current: 17.1, power: 3.74, energy: 3.74 }
+]);
+
+const meterConfig = ref({
+  period: 'daily'
+});
+
+const meterData = ref([
+  { meterTime: '2025-06-12 00:00:00', meterType: '电表', lastReading: '12000.5', currentReading: '12095.3', usage: '94.8', unit: 'kWh', status: '正常', remark: '自动抄表' },
+  { meterTime: '2025-06-11 00:00:00', meterType: '水表', lastReading: '5420.2', currentReading: '5435.7', usage: '15.5', unit: 'm³', status: '正常', remark: '自动抄表' }
+]);
+
+const eventQuery = ref({
+  type: ''
+});
 
+const eventDateRange = ref([]);
+const eventList = ref([
+  { eventTime: '2025-06-12 14:30:25', type: '告警事件', title: '温度异常告警', content: '空调设备AHU-01温度超限，已自动调节', operator: '系统' },
+  { eventTime: '2025-06-12 12:00:00', type: '维护事件', title: '设备维护完成', content: '完成空调过滤网清洗和制冷剂检查', operator: '李四' },
+  { eventTime: '2025-06-12 09:15:30', type: '操作事件', title: '设备参数调整', content: '根据天气预报调整温度设定值', operator: '张三' },
+  { eventTime: '2025-06-11 18:00:00', type: '系统事件', title: '设备自动启停', content: '根据排程计划，设备自动停机', operator: '系统' }
+]);
+
+// 新增的方法
+function getAlarmLevelType(level) {
+  const typeMap = {
+    '严重': 'danger',
+    '警告': 'warning',
+    '一般': 'info'
+  };
+  return typeMap[level] || 'info';
+}
+
+function getAlarmStatusType(status) {
+  const typeMap = {
+    '未处理': 'danger',
+    '处理中': 'warning',
+    '已处理': 'success'
+  };
+  return typeMap[status] || 'info';
+}
+
+function handleAlarmSelection(selection) {
+  // 处理告警选择
+}
+
+function handleAlarmAck() {
+  proxy.$modal.msgSuccess("批量确认成功");
+}
+
+function handleAlarmExport() {
+  proxy.$modal.msgSuccess("导出告警数据");
+}
+
+function handleAlarmDetail(row) {
+  proxy.$modal.msgInfo("查看告警详情");
+}
+
+function handleAlarmConfirm(row) {
+  proxy.$modal.msgSuccess("告警已确认");
+}
+
+function queryControlRecords() {
+  proxy.$modal.msgSuccess("查询控制记录");
+}
+
+function changeChartPeriod(period) {
+  proxy.$modal.msgInfo(`切换到${period}视图`);
+}
+
+function queryHistoryData() {
+  proxy.$modal.msgSuccess("查询历史数据");
+}
+
+function exportHistoryData() {
+  proxy.$modal.msgSuccess("导出历史数据");
+}
+
+function handleManualRead() {
+  proxy.$modal.msgSuccess("手动抄表成功");
+}
+
+function handleMeterExport() {
+  proxy.$modal.msgSuccess("导出抄表数据");
+}
+
+function queryEvents() {
+  proxy.$modal.msgSuccess("查询事件记录");
+}
+
+function getEventType(type) {
+  const typeMap = {
+    '系统事件': 'primary',
+    '操作事件': 'success',
+    '告警事件': 'danger',
+    '维护事件': 'warning'
+  };
+  return typeMap[type] || 'info';
+}
+//================
 const data = reactive({
   form: {},
   queryParams: {
@@ -454,3 +925,76 @@ function handleExport() {
 
 getList();
 </script>
+<style scoped>
+/* 新增的样式 */
+.configuration-container .card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.realtime-container .realtime-item {
+  text-align: center;
+  padding: 20px;
+}
+
+.realtime-item .item-header {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 10px;
+}
+
+.realtime-item .item-header i {
+  font-size: 24px;
+  margin-right: 10px;
+}
+
+.realtime-item .item-title {
+  font-size: 16px;
+  color: #303133;
+}
+
+.realtime-item .item-value {
+  margin: 15px 0;
+}
+
+.realtime-item .value {
+  font-size: 32px;
+  font-weight: bold;
+  color: #409EFF;
+}
+
+.realtime-item .unit {
+  font-size: 14px;
+  color: #909399;
+  margin-left: 5px;
+}
+
+.realtime-item .item-info {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  color: #909399;
+}
+
+.realtime-item .status.normal {
+  color: #67C23A;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+</style>

pm_ui/src/views/device/configuration/index.vue

@@ -0,0 +1,403 @@
+<!-- 设备组态页面 -->
+<!-- 文件路径: src/views/device/configuration/index.vue -->
+<template>
+  <div class="app-container">
+    <!-- 查询条件 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="设备编码" prop="deviceCode">
+        <el-input
+            v-model="queryParams.deviceCode"
+            placeholder="请输入设备编码"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+            v-model="queryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子系统类型" prop="subsystemType">
+        <el-select v-model="queryParams.subsystemType" placeholder="请选择子系统类型" clearable style="width: 150px" >
+          <el-option label="暖通空调" value="hvac"/>
+          <el-option label="新风系统" value="fresh_air"/>
+          <el-option label="冷热源系统" value="cooling_heating"/>
+          <el-option label="水系统" value="water_system"/>
+          <el-option label="电梯系统" value="elevator"/>
+          <el-option label="配电系统" value="power_distribution"/>
+          <el-option label="照明系统" value="lighting"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable style="width: 150px">
+          <el-option label="正常" value="1"/>
+          <el-option label="故障" value="2"/>
+          <el-option label="离线" value="0"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 设备列表 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备编码" align="center" prop="deviceCode" width="160"/>
+      <el-table-column label="设备名称" align="center" prop="deviceName" width="150"/>
+      <el-table-column label="子系统类型" align="center" prop="subsystemType" width="160">
+        <template #default="scope">
+          <dict-tag :options="subsystem_type_options" :value="scope.row.subsystemType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属空间" align="center" prop="spaceName" width="160"/>
+      <el-table-column label="设备状态" align="center" prop="status" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.status === '1' ? 'success' : scope.row.status === '2' ? 'danger' : 'info'">
+            {{ scope.row.status === '1' ? '正常' : scope.row.status === '2' ? '故障' : '离线' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="在线状态" align="center" prop="isOnline" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.isOnline ? 'success' : 'danger'">
+            {{ scope.row.isOnline ? '在线' : '离线' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="告警数量" align="center" prop="alarmCount" width="100">
+        <template #default="scope">
+          <el-badge :value="scope.row.alarmCount" :type="scope.row.alarmCount > 0 ? 'danger' : 'success'">
+<!--            <span>{{ scope.row.alarmCount }}</span>-->
+          </el-badge>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" min-width="200" fixed="right" align="center">
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleConfiguration(scope.row)">组态图</el-button>
+          <el-button link type="primary" icon="Monitor" @click="handleMonitor(scope.row)">监控</el-button>
+          <el-button link type="primary" icon="Operation" @click="handleControl(scope.row)">控制</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+    />
+
+    <!-- 设备组态图和监控对话框 -->
+    <el-dialog :title="dialogTitle" v-model="dialogVisible" width="80%" append-to-body>
+      <el-tabs v-model="activeTab" @tab-change="handleTabChange">
+        <!-- 组态图 -->
+        <el-tab-pane label="组态图" name="configuration">
+          <div class="configuration-container">
+            <div class="device-info">
+              <el-descriptions :column="4" border>
+                <el-descriptions-item label="设备编码">{{currentDevice.deviceCode}}</el-descriptions-item>
+                <el-descriptions-item label="设备名称">{{currentDevice.deviceName}}</el-descriptions-item>
+                <el-descriptions-item label="子系统类型">
+                  <dict-tag :options="subsystem_type_options" :value="currentDevice.subsystemType"/>
+                </el-descriptions-item>
+                <el-descriptions-item label="设备状态">
+                  <el-tag :type="currentDevice.status === '1' ? 'success' : currentDevice.status === '2' ? 'danger' : 'info'">
+                    {{ currentDevice.status === '1' ? '正常' : currentDevice.status === '2' ? '故障' : '离线' }}
+                  </el-tag>
+                </el-descriptions-item>
+              </el-descriptions>
+            </div>
+
+            <!-- 组态图展示区域 -->
+            <div class="configuration-diagram" style="height: 400px; border: 1px solid #ddd; margin: 20px 0; position: relative; background: #f5f5f5;">
+              <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center;">
+                <el-icon size="64" color="#ccc"><Monitor /></el-icon>
+                <p style="color: #999; margin-top: 10px;">组态图加载区域</p>
+                <p style="color: #999; font-size: 12px;">实际项目中这里会加载SVG组态图或其他图形组件</p>
+              </div>
+            </div>
+
+            <!-- 点位列表 -->
+            <div class="point-list">
+              <el-table :data="pointList" height="300">
+                <el-table-column prop="pointCode" label="点位编码" width="120"/>
+                <el-table-column prop="pointName" label="点位名称" width="150"/>
+                <el-table-column prop="pointType" label="点位类型" width="100">
+                  <template #default="scope">
+                    <el-tag :type="scope.row.pointType === 'AI' ? 'success' : scope.row.pointType === 'AO' ? 'warning' : scope.row.pointType === 'DI' ? 'info' : 'danger'">
+                      {{ scope.row.pointType }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="currentValue" label="当前值" width="100"/>
+                <el-table-column prop="unit" label="单位" width="80"/>
+                <el-table-column prop="alarmStatus" label="告警状态" width="100">
+                  <template #default="scope">
+                    <el-tag :type="scope.row.alarmStatus ? 'danger' : 'success'">
+                      {{ scope.row.alarmStatus ? '告警' : '正常' }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="200">
+                  <template #default="scope">
+                    <el-button link type="primary" @click="handlePointDetail(scope.row)">详情</el-button>
+                    <el-button link type="primary" @click="handlePointControl(scope.row)" v-if="scope.row.pointType === 'AO' || scope.row.pointType === 'DO'">控制</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </el-tab-pane>
+
+        <!-- 点位详情 -->
+        <el-tab-pane label="点位详情" name="pointDetail">
+          <div v-if="currentPoint">
+            <el-descriptions :column="2" border>
+              <el-descriptions-item label="点位编码">{{currentPoint.pointCode}}</el-descriptions-item>
+              <el-descriptions-item label="点位名称">{{currentPoint.pointName}}</el-descriptions-item>
+              <el-descriptions-item label="点位类型">{{currentPoint.pointType}}</el-descriptions-item>
+              <el-descriptions-item label="当前值">{{currentPoint.currentValue}} {{currentPoint.unit}}</el-descriptions-item>
+              <el-descriptions-item label="最小值">{{currentPoint.minValue}}</el-descriptions-item>
+              <el-descriptions-item label="最大值">{{currentPoint.maxValue}}</el-descriptions-item>
+              <el-descriptions-item label="告警状态">
+                <el-tag :type="currentPoint.alarmStatus ? 'danger' : 'success'">
+                  {{ currentPoint.alarmStatus ? '告警' : '正常' }}
+                </el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="更新时间">{{currentPoint.updateTime}}</el-descriptions-item>
+            </el-descriptions>
+
+            <!-- 趋势图 -->
+            <div class="trend-chart" style="margin-top: 20px;">
+              <h4>趋势图</h4>
+              <div style="height: 300px; border: 1px solid #ddd; background: #f5f5f5; display: flex; align-items: center; justify-content: center;">
+                <div style="text-align: center;">
+                  <el-icon size="48" color="#ccc"><TrendCharts /></el-icon>
+                  <p style="color: #999; margin-top: 10px;">趋势图展示区域</p>
+                  <p style="color: #999; font-size: 12px;">实际项目中这里会加载ECharts图表</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <!-- 控制指令下发对话框 -->
+    <el-dialog title="控制指令下发" v-model="controlVisible" width="500px" append-to-body>
+      <el-form ref="controlRef" :model="controlForm" label-width="100px">
+        <el-form-item label="点位编码">
+          <el-input v-model="controlForm.pointCode" disabled />
+        </el-form-item>
+        <el-form-item label="点位名称">
+          <el-input v-model="controlForm.pointName" disabled />
+        </el-form-item>
+        <el-form-item label="当前值">
+          <el-input v-model="controlForm.currentValue" disabled />
+        </el-form-item>
+        <el-form-item label="控制值" prop="controlValue" v-if="controlForm.pointType === 'AO'">
+          <el-input-number v-model="controlForm.controlValue" :min="controlForm.minValue" :max="controlForm.maxValue" />
+        </el-form-item>
+        <el-form-item label="控制值" prop="controlValue" v-if="controlForm.pointType === 'DO'">
+          <el-radio-group v-model="controlForm.controlValue">
+            <el-radio :label="1">开启</el-radio>
+            <el-radio :label="0">关闭</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="执行时间">
+          <el-date-picker
+              v-model="controlForm.executeTime"
+              type="datetime"
+              placeholder="选择执行时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="controlForm.remark" type="textarea" rows="3" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="controlVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitControl">确认下发</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DeviceConfiguration">
+import { getDeviceConfigurationList, getDevicePoints, sendControlCommand } from "@/api/device/configuration";
+
+const { proxy } = getCurrentInstance();
+
+const deviceList = ref([]);
+const pointList = ref([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const dialogVisible = ref(false);
+const controlVisible = ref(false);
+const dialogTitle = ref("");
+const activeTab = ref('configuration');
+const currentDevice = ref({});
+const currentPoint = ref({});
+
+// 子系统类型选项
+const subsystem_type_options = ref([
+  { label: '暖通空调', value: 'hvac' },
+  { label: '新风系统', value: 'fresh_air' },
+  { label: '冷热源系统', value: 'cooling_heating' },
+  { label: '水系统', value: 'water_system' },
+  { label: '电梯系统', value: 'elevator' },
+  { label: '配电系统', value: 'power_distribution' },
+  { label: '照明系统', value: 'lighting' }
+]);
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceCode: null,
+    deviceName: null,
+    subsystemType: null,
+    status: null
+  },
+  controlForm: {
+    pointCode: null,
+    pointName: null,
+    currentValue: null,
+    controlValue: null,
+    pointType: null,
+    minValue: null,
+    maxValue: null,
+    executeTime: null,
+    remark: null
+  }
+});
+
+const { queryParams, controlForm } = toRefs(data);
+
+/** 查询设备列表 */
+function getList() {
+  loading.value = true;
+  getDeviceConfigurationList(queryParams.value).then(response => {
+    deviceList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  // 处理多选
+}
+
+/** 查看组态图 */
+function handleConfiguration(row) {
+  currentDevice.value = row;
+  dialogTitle.value = `${row.deviceName} - 设备组态`;
+  activeTab.value = 'configuration';
+  dialogVisible.value = true;
+
+  // 获取设备点位列表
+  getDevicePoints(row.deviceCode).then(response => {
+    pointList.value = response.data;
+  });
+}
+
+/** 设备监控 */
+function handleMonitor(row) {
+  handleConfiguration(row);
+}
+
+/** 设备控制 */
+function handleControl(row) {
+  handleConfiguration(row);
+}
+
+/** 标签页切换 */
+function handleTabChange(tab) {
+  activeTab.value = tab;
+}
+
+/** 点位详情 */
+function handlePointDetail(row) {
+  currentPoint.value = row;
+  activeTab.value = 'pointDetail';
+}
+
+/** 点位控制 */
+function handlePointControl(row) {
+  controlForm.value = {
+    pointCode: row.pointCode,
+    pointName: row.pointName,
+    currentValue: row.currentValue,
+    controlValue: row.currentValue,
+    pointType: row.pointType,
+    minValue: row.minValue,
+    maxValue: row.maxValue,
+    executeTime: null,
+    remark: null
+  };
+  controlVisible.value = true;
+}
+
+/** 提交控制指令 */
+function submitControl() {
+  sendControlCommand(controlForm.value).then(response => {
+    proxy.$modal.msgSuccess("控制指令下发成功");
+    controlVisible.value = false;
+    // 刷新点位数据
+    getDevicePoints(currentDevice.value.deviceCode).then(response => {
+      pointList.value = response.data;
+    });
+  });
+}
+
+getList();
+</script>
+
+<style scoped>
+.configuration-container {
+  padding: 10px;
+}
+
+.device-info {
+  margin-bottom: 20px;
+}
+
+.configuration-diagram {
+  border-radius: 4px;
+}
+
+.point-list {
+  margin-top: 20px;
+}
+
+.trend-chart {
+  margin-top: 20px;
+}
+</style>

pm_ui/src/views/dtxt/index.vue

@@ -5,7 +5,7 @@
       <el-tab-pane label="电梯监控" name="monitor">
         <el-form :model="elevatorQuery" ref="elevatorQueryRef" :inline="true" label-width="80px">
           <el-form-item label="楼栋" prop="buildingId">
-            <el-select v-model="elevatorQuery.buildingId" placeholder="请选择楼栋" clearable>
+            <el-select v-model="elevatorQuery.buildingId" placeholder="请选择楼栋" clearable style="width: 150px">
               <el-option
                   v-for="item in buildingList"
                   :key="item.id"
@@ -15,14 +15,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="电梯类型" prop="elevatorType">
-            <el-select v-model="elevatorQuery.elevatorType" placeholder="请选择类型" clearable>
+            <el-select v-model="elevatorQuery.elevatorType" placeholder="请选择类型" clearable style="width: 150px">
               <el-option label="客梯" value="客梯" />
               <el-option label="货梯" value="货梯" />
               <el-option label="扶梯" value="扶梯" />
             </el-select>
           </el-form-item>
           <el-form-item label="运行状态" prop="runStatus">
-            <el-select v-model="elevatorQuery.runStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="elevatorQuery.runStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="停止" :value="0" />
               <el-option label="上行" :value="1" />
               <el-option label="下行" :value="2" />
@@ -208,7 +208,7 @@
             <el-input v-model="alarmQuery.deviceName" placeholder="请输入设备名称" clearable />
           </el-form-item>
           <el-form-item label="报警类型" prop="alarmType">
-            <el-select v-model="alarmQuery.alarmType" placeholder="请选择报警类型" clearable>
+            <el-select v-model="alarmQuery.alarmType" placeholder="请选择报警类型" clearable style="width: 150px">
               <el-option label="超载报警" value="overload" />
               <el-option label="困人报警" value="trapped" />
               <el-option label="故障报警" value="fault" />
@@ -216,14 +216,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="报警级别" prop="alarmLevel">
-            <el-select v-model="alarmQuery.alarmLevel" placeholder="请选择报警级别" clearable>
+            <el-select v-model="alarmQuery.alarmLevel" placeholder="请选择报警级别" clearable style="width: 150px">
               <el-option label="提示" :value="1" />
               <el-option label="一般" :value="2" />
               <el-option label="严重" :value="3" />
             </el-select>
           </el-form-item>
           <el-form-item label="处理状态" prop="handleStatus">
-            <el-select v-model="alarmQuery.handleStatus" placeholder="请选择处理状态" clearable>
+            <el-select v-model="alarmQuery.handleStatus" placeholder="请选择处理状态" clearable style="width: 150px">
               <el-option label="未处理" :value="0" />
               <el-option label="已处理" :value="1" />
             </el-select>

pm_ui/src/views/fkxt/VisitorSystem.vue

@@ -11,7 +11,7 @@
             <el-input v-model="visitorQuery.visitedPerson" placeholder="请输入被访人" clearable />
           </el-form-item>
           <el-form-item label="状态" prop="visitStatus">
-            <el-select v-model="visitorQuery.visitStatus" placeholder="请选择状态" clearable width="80px">
+            <el-select v-model="visitorQuery.visitStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="预约" :value="0" />
               <el-option label="已到达" :value="1" />
               <el-option label="访问中" :value="2" />
@@ -96,7 +96,7 @@
             <el-input v-model="accessQuery.gateLocation" placeholder="请输入门禁位置" clearable />
           </el-form-item>
           <el-form-item label="刷卡类型" prop="swipeType">
-            <el-select v-model="accessQuery.swipeType" placeholder="请选择类型" clearable>
+            <el-select v-model="accessQuery.swipeType" placeholder="请选择类型" clearable style="width: 150px">
               <el-option label="进入" :value="1" />
               <el-option label="离开" :value="2" />
             </el-select>

pm_ui/src/views/nygl/index.vue

@@ -11,7 +11,7 @@
             <el-input v-model="energyQuery.deviceName" placeholder="请输入设备名称" clearable />
           </el-form-item>
           <el-form-item label="能耗类型" prop="energyType">
-            <el-select v-model="energyQuery.energyType" placeholder="请选择能耗类型" clearable>
+            <el-select v-model="energyQuery.energyType" placeholder="请选择能耗类型" clearable style="width: 150px">
               <el-option label="电" value="electricity" />
               <el-option label="水" value="water" />
               <el-option label="煤" value="coal" />
@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="楼栋" prop="building">
-            <el-select v-model="energyQuery.building" placeholder="请选择楼栋" clearable>
+            <el-select v-model="energyQuery.building" placeholder="请选择楼栋" clearable style="width: 150px">
               <el-option label="A栋" value="A" />
               <el-option label="B栋" value="B" />
               <el-option label="C栋" value="C" />

pm_ui/src/views/parking/index.vue

@@ -179,7 +179,7 @@
         <div class="report-container">
           <el-form :model="reportQuery" :inline="true" label-width="80px">
             <el-form-item label="统计类型">
-              <el-select v-model="reportQuery.reportType" placeholder="请选择">
+              <el-select v-model="reportQuery.reportType" placeholder="请选择" style="width: 150px">
                 <el-option label="日报表" value="daily" />
                 <el-option label="周报表" value="weekly" />
                 <el-option label="月报表" value="monthly" />

pm_ui/src/views/patrol/index.vue

@@ -11,24 +11,24 @@
             <el-input v-model="pointQuery.pointName" placeholder="请输入巡更点名称" clearable />
           </el-form-item>
           <el-form-item label="楼栋" prop="buildingId">
-            <el-select v-model="pointQuery.buildingId" placeholder="请选择楼栋" clearable>
+            <el-select v-model="pointQuery.buildingId" placeholder="请选择楼栋" clearable style="width: 150px">
               <el-option v-for="building in buildingList" :key="building.id" :label="building.name" :value="building.id" />
             </el-select>
           </el-form-item>
           <el-form-item label="楼层" prop="floorId">
-            <el-select v-model="pointQuery.floorId" placeholder="请选择楼层" clearable>
+            <el-select v-model="pointQuery.floorId" placeholder="请选择楼层" clearable style="width: 150px">
               <el-option v-for="floor in floorList" :key="floor.id" :label="floor.name" :value="floor.id" />
             </el-select>
           </el-form-item>
           <el-form-item label="巡更点类型" prop="pointType">
-            <el-select v-model="pointQuery.pointType" placeholder="请选择类型" clearable>
+            <el-select v-model="pointQuery.pointType" placeholder="请选择类型" clearable style="width: 150px">
               <el-option label="普通" value="normal" />
               <el-option label="重点" value="key" />
               <el-option label="紧急" value="emergency" />
             </el-select>
           </el-form-item>
           <el-form-item label="是否启用" prop="isActive">
-            <el-select v-model="pointQuery.isActive" placeholder="请选择" clearable>
+            <el-select v-model="pointQuery.isActive" placeholder="请选择" clearable style="width: 150px">
               <el-option label="启用" :value="1" />
               <el-option label="禁用" :value="0" />
             </el-select>
@@ -95,7 +95,7 @@
       <el-tab-pane label="巡更记录" name="records">
         <el-form :model="recordQuery" ref="recordQueryRef" :inline="true" label-width="80px">
           <el-form-item label="巡更点" prop="pointCode">
-            <el-select v-model="recordQuery.pointCode" placeholder="请选择巡更点" clearable>
+            <el-select v-model="recordQuery.pointCode" placeholder="请选择巡更点" clearable style="width: 150px">
               <el-option v-for="point in allPointList" :key="point.point_code" :label="point.point_name" :value="point.point_code" />
             </el-select>
           </el-form-item>
@@ -103,12 +103,12 @@
             <el-input v-model="recordQuery.patrolPersonName" placeholder="请输入巡更人员" clearable />
           </el-form-item>
           <el-form-item label="巡更路线" prop="patrolRouteId">
-            <el-select v-model="recordQuery.patrolRouteId" placeholder="请选择路线" clearable>
+            <el-select v-model="recordQuery.patrolRouteId" placeholder="请选择路线" clearable style="width: 150px">
               <el-option v-for="route in routeList" :key="route.id" :label="route.name" :value="route.id" />
             </el-select>
           </el-form-item>
           <el-form-item label="巡更状态" prop="patrolStatus">
-            <el-select v-model="recordQuery.patrolStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="recordQuery.patrolStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="正常" :value="1" />
               <el-option label="异常" :value="0" />
               <el-option label="超时" :value="2" />
@@ -684,7 +684,12 @@ function initData() {
     { id: 'B2', name: 'B栋' },
     { id: 'B3', name: 'C栋' }
   ]
-
+  // 调用接口加载楼层数据
+  floorList.value = [
+    { id: 'F1', name: '1楼' },
+    { id: 'F2', name: '2楼' },
+    { id: 'F3', name: '3楼' }
+  ]
   routeList.value = [
     { id: 'R1', name: '日常巡更路线' },
     { id: 'R2', name: '夜间巡更路线' },

pm_ui/src/views/rqbjxt/index.vue

@@ -11,7 +11,7 @@
             <el-input v-model="alarmPointQuery.deviceName" placeholder="请输入设备名称" clearable />
           </el-form-item>
           <el-form-item label="报警类型" prop="alarmType">
-            <el-select v-model="alarmPointQuery.alarmType" placeholder="请选择报警类型" clearable>
+            <el-select v-model="alarmPointQuery.alarmType" placeholder="请选择报警类型" clearable style="width: 150px">
               <el-option label="入侵检测" value="intrusion" />
               <el-option label="门磁报警" value="door_magnetic" />
               <el-option label="红外探测" value="infrared" />
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="防区" prop="zone">
-            <el-select v-model="alarmPointQuery.zone" placeholder="请选择防区" clearable>
+            <el-select v-model="alarmPointQuery.zone" placeholder="请选择防区" clearable style="width: 150px">
               <el-option label="防区1" value="zone1" />
               <el-option label="防区2" value="zone2" />
               <el-option label="防区3" value="zone3" />
@@ -28,7 +28,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="设备状态" prop="deviceStatus">
-            <el-select v-model="alarmPointQuery.deviceStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="alarmPointQuery.deviceStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="正常" :value="1" />
               <el-option label="报警" :value="2" />
               <el-option label="故障" :value="3" />
@@ -117,7 +117,7 @@
       <el-tab-pane label="实时报警" name="realTimeAlarms">
         <el-form :model="alarmQuery" ref="alarmQueryRef" :inline="true" label-width="80px">
           <el-form-item label="报警级别" prop="alarmLevel">
-            <el-select v-model="alarmQuery.alarmLevel" placeholder="请选择报警级别" clearable>
+            <el-select v-model="alarmQuery.alarmLevel" placeholder="请选择报警级别" clearable style="width: 150px">
               <el-option label="低级" :value="1" />
               <el-option label="中级" :value="2" />
               <el-option label="高级" :value="3" />
@@ -125,7 +125,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="处理状态" prop="handleStatus">
-            <el-select v-model="alarmQuery.handleStatus" placeholder="请选择处理状态" clearable>
+            <el-select v-model="alarmQuery.handleStatus" placeholder="请选择处理状态" clearable style="width: 150px">
               <el-option label="未处理" :value="0" />
               <el-option label="处理中" :value="1" />
               <el-option label="已处理" :value="2" />
@@ -133,7 +133,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="防区" prop="zone">
-            <el-select v-model="alarmQuery.zone" placeholder="请选择防区" clearable>
+            <el-select v-model="alarmQuery.zone" placeholder="请选择防区" clearable style="width: 150px">
               <el-option label="防区1" value="zone1" />
               <el-option label="防区2" value="zone2" />
               <el-option label="防区3" value="zone3" />
@@ -250,7 +250,7 @@
             <el-input v-model="zoneQuery.zoneName" placeholder="请输入防区名称" clearable />
           </el-form-item>
           <el-form-item label="防区状态" prop="zoneStatus">
-            <el-select v-model="zoneQuery.zoneStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="zoneQuery.zoneStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="布防" :value="1" />
               <el-option label="撤防" :value="0" />
             </el-select>

pm_ui/src/views/spafjkxt/index.vue

@@ -14,7 +14,7 @@
             <el-input v-model="cameraQuery.monitorArea" placeholder="请输入监控区域" clearable />
           </el-form-item>
           <el-form-item label="楼栋" prop="building">
-            <el-select v-model="cameraQuery.building" placeholder="请选择楼栋" clearable>
+            <el-select v-model="cameraQuery.building" placeholder="请选择楼栋" clearable style="width: 150px">
               <el-option label="A栋" value="A" />
               <el-option label="B栋" value="B" />
               <el-option label="C栋" value="C" />
@@ -22,7 +22,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="设备状态" prop="deviceStatus">
-            <el-select v-model="cameraQuery.deviceStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="cameraQuery.deviceStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="在线" :value="1" />
               <el-option label="离线" :value="0" />
               <el-option label="故障" :value="2" />
@@ -106,7 +106,7 @@
             <el-input v-model="linkageQuery.linkageCamera" placeholder="请输入联动摄像机" clearable />
           </el-form-item>
           <el-form-item label="规则状态" prop="ruleStatus">
-            <el-select v-model="linkageQuery.ruleStatus" placeholder="请选择状态" clearable>
+            <el-select v-model="linkageQuery.ruleStatus" placeholder="请选择状态" clearable style="width: 150px">
               <el-option label="启用" :value="1" />
               <el-option label="禁用" :value="0" />
             </el-select>