优化月报统计优化

增加scada指标是否显示查询条件

hnls-gps/hnls-gps-boot/src/main/java/com/tofly/gpsboot/service/statement/impl/StatementServiceImpl.java

@@ -769,6 +769,7 @@ public class StatementServiceImpl implements IStatementService {
                                     .append(",个人线比例: ")
                                     .append(lenRate)
                                     .append("%");
+                            vo.setStatisticalUserId(e);
                             vo.setLenRate(countRate);
                             vo.setPointRate(lenRate);
                         }

hnls-scada/src/main/java/com/tofly/scada/entity/Allocation.java

@@ -127,4 +127,10 @@ public class Allocation implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "是否展示（0否1是）")
+    private Short isDisplay;
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String isDisplayName;
 }

hnls-scada/src/main/java/com/tofly/scada/entity/dto/DeviceQuery.java

@@ -89,4 +89,7 @@ public class DeviceQuery implements Serializable {
     @ApiModelProperty(value = "设备类型IDs")
     private String deviceTypeIds;
 
+    @ApiModelProperty(value = "是否展示（0否1是）")
+    private Short isDisplay;
+
 }

hnls-scada/src/main/java/com/tofly/scada/service/impl/ScadaServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
 import com.tofly.scada.common.FlowConstant;
 import com.tofly.scada.common.MessageTopicEnum;
@@ -954,7 +955,7 @@ public class ScadaServiceImpl extends ServiceImpl<ScadaMapper, Scada> implements
             return null;
         }
         //查询所有指标
-        List<Allocation> allocations = allocationMapper.selectList(null);
+        List<Allocation> allocations = allocationMapper.selectList(new QueryWrapper<Allocation>().lambda().eq(StringUtil.isNotNull(deviceQuery.getIsDisplay()),Allocation::getIsDisplay,deviceQuery.getIsDisplay()));
         //查询所有报警
         List<ScadaReport> scadaReports = reportMapper.selectList(null);
         //查询最新scada数据

hnls-scada/src/main/resources/mapper/AllocationMapper.xml

@@ -22,7 +22,13 @@
             <result property="createUser" column="CREATE_USER" jdbcType="DECIMAL"/>
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="type" column="TYPE" jdbcType="VARCHAR"/>
+            <result property="isDisplay" column="IS_DISPLAY"/>
+            <association property="isDisplayName" column="IS_DISPLAY"
+                     select="getIsDisplayName"/>
     </resultMap>
+    <select id="getIsDisplayName" resultType="string">
+        SELECT decode(#{isDisplay},'0','否','1','是') as isDisplayName FROM dual
+    </select>
 
     <sql id="Base_Column_List">
         ID,DEVICE_ID,MODEL,