Merge branch 'server-165' into usky-zyj

service-fire/service-fire-biz/pom.xml

@@ -94,6 +94,25 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+
+        <!--图片处理依赖-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

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

@@ -4,6 +4,8 @@ package com.usky.fire.controller.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.util.StringUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.PatrolInspectionAttendance;
 import com.usky.fire.service.PatrolInspectionAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,7 @@ public class PatrolInspectionAttendanceController {
      * @param patrolInspectionAttendance
      * @return
      */
+    @Log(title = " 签到、签退信息记录", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public ApiResult<Void> add(@RequestBody PatrolInspectionAttendance patrolInspectionAttendance){
         patrolInspectionAttendanceService.add(patrolInspectionAttendance);

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

@@ -94,6 +94,7 @@ public class PatrolInspectionContentController {
      * @return
      * @throws IOException
      */
+    @Log(title = "巡检内容", businessType = BusinessType.EXPORT)
     @PostMapping("/contentListExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "contentTitle", required = false) String contentTitle,

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

@@ -1,19 +1,28 @@
 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.PatrolInspectionRecord;
 import com.usky.fire.service.PatrolInspectionRecordService;
 import com.usky.fire.service.vo.PatrolInspectionRecordExportVo;
 import com.usky.fire.service.vo.PatrolInspectionRecordVo;
 import com.usky.fire.service.vo.RecordStatisticsVo;
+import org.apache.commons.io.IOUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
 import java.util.List;
 
 /**
@@ -92,6 +101,7 @@ public class PatrolInspectionRecordController {
      * @param idList        记录ID
      * @throws IOException
      */
+    @Log(title = "巡检记录", businessType = BusinessType.EXPORT)
     @PostMapping("/recordLsitExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "areaName", required = false) String areaName,
@@ -105,5 +115,31 @@ public class PatrolInspectionRecordController {
         ExcelUtil<PatrolInspectionRecordExportVo> util = new ExcelUtil<PatrolInspectionRecordExportVo>(PatrolInspectionRecordExportVo.class);
         util.exportExcel(response, list, "巡检记录", "巡检记录");
     }
+
+
+    /**
+     * 巡查自检-巡检记录-导出(添加多媒体数据)
+     *
+     * @param response
+     * @param areaName      区域名称
+     * @param siteName      地点名称
+     * @param name          人员名称
+     * @param planType      计划类型
+     * @param startDateTime 开始时间
+     * @param endDateTime   结束时间
+     * @param idList        记录ID
+     * @throws IOException
+     */
+    @PostMapping("/recordLsitExportMultimedia")
+    public void exportMultimedia(HttpServletResponse response,
+                                 @RequestParam(value = "areaName", required = false) String areaName,
+                                 @RequestParam(value = "siteName", required = false) String siteName,
+                                 @RequestParam(value = "name", required = false) String name,
+                                 @RequestParam(value = "planType", required = false) Integer planType,
+                                 @RequestParam(value = "startDateTime", required = false) String startDateTime,
+                                 @RequestParam(value = "endDateTime", required = false) String endDateTime,
+                                 @RequestParam(value = "idList", required = false) String idList) throws IOException {
+        patrolInspectionRecordService.exportImage(response,areaName, siteName, name, planType, startDateTime, endDateTime, idList);
+    }
 }
 

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

@@ -146,6 +146,7 @@ public class PatrolInspectionSiteController {
      * @param idList   地点ID
      * @return
      */
+    @Log(title = "巡检地点", businessType = BusinessType.EXPORT)
     @PostMapping("/patrolInspectionSiteListExport")
     public void export(HttpServletResponse response,
                        @RequestParam(required = false) Integer areaId,

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

@@ -3,6 +3,8 @@ package com.usky.fire.controller.web;
 
 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.PatrolInspectionType;
 import com.usky.fire.service.PatrolInspectionTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,7 @@ public class PatrolInspectionTypeController {
      * @param patrolInspectionType
      * @return
      */
+    @Log(title = "操作类型", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public ApiResult<Void> add(@RequestBody PatrolInspectionType patrolInspectionType){
         patrolInspectionTypeService.add(patrolInspectionType);
@@ -50,6 +53,7 @@ public class PatrolInspectionTypeController {
      * @param deleteType
      * @return
      */
+    @Log(title = "操作类型", businessType = BusinessType.DELETE)
     @GetMapping("/delete")
     public ApiResult<Void> delete(@RequestBody PatrolInspectionType deleteType){
         patrolInspectionTypeService.softDelete(deleteType);

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

@@ -2,6 +2,7 @@ package com.usky.fire.mapper;
 
 import com.usky.fire.domain.PatrolInspectionRecordPicture;
 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-07-21
  */
+@Repository
 public interface PatrolInspectionRecordPictureMapper extends CrudMapper<PatrolInspectionRecordPicture> {
 
 }

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

@@ -7,6 +7,9 @@ import com.usky.fire.service.vo.PatrolInspectionRecordExportVo;
 import com.usky.fire.service.vo.PatrolInspectionRecordVo;
 import com.usky.fire.service.vo.RecordStatisticsVo;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.MalformedURLException;
 import java.util.List;
 
 /**
@@ -40,4 +43,6 @@ public interface PatrolInspectionRecordService extends CrudService<PatrolInspect
     List<PatrolInspectionRecordExportVo> recordLsitExport(String areaName, String siteName, String name,
                                                           Integer planType, String startDateTime,
                                                           String endDateTime,String idList);
+    void exportImage(HttpServletResponse response, String areaName, String siteName, String name, Integer planType,
+                            String startDateTime, String endDateTime, String idList) throws IOException;
 }

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

@@ -1,5 +1,6 @@
 package com.usky.fire.service.impl;
 
+import com.ruoyi.common.core.utils.file.ImageUtils;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,12 +14,25 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.*;
 import com.usky.fire.mapper.PatrolInspectionPlanMapper;
 import com.usky.fire.mapper.PatrolInspectionRecordMapper;
+import com.usky.fire.mapper.PatrolInspectionRecordPictureMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.vo.*;
 import com.usky.system.model.LoginUser;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +72,9 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
     @Autowired
     private PatrolInspectionPlanMapper patrolInspectionPlanMapper;
 
+    @Autowired
+    private PatrolInspectionRecordPictureMapper orphansInspectionRecordPictureMapper;
+
     @Override
     public CommonPage<PatrolInspectionRecord> patrolInspectionRecordLsit(String areaName, String siteName, String name,
                                                                          Integer planType, String startDateTime, String endDateTime,
@@ -148,7 +165,9 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
             contentOptionVo.setCreateTime(contentOptionList.get(i).getCreateTime());
             contentOptionVo.setSelectStatus(false);
             for (int j = 0; j < patrolInspectionRecordOptionList.size(); j++) {
-                contentOptionVo.setRemarks(patrolInspectionRecordOptionList.get(j).getRemarks());
+                if(contentOptionList.get(i).getContentId()==patrolInspectionContentList.get(j).getId()){
+                    contentOptionVo.setRemarks(patrolInspectionRecordOptionList.get(j).getRemarks());
+                }
                 if (contentOptionList.get(i).getId() == patrolInspectionRecordOptionList.get(j).getContentOptionId()) {
                     contentOptionVo.setSelectStatus(true);
                 }
@@ -399,4 +418,286 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
         }
         return list;
     }
+
+    @Override
+    public void exportImage(HttpServletResponse response, String areaName, String siteName, String name, Integer planType,
+                            String startDateTime, String endDateTime, String idList) throws IOException {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String userType = null;
+        if (loginUser != null && !"".equals(loginUser)) {
+            userType = loginUser.getUserType();
+        }
+        LambdaQueryWrapper<PatrolInspectionRecord> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionRecord::getTenantId, SecurityUtils.getTenantId())
+                .like(StringUtils.isNotBlank(areaName), PatrolInspectionRecord::getAreaName, areaName)
+                .like(StringUtils.isNotBlank(siteName), PatrolInspectionRecord::getSiteName, siteName)
+                .like(StringUtils.isNotBlank(name), PatrolInspectionRecord::getName, name)
+                .eq(planType != null && planType != 0, PatrolInspectionRecord::getPlanType, planType)
+                .between(StringUtils.isNotBlank(startDateTime) && StringUtils.isNotBlank(endDateTime), PatrolInspectionRecord::getCreateTime, startDateTime, endDateTime)
+                .eq("00".equals(userType), PatrolInspectionRecord::getCreator, SecurityUtils.getUsername());
+        if (StringUtils.isNotBlank(idList)) {
+            List<Integer> listId = new ArrayList<>();
+            String[] idArray = idList.split(",");
+            for (int i = 0; i < idArray.length; i++) {
+                listId.add(Integer.parseInt(idArray[i]));
+            }
+            queryWrapper.in(PatrolInspectionRecord::getId, listId);
+        }
+        queryWrapper.orderByDesc(PatrolInspectionRecord::getId);
+        List<PatrolInspectionRecord> patrolInspectionRecordList = this.list(queryWrapper);
+        List<PatrolInspectionRecordExportVo> list = new ArrayList<>();
+        for (int i = 0; i < patrolInspectionRecordList.size(); i++) {
+            PatrolInspectionRecordExportVo patrolInspectionRecordExportVo = new PatrolInspectionRecordExportVo();
+            patrolInspectionRecordExportVo.setXh(i + 1);
+            patrolInspectionRecordExportVo.setId(patrolInspectionRecordList.get(i).getId());
+            patrolInspectionRecordExportVo.setSiteNubmber(patrolInspectionRecordList.get(i).getSiteNubmber());
+            patrolInspectionRecordExportVo.setSiteType(patrolInspectionRecordList.get(i).getSiteType());
+            patrolInspectionRecordExportVo.setAreaName(patrolInspectionRecordList.get(i).getAreaName());
+            patrolInspectionRecordExportVo.setSiteName(patrolInspectionRecordList.get(i).getSiteName());
+            patrolInspectionRecordExportVo.setName(patrolInspectionRecordList.get(i).getName());
+            patrolInspectionRecordExportVo.setPhone(patrolInspectionRecordList.get(i).getPhone());
+            patrolInspectionRecordExportVo.setPlanType(patrolInspectionRecordList.get(i).getPlanType());
+            patrolInspectionRecordExportVo.setLongitude(patrolInspectionRecordList.get(i).getLongitude());
+            patrolInspectionRecordExportVo.setLatitude(patrolInspectionRecordList.get(i).getLatitude());
+            patrolInspectionRecordExportVo.setStartDate(patrolInspectionRecordList.get(i).getStartDate().format(df));
+            patrolInspectionRecordExportVo.setEndDate(patrolInspectionRecordList.get(i).getEndDate().format(df));
+            patrolInspectionRecordExportVo.setCreateTime(patrolInspectionRecordList.get(i).getCreateTime().format(df));
+            LambdaQueryWrapper<PatrolInspectionRecordPicture> queryWrapperJpg = Wrappers.lambdaQuery();//导出图片
+            queryWrapperJpg.select(PatrolInspectionRecordPicture::getPictureUrl)
+                    .eq(PatrolInspectionRecordPicture::getRecordId, patrolInspectionRecordList.get(i).getId());
+            List<PatrolInspectionRecordPicture> pictures = orphansInspectionRecordPictureMapper.selectList(queryWrapperJpg);
+            if (pictures.size() > 0) {
+                for (int j = 0; j < pictures.size() && j < 5; j++) {
+                    String pictureUrl = pictures.get(j).getPictureUrl();
+                    switch (j) {
+                        case 0:
+                            patrolInspectionRecordExportVo.setImagePath1(pictureUrl);
+                            break;
+                        case 1:
+                            patrolInspectionRecordExportVo.setImagePath2(pictureUrl);
+                            break;
+                        case 2:
+                            patrolInspectionRecordExportVo.setImagePath3(pictureUrl);
+                            break;
+                        case 3:
+                            patrolInspectionRecordExportVo.setImagePath4(pictureUrl);
+                            break;
+                        case 4:
+                            patrolInspectionRecordExportVo.setImagePath5(pictureUrl);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            list.add(patrolInspectionRecordExportVo);
+        }
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        XSSFSheet sheet = workbook.createSheet("巡检记录");
+        // 添加列标题行
+        Row headerRow = sheet.createRow(1);
+        String[] headers = {
+                "序号", "地点号码", "地点类型", "区域名称", "地点名称", "巡检人员", "联系电话",
+                "计划类型", "经度", "纬度", "开始时间", "结束时间", "巡检时间", "巡检照片1",
+                "巡检照片2", "巡检照片3", "巡检照片4", "巡检照片5"
+        };
+        // 添加总标题行
+        Row titleRow = sheet.createRow(0);
+        Cell titleCell = titleRow.createCell(0);
+        titleCell.setCellValue("巡检记录");
+        CellStyle titleCellStyle = workbook.createCellStyle();
+        // 设置字体为黑色加粗
+        Font titleFont = workbook.createFont();
+        titleFont.setFontName("宋体");
+        titleFont.setFontHeightInPoints((short) 16);
+        titleFont.setColor(IndexedColors.BLACK.getIndex());
+        titleFont.setBold(true);
+        titleCellStyle.setFont(titleFont);
+        // 设置水平居中和垂直居中
+        titleCellStyle.setAlignment(HorizontalAlignment.CENTER);
+        titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        titleCell.setCellStyle(titleCellStyle);
+        titleRow.setHeightInPoints(30);
+        // 合并标题单元格以横跨所有列
+        int totalColumns = headers.length;
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, totalColumns - 1));
+        //设置列标题
+        for (int i = 0; i < headers.length; i++) {
+            Cell cell = headerRow.createCell(i);
+            cell.setCellValue(headers[i]);
+            CellStyle headerCellStyle = workbook.createCellStyle();
+            headerCellStyle.setAlignment(HorizontalAlignment.CENTER);
+            headerCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+            headerCellStyle.setBorderBottom(BorderStyle.THIN);
+            headerCellStyle.setBorderTop(BorderStyle.THIN);
+            headerCellStyle.setBorderLeft(BorderStyle.THIN);
+            headerCellStyle.setBorderRight(BorderStyle.THIN);
+            // 设置背景颜色为灰色
+            headerCellStyle.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+            headerCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+            // 设置字体为白色
+            Font headerFont = workbook.createFont();
+            headerFont.setFontName("宋体");
+            headerFont.setFontHeightInPoints((short) 10);
+            headerFont.setColor(IndexedColors.WHITE.getIndex());
+            headerFont.setBold(true);
+            headerRow.setHeightInPoints(13.5f);
+            headerCellStyle.setFont(headerFont);
+            cell.setCellStyle(headerCellStyle);
+        }
+
+        Row fixedRow = sheet.createRow(list.size() + 3); // 数据行数 + 标题行数(1) + 固定行(1) + 空一行
+        CellStyle fixedCellStyle = workbook.createCellStyle();
+
+        // 创建字体样式
+        Font fixedFont = workbook.createFont();
+        fixedFont.setFontName("宋体");
+        fixedFont.setBold(true);
+        fixedFont.setFontHeightInPoints((short) 12);
+        fixedCellStyle.setFont(fixedFont);
+
+        // 创建“负责人签名”单元格
+        Cell cellSign = fixedRow.createCell(0);
+        cellSign.setCellValue("负责人签名：");
+        cellSign.setCellStyle(fixedCellStyle);
+
+        // 创建“日期”单元格
+        Cell cellDate = fixedRow.createCell(4); // 假设日期单元格在第五列
+        cellDate.setCellValue("日期：");
+        cellDate.setCellStyle(fixedCellStyle);
+
+        // 合并单元格
+//        sheet.addMergedRegion(new CellRangeAddress(list.size() + 2, list.size() + 2, 0, 0)); // 负责人签名
+//        sheet.addMergedRegion(new CellRangeAddress(list.size() + 2, list.size() + 2, 4, 4)); // 日期
+
+        // 设置固定行的高度
+        fixedRow.setHeightInPoints(20);
+
+        // 设置数据行样式
+        CellStyle dataCellStyle = workbook.createCellStyle();
+        Font dataFont = workbook.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        dataCellStyle.setFont(dataFont);
+        dataCellStyle.setAlignment(HorizontalAlignment.CENTER);
+        dataCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        dataCellStyle.setBorderBottom(BorderStyle.THIN);
+        dataCellStyle.setBorderTop(BorderStyle.THIN);
+        dataCellStyle.setBorderLeft(BorderStyle.THIN);
+        dataCellStyle.setBorderRight(BorderStyle.THIN);
+        // 添加数据
+        for (int i = 0; i < list.size(); i++) {
+            PatrolInspectionRecordExportVo record = list.get(i);
+            Row row = sheet.createRow(i + 2);
+
+            for (int j = 0; j < headers.length; j++) {
+                Cell cell = row.createCell(j);
+                cell.setCellStyle(dataCellStyle);
+
+                // 根据 j 变量来确定应该填充数据的单元格索引
+                switch (j) {
+                    case 0:
+                        cell.setCellValue(record.getXh());
+                        break;
+                    case 1:
+                        cell.setCellValue(record.getSiteNubmber());
+                        break;
+                    case 2:
+                        cell.setCellValue(record.getSiteType() == 1 ? "二维码" : "NFC");
+                        break;
+                    case 3:
+                        cell.setCellValue(record.getAreaName());
+                        break;
+                    case 4:
+                        cell.setCellValue(record.getSiteName());
+                        break;
+                    case 5:
+                        cell.setCellValue(record.getName());
+                        break;
+                    case 6:
+                        cell.setCellValue(record.getPhone());
+                        break;
+                    case 7:
+                        cell.setCellValue(record.getPlanType() == 1 ? "普通计划" : "按次计划");
+                        break;
+                    case 8:
+                        cell.setCellValue(record.getLongitude());
+                        break;
+                    case 9:
+                        cell.setCellValue(record.getLatitude());
+                        break;
+                    case 10:
+                        cell.setCellValue(record.getStartDate());
+                        break;
+                    case 11:
+                        cell.setCellValue(record.getEndDate());
+                        break;
+                    case 12:
+                        cell.setCellValue(record.getCreateTime());
+                        break;
+                    default:
+                        break;
+                }
+                CreationHelper helper = workbook.getCreationHelper();
+                Drawing<?> drawing = sheet.createDrawingPatriarch();
+                ClientAnchor anchor;
+                if (record.getImagePath1() != null || record.getImagePath2() != null
+                        || record.getImagePath3() != null || record.getImagePath4() != null || record.getImagePath5() != null) {
+                    for (int k = 0; k < 5; k++) {
+                        String imagePath = null;
+                        switch (k) {
+                            case 0:
+                                imagePath = record.getImagePath1();
+                                break;
+                            case 1:
+                                imagePath = record.getImagePath2();
+                                break;
+                            case 2:
+                                imagePath = record.getImagePath3();
+                                break;
+                            case 3:
+                                imagePath = record.getImagePath4();
+                                break;
+                            case 4:
+                                imagePath = record.getImagePath5();
+                                break;
+                        }
+
+                        if (imagePath != null) {
+                            byte[] imageBytes = getImageBytes(imagePath);
+                            int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_JPEG);
+
+                            anchor = helper.createClientAnchor();
+                            anchor.setCol1(headers.length - 5 + k);
+                            anchor.setRow1(i + 2);
+
+                            Picture pict = drawing.createPicture(anchor, pictureIdx);
+                            pict.resize(1, 1);
+                        }
+                    }
+                }
+            }
+
+        }
+
+        for (int i = 0; i < headers.length; i++) {
+            sheet.setColumnWidth(i, (int) (16.09 * 256));
+        }
+
+        // 输出Excel文件
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Content-Disposition", "attachment; filename=巡检记录.xlsx");
+        workbook.write(response.getOutputStream());
+        workbook.close();
+    }
+
+    public byte[] getImageBytes(String imageUrl) throws IOException {
+        URL url = new URL(imageUrl);
+        BufferedImage image = ImageIO.read(url);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageIO.write(image, "jpg", baos);
+        return baos.toByteArray();
+    }
+
 }

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

@@ -143,5 +143,29 @@ public class PatrolInspectionRecordExportVo implements Serializable {
      */
     private String creator;
 
-
+    /**
+     * 图片数据
+     */
+    @Excel(name = "巡检照片1")
+    private String imagePath1;
+    /**
+     * 图片数据
+     */
+    @Excel(name = "巡检照片2")
+    private String imagePath2;
+    /**
+     * 图片数据
+     */
+    @Excel(name = "巡检照片3")
+    private String imagePath3;
+    /**
+     * 图片数据
+     */
+    @Excel(name = "巡检照片4")
+    private String imagePath4;
+    /**
+     * 图片数据
+     */
+    @Excel(name = "巡检照片5")
+    private String imagePath5;
 }

service-iot/service-iot-api/src/main/java/com/usky/iot/RemoteMceService.java

@@ -0,0 +1,22 @@
+package com.usky.iot;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.factory.RemoteMceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author han
+ * @date 2024/04/26 14:07
+ */
+@FeignClient(contextId = "remoteMceService", value = "service-iot", fallbackFactory =
+        RemoteMceFallbackFactory.class)
+public interface RemoteMceService {
+    /**
+     * 新增消息
+     *
+     * @return 消息结果
+     */
+    @PostMapping("/addMce")
+    ApiResult<Void> addMce(String mceReceive);
+}

service-iot/service-iot-api/src/main/java/com/usky/iot/factory/RemoteMceFallbackFactory.java

@@ -0,0 +1,32 @@
+package com.usky.iot.factory;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.FeignBadRequestException;
+import com.usky.iot.RemoteMceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author han
+ * @date 2024/04/02 15:07
+ */
+@Component
+public class RemoteMceFallbackFactory implements FallbackFactory<RemoteMceService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteMceFallbackFactory.class);
+
+    @Override
+    public RemoteMceService create(Throwable throwable)
+    {
+        log.error("iot服务调用失败:{}", throwable.getMessage());
+        return new RemoteMceService()
+        {
+            @Override
+            public ApiResult<Void> addMce(String mceReceive) {
+                throw new FeignBadRequestException(500,"新增消息异常"+throwable.getMessage());
+            }
+        };
+    }
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/MceControllerApi.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.api;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.RemoteMceService;
+import com.usky.iot.service.MceReceiveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class MceControllerApi implements RemoteMceService {
+
+    @Autowired
+    private MceReceiveService mceReceiveService;
+
+    @Override
+    public ApiResult<Void> addMce(String mceReceive) {
+        mceReceiveService.add(mceReceive);
+        return ApiResult.success();
+    }
+}

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

@@ -101,5 +101,15 @@ public class MceReceiveController {
         mceReceiveService.updateMceReceive(mceReceive);
         return ApiResult.success();
     }
+
+    /**
+     * 消息接收接口
+     * @return
+     */
+    @PostMapping("/mceAdd")
+    ApiResult<Void> add(@RequestBody String mceReceive){
+        mceReceiveService.add(mceReceive);
+        return ApiResult.success();
+    }
 }
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -60,6 +62,7 @@ public class MceContent implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
@@ -70,6 +73,7 @@ public class MceContent implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -75,6 +77,7 @@ public class MceReceive implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
@@ -85,6 +88,7 @@ public class MceReceive implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -60,6 +62,7 @@ public class MceSetting implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
@@ -70,6 +73,7 @@ public class MceSetting implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
 

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

@@ -29,4 +29,6 @@ public interface MceReceiveService extends CrudService<MceReceive> {
     Map<String, Object> mceReceiveStatic();
 
     void updateMceReceive(MceReceive mceReceive);
+
+    void add(String mceReceive);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/HttpClientUtils.java

@@ -0,0 +1,137 @@
+package com.usky.iot.service.config;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ 1. 跨域请求工具类
+ */
+public class HttpClientUtils {
+
+    public static String doGet(String url, Map<String, String> param) {
+
+        // 创建Httpclient对象
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        String resultString = "";
+        CloseableHttpResponse response = null;
+        try {
+            // 创建uri
+            URIBuilder builder = new URIBuilder(url);
+            if (param != null) {
+                for (String key : param.keySet()) {
+                    builder.addParameter(key, param.get(key));
+                }
+            }
+            URI uri = builder.build();
+
+            // 创建http GET请求
+            HttpGet httpGet = new HttpGet(uri);
+
+            // 执行请求
+            response = httpclient.execute(httpGet);
+            // 判断返回状态是否为200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return resultString;
+    }
+
+    public static String doGet(String url) {
+        return doGet(url, null);
+    }
+
+    public static String doPost(String url, Map<String, String> param) {
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = null;
+        String resultString = "";
+        try {
+            // 创建Http Post请求
+            HttpPost httpPost = new HttpPost(url);
+            httpPost.setHeader("Content-Type", "application/json");
+            // 创建参数列表
+            if (param != null) {
+                List<NameValuePair> paramList = new ArrayList<>();
+                for (String key : param.keySet()) {
+                    paramList.add(new BasicNameValuePair(key, param.get(key)));
+                }
+                // 模拟表单
+                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+                httpPost.setEntity(entity);
+            }
+            // 执行http请求
+            response = httpClient.execute(httpPost);
+            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return resultString;
+    }
+
+    public static String doPost(String url) {
+        return doPost(url, null);
+    }
+
+    public static String doPostJson(String url, String json) {
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = null;
+        String resultString = "";
+        try {
+            // 创建Http Post请求
+            HttpPost httpPost = new HttpPost(url);
+            // 创建请求内容
+            StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
+            httpPost.setEntity(entity);
+            // 执行http请求
+            response = httpClient.execute(httpPost);
+            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return resultString;
+    }
+}

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

@@ -10,16 +10,19 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.gson.JsonObject;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.iot.domain.BaseBuild;
 import com.usky.iot.domain.MceContent;
 import com.usky.iot.domain.MceReceive;
+import com.usky.iot.domain.MceSetting;
 import com.usky.iot.mapper.MceReceiveMapper;
 import com.usky.iot.service.MceContentService;
 import com.usky.iot.service.MceReceiveService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.service.MceSettingService;
+import com.usky.iot.service.config.HttpClientUtils;
 import com.usky.system.RemoteUserService;
 import com.usky.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +30,6 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -46,6 +48,9 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
     @Autowired
     private RemoteUserService remoteUserService;
 
+    @Autowired
+    private MceSettingService mceSettingService;
+
     @Override
     public CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size) {
         List<Object> list = new ArrayList<>();
@@ -207,4 +212,58 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         }
         this.update(updateWrapper);
     }
+
+    @Override
+    public void add(String mceReceive){
+        String appUrl = "https://fc-mp-85a26092-1305-4bf1-998f-b609512c8f7b.next.bspapp.com/uniPushMessage";
+        JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
+        MceContent mceContent = new MceContent();
+        mceContent.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
+        mceContent.setInfoContent(mceReceiveVO.get("infoContent").toString());
+        mceContent.setInfoType(mceReceiveVO.get("infoType").toString());
+        mceContent.setCreateBy(SecurityUtils.getUsername());
+        mceContent.setCreateTime(LocalDateTime.now());
+        mceContent.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
+        mceContent.setTenantId(SecurityUtils.getTenantId());
+        mceContentService.save(mceContent);
+        Integer contentId = mceContent.getId();
+        ApiResult<List<SysUser>> userAllList = remoteUserService.userAllList();
+        List<SysUser> list = userAllList.getData();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                MceReceive mceReceive1 = new MceReceive();
+                mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
+                mceReceive1.setContentId(contentId);
+                mceReceive1.setReadFlag(0);
+                mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
+                mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
+                mceReceive1.setReceiverName(list.get(i).getUserName());
+                mceReceive1.setCreateBy(SecurityUtils.getUsername());
+                mceReceive1.setCreateTime(LocalDateTime.now());
+                mceReceive1.setTenantId(list.get(i).getTenantId());
+//                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
+                this.save(mceReceive1);
+                LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
+                lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
+                List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
+                if (CollectionUtils.isNotEmpty(list1)){
+                    JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
+                    if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+                        JsonObject jsonObject = new JsonObject();
+                        jsonObject.addProperty("cids", "b9ba637d52b3eca1cd15d9d1ede4d00b");
+                        jsonObject.addProperty("title", mceReceiveVO.get("infoTitle").toString());
+                        jsonObject.addProperty("content", mceReceiveVO.get("infoContent").toString());
+//                        HashMap map1 = new HashMap();
+//                        map1.put("text", "b0e7580c39166f9f8d5ed20da807ba1f");
+//                        map.put("payload", map1);
+                        String resultString = HttpClientUtils.doPostJson(appUrl,jsonObject.toString());
+                    }
+                    JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
+                    if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -57,18 +57,20 @@ public class MceSettingServiceImpl extends AbstractCrudService<MceSettingMapper,
         List<MceSetting> list1 = this.list(lambdaQuery);
         Map<String, Object> map = new HashMap<>();
         if (CollectionUtils.isEmpty(list1)) {
-            Map<String, Integer> map1 = new HashMap<>();
-            map1.put("meetingNotice", 1);
-            map1.put("noticeBulletin", 1);
-            map1.put("inspectionSystem", 1);
-            map1.put("deviceAlarm", 1);
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("1", true);
+            map1.put("2", true);
+            map1.put("3", true);
+            map1.put("4", true);
             map.put("appMode",map1);
             map.put("pcMode",map1);
             map.put("wcMode",map1);
+            map.put("id",0);
         }else {
             map.put("appMode",JSONObject.parseObject(list1.get(0).getAppMode()));
             map.put("pcMode",JSONObject.parseObject(list1.get(0).getPcMode()));
             map.put("wcMode",JSONObject.parseObject(list1.get(0).getWcMode()));
+            map.put("id",list1.get(0).getId());
         }
         return map;
     }