From 1ce9d133f17e2825ff3985c96a820782c8e94445 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Tue, 3 Dec 2024 20:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=EF=BC=8C=E5=9B=9B=EF=BC=8C=E4=BA=94?=
 =?UTF-8?q?=E6=A5=BC=E4=BB=93=E5=82=A8=E5=92=8C=E7=94=9F=E4=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hw/dms/controller/DmsBaseDeviceSuplierController.java   | 6 +++---
 .../ems/record/service/impl/RecordAlarmDataServiceImpl.java | 4 ++--
 .../main/resources/mapper/record/RecordAlarmRuleMapper.xml  | 2 +-
 hw-ui/src/views/dms/activity/index.vue                      | 2 +-
 hw-ui/src/views/dms/konwledgeMaint/index.vue                | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
index 3b5d164a..e51aa650 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
@@ -40,11 +40,11 @@ public class DmsBaseDeviceSuplierController extends BaseController
      */
     @RequiresPermissions("dms:suplier:list")
     @GetMapping("/list")
-    public List<DmsBaseDeviceSuplier> list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
+    public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
     {
-//        startPage();
+        startPage();
         List<DmsBaseDeviceSuplier> list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier);
-        return list;
+        return getDataTable(list);
     }
     //todo 新加一个con 拿掉分页
 
diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/record/service/impl/RecordAlarmDataServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/record/service/impl/RecordAlarmDataServiceImpl.java
index 4beab83e..f080c9a4 100644
--- a/hw-modules/hw-ems/src/main/java/com/hw/ems/record/service/impl/RecordAlarmDataServiceImpl.java
+++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/record/service/impl/RecordAlarmDataServiceImpl.java
@@ -582,7 +582,7 @@ public class RecordAlarmDataServiceImpl implements IRecordAlarmDataService {
             if (triggerNumber == 0){
                 triggerNumber = 1L;
             }
-            if (rule.getEnergyType() == 4){
+            if (rule.getEnergyType() == 6){
                 List<RecordAlarmData> records = recordDnbInstantMapper.selectNoiseCount(time,rule.getNoise());
                 for (RecordAlarmData record : records) {
                     if (record.getAlarmCount()>triggerNumber){
@@ -597,7 +597,7 @@ public class RecordAlarmDataServiceImpl implements IRecordAlarmDataService {
                         continue;
                     }
                 }
-            }else if (rule.getEnergyType() == 6){
+            }else if (rule.getEnergyType() == 4){
                 List<RecordAlarmData> records = recordDnbInstantMapper.selectDustCount(time,rule.getPm1());
                 for (RecordAlarmData record : records) {
                     if (record.getAlarmCount()>triggerNumber){
diff --git a/hw-modules/hw-ems/src/main/resources/mapper/record/RecordAlarmRuleMapper.xml b/hw-modules/hw-ems/src/main/resources/mapper/record/RecordAlarmRuleMapper.xml
index bdda610b..614f0fcc 100644
--- a/hw-modules/hw-ems/src/main/resources/mapper/record/RecordAlarmRuleMapper.xml
+++ b/hw-modules/hw-ems/src/main/resources/mapper/record/RecordAlarmRuleMapper.xml
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where objId = #{objId}
     </select>
     <select id="selectEnergyTypes" resultType="com.hw.ems.record.domain.RecordAlarmRule">
-        select objId, rule_id, rule_name,monitor_id monitorId, collect_time, energy_type energyType, trigger_rule triggerRule, trigger_number triggerNumber, time_range timeRange, device_offline_time, notify_user, cause, create_by, create_time, update_by, update_time, dept_id, user_id  FROM `hwjy-cloud`.record_alarm_rule where energy_type != 2 and trigger_rule = 0
+        select objId, rule_id, rule_name,monitor_id monitorId, collect_time, energy_type energyType, trigger_rule triggerRule, trigger_number triggerNumber, time_range timeRange, device_offline_time, notify_user, cause, create_by, create_time, update_by, update_time, dept_id, user_id,pm1,pm2,pm10,temperature,humidity,noise  FROM `hwjy-cloud`.record_alarm_rule where energy_type != 2 and trigger_rule = 0
     </select>
 
     <insert id="insertRecordAlarmRule" parameterType="RecordAlarmRule" useGeneratedKeys="true" keyProperty="objId">
diff --git a/hw-ui/src/views/dms/activity/index.vue b/hw-ui/src/views/dms/activity/index.vue
index ce774c4e..aa7837bb 100644
--- a/hw-ui/src/views/dms/activity/index.vue
+++ b/hw-ui/src/views/dms/activity/index.vue
@@ -20,7 +20,7 @@
 <!--        </el-col>-->
         <el-col :span="8" :offset="2">
           <el-form-item label="工单状态" >
-            <el-input  placeholder="待维修" disabled />
+            <el-input  placeholder="维修完成" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">
diff --git a/hw-ui/src/views/dms/konwledgeMaint/index.vue b/hw-ui/src/views/dms/konwledgeMaint/index.vue
index 386faa5c..b6989c0f 100644
--- a/hw-ui/src/views/dms/konwledgeMaint/index.vue
+++ b/hw-ui/src/views/dms/konwledgeMaint/index.vue
@@ -350,6 +350,7 @@ export default {
     handlePictureSuccess(res, file) {
       //设置图片访问路径
       const imgObjectUrl = this.imgUpload.url2 + file.response.imgUrl;
+      console.log(process.env.VUE_APP_BASE_API)
       //这是每个成功上传图片，以对象的形式保存在一个数组中，进而以JSON格式保存在数据库中某个字段里
       let currentFile = { name: '', url: '' };
       currentFile.name = file.name;