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

smart-city-platform/src/main/java/com/bz/smart_city/controller/PlatformApiController.java

@@ -1,11 +1,11 @@
 package com.bz.smart_city.controller;
 
 import com.bz.smart_city.commom.model.AjaxMessage;
+import com.bz.smart_city.commom.model.Pagination;
 import com.bz.smart_city.commom.model.ResultStatus;
 import com.bz.smart_city.commom.util.MessageSend.JSONUtils;
 import com.bz.smart_city.commom.util.UserUtil;
-import com.bz.smart_city.dto.LoginUser;
-import com.bz.smart_city.dto.TodayDynamicDto;
+import com.bz.smart_city.dto.*;
 import com.bz.smart_city.service.PlatformAapiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -81,4 +81,19 @@ public class PlatformApiController {
         valveMessage.put("meterStatus",meterStatus);
         kafkaTemplate.send(billingValveStatusReceiving, JSONUtils.obj2json(valveMessage));
     }
+    @PostMapping  ("/getTheMapInformationOfTheDevice")
+    @ApiOperation(value = "设备数量统计")
+    public AjaxMessage<List<MapStatisticalDto>> getTheMapInformationOfTheDevice (
+            @RequestBody  QueryDeviceMonitorDto queryDeviceMonitorDto) {
+
+        List<MapStatisticalDto>statisticalDtos=platformAapiService.getTheMapInformationOfTheDevice(queryDeviceMonitorDto);
+        return new AjaxMessage<>(ResultStatus.OK,statisticalDtos);
+    }
+    @PostMapping  ("/getDeviceListInformation")
+    @ApiOperation(value = "设备数量统计")
+    public AjaxMessage getDeviceListInformation (@RequestBody QueryDeviceMonitorDto queryDeviceMonitorDto) {
+
+        Pagination<DeviceDto>devices=platformAapiService.getDeviceListInformation(queryDeviceMonitorDto);
+        return new AjaxMessage<>(ResultStatus.OK,devices);
+    }
 }

smart-city-platform/src/main/java/com/bz/smart_city/dao/BuildingMapper.java

@@ -84,5 +84,10 @@ public interface BuildingMapper {
     int countBycCommunityId(@Param("communityId") Integer communityId);
 
     int findByNameUnique(@Param("id") Integer id, @Param("siteId") Integer siteId, @Param("community") Integer community, @Param("name") String name);
+
+    List<BuildingInfoListDto> obtainBuildingInformationOnTheIntegratedMap
+            (@Param("programItems")List<ProgramItem> programItemDtos,@Param("longitudeMin") Double longitudeMin,
+             @Param("longitudeMax") Double longitudeMax, @Param("latitudeMin") Double latitudeMin,
+             @Param("latitudeMax") Double latitudeMax);
 }
 

smart-city-platform/src/main/java/com/bz/smart_city/dao/DeviceMapper.java

@@ -181,5 +181,8 @@ public interface DeviceMapper {
 
     long statisticsEquipmentTotal(@Param("programItems") List<ProgramItemDto> programItems);
 
+    List<DeviceDto> findDevicesOnTheMap( @Param("device")QueryDeviceMonitorDto queryDeviceMonitorDto,
+                                        @Param("programItems") List<ProgramItem> programItemDtos);
+
 }
 

smart-city-platform/src/main/java/com/bz/smart_city/dao/UserMapper.java

@@ -81,5 +81,7 @@ public interface UserMapper {
 
 
     List<ProgramItemDto> findTenantAuthority();
+
+    List<ProgramItem> findAuthByTenantId(String tenantId);
 }
 

smart-city-platform/src/main/java/com/bz/smart_city/dto/QueryDeviceMonitorDto.java

@@ -0,0 +1,19 @@
+package com.bz.smart_city.dto;
+
+import lombok.Data;
+
+@Data
+public class QueryDeviceMonitorDto {
+    private Integer type;
+    private Integer province;
+    private Integer city;
+    private Integer region;
+    private Integer community;
+    private Integer buildingId;
+    private String keywords;
+    private String tenantId;
+    private Integer page;
+    private Integer size;
+    private String northEast;
+    private String southWest;
+}

smart-city-platform/src/main/java/com/bz/smart_city/service/PlatformAapiService.java

@@ -1,5 +1,10 @@
 package com.bz.smart_city.service;
 
+import com.bz.smart_city.commom.model.Pagination;
+import com.bz.smart_city.dto.DeviceDto;
+import com.bz.smart_city.dto.MapStatisticalDto;
+import com.bz.smart_city.dto.QueryDeviceMonitorDto;
+
 import java.util.List;
 import java.util.Map;
 
@@ -17,4 +22,8 @@ public interface PlatformAapiService {
 
 
     List<Map<String, Object>> getDeviceStatistics(Map<String, Object> args);
+
+    List<MapStatisticalDto> getTheMapInformationOfTheDevice(QueryDeviceMonitorDto queryDeviceMonitorDto);
+
+    Pagination<DeviceDto> getDeviceListInformation(QueryDeviceMonitorDto queryDeviceMonitorDto);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/sync/PlatformAapiServiceImpl.java

@@ -1,20 +1,19 @@
 package com.bz.smart_city.service.sync;
 
-import com.bz.smart_city.dao.CustomerMapper;
-import com.bz.smart_city.dao.DeviceMapper;
-import com.bz.smart_city.dao.OperatingValveRecordMapper;
-import com.bz.smart_city.dao.UserMapper;
+import com.bz.smart_city.commom.model.Pagination;
+import com.bz.smart_city.dao.*;
 import com.bz.smart_city.dao.assistant.InstallListMapper;
-import com.bz.smart_city.dao.assistant.InstallPlanMapper;
-import com.bz.smart_city.dto.ProgramItemDto;
+import com.bz.smart_city.dto.*;
 import com.bz.smart_city.entity.*;
-import com.bz.smart_city.entity.assistant.InstallPlan;
 import com.bz.smart_city.service.DeviceService;
 import com.bz.smart_city.service.PlatformAapiService;
+import com.bz.smart_city.service.StatAndAnalysisService;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -32,6 +31,10 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
     private InstallListMapper installListMapper;
     @Autowired
     private UserMapper userMapper;
+    @Resource
+    private BuildingMapper buildingMapper;
+    @Autowired
+    private StatAndAnalysisService statAndAnalysisService;
     @Override
     public void updateMeterNo(String meterNo, String meterCode, String customerNo) {
         Customer customer = customerMapper.findBySiteIdAndCustomerNo(null, customerNo);
@@ -102,6 +105,59 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
         // ;
         return result;
     }
+    private Double[]getCoordinate(String preCoordinate){
+         Double[]coordinates=new Double[2];
+        String[] preCoordinates = StringUtils.split(preCoordinate, ",");
+        coordinates[0]=Double.valueOf(preCoordinates[0]);
+        coordinates[1]=Double.valueOf(preCoordinates[1]);
+        return coordinates;
+    }
+    @Override
+    public List<MapStatisticalDto> getTheMapInformationOfTheDevice(QueryDeviceMonitorDto queryDeviceMonitorDto) {
+        List<Integer>siteList=new ArrayList<>();
+        siteList.add(1);
+        Double longitudeMin = 0d;
+        Double longitudeMax = 0d;
+
+        Double latitudeMin = 0d;
+        Double latitudeMax = 0d;
+        String northEast=queryDeviceMonitorDto.getNorthEast();
+        String southWest=queryDeviceMonitorDto.getSouthWest();
+        if (northEast != null && southWest != null) {
+            Double[]northEastDouble = getCoordinate(northEast);
+            Double[] southWestDouble =getCoordinate(southWest);
+
+            longitudeMin =southWestDouble [0];
+            longitudeMax = northEastDouble[0];
+
+            latitudeMin =southWestDouble [1];
+            latitudeMax = northEastDouble[1];
+        }
+        List<ProgramItem>programItemDtos = userMapper.findAuthByTenantId(queryDeviceMonitorDto.getTenantId());
+        if(programItemDtos.isEmpty()){
+            return new ArrayList<>();
+        }
+        List<BuildingInfoListDto>buildingInfoListDtos=buildingMapper.
+                obtainBuildingInformationOnTheIntegratedMap(programItemDtos,longitudeMin,
+                        longitudeMax, latitudeMin, latitudeMax);
+              /*  buildingMapper.getBuildingStatistics(siteList, programItemDtos, null, null, null,
+                queryDeviceMonitorDto.getProvince(), queryDeviceMonitorDto.getCity(), queryDeviceMonitorDto.getRegion(),
+                queryDeviceMonitorDto.getCommunity(),queryDeviceMonitorDto.getType(),
+                longitudeMin, longitudeMax, latitudeMin, latitudeMax,null);*/
+        List<MapStatisticalDto> mapStatisticalDtos = statAndAnalysisService.mapStatistical(queryDeviceMonitorDto.getType(), buildingInfoListDtos);
+        return mapStatisticalDtos;
+    }
+
+    @Override
+    public Pagination<DeviceDto> getDeviceListInformation(QueryDeviceMonitorDto queryDeviceMonitorDto) {
+        List<ProgramItem>programItemDtos = userMapper.findAuthByTenantId(queryDeviceMonitorDto.getTenantId());
+        if(programItemDtos.isEmpty()){
+            return new Pagination<>();
+        }
+        PageHelper.startPage(queryDeviceMonitorDto.getPage(), queryDeviceMonitorDto.getSize());
+        List<DeviceDto> list =deviceMapper.findDevicesOnTheMap(queryDeviceMonitorDto,programItemDtos);
+        return new Pagination<>(list);
+    }
 
 
     private Device getDevice(String meterNo, String customerNo){

smart-city-platform/src/main/resources/application-prd.properties

@@ -185,8 +185,8 @@ sync.customer.wuhan.id=26
 #mongodb url
 spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database
 logging.level.org.springframework.data.mongodb.core=INFO
-account_userInfo_url=http://114.135.61.188:58084/api/pay/getAccountInfoByMetercode
-sync_customer_no_url=http://114.135.61.188:58084/api/customer/synCustomer
+account_userInfo_url=http://114.135.61.186:30002/api/pay/getAccountInfoByMetercode
+sync_customer_no_url=http://114.135.61.186:30002/api/customer/synCustomer
 platform_appid=1001
 platform_appSecret=12345678
 platform_url=http://114.135.61.187:38087/user-auth/user/getUniqId?appId={appId}&key={key}

smart-city-platform/src/main/resources/mapper/BuildingMapper.xml

@@ -1306,6 +1306,58 @@
         select count(1) from sc_building where status = 1 and name = #{name} and site_id = #{siteId} and community = #{community}
         <if test="id != null"> and id != #{id}</if>
     </select>
+    <select id="obtainBuildingInformationOnTheIntegratedMap"
+            resultType="com.bz.smart_city.dto.BuildingInfoListDto">
+        select
+        sb.id as building_id,
+        sb.name as building_name,
+        sb.address ,
+        sb.province,
+        sb.city,
+        sb.region,
+        sb.community,
+        sa1.name as province_name,
+        sa2.name as city_name,
+        sa3.name as region_name,
+        sc.name as community_name,
+        sb.latitude,
+        sb.longitude,
+        temp.device_count,
+        temp.normal_count,
+        temp.alarm_count,
+        temp.fault_count,
+        temp.offline_count,
+        temp.device_unused_count
+        from sc_building sb
+        JOIN(
+        SELECT
+        sd.building_id,
+        count(1) as device_count,
+        SUM(IF(sd.device_status = 1, 1, 0)) as normal_count,
+        SUM(IF(sd.device_status = 2, 1, 0)) as alarm_count,
+        SUM(IF(sd.device_status = 3, 1, 0)) as fault_count,
+        SUM(IF(sd.device_status = 4, 1, 0)) as offline_count,
+        SUM(IF(sd.device_status = 5, 1, 0)) as device_unused_count
+        from sc_device sd
+        <if test="programItems != null and programItems.size() != 0">
+            left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
+        WHERE sd.status = 1 and sd.sys_id != -99
+       <if test="programItems != null and programItems.size() != 0"> and
+            <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
+                sdd.${item.dimensionCode} = #{item.dimensionValue}
+            </foreach>
+        </if>
+        GROUP BY sd.building_id
+        ) temp on (sb.id = temp.building_id)
+        left join sc_area sa1 on sa1.id = sb.province
+        left join sc_area sa2 on sa2.id = sb.city
+        left join sc_area sa3 on sa3.id = sb.region
+        left join sc_community sc on sc.id = sb.community
+        where sb.status = 1
+        <if test=" longitudeMin != 0 and longitudeMax != 0"> and sb.longitude > #{longitudeMin} AND sb.longitude <![CDATA[  < ]]> #{longitudeMax} </if>
+        <if test=" latitudeMin != 0 and latitudeMax != 0"> and sb.latitude > #{latitudeMin} AND sb.latitude <![CDATA[  < ]]> #{latitudeMax} </if>
+
+    </select>
 
 
 </mapper>

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -1229,6 +1229,29 @@
             </foreach>
         </if>
     </select>
+    <select id="findDevicesOnTheMap" resultType="com.bz.smart_city.dto.DeviceDto">
+        select sd.*,scus.customer_name,sdt.en_equipment_type ,sdt.model,swmed.meter_reading
+        from sc_device sd
+        left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)
+        left join sc_water_meter_error_days swmed on ( swmed.device_id = sd.id)
+        left join sc_customer scus on ( scus.id = sd.customer_id)
+        <if test="programItems != null and programItems.size() != 0">
+            left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)
+        </if>
+        where sd.status = 1
+        <if test="programItems != null and programItems.size() != 0"> and
+            <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
+                sdd.${item.dimensionCode} = #{item.dimensionValue}
+            </foreach>
+        </if>
+        <if test="device.buildingId!=null">
+           and sd.building_id=#{device.buildingId}
+        </if>
+        <if test="device.keywords!=null">
+            and (scus.customer_name LIKE concat('%',#{device.keywords},'%')
+                 or sd.water_meter_no LIKE concat('%',#{device.keywords},'%') )
+        </if>
+    </select>
     <update id="updateMeterNo">
         update sc_device set metercode=#{meterNo}
         where metercode=#{meterNo} and customer_id=#{customerId}

smart-city-platform/src/main/resources/mapper/UserMapper.xml

@@ -545,6 +545,16 @@
             on (spi.status=1 and spi.program_id=a.program_id)
 
     </select>
+    <select id="findAuthByTenantId" resultType="com.bz.smart_city.entity.ProgramItem">
+        select
+            spi.id,
+            spi.dimension_id,
+            spi.dimension_code,
+            spi.dimension_value, a.tenant_id from
+            sc_program_item spi join sc_config_platform_user a
+                                     on (spi.status=1 and spi.program_id=a.program_id)
+         where tenant_id=#{tenantId}
+    </select>
 
 
 </mapper>