Prechádzať zdrojové kódy

'基础信息管理-执法检查数据管理接口导出'

james 2 rokov pred
rodič
commit
1a7259d753

+ 20 - 3
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataRtController.java

@@ -35,16 +35,33 @@ public class DataRtController {
      *
      * @param deviceCode 设备编号
      * @param systemType 系统类型(1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("dataRtList")
+    public ApiResult<CommonPage<DataRt>> dataRtList(@RequestParam(value = "deviceCode", required = false) String deviceCode,
+                                                    @RequestParam(value = "systemType") Integer systemType,
+                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(dataRtService.dataRtList(deviceCode, systemType, pageNum, pageSize));
+    }
+
+    /**
+     * 设备管理实时数据-列表查询
+     *
+     * @param deviceCode 设备编号
+     * @param systemType 系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统)
      * @param pageNum          当前页
      * @param pageSize         每页条数
      * @return
      */
-    @GetMapping("dataRtList")
-    public ApiResult<CommonPage<DataRtVo>> dataRtList(@RequestParam(value = "deviceCode", required = false) String deviceCode,
+    @GetMapping("deviceDataRtList")
+    public ApiResult<CommonPage<DataRtVo>> deviceDataRtList(@RequestParam(value = "deviceCode", required = false) String deviceCode,
                                           @RequestParam(value = "systemType") Integer systemType,
                                           @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                           @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataRtService.dataRtList(deviceCode, systemType, pageNum, pageSize));
+        return ApiResult.success(dataRtService.deviceDataRtList(deviceCode, systemType, pageNum, pageSize));
     }
 
     /**

+ 24 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceInspectRecordController.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;
@@ -9,6 +10,11 @@ import com.usky.fire.domain.DemEnforceInspectRecord;
 import com.usky.fire.service.DemEnforceInspectRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import com.usky.fire.service.vo.DemEnforceInspectRecordVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -42,6 +48,24 @@ public class DemEnforceInspectRecordController {
         return ApiResult.success(demEnforceInspectRecordService.enforceInspectRecordList(projectCode, companyName, pageNum, pageSize));
     }
 
+    /**
+     * 执法检查数据-列表查询-导出
+     *
+     * @param projectCode 项目编号
+     * @param companyName 单位名称
+     * @param exportTitle 文件名
+     * @throws IOException
+     */
+    @PostMapping("enforceInspectRecordListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "projectCode", required = false) String projectCode,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException{
+        List<DemEnforceInspectRecordVO> list = demEnforceInspectRecordService.enforceInspectRecordListExport(projectCode, companyName);
+        ExcelUtil<DemEnforceInspectRecordVO> util = new ExcelUtil<DemEnforceInspectRecordVO>(DemEnforceInspectRecordVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 执法检查数据-修改
      *

+ 12 - 1
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataRtService.java

@@ -23,11 +23,22 @@ public interface DataRtService extends CrudService<DataRt> {
      *
      * @param deviceCode 设备编号
      * @param systemType 系统类型(1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    CommonPage<DataRt> dataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize);
+
+    /**
+     * 设备管理实时数据-列表查询
+     *
+     * @param deviceCode 设备编号
+     * @param systemType 系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统)
      * @param pageNum          当前页
      * @param pageSize         每页条数
      * @return
      */
-    CommonPage<DataRtVo> dataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize);
+    CommonPage<DataRtVo> deviceDataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize);
 
     /**
      * 物联网实时数据-导出数据查询

+ 12 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemEnforceInspectRecordService.java

@@ -3,6 +3,9 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemEnforceInspectRecord;
+import com.usky.fire.service.vo.DemEnforceInspectRecordVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +28,15 @@ public interface DemEnforceInspectRecordService extends CrudService<DemEnforceIn
      */
     CommonPage<Object> enforceInspectRecordList(String projectCode, String companyName, Integer pageNum, Integer pageSize);
 
+    /**
+     * 执法检查数据-列表查询-导出
+     *
+     * @param projectCode 项目编号
+     * @param companyName 单位编号
+     * @return
+     */
+    List<DemEnforceInspectRecordVO> enforceInspectRecordListExport(String projectCode, String companyName);
+
     /**
      * 执法检查数据-修改
      *

+ 18 - 1
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataRtServiceImpl.java

@@ -53,7 +53,24 @@ public class DataRtServiceImpl extends AbstractCrudService<DataRtMapper, DataRt>
     private BaseDeviceStatusService baseDeviceStatusService;
 
     @Override
-    public CommonPage<DataRtVo> dataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize){
+    public CommonPage<DataRt> dataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize) {
+        List<String> companyIdList = baseUserCompanyService.companyIdList();
+        IPage<DataRt> page = new Page<>(pageNum, pageSize);
+        if (CollectionUtils.isNotEmpty(companyIdList)) {
+            LambdaQueryWrapper<DataRt> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(StringUtils.isNotBlank(deviceCode), DataRt::getDeviceCode, deviceCode)
+                    .eq(DataRt::getSystemType, systemType)
+                    .in(DataRt::getCompanyId, companyIdList);
+            page = this.page(page, queryWrapper);
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                page.getRecords().get(i).setDeviceTypeName(OnlineMethod.getDeviceTypeName(page.getRecords().get(i).getDeviceType()));
+            }
+        }
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public CommonPage<DataRtVo> deviceDataRtList(String deviceCode, Integer systemType, Integer pageNum, Integer pageSize){
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());

+ 44 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceInspectRecordServiceImpl.java

@@ -14,6 +14,7 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.DemEnforceInspectRecord;
 import com.usky.fire.mapper.DemEnforceInspectRecordMapper;
 import com.usky.fire.service.DemEnforceInspectRecordService;
+import com.usky.fire.service.vo.DemEnforceInspectRecordVO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -79,6 +80,49 @@ public class DemEnforceInspectRecordServiceImpl extends AbstractCrudService<DemE
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemEnforceInspectRecordVO> enforceInspectRecordListExport(String projectCode, String companyName){
+        List<DemEnforceInspectRecordVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemEnforceInspectRecord> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemEnforceInspectRecord::getId, DemEnforceInspectRecord::getProjectCode, DemEnforceInspectRecord::getCompanyName,
+                DemEnforceInspectRecord::getCompanyAddress, DemEnforceInspectRecord::getInspectDescript, DemEnforceInspectRecord::getInspectName,
+                DemEnforceInspectRecord::getFireDutyName, DemEnforceInspectRecord::getFireDutyPhone, DemEnforceInspectRecord::getFireManageName,
+                DemEnforceInspectRecord::getFireManagePhone, DemEnforceInspectRecord::getCompanyNatureName, DemEnforceInspectRecord::getEnforceInspectPerson,
+                DemEnforceInspectRecord::getSafeManageContent, DemEnforceInspectRecord::getFireProtectContent, DemEnforceInspectRecord::getSafeEvacuatContent,
+                DemEnforceInspectRecord::getBuildArea, DemEnforceInspectRecord::getBuildFloor, DemEnforceInspectRecord::getBuildHigh,
+                DemEnforceInspectRecord::getIllegalAct, DemEnforceInspectRecord::getHandlingSituation, DemEnforceInspectRecord::getInspectQualified)
+                .eq(DemEnforceInspectRecord::getEnable, 0)
+                .like(StringUtils.isNotBlank(projectCode), DemEnforceInspectRecord::getProjectCode, projectCode)
+                .like(StringUtils.isNotBlank(companyName), DemEnforceInspectRecord::getCompanyName, companyName)
+                .orderByDesc(DemEnforceInspectRecord::getId).last("limit 1000");
+        List<DemEnforceInspectRecord> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                DemEnforceInspectRecordVO demEnforceInspectRecordVO = new DemEnforceInspectRecordVO();
+                demEnforceInspectRecordVO.setProjectCode(list1.get(i).getProjectCode());
+                demEnforceInspectRecordVO.setCompanyName(list1.get(i).getCompanyName());
+                demEnforceInspectRecordVO.setCompanyAddress(list1.get(i).getCompanyAddress());
+                demEnforceInspectRecordVO.setInspectName(list1.get(i).getInspectName());
+                demEnforceInspectRecordVO.setInspectDescript(list1.get(i).getInspectDescript());
+                demEnforceInspectRecordVO.setFireDutyName(list1.get(i).getFireDutyName());
+                demEnforceInspectRecordVO.setFireDutyPhone(list1.get(i).getFireDutyPhone());
+                demEnforceInspectRecordVO.setFireManageName(list1.get(i).getFireManageName());
+                demEnforceInspectRecordVO.setFireManagePhone(list1.get(i).getFireManagePhone());
+                demEnforceInspectRecordVO.setCompanyNatureName(list1.get(i).getCompanyNatureName());
+                demEnforceInspectRecordVO.setEnforceInspectPerson(list1.get(i).getEnforceInspectPerson());
+                demEnforceInspectRecordVO.setBuildArea(list1.get(i).getBuildArea());
+                demEnforceInspectRecordVO.setIllegalAct(list1.get(i).getIllegalAct());
+                demEnforceInspectRecordVO.setInspectQualified(list1.get(i).getInspectQualified());
+                demEnforceInspectRecordVO.setBuildFloor(list1.get(i).getBuildFloor());
+                demEnforceInspectRecordVO.setBuildHigh(list1.get(i).getBuildHigh());
+                demEnforceInspectRecordVO.setHandlingSituation(list1.get(i).getHandlingSituation());
+                list.add(demEnforceInspectRecordVO);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public void updateEnforceInspectRecord(DemEnforceInspectRecord demEnforceInspectRecord) {
         String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());

+ 135 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemEnforceInspectRecordVO.java

@@ -0,0 +1,135 @@
+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-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemEnforceInspectRecordVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号")
+    private String projectCode;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 单位地址
+     */
+    @Excel(name = "单位地址")
+    private String companyAddress;
+
+    /**
+     * 检查名称
+     */
+    @Excel(name = "检查名称")
+    private String inspectName;
+
+    /**
+     * 检查描述
+     */
+    @Excel(name = "检查描述")
+    private String inspectDescript;
+
+    /**
+     * 消防安全责任人
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人电话
+     */
+    @Excel(name = "消防安全责任人电话")
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人电话
+     */
+    @Excel(name = "消防安全管理人电话")
+    private String fireManagePhone;
+
+    /**
+     * 单位性质名称
+     */
+    @Excel(name = "单位性质名称")
+    private String companyNatureName;
+
+    /**
+     * 消防监督检查员
+     */
+    @Excel(name = "消防监督检查员")
+    private String enforceInspectPerson;
+
+    /**
+     * 建筑面积
+     */
+    @Excel(name = "建筑面积")
+    private String buildArea;
+
+    /**
+     * 违法行为
+     */
+    @Excel(name = "违法行为")
+    private String illegalAct;
+
+    /**
+     * 检查是否合格
+     */
+    @Excel(name = "检查是否合格")
+    private Integer inspectQualified;
+
+    /**
+     * 建筑层数
+     */
+    @Excel(name = "建筑层数")
+    private String buildFloor;
+
+    /**
+     * 建筑高度
+     */
+    @Excel(name = "建筑高度")
+    private String buildHigh;
+
+    /**
+     * 处理情况
+     */
+    @Excel(name = "处理情况")
+    private String handlingSituation;
+}