Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -437,8 +437,8 @@
       rd.valve_status,
       rd.last_receive_time,
       rd.address,
-      rd.lng,
-      rd.lat,
+      ifnull(rd.lng,rc.lng) as lng,
+      ifnull(rd.lat,rc.lat) as lat,
       rd.user_name,
       rd.user_phone,
       rd.id_card,

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/SceneMapper.xml

@@ -103,11 +103,9 @@
             <if test="user.companyOrgId!=null and user.deptOrgId!=null">
                 and a.DEPT_ORG_ID = #{user.deptOrgId} and a.COMPANY_ORG_ID = #{user.companyOrgId}
             </if>
-
             <if test="user.companyOrgId!=null and user.deptOrgId == null">
                 and a.DEPT_ORG_ID is null and a.COMPANY_ORG_ID = #{user.companyOrgId}
             </if>
-
             <if test="user.tenantId != null  and user.tenantId != ''">and a.tenant_id = #{user.tenantId}</if>
             <if test="typeNames != null ">
                 and s.scene_type_name in

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/DayMonthYearReportController.java

@@ -3,6 +3,7 @@ package com.bz.zoneiot.water.web.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bz.zoneiot.core.oauth2.util.UserUtil;
 import com.bz.zoneiot.water.api.dto.ReportDto;
 import com.bz.zoneiot.water.api.dto.ReportQueryDto;
 import com.bz.zoneiot.water.api.dto.ReportStatisticalDimensionDto;
@@ -22,10 +23,12 @@ import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -173,11 +176,13 @@ public class DayMonthYearReportController {
             iPage = reportService.getPipeDevicePressReportByDeviceIds(new Page<>(1, 1000000), queryDto);
         }
         List<ReportVo> list = iPage.getRecords();
-        if (CollectionUtil.isEmpty(list)){
-            throw BusinessException.builder(WaterErrorEnum.OBJECT_ERROR);
+        List<List<String>> reportTitle;
+        if (CollectionUtils.isEmpty(list)){
+            reportTitle = ReportExcelUtil.toExcelTitleList(new ArrayList<>(), queryDto.getSceneType(),0);
+        } else {
+            reportTitle = ReportExcelUtil.toExcelTitleList(list.get(0).getReportTitle(), queryDto.getSceneType(),0);
         }
-        List<List<String>> reportTitle = ReportExcelUtil.toExcelTitleList(list.get(0).getReportTitle(), queryDto.getSceneType(),0);
-        EasyExcelUtil.excelWriteWithHeader(response, SceneEnum.getMsg(queryDto.getSceneType()) +"报表", reportTitle, ReportExcelUtil.toReportExcelDto(list,queryDto.getSceneType()));
+        EasyExcelUtil.excelWriteWithHeader(response, SceneEnum.getMsg(queryDto.getSceneType()) +"报表", reportTitle, ReportExcelUtil.toReportExcelDto(list, queryDto.getSceneType()));
     }
 
     @RequestMapping(value = "/export/historyDataExcel", method = RequestMethod.GET)
@@ -194,10 +199,12 @@ public class DayMonthYearReportController {
             iPage = reportService.getPipeHistoryDataDevicePressReportByDeviceIds(new Page<>(1, 1000000), queryDto);
         }
         List<ReportVo> list = iPage.getRecords();
-        if (CollectionUtil.isEmpty(list)) {
-            throw BusinessException.builder(WaterErrorEnum.OBJECT_ERROR);
+        List<List<String>> reportTitle;
+        if (CollectionUtils.isEmpty(list)){
+            reportTitle = ReportExcelUtil.toHistoryDataExcelTitleList(new ArrayList<>(), queryDto.getSceneType(),1);
+        } else {
+            reportTitle = ReportExcelUtil.toHistoryDataExcelTitleList(list.get(0).getReportTitle(), queryDto.getSceneType(),1);
         }
-        List<List<String>> reportTitle = ReportExcelUtil.toHistoryDataExcelTitleList(list.get(0).getReportTitle(), queryDto.getSceneType(),1);
         EasyExcelUtil.excelWriteWithHeader(response, SceneEnum.getMsg(queryDto.getSceneType()) +"报表", reportTitle, ReportExcelUtil.toHisoryDataReportExcelDto(list, queryDto.getSceneType()));
     }
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AbstractReportService.java

@@ -72,13 +72,13 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
         Map<String, ReportAttributeVo> mapsAttributeTitle = new LinkedHashMap<>();
         // 获取标题
         List<ReportTitleDto> reportTitleDtos = getReportTitle(reportDto, mapsTitle, mapsAttributeTitle,0);
-        // 固定参数项
-        List<ReportVo> reportList = findReport(reportDto);
         // 如果为空，把自定义表头返回回去
         if (CollectionUtil.isEmpty(reportPage.getRecords())){
             defaultReport(reportTitleDtos, reportPage);
             return;
         }
+        // 固定参数项
+        List<ReportVo> reportList = findReport(reportDto);
         int total = 0;
         // 单个属性值
         for (ReportVo item : reportPage.getRecords()) {
@@ -574,9 +574,7 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
             return new Page<>();
         }
         Page<ReportVo> reportPage = this.findPageReport(page, getReportPageQuery(queryDto, devices, isPipe));
-        if (!CollectionUtil.isEmpty(reportPage.getRecords())){
             reportDataHandle(queryDto, devices, reportPage, isPipe);
-        }
         return reportPage;
     }
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/SceneService.java

@@ -20,11 +20,13 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -116,9 +118,12 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
      * 查列表
      */
     public List<SceneEntity> findListByTypeName(List<String> typeName) {
-        List<SceneEntity> sceneEntities = sceneMapper.findListByTypeName(typeName, UserUtil.getCurrentUser().getUserCondition());
-        List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
-        return sceneTree;
+        SceneEntity sceneEntity = new SceneEntity();
+        List<SceneEntity> list = findAllList(sceneEntity);
+        if (CollectionUtils.isEmpty(list)){
+            return list;
+        }
+        return list.stream().filter(t -> typeName.contains(t.getSceneTypeName())).collect(Collectors.toList());
     }
 
     /**

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/util/ReportExcelUtil.java

@@ -160,7 +160,7 @@ public class ReportExcelUtil {
      **/
     public static List<List<String>> toHistoryDataExcelTitleList(List<ReportTitleDto> titleDtos, int titleType,int reportType){
         List<List<String>> titleList = toTitleList(titleDtos,reportType);
-        String[] shuZu  = TITLE_MAP.get(4);
+        String[] shuZu  = TITLE_MAP.get(titleType);
         if (shuZu == null) {
             return titleList;
         }