From 85e362adc639c3a2f27ff5b2dc9a9575b2444d44 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Fri, 21 Apr 2023 13:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E8=BF=90=E7=BB=B4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/mapper/mapping/LineMapper.xml   |  2 +-
 .../mapper/mapping/TerminalMaintainMapper.xml |  7 ++++---
 .../impl/TerminalMaintainServiceImpl.java     | 14 ++++++-------
 .../impl/EventTemplateServiceImpl.java        | 21 +++++++++++++++++--
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 1c894e8f4..a97da5c46 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -846,7 +846,7 @@
         SELECT
         device.Name name,
         sub.Name substation,
-        m.Time_Id updateTime,
+        device.Update_Time updateTime,
         b.run_flag runFlag,
         b.com_flag comFlag,
         ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
index d28a02770..78c6cdffe 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
@@ -14,7 +14,7 @@
 	ifnull(g.name,'/') version,
 	ifnull(d.flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal,
 	ifnull(d1.flow,0) reamFlowMeal,
-	FORMAT(ifnull(mo.statis_value,0)/1024/1024,2) as statisValue
+    ROUND(ifnull(mo.Actual_Value,0)/1024/1024,2) statisValue
 FROM
 	pq_line a
 	INNER JOIN pq_device b ON a.id = b.id
@@ -139,10 +139,11 @@ FROM
         IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlow,
         IFNULL(d1.flow, 0) extendFlow,
         IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) +  IFNULL(d1.flow, 0) flowMeal
-        FROM  cld_dev_meal c
+        FROM  pq_line device
+        LEFT JOIN cld_dev_meal c ON device.id = c.Line_Id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        WHERE c.Line_Id = #{devId} AND d.State =1 AND d1.State =1
+        WHERE device.Id = #{devId}
     </select>
 
     <select id="getMonthFlow" resultType="com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
index d7688549c..073dc3ba9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
@@ -282,12 +282,12 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
     public List<TerminalDaliyFlowVO> getFlowManageDetail(TerminalMainQueryParam param) {
         List<TerminalDaliyFlowVO> list = new ArrayList<>();
         TerminalDaliyFlowVO flowManageDetail = terminalMaintainMapper.getFlowManageDetail(param.getDevId());
-        if (flowManageDetail ==null) {
-            flowManageDetail = new TerminalDaliyFlowVO();
-            flowManageDetail.setBaseFlow(1024f);
-            flowManageDetail.setExtendFlow(0f);
-            flowManageDetail.setFlowMeal(1024f);
-        }
+//        if (flowManageDetail ==null) {
+//            flowManageDetail = new TerminalDaliyFlowVO();
+//            flowManageDetail.setBaseFlow(1024f);
+//            flowManageDetail.setExtendFlow(0f);
+//            flowManageDetail.setFlowMeal(1024f);
+//        }
         List<DeviceDayFlow> deviceDayFlowList = getFlowManageDetailFromInfluxDB(param);
         float sum = (float) deviceDayFlowList.stream().mapToDouble(DeviceDayFlow::getDailyActualValue).sum();
         flowManageDetail.setDeviceDayFlowsList(deviceDayFlowList);
@@ -310,7 +310,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).append("' and ");
         stringBuilder.append("dev_id ='").append(param.getDevId()).append("'");
-        String sql = "select * from " + InfluxDBPublicParam.PQS_ACTUAL_FLOW + "  where " + stringBuilder.toString() + InfluxDBPublicParam.TIME_ZONE;
+        String sql = "select * from " + InfluxDBPublicParam.CLD_STATIS_FLOW + "  where " + stringBuilder.toString() + InfluxDBPublicParam.TIME_ZONE;
         QueryResult result = influxDbUtils.query(sql);
         InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
         List<DeviceDayFlow> deviceDayFlow = influxDBResultMapper.toPOJO(result, DeviceDayFlow.class);
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
index cc18fb8db..0c9e3e8e6 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
@@ -24,9 +24,9 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -173,6 +173,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
     public List<EventReportDictVO> selectReleation(String id) {
         List<EventReportDictVO> list = new ArrayList<>();
         List<String> configs = templateRelMapper.selectReleation(id);
+        configs = configs.stream().filter(t -> !isContainChinese(t)).collect(Collectors.toList());
         configs.forEach(config -> {
             EventReportDictVO eventReportDictVO = new EventReportDictVO();
             eventReportDictVO.setName(config);
@@ -182,6 +183,22 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         return list;
     }
 
+    /**
+     * 字符串是否包含中文
+     *
+     * @param str 待校验字符串
+     * @return true 包含中文字符 false 不包含中文字符
+     */
+    public static boolean isContainChinese(String str)  {
+
+//        if (StringUtils.isEmpty(str)) {
+//            throw new EmptyException("sms context is empty!");
+//        }
+        Pattern p = Pattern.compile("[\u4E00-\u9FA5|\\！|\\，|\\。|\\（|\\）|\\《|\\》|\\“|\\”|\\？|\\：|\\；|\\【|\\】]");
+        Matcher m = p.matcher(str);
+        return m.find();
+    }
+
     /**
      * 名称重复校验
      */