Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseDeviceController.java

@@ -2,6 +2,7 @@ package com.usky.fire.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.service.BaseDeviceService;
 import com.usky.fire.service.vo.BaseDeviceVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -36,5 +38,15 @@ public class BaseDeviceController {
         return ApiResult.success(baseDeviceService.deviceTypeList());
     }
 
+    /**
+     * 企业自主管理-物联网设备情况统计撒点
+     * @param deviceTypeCode
+     * @return
+     */
+    @GetMapping("deviceTypeScatter")
+    public ApiResult<List<BaseBuild>> deviceTypeScatter(@RequestParam(value = "deviceTypeCode") Integer deviceTypeCode){
+        return ApiResult.success(baseDeviceService.deviceTypeScatter(deviceTypeCode));
+    }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseBuild.java

@@ -187,4 +187,14 @@ public class BaseBuild implements Serializable {
      * 其他设施
      */
     private String otherFacilities;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/BaseBuildMapper.java

@@ -2,6 +2,7 @@ package com.usky.fire.mapper;
 
 import com.usky.fire.domain.BaseBuild;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-11-22
  */
+@Repository
 public interface BaseBuildMapper extends CrudMapper<BaseBuild> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseDeviceService.java

@@ -1,8 +1,10 @@
 package com.usky.fire.service;
 
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.domain.BaseDevice;
 import com.usky.fire.service.vo.BaseDeviceVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -34,4 +36,6 @@ public interface BaseDeviceService extends CrudService<BaseDevice> {
     Integer deviceCount(String companyId, Integer deviceType);
 
     BaseDeviceVO deviceTypeList();
+
+    List<BaseBuild> deviceTypeScatter(Integer deviceTypeCode);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseDeviceServiceImpl.java

@@ -2,10 +2,13 @@ package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.domain.BaseDevice;
 import com.usky.fire.domain.BaseDeviceStatus;
+import com.usky.fire.mapper.BaseBuildMapper;
 import com.usky.fire.mapper.BaseDeviceMapper;
 import com.usky.fire.mapper.BaseDeviceStatusMapper;
 import com.usky.fire.service.BaseDeviceService;
@@ -32,6 +35,9 @@ public class BaseDeviceServiceImpl extends AbstractCrudService<BaseDeviceMapper,
     @Autowired
     private BaseDeviceStatusMapper baseDeviceStatusMapper;
 
+    @Autowired
+    private BaseBuildMapper baseBuildMapper;
+
     @Override
     public List<BaseDevice> deviceData(String deviceCode) {
         LambdaQueryWrapper<BaseDevice> queryWrapper = Wrappers.lambdaQuery();
@@ -58,11 +64,13 @@ public class BaseDeviceServiceImpl extends AbstractCrudService<BaseDeviceMapper,
 
         BaseDeviceVO baseDeviceVO = new BaseDeviceVO();
         LambdaQueryWrapper<BaseDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(BaseDevice::getEnable,1);
         Integer totalCount = this.count(queryWrapper);
         baseDeviceVO.setDeviceCount(totalCount);
 
         QueryWrapper<BaseDevice> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("device_type as deviceTypeCode","device_name as deviceTypeName","count(*) as deviceCount")
+                .eq("enable",1)
                 .groupBy("device_type");
         List<Map<String,Object>> map = this.listMaps(queryWrapper1);
         if(map.size() > 0){
@@ -99,4 +107,29 @@ public class BaseDeviceServiceImpl extends AbstractCrudService<BaseDeviceMapper,
         return baseDeviceVO;
     }
 
+    @Override
+    public List<BaseBuild> deviceTypeScatter(Integer deviceTypeCode){
+        List<BaseBuild> list = new ArrayList<>();
+
+        LambdaQueryWrapper<BaseDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseDevice::getCompanyId)
+                .eq(BaseDevice::getEnable,1)
+            .eq(BaseDevice::getDeviceType,deviceTypeCode);
+        List<BaseDevice> deviceList = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(deviceList)){
+            List<String> buildNumList = new ArrayList<>();
+            for (int i = 0; i < deviceList.size(); i++) {
+                buildNumList.add(deviceList.get(i).getCompanyId());
+            }
+            if(buildNumList.size() > 0){
+                LambdaQueryWrapper<BaseBuild> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.in(BaseBuild::getBuildNum,buildNumList)
+                        .eq(BaseBuild::getDeleteFlag,0);
+                list = baseBuildMapper.selectList(queryWrapper1);
+            }
+        }
+
+        return list;
+    }
+
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseBuildMapper.xml

@@ -37,6 +37,8 @@
         <result column="fire_facility_system" property="fireFacilitySystem" />
         <result column="other_system" property="otherSystem" />
         <result column="other_facilities" property="otherFacilities" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
     </resultMap>
 
 </mapper>