智能分析指标权限配置权限过滤问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWeightController.java

@@ -58,7 +58,7 @@ public class IdxBizFanWeightController extends BaseController {
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
         String orgCode = "86";
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+        if (!ObjectUtils.isEmpty(stdUserEmpower)) {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0);
         }
         LambdaQueryWrapper<IdxBizFanWeight> qu=new LambdaQueryWrapper<>();
@@ -123,7 +123,7 @@ public class IdxBizFanWeightController extends BaseController {
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
         String orgCode = "86";
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+        if (!ObjectUtils.isEmpty(stdUserEmpower)) {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0);
         }
         QueryWrapper< IdxBizFanWeight> qu=new QueryWrapper<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java

@@ -63,7 +63,7 @@ public class IdxBizPvWeightController extends BaseController {
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
         String orgCode = "86";
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+        if (!ObjectUtils.isEmpty(stdUserEmpower)) {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0);
         }
         LambdaQueryWrapper<IdxBizPvWeight> qu=new LambdaQueryWrapper<>();
@@ -130,7 +130,7 @@ public class IdxBizPvWeightController extends BaseController {
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
         String orgCode = "86";
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
+        if (!ObjectUtils.isEmpty(stdUserEmpower)) {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0);
         }
         QueryWrapper< IdxBizPvWeight> qu=new QueryWrapper<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointProcessVariableClassificationDto.java

@@ -104,6 +104,10 @@ public class IdxBizFanPointProcessVariableClassificationDto  {
     @TableField("KKS")
     private String kks;
 
+    @ApiModelProperty(value = "orgCode")
+    @TableField("ORG_CODE")
+    private String orgCode;
+
 
  private Double currentValue;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointProcessVariableClassificationDto.java

@@ -5,22 +5,22 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 /**
- * 
- *
  * @author system_generator
  * @date 2023-08-15
  */
 @Data
-@ApiModel(value="IdxBizPvPointProcessVariableClassificationDto", description="")
-public class IdxBizPvPointProcessVariableClassificationDto  {
+@ApiModel(value = "IdxBizPvPointProcessVariableClassificationDto", description = "")
+public class IdxBizPvPointProcessVariableClassificationDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @TableId("SEQUENCE_NBR")
@@ -102,12 +102,15 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     @ApiModelProperty(value = "KKS码")
     @TableField("KKS")
     private String kks;
+    @ApiModelProperty(value = "orgCode")
+    @TableField("ORG_CODE")
+    private String orgCode;
+    
+    private Double currentValue;
 
- private Double currentValue;
-
- private String pointOneId;
- private String pointTwoId;
- private String pointThreeId;
+    private String pointOneId;
+    private String pointTwoId;
+    private String pointThreeId;
 
- private String analysVariableId;
+    private String analysVariableId;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointProcessVariableClassification.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -156,4 +157,8 @@ public class IdxBizFanPointProcessVariableClassification{
 	@TableField("KKS")
     private String kks;
 
+
+    @ApiModelProperty(value = "orgCode")
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointProcessVariableClassification.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -164,4 +165,7 @@ public class IdxBizPvPointProcessVariableClassification{
 	@TableField("KKS")
     private String kks;
 
+    @ApiModelProperty(value = "orgCode")
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -1740,6 +1740,7 @@ public class CommonServiceImpl {
                         fanHealthIndex.setHealthLevel(fanHealthIndex.getHealthLevel());
                         fanHealthIndex.setKks(idxBizFanHealthIndex.getKks());
                         fanHealthIndex.setRecDate(format);
+                        fanHealthIndex.setOrgCode(obj.getOrgCode());
                         fanHealthIndices1.add(fanHealthIndex);
                     }
                 }
@@ -2019,6 +2020,7 @@ public class CommonServiceImpl {
                         pvHealthIndex.setHealthLevel(idxBizPvHealthIndex.getHealthLevel());
                         pvHealthIndex.setKks(idxBizPvHealthIndex.getKks());
                         pvHealthIndex.setRecDate(format);
+                        pvHealthIndex.setOrgCode(obj.getOrgCode());
                         fanHealthIndices1.add(pvHealthIndex);
                     }
                 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -804,6 +804,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
                     fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
+                    fanWarningRecord.setOrgCode(idxBizFanHealthIndices.get(0).getOrgCode());
                     tdFanWarningRecordList.add(fanWarningRecord);
 
 
@@ -972,6 +973,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
                     fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
+                    fanWarningRecord.setOrgCode(idxBizFanHealthIndices.get(0).getOrgCode());
                     tdFanWarningRecordList.add(fanWarningRecord);
                 }
             }
@@ -1143,6 +1145,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
                     fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
+                    fanWarningRecord.setOrgCode(idxBizFanHealthIndices.get(0).getOrgCode());
                     tdFanWarningRecordList.add(fanWarningRecord);
                 }
             }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanHealthIndex.java

@@ -30,4 +30,5 @@ public class FanHealthIndex implements Serializable {
     private String pointName;
     private String analysisTime;
     private String kks;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanHealthIndexDay.java

@@ -31,4 +31,5 @@ public class FanHealthIndexDay implements Serializable {
     private String kks;
     private String status;
     private String value;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanHealthIndexHour.java

@@ -31,4 +31,5 @@ public class FanHealthIndexHour implements Serializable {
     private String kks;
     private String status;
     private String value;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanHealthIndexMoment.java

@@ -31,4 +31,5 @@ public class FanHealthIndexMoment implements Serializable {
     private String kks;
     private String status;
     private String value;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanWarningRecord.java

@@ -28,4 +28,5 @@ public class FanWarningRecord implements Serializable {
     private String kks;
     private String warningPeriod;
     private String status;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvHealthIndex.java

@@ -34,5 +34,5 @@ public class PvHealthIndex {
     private String pointName;
     private String analysisTime;
     private String kks;
-
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvHealthIndexDay.java

@@ -36,4 +36,5 @@ public class PvHealthIndexDay {
     private String kks;
     private String value;
     private String status;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvHealthIndexHour.java

@@ -36,5 +36,5 @@ public class PvHealthIndexHour {
     private String kks;
     private String value;
     private String status;
-
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvHealthIndexMoment.java

@@ -36,5 +36,5 @@ public class PvHealthIndexMoment {
     private String kks;
     private String value;
     private String status;
-
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvWarningRecord.java

@@ -30,4 +30,5 @@ public class PvWarningRecord implements Serializable {
     private String kks;
     private String warningPeriod;
     private String status;
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.xml

@@ -358,7 +358,8 @@
         `ANOMALY`,
         `POINT_NAME`,
         `ANALYSIS_TIME`,
-        `KKS`
+        `KKS`，
+        `ORG_CODE`
         )
         values
             <foreach collection="list" separator="," item="item" index="index">
@@ -383,6 +384,7 @@
                 #{item.pointName, jdbcType=VARCHAR},
                 #{item.analysisTime, jdbcType=VARCHAR},
                 #{item.kks, jdbcType=VARCHAR}
+                #{item.orgCode, jdbcType=VARCHAR}
                 )
             </foreach>
     </insert>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -29,6 +29,7 @@
         #{item.pointName, jdbcType=VARCHAR},
         #{item.analysisTime, jdbcType=VARCHAR},
         #{item.kks, jdbcType=VARCHAR}
+        #{item.orgCode, jdbcType=VARCHAR}
         )
     </foreach>
     </insert>
@@ -48,6 +49,7 @@
         avg(anomaly) as anomaly,
         point_name,
         kks,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}
@@ -79,6 +81,7 @@
         equipment_name,
         number,
         avg(anomaly) as anomaly,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}
@@ -104,6 +107,7 @@
         number,
         equipment_name,
         avg(anomaly) as anomaly,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}
@@ -126,6 +130,7 @@
         '场站' as analysis_obj_type,
         area,
         avg(anomaly) as anomaly,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}
@@ -144,6 +149,7 @@
         '片区' as analysis_obj_type,
         area,
         avg(anomaly) as anomaly,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}
@@ -224,6 +230,7 @@
         #{item.pointName, jdbcType=VARCHAR},
         #{item.analysisTime, jdbcType=VARCHAR},
         #{item.kks, jdbcType=VARCHAR}
+        #{item.orgCode, jdbcType=VARCHAR}
         )
     </foreach>
 
@@ -498,6 +505,7 @@
     select
         '全域' as analysis_obj_type,
         avg(anomaly) as anomaly,
+        org_code,
         AVG(health_index) as health_index
     from
         #{tableName}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -52,6 +52,7 @@
         #{item.kks, jdbcType=VARCHAR},
         #{item.warningPeriod, jdbcType=VARCHAR},
         #{item.status, jdbcType=VARCHAR})
+        #{item.orgCode, jdbcType=VARCHAR})
     </foreach>
 
     </insert>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvHealthIndex.xml

@@ -63,6 +63,7 @@
             #{item.pointName, jdbcType=VARCHAR},
             #{item.analysisTime, jdbcType=VARCHAR},
             #{item.kks, jdbcType=VARCHAR}
+            #{item.orgCode, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>