'开发值班查岗、网格员信息管理、基础信息管理-单位信息管理三个导出接口'

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

@@ -1,6 +1,7 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
@@ -8,9 +9,13 @@ import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.BaseCompanyService;
 import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.CompanyExportVO;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -56,6 +61,23 @@ public class BaseCompanyController {
         return ApiResult.success(baseCompanyService.companyList(companyName, organization, pageNum, pageSize));
     }
 
+    /**
+     * 单位管理-单位列表查询-导出
+     *
+     * @param companyName  单位名称
+     * @param organization 组织机构编码
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("companyListExport")
+    public void export(HttpServletResponse response,
+                                  @RequestParam(value = "companyName", required = false) String companyName,
+                                  @RequestParam(value = "organization", required = false) String organization,
+                                  @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<CompanyExportVO> list = baseCompanyService.companyListExport(companyName, organization);
+        ExcelUtil<CompanyExportVO> util = new ExcelUtil<CompanyExportVO>(CompanyExportVO.class);
+        util.exportExcel(response,list,exportTitle,exportTitle);
+    }
     /**
      * 单位管理-修改
      *

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

@@ -1,18 +1,21 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.BaseCompanyPerson;
 import com.usky.fire.domain.MhPostInspect;
 import com.usky.fire.service.BaseCompanyPersonService;
 import com.usky.fire.service.MhPostInspectService;
+import com.usky.fire.service.vo.AlarmFireVo;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -50,6 +53,24 @@ public class BaseCompanyPersonController {
         return ApiResult.success(baseCompanyPersonService.baseCompanyPersonList(companyCode, companyName, pageNum, pageSize));
     }
 
+    /**
+     * 值班查岗-查岗单位及记录数据查询列表查询接口（闵行支队、企业版）-导出
+     *
+     * @param companyCode 单位编号
+     * @param companyName 单位名称
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("postInspectListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "companyCode", required = false) String companyCode,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<BaseCompanyPersonVO> list = baseCompanyPersonService.baseCompanyPersonListExport(companyCode,companyName);
+        ExcelUtil<BaseCompanyPersonVO> util = new ExcelUtil<BaseCompanyPersonVO>(BaseCompanyPersonVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 值班查岗-主页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
      *

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

@@ -31,11 +31,15 @@ public class BscLawTrendController {
      * 消防执法动态-数据查询
      *
      * @param moduleType 模块类型(monthLaw:当月执法情况 adstraLicense:行政许可情况 reportComplaint:消防隐患举报投诉 complaintHandle:投诉处理情况)
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
     @GetMapping("lawTrendList")
-    public ApiResult<Object> lawTrendList(@RequestParam(value = "moduleType") String moduleType) {
-        return ApiResult.success(bscLawTrendService.lawTrendList(moduleType));
+    public ApiResult<Object> lawTrendList(@RequestParam(value = "moduleType") String moduleType,
+                                          @RequestParam(value = "startDate", required = false) String startDate,
+                                          @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(bscLawTrendService.lawTrendList(moduleType, startDate, endDate));
     }
 
     /**

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

@@ -1,15 +1,21 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemGridMember;
 import com.usky.fire.service.DemGridMemberService;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 网格员信息管理表 前端控制器
@@ -46,6 +52,28 @@ public class DemGridMemberController {
         return ApiResult.success(demGridMemberService.gridMemberList(gridArea, streetTown, gridPersonnel, id, pageNum, pageSize));
     }
 
+    /**
+     * 网格员信息管理-列表查询-导出
+     *
+     * @param gridArea      网格区域
+     * @param streetTown    街镇
+     * @param gridPersonnel 网格人员姓名
+     * @param id            主键ID
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("gridMemberListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "gridArea", required = false) String gridArea,
+                       @RequestParam(value = "streetTown", required = false) String streetTown,
+                       @RequestParam(value = "gridPersonnel", required = false) String gridPersonnel,
+                       @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<DemGridMemberVO> list = demGridMemberService.gridMemberListExport(gridArea, streetTown, gridPersonnel, id);
+        ExcelUtil<DemGridMemberVO> util = new ExcelUtil<DemGridMemberVO>(DemGridMemberVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 网格员信息管理-新增
      *

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

@@ -3,8 +3,10 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompanyPerson;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 
 import java.util.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -27,6 +29,8 @@ public interface BaseCompanyPersonService extends CrudService<BaseCompanyPerson>
      */
     CommonPage<BaseCompanyPerson> baseCompanyPersonList(String companyCode, String companyName, Integer pageNum, Integer pageSize);
 
+    List<BaseCompanyPersonVO> baseCompanyPersonListExport(String companyCode, String companyName);
+
     /**
      * 值班查岗-主页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
      *

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.CompanyExportVO;
 
 import java.util.List;
 import java.util.Map;
@@ -51,6 +52,13 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      */
     CommonPage<Object> companyList(String companyName, String organization, Integer pageNum, Integer pageSize);
 
+    /**
+     * 单位管理-单位列表查询-导出
+     * @param companyName  单位名称
+     * @param organization 组织机构编码
+     */
+    List<CompanyExportVO> companyListExport(String companyName, String organization);
+
     /**
      * 单位管理-修改
      *

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

@@ -25,9 +25,11 @@ public interface BscLawTrendService extends CrudService<BscLawTrend> {
      * 消防执法动态-数据查询
      *
      * @param moduleType 模块类型
+     * @param startDate  开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate    结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Object lawTrendList(String moduleType);
+    Object lawTrendList(String moduleType, String startDate, String endDate);
 
     /**
      * 消防执法动态-单位撒点详情数据

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

@@ -2,8 +2,11 @@ package com.usky.fire.service;
 
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格员信息管理表 服务类
@@ -16,6 +19,8 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize);
 
+    List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id);
+
     void addGridMember(DemGridMember demGridMember);
 
     void updateGridMember(DemGridMember demGridMember);

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

@@ -15,10 +15,12 @@ import com.usky.fire.mapper.BaseCompanyPersonMapper;
 import com.usky.fire.mapper.MhPostInspectMapper;
 import com.usky.fire.service.BaseCompanyPersonService;
 import com.usky.fire.service.BaseUserCompanyService;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -32,9 +34,6 @@ import java.util.*;
 @Service
 public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompanyPersonMapper, BaseCompanyPerson> implements BaseCompanyPersonService {
 
-    @Autowired
-    private BaseUserCompanyService baseUserCompanyService;
-
     @Autowired
     private MhPostInspectMapper mhPostInspectMapper;
 
@@ -78,6 +77,51 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<BaseCompanyPersonVO> baseCompanyPersonListExport(String companyCode,String companyName){
+        LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(BaseCompany::getCompanyId)
+                .eq(BaseCompany::getEnable,0)
+                .like(StringUtils.isNotBlank(companyCode), BaseCompany::getCompanyCode, companyCode)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> baseCompanies = baseCompanyMapper.selectList(queryWrapper1);
+        List<BaseCompanyPersonVO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(baseCompanies)){
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < baseCompanies.size(); i++) {
+                companyIdList.add(baseCompanies.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<BaseCompanyPerson> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(BaseCompanyPerson::getCompanyId, companyIdList)
+                    .orderByDesc(BaseCompanyPerson::getId);
+            List<BaseCompanyPerson> list1 = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(list1)) {
+                List<BaseCompanyPerson> baseCompanyPeople = mhPostInspectMapper.inspectStatistics(null);
+                for (int i = 0; i < list1.size(); i++) {
+                    BaseCompanyPersonVO baseCompanyPersonVO = new BaseCompanyPersonVO();
+                    baseCompanyPersonVO.setCompanyName(list1.get(i).getCompanyName());
+                    baseCompanyPersonVO.setCompanyCode(list1.get(i).getCompanyCode());
+                    baseCompanyPersonVO.setFireDutyName(list1.get(i).getFireDutyName());
+                    baseCompanyPersonVO.setFireDutyPhone(list1.get(i).getFireDutyPhone());
+                    baseCompanyPersonVO.setFireManageName(list1.get(i).getFireManageName());
+                    baseCompanyPersonVO.setFireManagePhone(list1.get(i).getFireManagePhone());
+                    baseCompanyPersonVO.setFireControlPhone(list1.get(i).getFireControlPhone());
+                    for (int j = 0; j < baseCompanyPeople.size(); j++) {
+                        if (list1.get(i).getCompanyId().equals(baseCompanyPeople.get(j).getCompanyId())) {
+                            baseCompanyPersonVO.setInspectCount(baseCompanyPeople.get(j).getInspectCount());
+                            baseCompanyPersonVO.setAnswerCount(baseCompanyPeople.get(j).getAnswerCount());
+                            baseCompanyPersonVO.setInspectTime((baseCompanyPeople.get(j).getInspectTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        }
+                    }
+                    list.add(baseCompanyPersonVO);
+                }
+            }
+
+        }
+        return list;
+    }
+
     @Override
     public Map<String, Object> postInspectStatistics() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

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

@@ -15,12 +15,14 @@ import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.CompanyExportVO;
 import com.usky.fire.service.vo.LocateInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -171,6 +173,75 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<CompanyExportVO> companyListExport(String companyName, String organization){
+
+        List<CompanyExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyId, BaseCompany::getCompanyName, BaseCompany::getOrganization,
+                BaseCompany::getAddress, BaseCompany::getCompanyType, BaseCompany::getFireHazard, BaseCompany::getLinkPhone,
+                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision, BaseCompany::getCreateTime)
+                .eq(BaseCompany::getEnable, 0)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .like(StringUtils.isNotBlank(organization), BaseCompany::getOrganization, organization)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> baseCompanyList = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(baseCompanyList)) {
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < baseCompanyList.size(); i++) {
+                companyIdList.add(baseCompanyList.get(i).getCompanyId());
+            }
+            List<BaseCompanyPerson> list1 = new ArrayList<>();
+            List<BaseCompanyAttach1> list2 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(companyIdList)) {
+                LambdaQueryWrapper<BaseCompanyPerson> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(BaseCompanyPerson::getId, BaseCompanyPerson::getCompanyId, BaseCompanyPerson::getFireDutyName,
+                        BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getDelegateName)
+                        .in(BaseCompanyPerson::getCompanyId, companyIdList);
+                list1 = baseCompanyPersonService.list(queryWrapper1);
+                LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper2 = Wrappers.lambdaQuery();
+                queryWrapper2.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getCompanyId, BaseCompanyAttach1::getFixedAssets,
+                        BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getEmployeeNum,
+                        BaseCompanyAttach1::getMainAttribute, BaseCompanyAttach1::getGovernBody)
+                        .in(BaseCompanyAttach1::getCompanyId, companyIdList);
+                list2 = baseCompanyAttach1Service.list(queryWrapper2);
+            }
+
+            for (int i = 0; i < baseCompanyList.size(); i++) {
+                CompanyExportVO companyDataVo = new CompanyExportVO();
+                companyDataVo.setCompanyName(baseCompanyList.get(i).getCompanyName());
+                companyDataVo.setOrganization(baseCompanyList.get(i).getOrganization());
+                companyDataVo.setAddress(baseCompanyList.get(i).getAddress());
+                companyDataVo.setCompanyType(baseCompanyList.get(i).getCompanyType());
+                companyDataVo.setFireHazard(baseCompanyList.get(i).getFireHazard());
+                companyDataVo.setLinkPhone(baseCompanyList.get(i).getLinkPhone());
+                companyDataVo.setFoundTime(baseCompanyList.get(i).getFoundTime());
+                companyDataVo.setCompanyNature(baseCompanyList.get(i).getCompanyNature());
+                companyDataVo.setAdministrativeDivision(baseCompanyList.get(i).getAdministrativeDivision());
+                for (int j = 0; j < list1.size(); j++) {
+                    if (baseCompanyList.get(i).getCompanyId().equals(list1.get(j).getCompanyId())) {
+                        companyDataVo.setDelegateName(list1.get(j).getDelegateName());
+                        companyDataVo.setFireDutyName(list1.get(j).getFireDutyName());
+                        companyDataVo.setFireManageName(list1.get(j).getFireManageName());
+                    }
+                }
+                for (int j = 0; j < list2.size(); j++) {
+                    if (baseCompanyList.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
+                        companyDataVo.setGovernBody(list2.get(j).getGovernBody());
+                        companyDataVo.setMainAttribute(list2.get(j).getMainAttribute());
+                        companyDataVo.setEmployeeNum(list2.get(j).getEmployeeNum());
+                        companyDataVo.setFixedAssets(list2.get(j).getFixedAssets());
+                        companyDataVo.setCoverArea(list2.get(j).getCoverArea());
+                        companyDataVo.setBuildArea(list2.get(j).getBuildArea());
+                    }
+                }
+                companyDataVo.setCreateTime((baseCompanyList.get(i).getCreateTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                list.add(companyDataVo);
+            }
+        }
+        return list;
+    }
+
     @Transactional
     @Override
     public void updateCompany(CompanyDataVo companyDataVo) {

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

@@ -74,7 +74,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     private DemEnforceInspectRecordService demEnforceInspectRecordService;
 
     @Override
-    public Object lawTrendList(String moduleType) {
+    public Object lawTrendList(String moduleType, String startDate, String endDate) {
         LambdaQueryWrapper<BscLawTrend> queryWrapper = Wrappers.lambdaQuery();
         switch (moduleType) {
             case "monthLaw":
@@ -95,7 +95,8 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
             default:
                 throw new BusinessException("参数错误");
         }
-        queryWrapper.orderByDesc(BscLawTrend::getId)
+        queryWrapper.between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate),  BscLawTrend::getCreateTime, startDate, endDate)
+                .orderByDesc(BscLawTrend::getId)
                 .last(" limit 1");
         List<BscLawTrend> list = this.list(queryWrapper);
         String data = null;

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

@@ -15,11 +15,13 @@ import com.usky.fire.mapper.DemGridMemberMapper;
 import com.usky.fire.service.DemGridMemberService;
 import com.usky.fire.service.DemGridMemderViceService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -73,6 +75,74 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id) {
+        LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(streetTown), DemGridMember::getStreetTown, streetTown)
+                .eq(id != null&&id != 0, DemGridMember::getId, id)
+                .like(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
+                .like(StringUtils.isNotBlank(gridPersonnel), DemGridMember::getGridPersonnel, gridPersonnel)
+                .orderByDesc(DemGridMember::getId);
+        List<DemGridMember> list1 = this.list(queryWrapper);
+        List<DemGridMemberVO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<Integer> gridMemberId = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                gridMemberId.add(list1.get(i).getId());
+            }
+            List<DemGridMemderVice> demGridMemderVicesList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(gridMemberId)) {
+                demGridMemderVicesList = demGridMemderViceService.gridMemderViceList(gridMemberId);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                DemGridMemberVO demGridMemberVO = new DemGridMemberVO();
+                demGridMemberVO.setGridArea(list1.get(i).getGridArea());
+                demGridMemberVO.setStreetTown(list1.get(i).getStreetTown());
+                StringBuffer gridPersonStr = new StringBuffer();
+                StringBuffer gridPhoneStr = new StringBuffer();
+                StringBuffer addPersonStr = new StringBuffer();
+                StringBuffer addPhoneStr = new StringBuffer();
+                gridPersonStr.append(list1.get(i).getGridPersonnel());
+                gridPhoneStr.append(list1.get(i).getGridPhone());
+                addPersonStr.append("");
+                addPhoneStr.append("");
+                if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
+                    for (int j = 0; j < demGridMemderVicesList.size(); j++) {
+                        if (list1.get(i).getId() == demGridMemderVicesList.get(j).getGridMemberId()) {
+                            if(demGridMemderVicesList.get(j).getPersonnelType() == 1){
+                                gridPersonStr.append(",").append(demGridMemderVicesList.get(j).getPersonnelName());
+                                gridPhoneStr.append(",").append(demGridMemderVicesList.get(j).getPhone());
+                            }
+                            if(demGridMemderVicesList.get(j).getPersonnelType() == 2){
+                                addPersonStr.append(demGridMemderVicesList.get(j).getPersonnelName()).append(",");
+                                addPhoneStr.append(demGridMemderVicesList.get(j).getPhone()).append(",");
+
+                            }
+                        }
+                    }
+                }
+                String gridPerson = gridPersonStr.toString();
+                String gridPhone = gridPhoneStr.toString();
+                String addPerson = addPersonStr.toString();
+                String addPhone = addPhoneStr.toString();
+
+                demGridMemberVO.setGridPersonnel(gridPerson);
+                demGridMemberVO.setGridPhone(gridPhone);
+                if(StringUtils.isNotBlank(addPerson)){
+                    demGridMemberVO.setAddPersonnel(addPerson.substring(0,addPerson.length()-1));
+                }
+                if(StringUtils.isNotBlank(addPhone)) {
+                    demGridMemberVO.setAddPhone(addPhone.substring(0, addPhone.length() - 1));
+                }
+                demGridMemberVO.setCreateTime((list1.get(i).getCreateTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                list.add(demGridMemberVO);
+            }
+
+        }
+        return list;
+    }
+
     @Transactional
     @Override
     public void addGridMember(DemGridMember demGridMember) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/mqtt/alarm/Alarm.java

@@ -20,6 +20,7 @@ import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
 
 /**
  * @author yq

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseCompanyPersonVO.java

@@ -0,0 +1,95 @@
+package com.usky.fire.service.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 值班查岗信息表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class BaseCompanyPersonVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 单位编号
+     */
+    @Excel(name = "单位编号")
+    private String companyCode;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人电话
+     */
+    @Excel(name = "消防安全责任人电话")
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人电话
+     */
+    @Excel(name = "消防安全管理人电话")
+    private String fireManagePhone;
+
+    /**
+     * 消防控制室电话
+     */
+    @Excel(name = "消防控制室电话")
+    private String fireControlPhone;
+
+    /**
+     * 查岗次数
+     */
+    @Excel(name = "查岗次数")
+    private Integer inspectCount;
+
+    /**
+     * 应答次数
+     */
+    @Excel(name = "应答次数")
+    private Integer answerCount;
+
+    /**
+     * 最后查岗时间
+     */
+    @Excel(name = "最后查岗时间")
+    private String inspectTime;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/CompanyExportVO.java

@@ -0,0 +1,148 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyExportVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 组织机构编码
+     */
+    @Excel(name = "组织机构代码")
+    private String organization;
+
+    /**
+     * 法人代表姓名
+     */
+    @Excel(name = "法人代表")
+    private String delegateName;
+
+    /**
+     * 单位详细地址
+     */
+    @Excel(name = "单位地址")
+    private String address;
+
+    /**
+     * 单位类型
+     */
+    @Excel(name = "单位类型")
+    private String companyType;
+
+    /**
+     * 火灾危险性
+     */
+    @Excel(name = "火灾危险性")
+    private String fireHazard;
+
+    /**
+     * 单位联系电话
+     */
+    @Excel(name = "单位电话")
+    private String linkPhone;
+
+    /**
+     * 单位成立时间
+     */
+    @Excel(name = "成立时间")
+    private LocalDateTime foundTime;
+
+    /**
+     * 单位性质
+     */
+    @Excel(name = "单位性质")
+    private Integer companyNature;
+
+    /**
+     * 行政区域
+     */
+    @Excel(name = "行政区域")
+    private String administrativeDivision;
+
+    /**
+     * 固定资产（单位：万元）
+     */
+    @Excel(name = "固定资产（万元）")
+    private String fixedAssets;
+
+    /**
+     * 占地面积
+     */
+    @Excel(name = "占地面积")
+    private String coverArea;
+
+    /**
+     * 建筑面积
+     */
+    @Excel(name = "建筑面积")
+    private String buildArea;
+
+    /**
+     * 职工人数
+     */
+    @Excel(name = "职工人数")
+    private String employeeNum;
+
+    /**
+     * 单位主属性
+     */
+    @Excel(name = "单位属性")
+    private String mainAttribute;
+
+    /**
+     * 管辖机构（含大队）
+     */
+    @Excel(name = "管辖机构")
+    private String governBody;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private String createTime;
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemGridMemberVO.java

@@ -0,0 +1,75 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 网格员信息表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemGridMemberVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格区域
+     */
+    @Excel(name = "网格区域")
+    private String gridArea;
+
+    /**
+     * 街镇
+     */
+    @Excel(name = "街镇")
+    private String streetTown;
+
+    /**
+     * 网格人员姓名
+     */
+    @Excel(name = "网格人员姓名")
+    private String gridPersonnel;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String gridPhone;
+
+    /**
+     * 增员人员姓名
+     */
+    @Excel(name = "增员人员姓名")
+    private String addPersonnel;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String addPhone;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private String createTime;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/MqttDataVO.java

@@ -0,0 +1,35 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author zyj
+ * @date 2023-01-11
+ */
+@Data
+public class MqttDataVO {
+    /**
+     * 设备编号
+     */
+    private String devId;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 单位编号
+     */
+    private String companyId;
+
+    /**
+     * 系统类型 (1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     */
+    private Integer systemType;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+}