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

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

@@ -0,0 +1,40 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemStreetTown;
+import com.usky.fire.service.DemStreetTownService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@RestController
+@RequestMapping("/demStreetTown")
+public class DemStreetTownController {
+    @Autowired
+    private DemStreetTownService demStreetTownService;
+    /**
+     * 列表
+     * @param streetTown
+     * @return
+     */
+    @GetMapping("streetDataList")
+    ApiResult<List<DemStreetTown>> streetDataList(@RequestParam(value = "streetTown",required = false) String streetTown){
+        return ApiResult.success(demStreetTownService.streetDataList(streetTown));
+    }
+}
+

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

@@ -0,0 +1,107 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemStreetTown implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 行政区
+     */
+    private String district;
+
+    /**
+     * 乡镇
+     */
+    private String streetTown;
+
+    /**
+     * 镇类别
+     */
+    private String townType;
+
+    /**
+     * 建成区面积（km²）
+     */
+    private Double builtUpArea;
+
+    /**
+     * 常住人口（万人）
+     */
+    private Double permanentPopulation;
+
+    /**
+     * 居住人口（万人）
+     */
+    private Double residentPopulation;
+
+    /**
+     * 易燃易爆危险品生产、经营单位数量
+     */
+    private Integer dangerousGood;
+
+    /**
+     * 劳动密集型企业数量
+     */
+    private Integer labourIntensive;
+
+    /**
+     * 上一年度税收（亿元）
+     */
+    private Double lastYearTax;
+
+    /**
+     * 是否已建立国家综合消防救援队(1 是，0 否)
+     */
+    private Integer rescueTeam;
+
+    /**
+     * “内部”的国家综合性消防救援队名称
+     */
+    private String internalRescueTeam;
+
+    /**
+     * “外部”到达边缘最近的国家队名称
+     */
+    private String externalRescueTeam;
+
+    /**
+     * 到达边缘的行车距离或时间
+     */
+    private String distance time;
+
+    /**
+     * 是否已建设乡镇政府专职消防队
+     */
+    private Integer dedicatedFireBrigade;
+
+    /**
+     * 乡镇政府专消防队名称
+     */
+    private String specializedFireBrigade;
+
+    /**
+     * 是否接入可视化调度平台
+     */
+    private Integer visualizedPlatform;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemStreetTown;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+public interface DemStreetTownMapper extends CrudMapper<DemStreetTown> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemStreetTown;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+public interface DemStreetTownService extends CrudService<DemStreetTown> {
+    List<DemStreetTown> streetDataList(String streetTown);
+}

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

@@ -0,0 +1,35 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemStreetTown;
+import com.usky.fire.mapper.DemStreetTownMapper;
+import com.usky.fire.service.DemStreetTownService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@Service
+public class DemStreetTownServiceImpl extends AbstractCrudService<DemStreetTownMapper, DemStreetTown> implements DemStreetTownService {
+    @Override
+    public List<DemStreetTown> streetDataList(String streetTown){
+        LambdaQueryWrapper<DemStreetTown> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .eq(StringUtils.isNotBlank(streetTown),DemStreetTown::getStreetTown,streetTown);
+        List<DemStreetTown> list = this.list(queryWrapper);
+        return list;
+    }
+}

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemStreetTownMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemStreetTown">
+        <id column="id" property="id" />
+        <result column="district" property="district" />
+        <result column="street_town" property="streetTown" />
+        <result column="town_type" property="townType" />
+        <result column="built_up_area" property="builtUpArea" />
+        <result column="permanent_population" property="permanentPopulation" />
+        <result column="resident_population" property="residentPopulation" />
+        <result column="dangerous_good" property="dangerousGood" />
+        <result column="labour_intensive" property="labourIntensive" />
+        <result column="last_year_tax" property="lastYearTax" />
+        <result column="rescue_team" property="rescueTeam" />
+        <result column="internal_rescue_team" property="internalRescueTeam" />
+        <result column="external_rescue_team" property="externalRescueTeam" />
+        <result column="distance_ time" property="distance time" />
+        <result column="dedicated_fire_brigade" property="dedicatedFireBrigade" />
+        <result column="specialized_fire_brigade" property="specializedFireBrigade" />
+        <result column="visualized_platform" property="visualizedPlatform" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildPlaneController.java

@@ -0,0 +1,21 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 建筑楼层平面图 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@Controller
+@RequestMapping("/baseBuildPlane")
+public class BaseBuildPlaneController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildPlane.java

@@ -0,0 +1,56 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 建筑楼层平面图
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildPlane implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 所属楼层
+     */
+    private String floor;
+
+    /**
+     * 平面图路径
+     */
+    private String planeViewUrl;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -2,6 +2,7 @@ package com.usky.iot.mapper;
 
 import com.usky.iot.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 han
  * @since 2023-06-07
  */
+@Repository
 public interface BaseBuildMapper extends CrudMapper<BaseBuild> {
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseBuildPlaneMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseBuildPlane;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 建筑楼层平面图 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+public interface BaseBuildPlaneMapper extends CrudMapper<BaseBuildPlane> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseBuildPlaneService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseBuildPlane;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 建筑楼层平面图 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+public interface BaseBuildPlaneService extends CrudService<BaseBuildPlane> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildPlaneServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.BaseBuildPlane;
+import com.usky.iot.mapper.BaseBuildPlaneMapper;
+import com.usky.iot.service.BaseBuildPlaneService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 建筑楼层平面图 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-17
+ */
+@Service
+public class BaseBuildPlaneServiceImpl extends AbstractCrudService<BaseBuildPlaneMapper, BaseBuildPlane> implements BaseBuildPlaneService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -301,26 +301,27 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
         List<Integer> facilityIdList = new ArrayList<>();
+        List<BaseBuildFacilityType> baseBuildFacilityType = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(baseBuildFacilityList)) {
             for (int i = 0; i < baseBuildFacilityList.size(); i++) {
                 facilityIdList.add(baseBuildFacilityList.get(i).getFacilityId());
             }
-        }
-        QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
-        query4.select("facility_type as facilityType","count(id) as count")
-                .in("id",facilityIdList)
-                .eq("delete_flag",0)
-                .groupBy("facility_type");
-        List<Map<String, Object>> baseBuildFacilityList5 = baseBuildFacilityService.listMaps(query4);
-        List<String> facilityTypeList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(baseBuildFacilityList5)) {
-            for (int l = 0; l < baseBuildFacilityList5.size(); l++) {
-                facilityTypeList.add(baseBuildFacilityList5.get(l).get("facilityType").toString());
+            QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
+            query4.select("facility_type as facilityType","count(id) as count")
+                    .in("id",facilityIdList)
+                    .eq("delete_flag",0)
+                    .groupBy("facility_type");
+            List<Map<String, Object>> baseBuildFacilityList5 = baseBuildFacilityService.listMaps(query4);
+            List<String> facilityTypeList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(baseBuildFacilityList5)) {
+                for (int l = 0; l < baseBuildFacilityList5.size(); l++) {
+                    facilityTypeList.add(baseBuildFacilityList5.get(l).get("facilityType").toString());
+                }
             }
+            LambdaQueryWrapper<BaseBuildFacilityType> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.in(BaseBuildFacilityType::getTypeCode,facilityTypeList);
+            baseBuildFacilityType = baseBuildFacilityTypeService.list(queryWrapper1);
         }
-        LambdaQueryWrapper<BaseBuildFacilityType> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.in(BaseBuildFacilityType::getTypeCode,facilityTypeList);
-        List<BaseBuildFacilityType> baseBuildFacilityType = baseBuildFacilityTypeService.list(queryWrapper1);
         return baseBuildFacilityType;
     }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -16,6 +16,7 @@ import com.usky.common.core.util.BeanMapperUtils;
 import com.usky.common.core.util.UUIDUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.*;
+import com.usky.iot.mapper.BaseBuildMapper;
 import com.usky.iot.mapper.BaseFacilityTypeMapper;
 import com.usky.iot.mapper.BaseGgpFacilityMapper;
 import com.usky.iot.service.*;
@@ -54,8 +55,8 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     private BaseFacilityBuildService baseFacilityBuildService;
     @Autowired
     private DmpDeviceInfoService dmpDeviceInfoService;
-//    @Autowired
-//    private BaseBuildService baseBuildService;
+    @Autowired
+    private BaseBuildMapper baseBuildMapper;
     @Autowired
     private BaseFacilityTypeMapper baseFacilityTypeMapper;
     @Autowired
@@ -306,12 +307,19 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(BaseFacilityDevice::getFacilityId,id);
         List<BaseFacilityDevice> baseFacilityDeviceList = baseFacilityDeviceService.list(lambdaQuery);
+        LambdaQueryWrapper<BaseBuild> lambdaQuery3 = Wrappers.lambdaQuery();
+        lambdaQuery3.eq(BaseBuild::getFacilityId,id);
+        List<BaseBuild> baseFacilityBuildList = baseBuildMapper.selectList(lambdaQuery3);
         Map<String, Object> map = new HashMap<>();
         map.put("id", baseGgpFacilityList.get(0).getId());
         map.put("facilityName", baseGgpFacilityList.get(0).getFacilityName());
         map.put("facilityAddress", baseGgpFacilityList.get(0).getFacilityAddress());
         map.put("contact", baseGgpFacilityList.get(0).getContact());
         map.put("contactPhone", baseGgpFacilityList.get(0).getContactPhone());
+        map.put("buildId", null);
+        if (CollectionUtils.isNotEmpty(baseFacilityBuildList)){
+            map.put("buildId", baseFacilityBuildList.get(0).getId());
+        }
         LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
         queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
         List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildPlaneMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.BaseBuildPlaneMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseBuildPlane">
+        <id column="id" property="id" />
+        <result column="build_id" property="buildId" />
+        <result column="floor" property="floor" />
+        <result column="plane_view_url" property="planeViewUrl" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>