Merge branch 'master' into feature-management-2021-9-16

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/util/Convert.java

@@ -11,7 +11,7 @@ import java.util.Set;
 /**
  * 类型转换器
  *
- * @author ruoyi
+ * @author yq
  */
 public final class Convert {
 

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/util/IdUtils.java

@@ -4,7 +4,7 @@ package com.bizmatics.common.core.util;
 /**
  * ID生成器工具类
  * 
- * @author ruoyi
+ * @author yq
  */
 public class IdUtils
 {

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/util/UUIDUtils.java

@@ -11,7 +11,7 @@ import java.util.concurrent.ThreadLocalRandom;
 /**
  * 提供通用唯一识别码（universally unique identifier）（UUID）实现
  *
- * @author ruoyi
+ * @author yq
  */
 public final class UUIDUtils implements java.io.Serializable, Comparable<UUIDUtils>
 {

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/util/sign/Base64.java

@@ -3,7 +3,7 @@ package com.bizmatics.common.core.util.sign;
 /**
  * Base64工具类
  * 
- * @author ruoyi
+ * @author yq
  */
 public final class Base64
 {

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/util/sign/Md5Utils.java

@@ -8,7 +8,7 @@ import java.security.MessageDigest;
 /**
  * Md5加密方法
  * 
- * @author ruoyi
+ * @author yq
  */
 public class Md5Utils
 {

fiveep-common/fiveep-common-mvc/src/main/java/com/bizmatics/common/mvc/utils/IpUtils.java

@@ -8,7 +8,7 @@ import java.util.Objects;
 /**
  * 获取IP方法
  *
- * @author ruoyi
+ * @author yq
  */
 public final class  IpUtils {
 

fiveep-common/fiveep-common-mvc/src/main/java/com/bizmatics/common/mvc/utils/ServletUtils.java

@@ -14,7 +14,7 @@ import java.io.IOException;
 /**
  * 客户端工具类
  *
- * @author ruoyi
+ * @author yq
  */
 public class ServletUtils {
     /**

fiveep-controller/src/main/java/com/bizmatics/controller/web/HtAnalogDataController.java

@@ -2,11 +2,8 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
-import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.model.vo.DataManagementVO;
-import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.service.HtAnalogDataService;
-import com.bizmatics.service.impl.HtAnalogDataServiceImpl;
 import com.bizmatics.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -106,6 +103,19 @@ public class HtAnalogDataController {
         return ApiResult.success(htAnalogDataService.getElectricIco(siteId, date));
     }
 
+    /**
+     * 历史电流电压评分
+     * @param deviceName
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping("rtRealScore")
+    public ApiResult<List<RealScoreVO>> rtRealScore(@RequestParam String deviceName,
+                                                            @RequestParam Date startTime,
+                                                            @RequestParam Date endTime) {
+        return ApiResult.success(htAnalogDataService.rtRealScore(deviceName, startTime,endTime));
+    }
 
     /**
      *数据管理-同比分析报表-统计图数据查询

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

@@ -4,10 +4,10 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.RtAnalogDataService;
 import com.bizmatics.service.vo.RadCountVO;
+import com.bizmatics.service.vo.RealScoreVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -59,6 +59,16 @@ public class RtAnalogDataController {
         return ApiResult.success(rtAnalogDataService.getEpLoad(siteId));
     }
 
+    /**
+     * 电能质量(实时评分)
+     * @param deviceName 设备编号
+     * @return
+     */
+    @GetMapping("realScore")
+    public ApiResult<RealScoreVO> realScore(@RequestParam String deviceName){
+        return ApiResult.success(rtAnalogDataService.realScore(deviceName));
+    }
+
     @RequestMapping("DataReport")
     public ApiResult<List<Map<String,Object>>> getDataReport(@RequestParam Integer siteId,
                                                              @RequestParam(required = false) Date startTime,

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/CaptchaController.java

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * 验证码操作处理
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 public class CaptchaController
@@ -42,7 +42,7 @@ public class CaptchaController
     private RedisHelper redisHelper;
     
     // 验证码类型
-    @Value("${ruoyi.captchaType}")
+    @Value("${wj.captchaType}")
     private String captchaType;
     
     @Autowired

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysConfigController.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 参数配置 信息操作处理
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/config")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDeptController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 /**
  * 部门信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/dept")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictDataController.java

@@ -19,7 +19,7 @@ import java.util.Objects;
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/dict/data")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysDictTypeController.java

@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/dict/type")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysLoginController.java

@@ -23,7 +23,7 @@ import java.util.*;
 /**
  * 登录验证
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 public class SysLoginController

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysMenuController.java

@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 菜单信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/menu")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysNoticeController.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 公告 信息操作处理
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/notice")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysPostController.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 岗位信息操作处理
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/post")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysProfileController.java

@@ -20,7 +20,7 @@ import java.util.Map;
 /**
  * 个人信息 业务处理
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/user/profile")
@@ -115,7 +115,7 @@ public class SysProfileController extends BaseController
 //        if (!file.isEmpty())
 //        {
 //            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+//            String avatar = FileUploadUtils.upload(yqConfig.getAvatarPath(), file);
 //            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
 //            {
 //                ApiResult ajax = ApiResult.success();

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysRoleController.java

@@ -26,7 +26,7 @@ import java.util.Objects;
 /**
  * 角色信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/role")

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 /**
  * 用户信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @RestController
 @RequestMapping("/system/user")

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

@@ -95,11 +95,11 @@ xss.excludes: /system/notice
 xss.urlPatterns: /system/*,/monitor/*,/tool/*
 
 # project
-ruoyi.name: RuoYi
-ruoyi.version: 3.6.0
-ruoyi.copyrightYear: 2021
-ruoyi.demoEnabled: true
-ruoyi.addressEnabled: false
-ruoyi.captchaType: math
+wj.name: yq
+wj.version: 3.6.0
+wj.copyrightYear: 2021
+wj.demoEnabled: true
+wj.addressEnabled: false
+wj.captchaType: math
 
 spring.messages.basename= i18n/messages

fiveep-model/src/main/java/com/bizmatics/model/base/TreeSelect.java

@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 /**
  * Treeselect树结构实体类
  * 
- * @author ruoyi
+ * @author yq
  */
 public class TreeSelect implements Serializable
 {

fiveep-model/src/main/java/com/bizmatics/model/constants/Constants.java

@@ -5,7 +5,7 @@ import io.jsonwebtoken.Claims;
 /**
  * 通用常量信息
  * 
- * @author ruoyi
+ * @author yq
  */
 public class Constants
 {

fiveep-model/src/main/java/com/bizmatics/model/constants/UserConstants.java

@@ -3,7 +3,7 @@ package com.bizmatics.model.constants;
 /**
  * 用户常量信息
  * 
- * @author ruoyi
+ * @author yq
  */
 public class UserConstants
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysConfig.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 /**
  * 参数配置表 sys_config
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysConfig extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysDept.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * 部门表 sys_dept
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysDept extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysDictData.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 /**
  * 字典数据表 sys_dict_data
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysDictData extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysDictType.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 /**
  * 字典类型表 sys_dict_type
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysDictType extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysLogininfor.java

@@ -9,7 +9,7 @@ import java.util.Date;
 /**
  * 系统访问记录表 sys_logininfor
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysLogininfor extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysMenu.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 菜单权限表 sys_menu
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysMenu extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysNotice.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.Size;
 /**
  * 通知公告表 sys_notice
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysNotice extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysOperLog.java

@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * 操作日志记录表 oper_log
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysOperLog extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysPost.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 /**
  * 岗位表 sys_post
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysPost extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysRole.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 /**
  * 角色表 sys_role
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysRole extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysRoleDept.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 角色和部门关联 sys_role_dept
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysRoleDept
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysRoleMenu.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 角色和菜单关联 sys_role_menu
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysRoleMenu
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysUser.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 用户对象 sys_user
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysUser extends BaseEntity
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysUserOnline.java

@@ -3,7 +3,7 @@ package com.bizmatics.model.system;
 /**
  * 当前在线会话
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysUserOnline
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysUserPost.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 用户和岗位关联 sys_user_post
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysUserPost
 {

fiveep-model/src/main/java/com/bizmatics/model/system/SysUserRole.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 用户和角色关联 sys_user_role
  * 
- * @author ruoyi
+ * @author yq
  */
 public class SysUserRole
 {

fiveep-model/src/main/java/com/bizmatics/model/vo/MetaVo.java

@@ -7,7 +7,7 @@ import com.bizmatics.model.constants.Constants;
 /**
  * 路由显示信息
  * 
- * @author ruoyi
+ * @author yq
  */
 public class MetaVo
 {

fiveep-model/src/main/java/com/bizmatics/model/vo/RouterVo.java

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * 路由配置信息
  * 
- * @author ruoyi
+ * @author yq
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RouterVo

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/AlarmPowerMapper.java

@@ -2,8 +2,8 @@ package com.bizmatics.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.model.AlarmPower;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.AlarmPower;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -63,5 +63,20 @@ public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
                           @Param("startTime") Date startTime,
                           @Param("endTime") Date endTime);
 
+    Page<Map<String,Object>> gradeSiteList(IPage<Map<String,Object>> page,
+                                           @Param("userId") Integer userId,
+                                           @Param("siteId") Integer siteId,
+                                           @Param("startTime") Date startTime,
+                                           @Param("endTime") Date endTime,
+                                           @Param("oneGrads") List<String> oneGrads,
+                                           @Param("otherGrads") List<String> otherGrads);
+    Page<AlarmPower> gradeList(IPage<AlarmPower> page,
+                               @Param("userId") Integer userId,
+                               @Param("siteId") Integer siteId,
+                               @Param("startTime") Date startTime,
+                               @Param("endTime") Date endTime,
+                               @Param("grades") List<String> grades,
+                               @Param("gradeType") Integer gradeType);
+
     List<AlarmPower> getLoopStatusListMap(@Param("siteId") Integer siteId);
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysConfigMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 参数配置 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysConfigMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysDeptMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 部门管理 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysDeptMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysDictDataMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 字典表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysDictDataMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysDictTypeMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 字典表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysDictTypeMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysLogininforMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 系统访问日志情况信息 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysLogininforMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysMenuMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 菜单表 数据层
  *
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysMenuMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysNoticeMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 通知公告表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysNoticeMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysOperLogMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 操作日志 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysOperLogMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysPostMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 岗位信息 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysPostMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysRoleDeptMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 角色与部门关联表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysRoleDeptMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysRoleMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 角色表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysRoleMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysRoleMenuMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 角色与菜单关联表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysRoleMenuMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysUserMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 用户表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysUserMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysUserPostMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 用户与岗位关联表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysUserPostMapper

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysUserRoleMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 用户与角色关联表 数据层
  * 
- * @author ruoyi
+ * @author yq
  */
 @Repository
 public interface SysUserRoleMapper

fiveep-persistence/src/main/resources/mapper/mysql/AlarmPowerMapper.xml

@@ -115,6 +115,84 @@
             </if>
         </where>
     </select>
+    <select id="gradeSiteList" resultType="java.util.Map">
+        SELECT us.site_id as siteId,s.site_name as siteName
+        (select count(*)
+        FROM alarm_power as ap
+        WHERE d.device_code = ap.device_code
+        <if test="oneGrads != null and oneGrads.size() > 0">
+            and ap.meas_name in
+            <foreach collection="oneGrads" item="name" index="index" open="(" close=")" separator=",">
+                #{name}
+            </foreach>
+        </if>
+        <if test="startTime != null and endTime != null">
+            and ap.sending_time between #{startTime} and #{endTime}
+        </if>) as oneGrade,
+        (select count(*)
+        FROM alarm_power as ap
+        WHERE d.device_code = ap.device_code
+        <if test="otherGrads != null and otherGrads.size() > 0">
+            and ap.meas_name in
+            <foreach collection="otherGrads" item="name" index="index" open="(" close=")" separator=",">
+                #{name}
+            </foreach>
+        </if>
+        <if test="startTime != null and endTime != null">
+            and ap.sending_time between #{startTime} and #{endTime}
+        </if>) as twoGrade,
+        (select count(*)
+        FROM alarm_power as ap
+        WHERE d.device_code = ap.device_code
+        <if test="startTime != null and endTime != null">
+            and ap.sending_time between #{startTime} and #{endTime}
+        </if>) as countGrade
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join site as s
+        on s.id = us.site_id
+        <where>
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+        </where>
+        group by us.site_id
+    </select>
+    <select id="gradeList" resultType="com.bizmatics.model.AlarmPower">
+        select ap.*
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join alarm_power as ap
+        on d.device_code = ap.device_code
+        <where>
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+            <if test="startTime != null and endTime != null">
+                and ap.sending_time between #{startTime} and #{endTime}
+            </if>
+            <if test="gradeType == 1 or gradeType == 3">
+                and ap.meas_name in
+                <foreach collection="otherGrads" item="name" index="index" open="(" close=")" separator=",">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="gradeType == 2">
+                and ap.meas_name not in
+                <foreach collection="otherGrads" item="name" index="index" open="(" close=")" separator=",">
+                    #{name}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/AlarmPowerService.java

@@ -1,8 +1,9 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.AlarmPower;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.AlarmPower;
+import com.bizmatics.service.vo.AlarmGradeVO;
 import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
 
@@ -42,6 +43,29 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      */
     CommonPage<AlarmPower> page(Date startTime, Date endTime, Integer status, Integer siteId, Integer current, Integer size);
 
+    /**
+     * 告警等级统计
+     * @param siteId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    CommonPage<AlarmGradeVO> alarmGradeCount(Integer siteId,Date startTime,Date endTime,Integer current,Integer size);
+
+    /**
+     * 告警等级集合
+     * @param siteId
+     * @param startTime
+     * @param endTime
+     * @param current
+     * @param size
+     * @param type
+     * @return
+     */
+    CommonPage<AlarmPower> alarmGradeList(Integer siteId,Date startTime,Date endTime,Integer current,Integer size,Integer type);
+
+
+
     List<Map<String,Object>> getLoopStatusList(Integer siteId);
 
 

fiveep-service/src/main/java/com/bizmatics/service/HtAnalogDataService.java

@@ -3,10 +3,7 @@ package com.bizmatics.service;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.model.vo.DataManagementVO;
-import com.bizmatics.service.vo.CommonIcoOneVO;
-import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.HadCountVO;
-import com.bizmatics.service.vo.TimeShareVO;
+import com.bizmatics.service.vo.*;
 
 import java.util.Date;
 import java.util.List;
@@ -81,16 +78,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
      * @param endTime
      * @return
      */
-    List<HtAnalogData> listByDeviceAndDate(String deviceName,Date startTime,Date endTime);
-
-    /**
-     * 三相不平衡
-     * @param deviceName
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    List<CommonIcoVO> balun(String deviceName,Date startTime,Date endTime);
+    List<RealScoreVO> rtRealScore(String deviceName, Date startTime, Date endTime);
 
     List<CommonIcoVO> yearOnYearList(DataManagementVO dataManagementVO);
 

fiveep-service/src/main/java/com/bizmatics/service/RtAnalogDataService.java

@@ -1,8 +1,11 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.RtAnalogData;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.RtAnalogData;
+import com.bizmatics.model.SiteDynamicProperties;
 import com.bizmatics.service.vo.RadCountVO;
+import com.bizmatics.service.vo.RealScoreVO;
 
 import java.util.Date;
 import java.util.List;
@@ -44,8 +47,16 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
      * @param deviceName
      * @return
      */
-    List<String> realScore(String deviceName);
+    RealScoreVO realScore(String deviceName);
 
+    /**
+     * 填充数据
+     * @param rtAnalogData
+     * @param siteDynamicProperties
+     * @param deviceAttribute
+     * @return
+     */
+    RealScoreVO fillRealScoreData(RtAnalogData rtAnalogData, SiteDynamicProperties siteDynamicProperties, DeviceAttribute deviceAttribute);
 
     /**
      *

fiveep-service/src/main/java/com/bizmatics/service/aop/DataScopeAspect.java

@@ -22,7 +22,7 @@ import java.util.Objects;
 /**
  * 数据过滤处理
  *
- * @author ruoyi
+ * @author yq
  */
 @Aspect
 @Component

fiveep-service/src/main/java/com/bizmatics/service/aop/RepeatSubmit.java

@@ -10,7 +10,7 @@ import java.lang.annotation.Target;
 /**
  * 自定义注解防止表单重复提交
  * 
- * @author ruoyi
+ * @author yq
  *
  */
 @Inherited

fiveep-service/src/main/java/com/bizmatics/service/config/CaptchaConfig.java

@@ -12,7 +12,7 @@ import static com.google.code.kaptcha.Constants.*;
 /**
  * 验证码配置
  *
- * @author ruoyi
+ * @author yq
  */
 @Configuration
 public class CaptchaConfig

fiveep-service/src/main/java/com/bizmatics/service/config/FilterConfig.java

@@ -17,7 +17,7 @@ import java.util.Map;
 /**
  * Filter配置
  *
- * @author ruoyi
+ * @author yq
  */
 @Configuration
 @ConditionalOnProperty(value = "xss.enabled", havingValue = "true")

fiveep-service/src/main/java/com/bizmatics/service/config/KaptchaTextCreator.java

@@ -7,7 +7,7 @@ import java.util.Random;
 /**
  * 验证码文本生成器
  * 
- * @author ruoyi
+ * @author yq
  */
 public class KaptchaTextCreator extends DefaultTextCreator
 {

fiveep-service/src/main/java/com/bizmatics/service/config/ResourcesConfig.java

@@ -15,7 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 /**
  * 通用配置
  * 
- * @author ruoyi
+ * @author yq
  */
 @Configuration
 public class ResourcesConfig implements WebMvcConfigurer
@@ -27,7 +27,7 @@ public class ResourcesConfig implements WebMvcConfigurer
     public void addResourceHandlers(ResourceHandlerRegistry registry)
     {
 //        /** 本地文件上传路径 */
-//        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+//        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + yqConfig.getProfile() + "/");
 //
 //        /** swagger配置 */
 //        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");

fiveep-service/src/main/java/com/bizmatics/service/config/SecurityConfig.java

@@ -22,7 +22,7 @@ import org.springframework.web.filter.CorsFilter;
 /**
  * spring security配置
  * 
- * @author ruoyi
+ * @author yq
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter

fiveep-service/src/main/java/com/bizmatics/service/config/RuoYiConfig.java → fiveep-service/src/main/java/com/bizmatics/service/config/WjConfig.java

@@ -6,11 +6,11 @@ import org.springframework.stereotype.Component;
 /**
  * 读取项目相关配置
  * 
- * @author ruoyi
+ * @author yq
  */
 @Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+@ConfigurationProperties(prefix = "wj")
+public class WjConfig
 {
     /** 项目名称 */
     private String name;
@@ -77,7 +77,7 @@ public class RuoYiConfig
 
     public void setProfile(String profile)
     {
-        RuoYiConfig.profile = profile;
+        WjConfig.profile = profile;
     }
 
     public static boolean isAddressEnabled()
@@ -87,7 +87,7 @@ public class RuoYiConfig
 
     public void setAddressEnabled(boolean addressEnabled)
     {
-        RuoYiConfig.addressEnabled = addressEnabled;
+        WjConfig.addressEnabled = addressEnabled;
     }
 
     /**

fiveep-service/src/main/java/com/bizmatics/service/config/security/LoginUser.java

@@ -12,7 +12,7 @@ import java.util.Set;
 /**
  * 登录用户身份权限
  * 
- * @author ruoyi
+ * @author yq
  */
 public class LoginUser implements UserDetails
 {

fiveep-service/src/main/java/com/bizmatics/service/config/security/UserDetailsServiceImpl.java

@@ -18,7 +18,7 @@ import java.util.Objects;
 /**
  * 用户验证处理
  *
- * @author ruoyi
+ * @author yq
  */
 @Service
 public class UserDetailsServiceImpl implements UserDetailsService

fiveep-service/src/main/java/com/bizmatics/service/config/security/filter/JwtAuthenticationTokenFilter.java

@@ -21,7 +21,7 @@ import java.util.Objects;
 /**
  * token过滤器 验证token有效性
  * 
- * @author ruoyi
+ * @author yq
  */
 @Component
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter

fiveep-service/src/main/java/com/bizmatics/service/config/security/handle/AuthenticationEntryPointImpl.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 /**
  * 认证失败处理类 返回未授权
  * 
- * @author ruoyi
+ * @author yq
  */
 @Component
 public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable

fiveep-service/src/main/java/com/bizmatics/service/config/security/handle/LogoutSuccessHandlerImpl.java

@@ -23,7 +23,7 @@ import java.util.Objects;
 /**
  * 自定义退出处理类 返回成功
  * 
- * @author ruoyi
+ * @author yq
  */
 @Configuration
 public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler

fiveep-service/src/main/java/com/bizmatics/service/enums/AlarmGradeCode.java

@@ -0,0 +1,16 @@
+package com.bizmatics.service.enums;
+
+/**
+ * @author yq
+ * @date 2021/10/26 10:16
+ */
+public enum AlarmGradeCode {
+    BusOutage,
+    PhaseLoss,
+    OverV,
+    UnderV,
+    OverEvT,
+    DevAbnormal,
+    DevOffline;
+
+}

fiveep-service/src/main/java/com/bizmatics/service/enums/UserStatus.java

@@ -3,7 +3,7 @@ package com.bizmatics.service.enums;
 /**
  * 用户状态
  * 
- * @author ruoyi
+ * @author yq
  */
 public enum UserStatus
 {

fiveep-service/src/main/java/com/bizmatics/service/filter/RepeatableFilter.java

@@ -11,7 +11,7 @@ import java.io.IOException;
 /**
  * Repeatable 过滤器
  * 
- * @author ruoyi
+ * @author yq
  */
 public class RepeatableFilter implements Filter
 {

fiveep-service/src/main/java/com/bizmatics/service/filter/RepeatedlyRequestWrapper.java

@@ -16,7 +16,7 @@ import java.io.InputStreamReader;
 /**
  * 构建可重复读取inputStream的request
  * 
- * @author ruoyi
+ * @author yq
  */
 public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
 {

fiveep-service/src/main/java/com/bizmatics/service/filter/XssFilter.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 防止XSS攻击的过滤器
  * 
- * @author ruoyi
+ * @author yq
  */
 public class XssFilter implements Filter
 {

fiveep-service/src/main/java/com/bizmatics/service/filter/XssHttpServletRequestWrapper.java

@@ -17,7 +17,7 @@ import java.io.IOException;
 /**
  * XSS过滤处理
  * 
- * @author ruoyi
+ * @author yq
  */
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
 {

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -13,7 +13,9 @@ import com.bizmatics.common.spring.util.GlobalUtils;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.service.AlarmPowerService;
+import com.bizmatics.service.enums.AlarmGradeCode;
 import com.bizmatics.service.util.SecurityUtils;
+import com.bizmatics.service.vo.AlarmGradeVO;
 import com.bizmatics.service.vo.AlarmPowerExportVO;
 import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
@@ -27,6 +29,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 /**
@@ -82,6 +85,55 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         return this.ToCommonPage(page);
     }
 
+    @Override
+    public CommonPage<AlarmGradeVO> alarmGradeCount(Integer siteId, Date startTime, Date endTime,Integer current,Integer size) {
+        Page<Map<String,Object>> page = new Page<>(current,size);
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
+        List<String> otherGrads = Arrays.stream(AlarmGradeCode.values())
+                .filter(alarmGradeCode -> alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
+                .map(Enum::name).collect(Collectors.toList());
+        List<String> oneGrads = Arrays.stream(AlarmGradeCode.values())
+                .filter(alarmGradeCode -> !alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
+                .map(Enum::name).collect(Collectors.toList());
+        page  = baseMapper.gradeSiteList(page, userId, siteId, startTime, endTime, oneGrads, otherGrads);
+        List<AlarmGradeVO> list = new ArrayList<>();
+        page.getRecords().forEach(map -> list.add(enhanceAlarmGradeVo(map)));
+        return new CommonPage<>(list,page.getTotal(),page.getSize(),page.getCurrent());
+    }
+
+    @Override
+    public CommonPage<AlarmPower> alarmGradeList(Integer siteId, Date startTime, Date endTime, Integer current, Integer size, Integer type) {
+        List<String> gradeList = null;
+        //1级告警
+        if (1 == type){
+            gradeList = Arrays.stream(AlarmGradeCode.values())
+                    .filter(alarmGradeCode -> alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
+                    .map(Enum::name).collect(Collectors.toList());
+        }else if (2 == type){
+            gradeList = Arrays.stream(AlarmGradeCode.values())
+                    .map(Enum::name).collect(Collectors.toList());
+        }else if (3 == type){
+            gradeList = Arrays.stream(AlarmGradeCode.values())
+                    .filter(alarmGradeCode -> alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
+                    .map(Enum::name).collect(Collectors.toList());
+        }
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
+        Page<AlarmPower> page = new Page<>(current,size);
+        page = baseMapper.gradeList(page,userId,siteId,startTime,endTime,gradeList,type);
+        return ToCommonPage(page);
+    }
+
+    public AlarmGradeVO enhanceAlarmGradeVo(Map<String,Object> map){
+        AlarmGradeVO alarmGradeVO = new AlarmGradeVO();
+        alarmGradeVO.setSiteId(Integer.parseInt(map.get("siteId").toString()));
+        alarmGradeVO.setSiteName(map.get("siteName").toString());
+        alarmGradeVO.setTotalGrade(Integer.parseInt(map.get("countGrade").toString()));
+        alarmGradeVO.setOneGrade(Integer.parseInt(map.get("oneGrade").toString()));
+        alarmGradeVO.setOtherGrade(Integer.parseInt(map.get("otherGrade").toString()));
+        alarmGradeVO.setTwoGrade(alarmGradeVO.getTotalGrade()-alarmGradeVO.getOneGrade()-alarmGradeVO.getOtherGrade());
+        return alarmGradeVO;
+    }
+
     @Override
     public List<Map<String, Object>> getLoopStatusList(Integer siteId) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -2,22 +2,19 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.Arith;
+import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.JsonUtils;
-import com.bizmatics.model.HadSiteStatic;
-import com.bizmatics.model.HtAnalogData;
+import com.bizmatics.model.*;
 import com.bizmatics.model.vo.DataManagementVO;
 import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
-import com.bizmatics.service.HadSiteStaticService;
-import com.bizmatics.service.HtAnalogDataService;
+import com.bizmatics.service.*;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.CommonIcoOneVO;
-import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.HadCountVO;
-import com.bizmatics.service.vo.TimeShareVO;
+import com.bizmatics.service.vo.*;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,6 +34,15 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
     @Autowired
     private HadSiteStaticService hadSiteStaticService;
+    @Autowired
+    private RtAnalogDataService rtAnalogDataService;
+
+    @Autowired
+    private DeviceService deviceService;
+    @Autowired
+    private SiteDynamicPropertiesService siteDynamicPropertiesService;
+    @Autowired
+    private DeviceAttributeService deviceAttributeService;
 
     @Override
     public HadCountVO selectCount() {
@@ -274,42 +280,32 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
     }
 
     @Override
-    public List<HtAnalogData> listByDeviceAndDate(String deviceName, Date startTime, Date endTime) {
+    public List<RealScoreVO> rtRealScore(String deviceName, Date startTime, Date endTime) {
         LambdaQueryWrapper<HtAnalogData> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(HtAnalogData::getIa,HtAnalogData::getIb,HtAnalogData::getIc,HtAnalogData::getUa,HtAnalogData::getUb,HtAnalogData::getUc)
                 .eq(HtAnalogData::getDeviceName,deviceName)
                 .between(HtAnalogData::getDataTime,startTime,endTime);
-        return list(queryWrapper);
-    }
-
-    @Override
-    public List<CommonIcoVO> balun(String deviceName, Date startTime, Date endTime) {
-        List<HtAnalogData> list = listByDeviceAndDate(deviceName, startTime, endTime);
-        List<Double> aList = new ArrayList<>();
-        List<Double> uList = new ArrayList<>();
-        List<Double> checkList = new ArrayList<>();
+        List<HtAnalogData> list = this.list(queryWrapper);
+        //查询设备
+        LambdaQueryWrapper<Device> deviceQuery = Wrappers.lambdaQuery();
+        deviceQuery.eq(Device::getDeviceName,deviceName);
+        Device device = deviceService.getOne(deviceQuery);
+        Optional.ofNullable(device).orElseThrow(() -> new BusinessException("设备不存在"));
+        //查询sd
+        LambdaQueryWrapper<SiteDynamicProperties> sdQuery = Wrappers.lambdaQuery();
+        sdQuery.eq(SiteDynamicProperties::getSiteId,device.getSiteId());
+        SiteDynamicProperties siteDynamicProperties = siteDynamicPropertiesService.getOne(sdQuery);
+        Optional.ofNullable(siteDynamicProperties).orElseThrow(() -> new BusinessException("sd不存在"));
+        LambdaQueryWrapper<DeviceAttribute> adQuery = Wrappers.lambdaQuery();
+        adQuery.eq(DeviceAttribute::getSiteId,device.getSiteId());
+        DeviceAttribute deviceAttribute= deviceAttributeService.getOne(adQuery);
+        Optional.ofNullable(deviceAttribute).orElseThrow(() -> new BusinessException("da不存在"));
+        List<RealScoreVO> realScoreVOS = new ArrayList<>();
         for (HtAnalogData htAnalogData:list) {
-            checkList.add(htAnalogData.getIa());
-            checkList.add(htAnalogData.getIb());
-            checkList.add(htAnalogData.getIc());
-            aList.add(checkBalun(checkList));
-            list.clear();
-            checkList.add(htAnalogData.getUa());
-            checkList.add(htAnalogData.getUb());
-            checkList.add(htAnalogData.getUc());
-            uList.add(checkBalun(checkList));
-            list.clear();
-        }
-        List<CommonIcoVO> commonIcoVOS = new ArrayList<>();
-        commonIcoVOS.add(CommonIcoVO.builder().name("电流不平衡度").listDate(aList).build());
-        commonIcoVOS.add(CommonIcoVO.builder().name("电压不平衡度").listDate(uList).build());
-        return commonIcoVOS;
-    }
-
-    public Double checkBalun(List<Double> list){
-        Double max = list.stream().max(Double::compareTo).get();
-        Double min = list.stream().min(Double::compareTo).get();
-        return Arith.div(Arith.sub(max,min),max);
+            RtAnalogData rtAnalogData = BeanMapperUtils.map(htAnalogData, RtAnalogData.class);
+            realScoreVOS.add(rtAnalogDataService.fillRealScoreData(rtAnalogData,siteDynamicProperties,deviceAttribute));
+        }
+        return realScoreVOS;
     }
 
 

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

@@ -115,19 +115,34 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
     }
 
     @Override
-    public List<String> realScore(String deviceName) {
+    public RealScoreVO realScore(String deviceName) {
         LambdaQueryWrapper<RtAnalogData> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(RtAnalogData::getDeviceName,deviceName);
         RtAnalogData rtAnalogData = getOne(queryWrapper);
-
-        return null;
+        //查询设备
+        LambdaQueryWrapper<Device> deviceQuery = Wrappers.lambdaQuery();
+        deviceQuery.eq(Device::getDeviceName,deviceName);
+        Device device = deviceService.getOne(deviceQuery);
+        Optional.ofNullable(device).orElseThrow(() -> new BusinessException("设备不存在"));
+        //查询sd
+        LambdaQueryWrapper<SiteDynamicProperties> sdQuery = Wrappers.lambdaQuery();
+        sdQuery.eq(SiteDynamicProperties::getSiteId,device.getSiteId());
+        SiteDynamicProperties siteDynamicProperties = siteDynamicPropertiesService.getOne(sdQuery);
+        Optional.ofNullable(siteDynamicProperties).orElseThrow(() -> new BusinessException("sd不存在"));
+        LambdaQueryWrapper<DeviceAttribute> adQuery = Wrappers.lambdaQuery();
+        adQuery.eq(DeviceAttribute::getSiteId,device.getSiteId());
+        DeviceAttribute deviceAttribute= deviceAttributeService.getOne(adQuery);
+        Optional.ofNullable(deviceAttribute).orElseThrow(() -> new BusinessException("da不存在"));
+        return  fillRealScoreData(rtAnalogData,siteDynamicProperties,deviceAttribute);
     }
 
     /**
      * 填充实时数据
      */
-    public void fillRealScoreData(RtAnalogData rtAnalogData, SiteDynamicProperties siteDynamicProperties,DeviceAttribute deviceAttribute){
+    @Override
+    public RealScoreVO fillRealScoreData(RtAnalogData rtAnalogData, SiteDynamicProperties siteDynamicProperties,DeviceAttribute deviceAttribute){
         List<Double> checkList = new ArrayList<>();
+        Integer score = 0;
         RealScoreVO realScoreVo = BeanMapperUtils.map(rtAnalogData, RealScoreVO.class);
         checkList.add(realScoreVo.getIa());
         checkList.add(realScoreVo.getIb());
@@ -141,15 +156,51 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         //电压不平衡
         realScoreVo.setVtBalun(checkBalun(checkList));
         //电压合格率
-        realScoreVo.setUaQualified(Arith.sub(rtAnalogData.getUa(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
-        realScoreVo.setUbQualified(Arith.sub(rtAnalogData.getUb(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
-        realScoreVo.setUcQualified(Arith.sub(rtAnalogData.getUc(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
+        double voltageLevel = Double.parseDouble(siteDynamicProperties.getVoltageLevel());
+        realScoreVo.setUaQualified(Arith.sub(rtAnalogData.getUa(), voltageLevel));
+        realScoreVo.setUbQualified(Arith.sub(rtAnalogData.getUb(),voltageLevel));
+        realScoreVo.setUcQualified(Arith.sub(rtAnalogData.getUc(), voltageLevel));
         //电流负载率
-        realScoreVo.setIaLoad(Arith.div(realScoreVo.getIa(),deviceAttribute.getRatedCurrent()));
-        realScoreVo.setIbLoad(Arith.div(realScoreVo.getIb(),deviceAttribute.getRatedCurrent()));
-        realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(),deviceAttribute.getRatedCurrent()));
-        //金
+        Double ratedCurrent = deviceAttribute.getRatedCurrent();
+        realScoreVo.setIaLoad(Arith.div(realScoreVo.getIa(),ratedCurrent));
+        realScoreVo.setIbLoad(Arith.div(realScoreVo.getIb(),ratedCurrent));
+        realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(),ratedCurrent));
+        //计算分数
+        //电压分数
+        if (computeUScore(realScoreVo.getUaQualified(),voltageLevel) && computeUScore(realScoreVo.getUbQualified(),voltageLevel)
+        && computeUScore(realScoreVo.getUcQualified(),voltageLevel)) {
+            score+=20;
+        }
+        //电流分数
+        if (realScoreVo.getIaLoad() <= 0.8 && realScoreVo.getIbLoad() <= 0.8 && realScoreVo.getIcLoad() <= 0.8){
+            score+=20;
+        }
+        //电压平衡分数
+        if (realScoreVo.getElBalun() <= 0.15){
+            score+=20;
+        }
+        //电流平衡分数
+        if (realScoreVo.getVtBalun() <= 0.15){
+            score+=20;
+        }
+        //功率
+        if (realScoreVo.getCOS() <= 0.15){
+            score+=20;
+        }
+        realScoreVo.setScore(score);
+        return realScoreVo;
+    }
 
+    /**
+     * 计算电压分数
+     * @return
+     */
+    public Boolean computeUScore(Double qualified,Double voltageLevel){
+        double mul = Arith.mul(qualified, voltageLevel);
+        if (mul <= 0.07 && mul >= -0.07){
+            return true;
+        }
+        return false;
     }
 
 

fiveep-service/src/main/java/com/bizmatics/service/interceptor/RepeatSubmitInterceptor.java

@@ -17,7 +17,7 @@ import java.lang.reflect.Method;
 /**
  * 防止重复提交拦截器
  *
- * @author ruoyi
+ * @author yq
  */
 @Component
 public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter

fiveep-service/src/main/java/com/bizmatics/service/interceptor/impl/SameUrlDataInterceptor.java

@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
  * 判断请求url和数据是否和上一次相同，
  * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。
  * 
- * @author ruoyi
+ * @author yq
  */
 @Component
 public class SameUrlDataInterceptor extends RepeatSubmitInterceptor

fiveep-service/src/main/java/com/bizmatics/service/system/ISysConfigService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 参数配置 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysConfigService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysDeptService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 部门管理 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysDeptService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysDictDataService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 字典 业务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysDictDataService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysDictTypeService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 字典 业务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysDictTypeService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysLogininforService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 系统访问日志情况信息 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysLogininforService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysMenuService.java

@@ -10,7 +10,7 @@ import java.util.Set;
 /**
  * 菜单 业务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysMenuService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysNoticeService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 公告 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysNoticeService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysOperLogService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 操作日志 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysOperLogService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysPostService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 岗位信息 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysPostService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysRoleService.java

@@ -9,7 +9,7 @@ import java.util.Set;
 /**
  * 角色业务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysRoleService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysUserOnlineService.java

@@ -7,7 +7,7 @@ import com.bizmatics.service.config.security.LoginUser;
 /**
  * 在线用户 服务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysUserOnlineService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/ISysUserService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * 用户 业务层
  * 
- * @author ruoyi
+ * @author yq
  */
 public interface ISysUserService
 {

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysConfigServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.Objects;
 /**
  * 参数配置 服务层实现
  * 
- * @author ruoyi
+ * @author yq
  */
 @Service
 public class SysConfigServiceImpl implements ISysConfigService