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

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

@@ -176,6 +176,8 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
             siteNum = patrolInspectionSiteMapper.selectSiteCount(areaIdList);
         }
         if (siteNum>0){
+            throw new BusinessException("区域下有绑定的点位，请解绑后再删除！");
+        }else {
             for (int i = 0; i < patrolInspectionArealist.size(); i++) {
                 PatrolInspectionArea patrolInspectionAreaz = new PatrolInspectionArea();
                 patrolInspectionAreaz.setId(patrolInspectionArealist.get(i).getId());
@@ -186,8 +188,6 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
             patrolInspectionArea.setId(id);
             patrolInspectionArea.setEnable(0);
             this.updateById(patrolInspectionArea);
-        }else {
-            throw new BusinessException("区域下有绑定的点位，请解绑后再删除！");
         }
     }
 

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

@@ -619,9 +619,9 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
         if (list > 0) {
             throw new BusinessException("不可重复采集地点");
         }
-//        if (siteCount <= 0) {
-//            throw new BusinessException("采集点位不合法，请采集合法点位");
-//        }
+        if (siteCount <= 0) {
+            throw new BusinessException("采集点位不合法，请采集合法点位");
+        }
         patrolInspectionSite.setCreator(SecurityUtils.getUsername());
         patrolInspectionSite.setCollector(SecurityUtils.getLoginUser().getSysUser().getNickName());
         patrolInspectionSite.setCreateTime(LocalDateTime.now());

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

@@ -0,0 +1,75 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.domain.BaseBuildEngineering;
+import com.usky.iot.service.BaseBuildEngineeringService;
+import com.usky.iot.service.BaseBuildEngineeringService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2026-02-03
+ */
+@RestController
+@RequestMapping("/baseBuildEngineering")
+public class BaseBuildEngineeringController {
+
+    @Autowired
+    private BaseBuildEngineeringService baseBuildEngineeringService;
+
+    /**
+     * 新增
+     * @param baseBuildEngineering
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody BaseBuildEngineering baseBuildEngineering){
+        baseBuildEngineeringService.add(baseBuildEngineering);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param baseBuildEngineering
+     * @return
+     */
+    @PutMapping
+    ApiResult<Void> update(@RequestBody BaseBuildEngineering baseBuildEngineering){
+        baseBuildEngineeringService.update(baseBuildEngineering);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    ApiResult<Void> remove(@PathVariable("id") Integer id){
+        baseBuildEngineeringService.remove(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 列表
+     * @param id
+     * @param buildId
+     * @return
+     */
+    @GetMapping("baseBuildEngineeringList")
+    ApiResult<List<BaseBuildEngineering>> baseBuildEngineeringList(@RequestParam(value = "id",required = false) Integer id,
+                                                     @RequestParam(value = "buildId") Integer buildId){
+        return ApiResult.success(baseBuildEngineeringService.baseBuildEngineeringList(id,buildId));
+    }
+}
+

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

@@ -0,0 +1,72 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.domain.BaseBuildUnit;
+import com.usky.iot.service.BaseBuildUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2026-02-03
+ */
+@RestController
+@RequestMapping("/baseBuildUnit")
+public class BaseBuildUnitController {
+    @Autowired
+    private BaseBuildUnitService baseBuildUnitService;
+
+    /**
+     * 新增
+     * @param baseBuildUnits
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody List<BaseBuildUnit> baseBuildUnits){
+        baseBuildUnitService.add(baseBuildUnits);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param baseBuildUnits
+     * @return
+     */
+    @PutMapping
+    ApiResult<Void> update(@RequestBody List<BaseBuildUnit> baseBuildUnits){
+        baseBuildUnitService.update(baseBuildUnits);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    ApiResult<Void> remove(@PathVariable("id") Integer id){
+        baseBuildUnitService.remove(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 列表
+     * @param id
+     * @param buildId
+     * @return
+     */
+    @GetMapping("baseBuildUnitList")
+    ApiResult<List<BaseBuildUnit>> baseBuildUnitList(@RequestParam(value = "id",required = false) Integer id,
+                                                     @RequestParam(value = "buildId") Integer buildId){
+        return ApiResult.success(baseBuildUnitService.baseBuildUnitList(id,buildId));
+    }
+}
+

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

@@ -150,6 +150,11 @@ public class BaseBuild implements Serializable {
      */
     private String buildDesc;
 
+    /**
+     * 单元数量
+     */
+    private Integer unitCount;
+
     /**
      * 创建时间
      */

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

@@ -0,0 +1,146 @@
+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 fu
+ * @since 2026-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildEngineering implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工程基础信息表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 工程名称
+     */
+    private String engineeringName;
+
+    /**
+     * 工程地址
+     */
+    private String engineeringAddress;
+
+    /**
+     * 工程区划
+     */
+    private String engineeringArea;
+
+    /**
+     * 联审编号
+     */
+    private String reviewCode;
+
+    /**
+     * 施工许可证工程单体编号
+     */
+    private String projectCode;
+
+    /**
+     * 单元数量
+     */
+    private Integer unitCount;
+
+    /**
+     * 平时阶段用途
+     */
+    private String normalUsage;
+
+    /**
+     * 建设单位
+     */
+    private String constructionCompany;
+
+    /**
+     * 建设单位联系人
+     */
+    private String constructionCompanyPerson;
+
+    /**
+     * 建设单位联系电话
+     */
+    private String constructionCompanyPhone;
+
+    /**
+     * 总包单位
+     */
+    private String contractorCompany;
+
+    /**
+     * 总包单位联系人
+     */
+    private String contractorCompanyPerson;
+
+    /**
+     * 总包单位电话
+     */
+    private String contractorCompanyPhone;
+
+    /**
+     * 物联系统建设单位
+     */
+    private String iotCompany;
+
+    /**
+     * 物联系统联系人
+     */
+    private String iotCompanyPerson;
+
+    /**
+     * 物联系统单位电话
+     */
+    private String iotCompanyPhone;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

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

@@ -0,0 +1,101 @@
+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 fu
+ * @since 2026-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildUnit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单元信息表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 单元主要出入口
+     */
+    private String unitMainExit;
+
+    /**
+     * 单元次要出入口
+     */
+    private String unitOtherExit;
+
+    /**
+     * 单元面积
+     */
+    private Double unitArea;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+
+    /**
+     * 防护单元用途
+     */
+    private String unitUsage;
+
+    /**
+     * 掩蔽人数上限
+     */
+    private Integer peopleNumber;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseBuildEngineering;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fu
+ * @since 2026-02-03
+ */
+public interface BaseBuildEngineeringMapper extends CrudMapper<BaseBuildEngineering> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseBuildUnit;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fu
+ * @since 2026-02-03
+ */
+public interface BaseBuildUnitMapper extends CrudMapper<BaseBuildUnit> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseBuildEngineering;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.domain.BaseBuildUnit;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author fu
+ * @since 2026-02-03
+ */
+public interface BaseBuildEngineeringService extends CrudService<BaseBuildEngineering> {
+    void add(BaseBuildEngineering baseBuildEngineering);
+
+    void update(BaseBuildEngineering baseBuildEngineering);
+
+    void remove(Integer id);
+
+    List<BaseBuildEngineering> baseBuildEngineeringList(Integer id, Integer buildId);
+}

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

@@ -0,0 +1,25 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseBuild;
+import com.usky.iot.domain.BaseBuildUnit;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author han
+ * @since 2026-02-03
+ */
+public interface BaseBuildUnitService extends CrudService<BaseBuildUnit> {
+    void add(List<BaseBuildUnit> baseBuildUnits);
+
+    void update(List<BaseBuildUnit> baseBuildUnits);
+
+    void remove(Integer id);
+
+    List<BaseBuildUnit> baseBuildUnitList(Integer id,Integer buildId);
+}

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

@@ -0,0 +1,59 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseBuildEngineering;
+import com.usky.iot.domain.BaseBuildUnit;
+import com.usky.iot.mapper.BaseBuildEngineeringMapper;
+import com.usky.iot.service.BaseBuildEngineeringService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2026-02-03
+ */
+@Service
+public class BaseBuildEngineeringServiceImpl extends AbstractCrudService<BaseBuildEngineeringMapper, BaseBuildEngineering> implements BaseBuildEngineeringService {
+    @Override
+    public void add(BaseBuildEngineering baseBuildEngineering){
+        baseBuildEngineering.setCreateBy(SecurityUtils.getUsername());
+        baseBuildEngineering.setCreateTime(LocalDateTime.now());
+        baseBuildEngineering.setTenantId(SecurityUtils.getTenantId());
+        this.save(baseBuildEngineering);
+    }
+
+    @Override
+    public void update(BaseBuildEngineering baseBuildEngineering){
+        baseBuildEngineering.setUpdateBy(SecurityUtils.getUsername());
+        baseBuildEngineering.setUpdateTime(LocalDateTime.now());
+        this.updateById(baseBuildEngineering);
+    }
+
+    @Override
+    public void remove(Integer id){
+
+        this.removeById(id);
+
+    }
+
+    @Override
+    public List<BaseBuildEngineering> baseBuildEngineeringList(Integer id, Integer buildId){
+        LambdaQueryWrapper<BaseBuildEngineering> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(!ObjectUtils.isEmpty(id),BaseBuildEngineering::getId,id)
+                .eq(BaseBuildEngineering::getBuildId,buildId)
+                .eq(BaseBuildEngineering::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(BaseBuildEngineering::getId);
+        List<BaseBuildEngineering> list = this.list(queryWrapper);
+        return list;
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.usky.iot.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.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseBuild;
+import com.usky.iot.domain.BaseBuildFacilityRelate;
+import com.usky.iot.domain.BaseBuildUnit;
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.iot.mapper.BaseBuildUnitMapper;
+import com.usky.iot.service.BaseBuildUnitService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2026-02-03
+ */
+@Service
+public class BaseBuildUnitServiceImpl extends AbstractCrudService<BaseBuildUnitMapper, BaseBuildUnit> implements BaseBuildUnitService {
+    @Override
+    public void add(List<BaseBuildUnit> baseBuildUnits){
+        if(CollectionUtils.isNotEmpty(baseBuildUnits)){
+            for(int i=0;i<baseBuildUnits.size();i++){
+                BaseBuildUnit baseBuildUnit = baseBuildUnits.get(i);
+                baseBuildUnit.setCreateBy(SecurityUtils.getUsername());
+                baseBuildUnit.setCreateTime(LocalDateTime.now());
+                baseBuildUnit.setTenantId(SecurityUtils.getTenantId());
+                this.save(baseBuildUnit);
+            }
+        }else {
+            throw new BusinessException("提交内容不能为空");
+        }
+    }
+
+    @Override
+    public void update(List<BaseBuildUnit> baseBuildUnits){
+        if(CollectionUtils.isNotEmpty(baseBuildUnits)){
+            this.remove(1);
+            for(int i=0;i<baseBuildUnits.size();i++){
+                BaseBuildUnit baseBuildUnit = baseBuildUnits.get(i);
+                baseBuildUnit.setUpdateBy(SecurityUtils.getUsername());
+                baseBuildUnit.setUpdateTime(LocalDateTime.now());
+                baseBuildUnit.setTenantId(SecurityUtils.getTenantId());
+                this.save(baseBuildUnit);
+            }
+        }else {
+            throw new BusinessException("提交内容不能为空");
+        }
+
+
+    }
+
+    @Override
+    public void remove(Integer id){
+        LambdaQueryWrapper<BaseBuildUnit> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(BaseBuildUnit::getTenantId,SecurityUtils.getTenantId());
+        this.remove(queryWrapper);
+
+    }
+
+    @Override
+    public List<BaseBuildUnit> baseBuildUnitList(Integer id,Integer buildId){
+        LambdaQueryWrapper<BaseBuildUnit> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(!ObjectUtils.isEmpty(id),BaseBuildUnit::getId,id)
+                .eq(BaseBuildUnit::getBuildId,buildId)
+                .eq(BaseBuildUnit::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(BaseBuildUnit::getId);
+        List<BaseBuildUnit> list = this.list(queryWrapper);
+        return list;
+    }
+}

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

@@ -0,0 +1,33 @@
+<?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.BaseBuildEngineeringMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseBuildEngineering">
+        <id column="id" property="id" />
+        <result column="engineering_name" property="engineeringName" />
+        <result column="engineering_address" property="engineeringAddress" />
+        <result column="engineering_area" property="engineeringArea" />
+        <result column="review_code" property="reviewCode" />
+        <result column="project_code" property="projectCode" />
+        <result column="unit_count" property="unitCount" />
+        <result column="normal_usage" property="normalUsage" />
+        <result column="construction_company" property="constructionCompany" />
+        <result column="construction_company_person" property="constructionCompanyPerson" />
+        <result column="construction_company_phone" property="constructionCompanyPhone" />
+        <result column="contractor_company" property="contractorCompany" />
+        <result column="contractor_company_person" property="contractorCompanyPerson" />
+        <result column="contractor_company_phone" property="contractorCompanyPhone" />
+        <result column="iot_company" property="iotCompany" />
+        <result column="iot_company_person" property="iotCompanyPerson" />
+        <result column="iot_company_phone" property="iotCompanyPhone" />
+        <result column="build_id" property="buildId" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

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

@@ -29,6 +29,7 @@
         <result column="bim_url" property="bimUrl" />
         <result column="contact_phone" property="contactPhone" />
         <result column="build_desc" property="buildDesc" />
+        <result column="unit_count" property="unitCount" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="update_by" property="updateBy" />

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

@@ -0,0 +1,24 @@
+<?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.BaseBuildUnitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseBuildUnit">
+        <id column="id" property="id" />
+        <result column="unit_name" property="unitName" />
+        <result column="unit_main_exit" property="unitMainExit" />
+        <result column="unit_other_exit" property="unitOtherExit" />
+        <result column="unit_area" property="unitArea" />
+        <result column="floor" property="floor" />
+        <result column="unit_usage" property="unitUsage" />
+        <result column="people_number" property="peopleNumber" />
+        <result column="build_id" property="buildId" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>