Browse Source

配置数据设置

yq 4 years ago
parent
commit
a145060367

+ 14 - 0
fiveep-controller/src/main/java/com/bizmatics/controller/web/RtAnalogDataController.java

@@ -7,9 +7,11 @@ import com.bizmatics.service.vo.RadCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 实时消费组模拟量
@@ -33,5 +35,17 @@ public class RtAnalogDataController {
     public ApiResult<RadCountVO> getCount(){
         return ApiResult.success(rtAnalogDataService.selectCount());
     }
+
+    /**
+     * 查看实时数据详情
+     * @param siteId 站点id
+     * @return
+     */
+    @RequestMapping("one")
+    public ApiResult<List<Map<String,Object>>> getOne(@RequestParam Integer siteId){
+        return ApiResult.success(rtAnalogDataService.getOne(siteId));
+    }
+
+
 }
 

+ 16 - 0
fiveep-controller/src/main/java/com/bizmatics/controller/web/RtSwitchDataController.java

@@ -1,13 +1,18 @@
 package com.bizmatics.controller.web;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.RtSwitchDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 实时消费组开关
  *
@@ -21,5 +26,16 @@ public class RtSwitchDataController {
     @Autowired
     private RtSwitchDataService rtSwitchDataService;
 
+    /**
+     * 查看单个信息
+     * @return
+     */
+    @RequestMapping("one")
+    public ApiResult<List<Map<String,Object>>> getOne(@RequestParam Integer siteId){
+        return ApiResult.success(rtSwitchDataService.getOne(siteId));
+    }
+
+
+
 }
 

+ 1 - 1
fiveep-controller/src/main/resources/application-dev.properties

@@ -16,7 +16,7 @@ mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
 spring.datasource.dynamic.primary=fiveep
-spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.71.145.219:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.71.145.219:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.fiveep.username=root
 spring.datasource.dynamic.datasource.fiveep.password=Wjzn2021Db
 spring.datasource.dynamic.druid.initial-size=5                                                                       

+ 5 - 0
fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtAnalogDataMapper.java

@@ -5,6 +5,8 @@ import com.bizmatics.common.mvc.base.CrudMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Map;
+
 /**
  * <p>
  *  Mapper 接口
@@ -26,4 +28,7 @@ public interface RtAnalogDataMapper extends CrudMapper<RtAnalogData> {
     Double selectTotalLoad(@Param("userId") Integer userId,
                         @Param("siteId") Integer siteId);
 
+
+    Map<String,Object> getOneMap(@Param("siteId")Integer siteId);
+
 }

+ 6 - 0
fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtSwitchDataMapper.java

@@ -2,6 +2,9 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.model.RtSwitchData;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.bizmatics.common.mvc.base.CrudMapper;
  */
 public interface RtSwitchDataMapper extends CrudMapper<RtSwitchData> {
 
+
+    Map<String,Object> getOneMap(@Param("siteId") Integer siteId);
+
 }

+ 77 - 67
fiveep-persistence/src/main/resources/mapper/mysql/RtAnalogDataMapper.xml

@@ -2,73 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.persistence.mapper.RtAnalogDataMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtAnalogData">
-        <id column="id" property="id" />
-        <result column="deviceName" property="deviceName" />
-        <result column="Busot" property="Busot" />
-        <result column="COS" property="cos" />
-        <result column="COSa" property="COSa" />
-        <result column="COSb" property="COSb" />
-        <result column="COSc" property="COSc" />
-        <result column="Demand" property="Demand" />
-        <result column="DevResetTimes" property="DevResetTimes" />
-        <result column="DeviceTemp" property="DeviceTemp" />
-        <result column="Epn" property="Epn" />
-        <result column="Epn1" property="Epn1" />
-        <result column="Epn2" property="Epn2" />
-        <result column="Epn3" property="Epn3" />
-        <result column="Epn4" property="Epn4" />
-        <result column="Epp" property="Epp" />
-        <result column="Epp1" property="Epp1" />
-        <result column="Epp2" property="Epp2" />
-        <result column="Epp3" property="Epp3" />
-        <result column="Epp4" property="Epp4" />
-        <result column="Eqn" property="Eqn" />
-        <result column="Eqp" property="Eqp" />
-        <result column="F" property="f" />
-        <result column="I0" property="i0" />
-        <result column="I2" property="i2" />
-        <result column="IHa" property="IHa" />
-        <result column="IHb" property="IHb" />
-        <result column="IHc" property="IHc" />
-        <result column="Ia" property="Ia" />
-        <result column="Ib" property="Ib" />
-        <result column="Ic" property="Ic" />
-        <result column="Ir" property="Ir" />
-        <result column="LastDayMD" property="LastDayMD" />
-        <result column="LastDayMDt" property="LastDayMDt" />
-        <result column="P" property="p" />
-        <result column="Pa" property="Pa" />
-        <result column="Pb" property="Pb" />
-        <result column="Pc" property="Pc" />
-        <result column="Q" property="q" />
-        <result column="Qa" property="Qa" />
-        <result column="Qb" property="Qb" />
-        <result column="Qc" property="Qc" />
-        <result column="SignalIntensity" property="SignalIntensity" />
-        <result column="T1" property="t1" />
-        <result column="T2" property="t2" />
-        <result column="T3" property="t3" />
-        <result column="T4" property="t4" />
-        <result column="THDUa" property="THDUa" />
-        <result column="THDUb" property="THDUb" />
-        <result column="THDUc" property="THDUc" />
-        <result column="Ua" property="Ua" />
-        <result column="Uab" property="Uab" />
-        <result column="Ub" property="Ub" />
-        <result column="Ubc" property="Ubc" />
-        <result column="UblU0" property="UblU0" />
-        <result column="UblU2" property="UblU2" />
-        <result column="Uc" property="Uc" />
-        <result column="Uca" property="Uca" />
-        <result column="Udt" property="Udt" />
-        <result column="Ul" property="Ul" />
-        <result column="Upt" property="Upt" />
-        <result column="Ust" property="Ust" />
-        <result column="freezingTime" property="freezingTime" />
-        <result column="dataTime" property="dataTime" />
-    </resultMap>
     <select id="selectTotalLoad" resultType="java.lang.Double">
         select COALESCE(SUM(P),0)
         from user_site as us
@@ -85,5 +18,82 @@
             </if>
         </where>
     </select>
+    <select id="getOneMap" resultType="java.util.Map">
+        select
+        rad.`id` as '伍继电力test_183消费组模拟量实时数据表ID',
+          `deviceName` as '阿里云平台设备名称',
+          `Busot` as '母线停电次数',
+          `COS` as '三相功率因数',
+          `COSa` as 'A相功率因数',
+          `COSb` as 'B相功率因数',
+          `COSc` as 'C相功率因数',
+          `Demand` as '实时有功需量',
+          `DevResetTimes` as '设备复位次数',
+          `DeviceTemp` as '设备温度',
+          `Epn` as '三相反向有功电度',
+          `Epn1` as '尖段反向有功电度',
+          `Epn2` as '峰段反向有功电度',
+          `Epn3` as '平段反向有功电度',
+          `Epn4` as '谷段反向有功电度',
+          `Epp` as '三相正向有功电度',
+          `Epp1` as '尖段正向有功电度',
+          `Epp2` as '峰段正向有功电度',
+          `Epp3` as '平段正向有功电度',
+          `Epp4` as '谷段正向有功电度',
+          `Eqn` as '三相反向无功电度',
+          `Eqp` as '三相正向无功电度',
+          `F` as '频率',
+          `I0` as '零序电流',
+          `I2` as '负序电流',
+          `IHa` as 'A相总谐波电流',
+          `IHb` as 'B相总谐波电流',
+          `IHc` as 'C相总谐波电流',
+          `Ia` as 'A相电流',
+          `Ib` as 'B相电流',
+          `Ic` as 'C相电流',
+          `Ir` as '剩余电流',
+          `LastDayMD` as '昨日有功最大需量',
+          `LastDayMDt` as '昨日有功最大需量发生时间',
+          `P` as '三相总有功功率',
+          `Pa` as 'A相有功功率',
+          `Pb` as 'B相有功功率',
+          `Pc` as 'C相有功功率',
+          `Q` as '三相总无功功率',
+          `Qa` as 'A相无功功率',
+          `Qb` as 'B相无功功率',
+          `Qc` as 'C相无功功率',
+          `SignalIntensity` as '信号强度',
+          `T1` as '第1路温度',
+          `T2` as '第2路温度',
+          `T3` as '第3路温度',
+          `T4` as '第4路温度',
+          `THDUa` as 'A相电压THD',
+          `THDUb` as 'B相电压THD',
+          `THDUc` as 'C相电压THD',
+          `Ua` as 'A相电压',
+          `Uab` as 'AB线电压',
+          `Ub` as 'B相电压',
+          `Ubc` as 'BC线电压',
+          `UblU0` as '零序电压不平衡度',
+          `UblU2` as '负序电压不平衡度',
+          `Uc` as 'C相电压',
+          `Uca` as 'CA线电压',
+          `Udt` as '电压暂降次数',
+          `Ul` as '线路侧电压',
+          `Upt` as '电压暂升次数',
+          `Ust` as '电压短时中断次数',
+          `freezingTime` as '冻结时间',
+          `dataTime` as '上报时间'
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join rt_analog_data as rad
+        on d.device_code = rad.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

+ 49 - 41
fiveep-persistence/src/main/resources/mapper/mysql/RtSwitchDataMapper.xml

@@ -2,46 +2,54 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.persistence.mapper.RtSwitchDataMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtSwitchData">
-        <id column="id" property="id" />
-        <result column="deviceName" property="deviceName" />
-        <result column="ArcA" property="ArcA" />
-        <result column="ArcB" property="ArcB" />
-        <result column="ArcC" property="ArcC" />
-        <result column="BusOutage" property="BusOutage" />
-        <result column="DI1" property="di1" />
-        <result column="DI2" property="di2" />
-        <result column="DI3" property="di3" />
-        <result column="DO1" property="do1" />
-        <result column="DO2" property="do2" />
-        <result column="DevAbnormal" property="DevAbnormal" />
-        <result column="EleAlarm" property="EleAlarm" />
-        <result column="FireAlarm" property="FireAlarm" />
-        <result column="LoadBrkState" property="LoadBrkState" />
-        <result column="LoadLive" property="LoadLive" />
-        <result column="MeasFailure" property="MeasFailure" />
-        <result column="Mute" property="Mute" />
-        <result column="OverDemandP" property="OverDemandP" />
-        <result column="OverDemandS" property="OverDemandS" />
-        <result column="OverEvT" property="OverEvT" />
-        <result column="OverI" property="OverI" />
-        <result column="OverIH" property="OverIH" />
-        <result column="OverIr" property="OverIr" />
-        <result column="OverT1" property="OverT1" />
-        <result column="OverT2" property="OverT2" />
-        <result column="OverT3" property="OverT3" />
-        <result column="OverT4" property="OverT4" />
-        <result column="OverUH" property="OverUH" />
-        <result column="OverV" property="OverV" />
-        <result column="PhaseLoss" property="PhaseLoss" />
-        <result column="ResDI1" property="ResDI1" />
-        <result column="ResDI2" property="ResDI2" />
-        <result column="ResDI3" property="ResDI3" />
-        <result column="ResDI4" property="ResDI4" />
-        <result column="Trip" property="Trip" />
-        <result column="UnderV" property="UnderV" />
-        <result column="dataTime" property="dataTime" />
-    </resultMap>
+
+    <select id="getOneMap" resultType="java.util.Map">
+        select
+        `ArcA` as 'A相燃弧',
+        `ArcB` as 'B相燃弧',
+        `ArcC` as 'C相燃弧',
+        `BusOutage` as '母线停电',
+        `DI1` as '开入1',
+        `DI2` as '开入2',
+        `DI3` as '开入3',
+        `DO1` as '开出1',
+        `DO2` as '开出2',
+        `DevAbnormal` as '设备异常',
+        `EleAlarm` as '线路电气故障总',
+        `FireAlarm` as '火灾预警总',
+        `LoadBrkState` as '线路开关状态',
+        `LoadLive` as '线路带电',
+        `MeasFailure` as '测量通道故障',
+        `Mute` as '消音',
+        `OverDemandP` as '有功需量超限',
+        `OverDemandS` as '视在需量超限',
+        `OverEvT` as '环境温度越限',
+        `OverI` as '电流越限',
+        `OverIH` as '电流谐波越限',
+        `OverIr` as '剩余电流越限',
+        `OverT1` as '测温点1超温',
+        `OverT2` as '测温点2超温',
+        `OverT3` as '测温点3超温',
+        `OverT4` as '测温点4超温',
+        `OverUH` as '电压谐波越限',
+        `OverV` as '过压',
+        `PhaseLoss` as '缺相',
+        `ResDI1` as '备用遥信1',
+        `ResDI2` as '备用遥信2',
+        `ResDI3` as '备用遥信3',
+        `ResDI4` as '备用遥信4',
+        `Trip` as '跳闸',
+        `UnderV` as '欠压'
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join rt_switch_data as rsd
+        on d.device_code = rsd.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

+ 11 - 0
fiveep-service/src/main/java/com/bizmatics/service/RtAnalogDataService.java

@@ -5,6 +5,7 @@ import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.service.vo.RadCountVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,6 +18,16 @@ import java.util.List;
 public interface RtAnalogDataService extends CrudService<RtAnalogData> {
 
 
+    /**
+     * 汇总
+     * @return
+     */
     RadCountVO selectCount();
 
+    /**
+     * 查看实时数据详情
+     * @param siteId 站点id
+     * @return
+     */
+    List<Map<String,Object>> getOne(Integer siteId);
 }

+ 9 - 0
fiveep-service/src/main/java/com/bizmatics/service/RtSwitchDataService.java

@@ -3,6 +3,9 @@ package com.bizmatics.service;
 import com.bizmatics.model.RtSwitchData;
 import com.bizmatics.common.mvc.base.CrudService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,10 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 public interface RtSwitchDataService extends CrudService<RtSwitchData> {
 
+
+    /**
+     * 查看单个信息
+     * @return
+     */
+    List<Map<String,Object>> getOne(Integer siteId);
 }

+ 53 - 53
fiveep-service/src/main/java/com/bizmatics/service/config/SessionFilter.java

@@ -1,53 +1,53 @@
-package com.bizmatics.service.config;
-
-
-import com.bizmatics.common.core.exception.BusinessException;
-import com.bizmatics.model.User;
-import com.bizmatics.service.util.SessionLocal;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author yq
- * @date 2021/7/8 10:35
- */
-@Component
-@Slf4j
-@WebFilter(urlPatterns = "/*", filterName = "reqResFilter")
-public class SessionFilter implements Filter {
-
-    private static final Set<String> ALLOWED_PATHS = Collections.unmodifiableSet(new HashSet<>(
-            Collections.singletonList("/user/login")));
-
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest)servletRequest;
-        String path = request.getRequestURI().substring(request.getContextPath().length()).replaceAll("[/]+$", "");
-        boolean allowedPath = ALLOWED_PATHS.contains(path);
-        if (!allowedPath){
-            HttpSession session = request.getSession();
-            if(session.getAttribute( "sessionuser") != null) {
-                if(SessionLocal.getUser() == null) {
-                    log.info("【当前线程"+Thread.currentThread().getName()+"中用户信息为空,从session中set到ThreadLocal.】");
-                    SessionLocal.setUser( (User)session.getAttribute( "sessionuser") );
-                }
-            } else {
-                throw new BusinessException("用户未登录请先登录");
-            }
-        }
-        chain.doFilter(servletRequest,servletResponse);
-    }
-
-}
+//package com.bizmatics.service.config;
+//
+//
+//import com.bizmatics.common.core.exception.BusinessException;
+//import com.bizmatics.model.User;
+//import com.bizmatics.service.util.SessionLocal;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import javax.servlet.*;
+//import javax.servlet.annotation.WebFilter;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpSession;
+//import java.io.IOException;
+//import java.util.Arrays;
+//import java.util.Collections;
+//import java.util.HashSet;
+//import java.util.Set;
+//
+///**
+// * @author yq
+// * @date 2021/7/8 10:35
+// */
+//@Component
+//@Slf4j
+//@WebFilter(urlPatterns = "/*", filterName = "reqResFilter")
+//public class SessionFilter implements Filter {
+//
+//    private static final Set<String> ALLOWED_PATHS = Collections.unmodifiableSet(new HashSet<>(
+//            Collections.singletonList("/user/login")));
+//
+//
+//    @Override
+//    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException {
+//        HttpServletRequest request = (HttpServletRequest)servletRequest;
+//        String path = request.getRequestURI().substring(request.getContextPath().length()).replaceAll("[/]+$", "");
+//        boolean allowedPath = ALLOWED_PATHS.contains(path);
+//        if (!allowedPath){
+//            HttpSession session = request.getSession();
+//            if(session.getAttribute( "sessionuser") != null) {
+//                if(SessionLocal.getUser() == null) {
+//                    log.info("【当前线程"+Thread.currentThread().getName()+"中用户信息为空,从session中set到ThreadLocal.】");
+//                    SessionLocal.setUser( (User)session.getAttribute( "sessionuser") );
+//                }
+//            } else {
+//                throw new BusinessException("用户未登录请先登录");
+//            }
+//        }
+//        chain.doFilter(servletRequest,servletResponse);
+//    }
+//
+//}

+ 43 - 3
fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java

@@ -16,7 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -33,8 +35,6 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
     @Autowired
     private UserSiteService userSiteService;
     @Autowired
-    private RtAnalogDataMapper rtAnalogDataMapper;
-    @Autowired
     private SiteService siteService;
 
 
@@ -47,7 +47,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         AtomicReference<Integer> norMalLoad = new AtomicReference<>(0);
         userSites.forEach(userSite -> {
             Site site = siteService.getOne(Wrappers.lambdaQuery(Site.class).eq(Site::getId, userSite.getId()));
-            Double aDouble = rtAnalogDataMapper.selectTotalLoad(userId, site.getId());
+            Double aDouble = baseMapper.selectTotalLoad(userId, site.getId());
             double div = Arith.div(aDouble, Double.parseDouble(site.getInstalledCapacity()));
             if (div < 0.4){
                 easyLoad.getAndSet(easyLoad.get() + 1);
@@ -64,4 +64,44 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         radCountVO.setNorMalLoad(Arith.div(norMalLoad.get(),count));
         return radCountVO;
     }
+
+    @Override
+    public List<Map<String, Object>> getOne(Integer siteId) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> radMap = baseMapper.getOneMap(siteId);
+        for (String name:radMap.keySet()) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("name",name);
+            map.put("value",addUnit(name,radMap.get(name).toString()));
+            list.add(map);
+        }
+        return list;
+    }
+
+    /**
+     * 添加数据单位
+     * @return
+     */
+    public String addUnit(String name,String value){
+        if (name.endsWith("电压")){
+            return value+"V";
+        }else if (name.endsWith("电流")){
+            return value+"A";
+        }else if (name.endsWith("温度")){
+            return value+"C";
+        }else if (name.endsWith("频率")){
+            return value+"Hz";
+        }else if (name.endsWith("有功功率") || name.endsWith("需量")){
+            return value+"KW";
+        }else if (name.endsWith("无功功率")){
+            return value+"KVar";
+        }else if (name.endsWith("不平衡度") || name.endsWith("电压畸变率")){
+            return value+"%";
+        }else if (name.endsWith("次数")){
+            return value+"次";
+        }else if (name.endsWith("电度") || name.endsWith("有功")){
+            return value+"KWh";
+        }
+        return value;
+    }
 }

+ 18 - 0
fiveep-service/src/main/java/com/bizmatics/service/impl/RtSwitchDataServiceImpl.java

@@ -6,6 +6,11 @@ import com.bizmatics.service.RtSwitchDataService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMapper, RtSwitchData> implements RtSwitchDataService {
 
+
+    @Override
+    public List<Map<String, Object>> getOne(Integer siteId) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> radMap = baseMapper.getOneMap(siteId);
+        for (String name:radMap.keySet()) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("name",name);
+            map.put("value",radMap.get(name));
+            list.add(map);
+        }
+        return list;
+    }
 }