提交代码

pom.xml

@@ -35,6 +35,7 @@
 		<commons.net.version>3.3</commons.net.version>
 		<com.jcraft.version>0.1.54</com.jcraft.version>
 		<freemarker.version>2.3.28</freemarker.version>
+		<aspectj.version>1.9.19</aspectj.version>
 	</properties>
 
 	<dependencies>
@@ -185,6 +186,18 @@
 			<artifactId>freemarker</artifactId>
 			<version>${freemarker.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/keystar/plane/inspection/PlaneInspectionApplication.java

@@ -3,9 +3,11 @@ package com.keystar.plane.inspection;
 import com.keystar.mqtt.annotation.EnableBindMqtt;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
 @EnableBindMqtt(basePackages = "com.keystar.plane.inspection.mqtt")
+@EnableAsync
 public class PlaneInspectionApplication {
 
 	public static void main(String[] args) {

src/main/java/com/keystar/plane/inspection/bo/AbnormalResultBo.java

@@ -0,0 +1,36 @@
+package com.keystar.plane.inspection.bo;
+
+import lombok.Data;
+
+/**
+ *  异常结果具体信息
+ **/
+@Data
+public class AbnormalResultBo {
+
+    /**
+     *  异常所在的阵列序号
+     **/
+    private String id;
+
+    /**
+     *  异常所在的行数
+     **/
+    private String rowIndex;
+
+    /**
+     *  异常所在的列数
+     **/
+    private String columnIndex;
+
+    /**
+     *  异常类型
+     **/
+    private String type;
+
+    /**
+     *  异常位置
+     **/
+    private String coordinates;
+
+}

src/main/java/com/keystar/plane/inspection/bo/PhotoBo.java

@@ -0,0 +1,65 @@
+package com.keystar.plane.inspection.bo;
+
+import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  图片信息和识别结果
+ **/
+@Data
+public class PhotoBo {
+
+    /**
+     *  图片id
+     **/
+    private Long id;
+
+    /**
+     *  航线id
+     **/
+    private Integer missionId;
+
+    /**
+     *  架次id
+     **/
+    private Integer recordId;
+
+    /**
+     *  可见光图片
+     **/
+    private String visibleImagePath;
+
+    /**
+     *  红外图片
+     **/
+    private String infraredImagePath;
+
+    /**
+     *  方阵名字
+     **/
+    private String pzName;
+
+    /**
+     *  包含的组串
+     **/
+    private List<String> pvName;
+
+    /**
+     *  图片的识别结果
+     **/
+//    private List<PhotoResultBo> results;
+    private List<PhotoResultEntity> results;
+
+    /**
+     *  图片包含的组串坐标
+     **/
+    private List<String> arrayBox;
+
+    /**
+     *  拍摄时间
+     **/
+    private Date time;
+}

src/main/java/com/keystar/plane/inspection/bo/PhotoResultBo.java

@@ -0,0 +1,31 @@
+package com.keystar.plane.inspection.bo;
+
+import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *  图片的识别结果
+ **/
+@Data
+public class PhotoResultBo {
+
+    /**
+     *  图片结果id
+     **/
+    private Long id;
+
+    /**
+     *  图片异常阵列序号
+     **/
+    private String arrayIndex;
+
+    /**
+     *  组串异常结果具体信息
+     **/
+    private List<AbnormalResultBo> resultBos;
+
+
+
+}

src/main/java/com/keystar/plane/inspection/bo/PvNameBo.java

@@ -0,0 +1,13 @@
+package com.keystar.plane.inspection.bo;
+
+import lombok.Data;
+
+@Data
+public class PvNameBo {
+
+    private String pvName;
+
+    private Integer startIndex;
+
+    private Integer pageSize;
+}

src/main/java/com/keystar/plane/inspection/bo/Summary.java

@@ -0,0 +1,35 @@
+package com.keystar.plane.inspection.bo;
+
+import lombok.Data;
+
+@Data
+public class Summary {
+
+//    private String FltFZ;
+//
+//    private String FltFZPct;
+//
+//    private String FltPVString;
+//
+//    private String FltPVStringPct;
+//
+//    private String FltPVPanel;
+//
+//    private String FltPVPanelPct;
+//
+//    private String DioFZ;
+//
+//    private String DioFZPct;
+//
+//    private String DioPVString;
+//
+//    private String DioPVStringPct;
+//
+//    private String FltFZPct;
+//    private String FltFZPct;
+//    private String FltFZPct;
+//    private String FltFZPct;
+//    private String FltFZPct;
+//    private String FltFZPct;
+
+}

src/main/java/com/keystar/plane/inspection/constant/MissionConstant.java

@@ -0,0 +1,12 @@
+package com.keystar.plane.inspection.constant;
+
+import com.keystar.plane.inspection.bo.Location;
+import com.keystar.plane.inspection.utils.FileUtil;
+
+import java.util.List;
+import java.util.Map;
+
+public class MissionConstant {
+
+    public static final int[] MISSION_ID = new int[] {2420, 2424, 2425};
+}

src/main/java/com/keystar/plane/inspection/controller/NestController.java

@@ -50,4 +50,6 @@ public class NestController {
     public PlaneInspectionBo getInspection(@RequestBody DateBo dateBo) throws Exception {
         return nestService.getInspection(dateBo);
     }
+
+
 }

src/main/java/com/keystar/plane/inspection/controller/PhotoController.java

@@ -4,18 +4,20 @@ import cn.hutool.core.util.IdUtil;
 import com.drew.imaging.jpeg.JpegProcessingException;
 import com.keystar.mqtt.bo.MqttMessageBo;
 import com.keystar.plane.inspection.bo.NewFileBo;
+import com.keystar.plane.inspection.bo.PhotoBo;
 import com.keystar.plane.inspection.bo.PhotoMqttMessageBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
+import com.keystar.plane.inspection.dao.PhotoResultVo;
 import com.keystar.plane.inspection.dao.PlanePhotoVo;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import com.keystar.plane.inspection.service.MqttService;
 import com.keystar.plane.inspection.service.PhotoService;
 import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.service.TangyangDataService;
 import com.keystar.plane.inspection.utils.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,6 +41,9 @@ public class PhotoController {
     @Autowired
     MqttService mqttService;
 
+    @Autowired
+    TangyangDataService tangyangDataService;
+
     /**
      *  获取最新的无人机图片文件
      **/
@@ -54,4 +59,25 @@ public class PhotoController {
     public void sendMqtt() throws IOException, JpegProcessingException, ParseException, InterruptedException {
         mqttService.sendPhotoMqtt();
     }
+
+    /**
+     *  根据组串的名字来获取无人机图片和识别结果
+     **/
+    @PostMapping("/getPhotoMsg")
+    public PhotoResultVo getPhotoMsg(@RequestBody PvNameBo pvNameBo){
+        return photoService.getPhotoMsg(pvNameBo);
+    }
+
+
+    /**
+     *  测试获取小时数
+     **/
+    @GetMapping("/hour")
+    public void getHour(){
+        Double monthEquHour = tangyangDataService.getMonthEquHour();
+        log.info(monthEquHour.toString());
+        Double htsptLose = tangyangDataService.getHtsptLose();
+        log.info(htsptLose.toString());
+    }
+
 }

src/main/java/com/keystar/plane/inspection/controller/ReportController.java

@@ -9,13 +9,22 @@ package com.keystar.plane.inspection.controller;
 import com.keystar.plane.inspection.bo.PlaneInspectionPicBo;
 import com.keystar.plane.inspection.bo.PlaneInspectionResultBo;
 import com.keystar.plane.inspection.bo.PlaneInspectionResultDetailBo;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import com.keystar.plane.inspection.mapper.PhotoResultMapper;
 import com.keystar.plane.inspection.service.IReportService;
+import com.keystar.plane.inspection.service.PhotoResultService;
+import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.service.TangyangDataService;
+import com.keystar.plane.inspection.service.impl.ReportServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
 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.RestController;
 
+import javax.annotation.Resource;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -29,7 +38,19 @@ public class ReportController {
     @Autowired
     private IReportService reportService;
 
-    @GetMapping("/test")
+    @Autowired
+    private PlanePhotoService planePhotoService;
+
+    @Resource
+    private PhotoResultMapper photoResultMapper;
+
+    @Autowired
+    private TangyangDataService tangyangDataService;
+
+    @Autowired
+    private PhotoResultService photoResultService;
+
+    /*@GetMapping("/test")
     public void test() {
 
         Map<String, String> mFlyCountMap = new HashMap<>();
@@ -197,5 +218,11 @@ public class ReportController {
 
         //生成报告主函数
         reportService.createReport(mFlyCountMap, mSummaryMap, planeInspectionResultBoList);
+    }*/
+
+    @GetMapping("/getMonthReport")
+    public void getMonthReport() throws ParseException {
+
+        reportService.getMonthReport();
     }
 }

src/main/java/com/keystar/plane/inspection/dao/PhotoResultVo.java

@@ -0,0 +1,14 @@
+package com.keystar.plane.inspection.dao;
+
+import com.keystar.plane.inspection.bo.PhotoBo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PhotoResultVo {
+
+    private Integer total;
+
+    private List<PhotoBo> data;
+}

src/main/java/com/keystar/plane/inspection/entity/PhotoResultEntity.java

@@ -25,11 +25,6 @@ public class PhotoResultEntity {
      **/
     @TableField(value = "photo_id")
     private Long photoId;
-
-    /**
-     *  图片地址
-     **/
-    private String path;
     
     /**
      *  阵列序号

src/main/java/com/keystar/plane/inspection/entity/PlanePhotoEntity.java

@@ -34,9 +34,16 @@ public class PlanePhotoEntity implements Serializable {
     private Integer recordId; 
     
     /**
-     *  图片地址
+     *  可见光图片地址
      **/
-    private String path;
+    @TableField(value = "visible_image_path")
+    private String visibleImagePath;
+
+    /**
+     *  红外图片地址
+     **/
+    @TableField(value = "infrared_image_path")
+    private String infraredImagePath;
     
     /**
      *  方阵名字
@@ -51,9 +58,19 @@ public class PlanePhotoEntity implements Serializable {
     private String pvName;
 
     /**
+     *  光伏板坐标
+     **/
+    @TableField(value = "array_box")
+    private String arrayBox;
+
+    /**
      *  记录时间
      **/
     private Date time;
 
+    /**
+     *  拍摄日期
+     **/
+    private Integer date;
 
 }

src/main/java/com/keystar/plane/inspection/mapper/PhotoResultMapper.java

@@ -2,8 +2,37 @@ package com.keystar.plane.inspection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface PhotoResultMapper extends BaseMapper<PhotoResultEntity> {
+
+    /**
+     *  根据图片id获取识别结果
+     **/
+    List<PhotoResultEntity> queryResultByPhotoId(Long photoId);
+    
+    /**
+     *  根据架次id, 异常类型获取异常组串个数(type=null 查询全部)
+     **/
+    List<PhotoResultEntity> queryFltPVString(@Param("recordId") Integer recordId, @Param("type") String type);
+
+    /**
+     *  根据架次id,异常类型获取异常光伏板个数
+     **/
+    List<PhotoResultEntity> queryFltPVPanel(@Param("recordId") Integer recordId, @Param("type") String type);
+
+    /**
+     *  根据架次id,异常类型获取异常方阵个数
+     **/
+    List<PhotoResultEntity> queryFltPz(@Param("recordId") Integer recordId, @Param("type") String type);
+
+    /**
+     *  根据架次id获取识别结果
+     **/
+    List<PhotoResultEntity> queryResultByRecordId(Long recordId);
 }

src/main/java/com/keystar/plane/inspection/mapper/PlanePhotoMapper.java

@@ -1,10 +1,47 @@
 package com.keystar.plane.inspection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.keystar.plane.inspection.bo.DateBo;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.mybatis.spring.annotation.MapperScan;
 
+import java.util.Date;
+import java.util.List;
+
 @Mapper
 public interface PlanePhotoMapper extends BaseMapper<PlanePhotoEntity> {
+
+    /**
+     *  根据光伏板的名字模糊查询对应的图片
+     **/
+    List<PlanePhotoEntity> getPhotoBo(PvNameBo pvNameBo);
+
+    /**
+     *  查询本月的总架次数
+     **/
+    List<PlanePhotoEntity> getRecordIdNum(DateBo dateBo);
+
+    /**
+     *  查询本月有效天数
+     **/
+    List<PlanePhotoEntity> getInspectionDate(DateBo dateBo);
+
+    /**
+     *  查询本月异常方阵数
+     **/
+    List<PlanePhotoEntity> getAbnormalFZNum(DateBo dateBo);
+
+    /**
+     *  根据航线查询的架次
+     **/
+    List<PlanePhotoEntity> queryNewRecordByMission(@Param("missionId") Integer missionId);
+
+    /**
+     *  根据架次id查询图片信息
+     **/
+    List<PlanePhotoEntity> queryPhotoByRecordId(@Param("recordId") Integer recordId);
 }

src/main/java/com/keystar/plane/inspection/mqtt/PlaneMqttHandler.java

@@ -10,6 +10,7 @@ import com.keystar.plane.inspection.constant.PlaneStatusConstant;
 import com.keystar.plane.inspection.constant.UrlConstant;
 import com.keystar.plane.inspection.dao.LoginVo;
 import com.keystar.plane.inspection.dao.PlanePhotoVo;
+import com.keystar.plane.inspection.service.MqttService;
 import com.keystar.plane.inspection.utils.HttpUtils;
 import com.keystar.plane.inspection.utils.RedisUtils;
 import com.keystar.plane.inspection.utils.Utils;
@@ -39,6 +40,9 @@ public class PlaneMqttHandler implements AbstractMqttHandler {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
+    @Autowired
+    MqttService mqttService;
+
 
     @SneakyThrows
     @Override
@@ -60,22 +64,25 @@ public class PlaneMqttHandler implements AbstractMqttHandler {
             String currentState = map.get("currentState");
             // 如果无人机当前状态是一边上传一边下载
             if (currentState.equals(PlaneStatusConstant.DOWNLOAD_UPLOAD_MEANWHILE)){
+//                log.info("========机巢处于一边上传一边下载状态=======");
                 RedisUtils.set(key,currentState);
             }
 
             // 如果无人机是处于空闲状态
             if (currentState.equals(PlaneStatusConstant.IDLE)){
-                // 上一个状态还是上传下载
+                // redis上一个状态还是上传下载
+//                log.info("===========无人机处于空闲状态===========");
                 if (RedisUtils.hasKey(key) && RedisUtils.get(key).equals(PlaneStatusConstant.DOWNLOAD_UPLOAD_MEANWHILE)){
-                    String token = planeLogin();
-
-
-                    if (token != null){
-                        // todo 拿取最新的无人机图片
-
+                    // 先将redis设置成空闲
+                    RedisUtils.set(key,currentState);
+                    // 获取最新任务的图片
+                    log.info("========开始获取无人机最新图片=========");
+                    try{
+                        mqttService.sendPhotoMqtt();
+                    }catch (Exception e){
+                        log.info("=========获取无人机图片失败=========");
                     }
                 }
-
                 RedisUtils.set(key,currentState);
             }
 

src/main/java/com/keystar/plane/inspection/mqtt/RecognizeMqttHandler.java

@@ -11,11 +11,13 @@ import com.keystar.plane.inspection.bo.RecognizeMessageBo;
 import com.keystar.plane.inspection.entity.PhotoResultEntity;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import com.keystar.plane.inspection.service.PhotoResultService;
+import com.keystar.plane.inspection.service.PlanePhotoService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +34,9 @@ public class RecognizeMqttHandler implements AbstractMqttHandler {
     @Autowired
     PhotoResultService photoResultService;
 
+    @Autowired
+    PlanePhotoService planePhotoService;
+
     @Override
     public void handle(MqttMessage message) throws IOException {
 
@@ -56,13 +61,26 @@ public class RecognizeMqttHandler implements AbstractMqttHandler {
             // 识别结果
             JSONArray detectResult = dataObject.getJSONArray("detectResult");
             List<RecognizeMessageBo> recognizeMessageBoList = detectResult.toJavaList(RecognizeMessageBo.class);
+            // 光伏板坐标
+            JSONArray arrayBox = dataObject.getJSONArray("arrayBox");
+            List<String> arrayBoxList = new ArrayList<>();
+            for (int i = 0; i < arrayBox.size(); i++) {
+                List<String> list = arrayBox.getJSONArray(i).toJavaList(String.class);
+                String join = String.join(",", list);
+                arrayBoxList.add(join);
+            }
+            String join = String.join(";", arrayBoxList);
+            // 将光伏板坐标入库
+            PlanePhotoEntity photoEntity = new PlanePhotoEntity();
+            photoEntity.setId(Long.parseLong(id));
+            photoEntity.setArrayBox(join);
+            planePhotoService.updateById(photoEntity);
 
             // 将识别结果入库
             for (RecognizeMessageBo recognizeMessageBo : recognizeMessageBoList){
                 PhotoResultEntity photoResultEntity = new PhotoResultEntity();
                 photoResultEntity.setId(IdUtil.getSnowflake().nextId());
                 photoResultEntity.setPhotoId(Long.parseLong(id));
-                photoResultEntity.setPath(visiblePath);
                 photoResultEntity.setArrayIndex(recognizeMessageBo.getArrayIndex());
                 photoResultEntity.setRowIndex(recognizeMessageBo.getRowIndex());
                 photoResultEntity.setColumnIndex(recognizeMessageBo.getColumnIndex());
@@ -74,8 +92,5 @@ public class RecognizeMqttHandler implements AbstractMqttHandler {
             }
 
         }
-
-
-
     }
 }

src/main/java/com/keystar/plane/inspection/service/IReportService.java

@@ -8,6 +8,7 @@ package com.keystar.plane.inspection.service;
 
 import com.keystar.plane.inspection.bo.PlaneInspectionResultBo;
 
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -15,8 +16,6 @@ public interface IReportService {
 
     void createReport(Map<String, String> mFlyCountMap, Map<String, String> mSummaryMap, List<PlaneInspectionResultBo> planeInspectionResultBoList);
 
-    String pic2Base64FromMinio(String minioAddr);
-
-    String pic2Base64FromPath(String filePath);
+    void getMonthReport() throws ParseException;
 
 }

src/main/java/com/keystar/plane/inspection/service/PhotoResultService.java

@@ -1,10 +1,29 @@
 package com.keystar.plane.inspection.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PlaneInspectionResultBo;
 import com.keystar.plane.inspection.entity.PhotoResultEntity;
 
+import java.util.List;
+
 /**
  *  无人机结果入库
  **/
 public interface PhotoResultService extends IService<PhotoResultEntity> {
+    
+    /**
+     *  根据图片id获取识别结果
+     **/
+    PhotoBo queryResultByPhotoId(PhotoBo photoBo);
+
+    /**
+     *  list全部的异常结果信息给巡检报告
+     **/
+    List<PlaneInspectionResultBo> listInspectionResult();
+
+    String pic2Base64FromMinio(String minioAddr);
+
+    String pic2Base64FromPath(String filePath);
+
 }

src/main/java/com/keystar/plane/inspection/service/PhotoService.java

@@ -2,9 +2,13 @@ package com.keystar.plane.inspection.service;
 
 import com.drew.imaging.jpeg.JpegProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
+import com.keystar.plane.inspection.dao.PhotoResultVo;
 import com.keystar.plane.inspection.dao.PlanePhotoVo;
 
 import java.io.IOException;
+import java.util.List;
 
 public interface PhotoService {
 
@@ -13,5 +17,11 @@ public interface PhotoService {
      **/
     PlanePhotoVo queryPhoto(String filePath) throws IOException, JpegProcessingException;
 
+    /**
+     *  通过组串名字获取对应的图片和识别结果
+     **/
+    PhotoResultVo getPhotoMsg(PvNameBo pvNameBo);
+
+
 
 }

src/main/java/com/keystar/plane/inspection/service/PlanePhotoService.java

@@ -1,10 +1,49 @@
 package com.keystar.plane.inspection.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.keystar.plane.inspection.bo.DateBo;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.text.ParseException;
+import java.util.List;
 
 /**
  *  无人机图片入库
  **/
 public interface PlanePhotoService extends IService<PlanePhotoEntity> {
+
+    /**
+     *  根据组串的名字去查询图片信息
+     **/
+    List<PhotoBo> queryPhotoByPvName(PvNameBo pvNameBo);
+
+    /**
+     *  查询本月的总架次数
+     **/
+    Integer getTotalSortie() throws ParseException;
+
+    /**
+     *  查询本月有效架次数
+     **/
+    Integer getEffectiveSortie() throws ParseException;
+
+    /**
+     *  查询本月有效巡检天数
+     **/
+    Integer getEffectiveInspectionDate() throws ParseException;
+
+    /**
+     *  查询本月异常方阵数
+     **/
+    Integer getFltFZ() throws ParseException;
+
+    /**
+     *  查询有效航线中的最新架次
+     **/
+    List<PlanePhotoEntity> queryNewRecordByMission();
+
+
 }

src/main/java/com/keystar/plane/inspection/service/TangyangDataService.java

@@ -0,0 +1,20 @@
+package com.keystar.plane.inspection.service;
+
+public interface TangyangDataService {
+
+    /**
+     *  获取当月等效小时数
+     **/
+    Double getMonthEquHour();
+    
+    /**
+     *  计算当月热斑损失电量
+     **/
+    Double getHtsptLose();
+
+    /**
+     *  计算当月二极管故障损失电量
+     **/
+    Double getDioLose();
+
+}

src/main/java/com/keystar/plane/inspection/service/impl/MqttServiceImpl.java

@@ -116,16 +116,19 @@ public class MqttServiceImpl implements MqttService {
 
     @Override
     public void sendPhotoMqtt() throws IOException, JpegProcessingException, ParseException, InterruptedException {
-//        NewFileBo newFile = FileUtil.getNewFilePath();
-        NewFileBo newFile = new NewFileBo();
-        newFile.setMissionId(2420);
-        newFile.setRecordId(1871);
-        newFile.setPath("/data/photo/"+ "2420" + "/" + "1871");
+        NewFileBo newFile = FileUtil.getNewFilePath();
+//        NewFileBo newFile = new NewFileBo();
+//        newFile.setMissionId(2425);
+//        newFile.setRecordId(1890);
+//        newFile.setPath("F:\\2425\\1890");
+//        newFile.setPath("C:\\Users\\KR0282\\Desktop\\photo\\1");
         log.info("=====返回的最新的图片文件目录：" + newFile.toString());
         File path = new File(newFile.getPath());
         log.info("=====图片目录：" + path.getPath());
         File[] files = path.listFiles();
         SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String visibleImage = null;
+        Long photoId = null;
         if (files != null){
             log.info("======目录里面的文件数：" + files.length);
             // 取出红外图片
@@ -146,16 +149,40 @@ public class MqttServiceImpl implements MqttService {
 
 //                        String s = new String(minioPath.getBytes(StandardCharsets.UTF_8));
 //                        String encode = URLEncoder.encode(s, "UTF-8");
-                        planePhotoEntity.setPath(minioPath);
+                        planePhotoEntity.setInfraredImagePath(minioPath);
+                        // 根据红外地址获取可见光地址，根据红外图片的后缀，拼接可见光图片的后缀
+                        String infraredStr = file.getName().split("_")[3];
+                        String visibleStr = null;
+                        switch (infraredStr)
+                        {
+                            case "T.JPG" :
+                                visibleStr = "Z.JPG";
+                                break;
+                            case "T.jpg" :
+                                visibleStr = "Z.jpg";
+                                break;
+                            case "THRM.JPG" :
+                                visibleStr = "ZOOM.JPG";
+                                break;
+                            case "THRM.jpg" :
+                                visibleStr = "ZOOM.jpg";
+                                break;
+                            default:
+                        }
+                        visibleImage = file.getName().split("_")[2] + "_" + visibleStr;
+                        photoId = planePhotoEntity.getId();
+
                         planePhotoEntity.setPzName(planePhotoVo.getPZName());
                         String joined = String.join(",", planePhotoVo.getPVNames());
                         planePhotoEntity.setPvName(joined);
                         planePhotoEntity.setTime(sd.parse(sd.format(new Date(file.lastModified()))));
                         planePhotoEntity.setMissionId(newFile.getMissionId());
                         planePhotoEntity.setRecordId(newFile.getRecordId());
+                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+                        planePhotoEntity.setDate(Integer.parseInt(dateFormat.format(new Date(file.lastModified()))));
                         photoEntityList.add(planePhotoEntity);
-//                        planePhotoService.save(planePhotoEntity);
-//                        log.info("======将图片入库：" + planePhotoEntity.toString());
+                        planePhotoService.save(planePhotoEntity);
+                        log.info("======将图片入库：" + planePhotoEntity.toString());
 
 //                        // 发送mqtt给图像识别
 //                        Thread.sleep(3000);
@@ -167,11 +194,19 @@ public class MqttServiceImpl implements MqttService {
 //                        log.info("======将图片发送mqtt给图像识别：" + photoMqttMessageBo.toString());
 
                     }
-
+                }
+                // 将红外对应的可见光图片，更新到数据库
+                if (visibleImage != null){
+                    if (file.getName().contains(visibleImage)){
+                        PlanePhotoEntity photoEntity = new PlanePhotoEntity();
+                        photoEntity.setId(photoId);
+                        photoEntity.setVisibleImagePath("/nest/photo/"+newFile.getMissionId()+"/"+newFile.getRecordId()+"/" + file.getName());
+                        planePhotoService.updateById(photoEntity);
+                    }
                 }
             }
             // 遍历完图片后，一起入库和发给图像识别
-            planePhotoService.saveBatch(photoEntityList);
+//            planePhotoService.saveBatch(photoEntityList);
             log.info("======遍历完成，将图像信息入库======");
             List<String> funcIndex = new ArrayList<>();
             // 二极管故障
@@ -186,7 +221,7 @@ public class MqttServiceImpl implements MqttService {
                 photoMqttMessageBo.setId(photoEntity.getId());
                 photoMqttMessageBo.setFuncIndex(funcIndex);
                 photoMqttMessageBo.setVisibleImagePath("");
-                photoMqttMessageBo.setInfraredImagePath(photoEntity.getPath());
+                photoMqttMessageBo.setInfraredImagePath(photoEntity.getInfraredImagePath());
                 messageBoList.add(photoMqttMessageBo);
             }
             mqttService.sendMqtt(messageBoList);

src/main/java/com/keystar/plane/inspection/service/impl/NestServiceImpl.java

@@ -1,6 +1,5 @@
 package com.keystar.plane.inspection.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,17 +7,13 @@ import com.keystar.plane.inspection.bo.DateBo;
 import com.keystar.plane.inspection.bo.PlaneInspectionBo;
 import com.keystar.plane.inspection.bo.TaskMissionRecordBo;
 import com.keystar.plane.inspection.constant.UrlConstant;
-import com.keystar.plane.inspection.dao.LoginVo;
 import com.keystar.plane.inspection.dao.NestStatusVo;
 import com.keystar.plane.inspection.enums.NestStatusEnum;
 import com.keystar.plane.inspection.service.LoginService;
 import com.keystar.plane.inspection.service.NestService;
 import com.keystar.plane.inspection.utils.HttpUtils;
-import com.keystar.plane.inspection.utils.RedisUtils;
-import com.keystar.plane.inspection.utils.Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 

src/main/java/com/keystar/plane/inspection/service/impl/PhotoResultServiceImpl.java

@@ -1,13 +1,193 @@
 package com.keystar.plane.inspection.service.impl;
 
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PlaneInspectionPicBo;
+import com.keystar.plane.inspection.bo.PlaneInspectionResultBo;
+import com.keystar.plane.inspection.bo.PlaneInspectionResultDetailBo;
 import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import com.keystar.plane.inspection.mapper.PhotoResultMapper;
+import com.keystar.plane.inspection.mapper.PlanePhotoMapper;
 import com.keystar.plane.inspection.service.PhotoResultService;
-import lombok.RequiredArgsConstructor;
+import com.keystar.plane.inspection.service.PlanePhotoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
 @Service
-@RequiredArgsConstructor
 public class PhotoResultServiceImpl extends ServiceImpl<PhotoResultMapper, PhotoResultEntity> implements PhotoResultService {
+
+    @Resource
+    PhotoResultMapper photoResultMapper;
+
+    @Resource
+    PlanePhotoMapper planePhotoMapper;
+
+    @Autowired
+    private MinioService minioService;
+
+    @Autowired
+    private PlanePhotoService planePhotoService;
+
+    @Override
+    public PhotoBo queryResultByPhotoId(PhotoBo photoBo) {
+        Long id = photoBo.getId();
+        List<PhotoResultEntity> photoResultEntities = photoResultMapper.queryResultByPhotoId(id);
+        photoBo.setResults(photoResultEntities);
+        return photoBo;
+    }
+
+    @Override
+    public String pic2Base64FromMinio(String minioAddr) {
+
+        String[] paths = StrUtil.splitToArray(minioAddr, "/");
+
+        InputStream inputStream = null;
+        ByteArrayOutputStream byteArrayOutputStream = null;
+
+        try {
+            inputStream = minioService.getObject(paths[1], StrUtil.sub(minioAddr,
+                    CharSequenceUtil.length(paths[1]) + 2, CharSequenceUtil.length(minioAddr)));
+
+            byteArrayOutputStream = new ByteArrayOutputStream();
+
+            byte[] bytes = new byte[10240];
+            int mReadLength = 0;
+
+            while ((mReadLength = inputStream.read(bytes)) != -1) {
+                byteArrayOutputStream.write(bytes, 0, mReadLength);
+            }
+
+            return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
+        }catch (Exception e) {
+
+        }finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                }catch (Exception e) {
+
+                }
+            }
+            if (byteArrayOutputStream != null) {
+                try {
+                    byteArrayOutputStream.close();
+                }catch (Exception e) {
+
+                }
+            }
+        }
+
+        return "";
+    }
+
+    @Override
+    public String pic2Base64FromPath(String filePath) {
+
+        FileInputStream fileInputStream = null;
+        ByteArrayOutputStream byteArrayOutputStream = null;
+
+        try {
+
+            fileInputStream = new FileInputStream(filePath);
+
+            byteArrayOutputStream = new ByteArrayOutputStream();
+
+            byte[] bytes = new byte[10240];
+            int mReadLength = 0;
+
+            while ((mReadLength = fileInputStream.read(bytes)) != -1) {
+                byteArrayOutputStream.write(bytes, 0, mReadLength);
+            }
+
+            return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
+        }catch (Exception e) {
+
+        }finally {
+            if (fileInputStream != null) {
+                try {
+                    fileInputStream.close();
+                }catch (Exception e) {
+
+                }
+            }
+            if (byteArrayOutputStream != null) {
+                try {
+                    byteArrayOutputStream.close();
+                }catch (Exception e) {
+
+                }
+            }
+        }
+
+        return "";
+
+    }
+
+    @Override
+    public List<PlaneInspectionResultBo> listInspectionResult() {
+        //查库组装巡检结果集合传入函数即可
+        List<PlaneInspectionResultBo> planeInspectionResultBoList = new ArrayList<>();
+
+        //查询有效航线中的最新架次
+        List<PlanePhotoEntity> photoEntityList = planePhotoService.queryNewRecordByMission();
+        log.debug("*******************photoEntityList Size: " + photoEntityList.size());
+        for (PlanePhotoEntity photoEntity : photoEntityList){
+
+            // 根据架次获取图片和异常信息
+            List<PlanePhotoEntity> photoList = planePhotoMapper.queryPhotoByRecordId(photoEntity.getRecordId());
+            log.debug("*******************photoList Size: " + photoList.size());
+            for (PlanePhotoEntity photo : photoList){
+                int detailNum = 0;
+                PlaneInspectionResultBo planeInspectionResultBo = new PlaneInspectionResultBo();
+                planeInspectionResultBo.setPics(new ArrayList<>());
+                planeInspectionResultBo.setDetails(new ArrayList<>());
+
+                int detailDioe = 0, detailHtspte = 0, detailOce = 0;
+                planeInspectionResultBo.setId(String.valueOf(photo.getId()));
+                PlaneInspectionPicBo planeInspectionPicBo = new PlaneInspectionPicBo();
+//                planeInspectionPicBo.setVisible(pic2Base64FromPath("F:\\photo\\" + photo.getVisibleImagePath()));
+                planeInspectionPicBo.setInfrared(pic2Base64FromPath("F:\\photo\\" +photo.getInfraredImagePath()));
+                planeInspectionPicBo.setVisible("");
+                planeInspectionResultBo.getPics().add(planeInspectionPicBo);
+
+                // 根据图片id获取识别异常信息
+                List<PhotoResultEntity> photoResultEntities = photoResultMapper.queryResultByPhotoId(photo.getId());
+                if (photoResultEntities.size() != 0){
+                    for (PhotoResultEntity photoResultEntity : photoResultEntities){
+                        switch (photoResultEntity.getType()){
+                            case "diodeFault":
+                                detailDioe = 1;
+                                break;
+                            case "covered":
+                                detailHtspte = 1;
+                            default:
+
+                        }
+                    }
+                }
+                PlaneInspectionResultDetailBo planeInspectionResultDetailBo = new PlaneInspectionResultDetailBo();
+                planeInspectionResultDetailBo.setNum(String.valueOf(detailNum+1));
+                planeInspectionResultDetailBo.setName(photo.getPvName());
+                planeInspectionResultDetailBo.setDioe(String.valueOf(detailDioe));
+                planeInspectionResultDetailBo.setHtspte(String.valueOf(detailHtspte));
+                planeInspectionResultDetailBo.setOce(String.valueOf(detailOce));
+                planeInspectionResultBo.getDetails().add(planeInspectionResultDetailBo);
+
+                planeInspectionResultBoList.add(planeInspectionResultBo);
+            }
+        }
+
+        return planeInspectionResultBoList;
+    }
 }

src/main/java/com/keystar/plane/inspection/service/impl/PhotoServiceImpl.java

@@ -4,11 +4,19 @@ import com.drew.imaging.jpeg.JpegProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keystar.plane.inspection.bo.Location;
+import com.keystar.plane.inspection.bo.PhotoBo;
 import com.keystar.plane.inspection.bo.PhotoMqttMessageBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
 import com.keystar.plane.inspection.constant.LocationConstant;
 import com.keystar.plane.inspection.dao.PhotoMessageVo;
+import com.keystar.plane.inspection.dao.PhotoResultVo;
 import com.keystar.plane.inspection.dao.PlanePhotoVo;
+import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import com.keystar.plane.inspection.mapper.PhotoResultMapper;
+import com.keystar.plane.inspection.mapper.PlanePhotoMapper;
 import com.keystar.plane.inspection.service.PhotoService;
+import com.keystar.plane.inspection.service.PlanePhotoService;
 import com.keystar.plane.inspection.utils.FileUtil;
 import com.keystar.plane.inspection.utils.GisCheckUtils;
 import com.keystar.plane.inspection.utils.PhotoUtils;
@@ -22,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -39,6 +48,15 @@ public class PhotoServiceImpl implements PhotoService {
 
 //    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+    @Resource
+    PlanePhotoMapper planePhotoMapper;
+
+    @Resource
+    PhotoResultMapper photoResultMapper;
+
+    @Autowired
+    PlanePhotoService planePhotoService;
+
 
     @Override
     public PlanePhotoVo queryPhoto(String filePath) throws IOException, JpegProcessingException {
@@ -99,6 +117,31 @@ public class PhotoServiceImpl implements PhotoService {
         return planePhotoVo;
     }
 
+    /**
+     *  通过组串名字获取对应的图片和识别结果
+     **/
+    @Override
+    public PhotoResultVo getPhotoMsg(PvNameBo pvNameBo) {
+        // 获取这个组串最新的图片
+        List<PhotoBo> photoBoList = planePhotoService.queryPhotoByPvName(pvNameBo);
+        // 获取这个组串的图片总数
+        PvNameBo nameBo = new PvNameBo();
+        nameBo.setPvName(pvNameBo.getPvName());
+        List<PlanePhotoEntity> photoEntityList = planePhotoMapper.getPhotoBo(nameBo);
+        PhotoResultVo photoResultVo = new PhotoResultVo();
+        photoResultVo.setTotal(photoEntityList.size());
+        // 根据图片id查询识别结果
+        List<PhotoBo> photoBos = new ArrayList<>();
+        for (PhotoBo photoBo : photoBoList){
+            Long id = photoBo.getId();
+            List<PhotoResultEntity> photoResultEntities = photoResultMapper.queryResultByPhotoId(id);
+            photoBo.setResults(photoResultEntities);
+            photoBos.add(photoBo);
+        }
+        photoResultVo.setData(photoBos);
+        return photoResultVo;
+    }
+
 
 
 }

src/main/java/com/keystar/plane/inspection/service/impl/PlanePhotoServiceImpl.java

@@ -1,14 +1,115 @@
 package com.keystar.plane.inspection.service.impl;
 
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.keystar.plane.inspection.bo.DateBo;
+import com.keystar.plane.inspection.bo.PhotoBo;
+import com.keystar.plane.inspection.bo.PvNameBo;
+import com.keystar.plane.inspection.constant.MissionConstant;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
 import com.keystar.plane.inspection.mapper.PlanePhotoMapper;
 import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.utils.Utils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class PlanePhotoServiceImpl extends ServiceImpl<PlanePhotoMapper, PlanePhotoEntity> implements PlanePhotoService {
 
-}
+    @Resource
+    PlanePhotoMapper planePhotoMapper;
+
+    @Override
+    public List<PhotoBo> queryPhotoByPvName(PvNameBo pvNameBo) {
+        Integer startIndex = pvNameBo.getStartIndex();
+        pvNameBo.setStartIndex((startIndex-1)*pvNameBo.getPageSize());
+        List<PlanePhotoEntity> photoEntityList = planePhotoMapper.getPhotoBo(pvNameBo);
+        List<PhotoBo> photoBoList = new ArrayList<>();
+        for( PlanePhotoEntity photoEntity : photoEntityList){
+            PhotoBo photoBo = new PhotoBo();
+            photoBo.setId(photoEntity.getId());
+            photoBo.setMissionId(photoEntity.getMissionId());
+            photoBo.setRecordId(photoEntity.getRecordId());
+            photoBo.setVisibleImagePath(photoEntity.getVisibleImagePath());
+            photoBo.setInfraredImagePath(photoEntity.getInfraredImagePath());
+            photoBo.setTime(photoEntity.getTime());
+            photoBo.setPzName(photoEntity.getPzName());
+            // 将组串名字分割
+            String pvNames = photoEntity.getPvName();
+            if (pvNames != null){
+                String[]  split = pvNames.split(",");
+                List<String> pvNameList = new ArrayList<>(Arrays.asList(split));
+                photoBo.setPvName(pvNameList);
+            }
+            // 将组串坐标分割
+            String arrayBox = photoEntity.getArrayBox();
+            if (arrayBox != null){
+                String[] arrBoxSplit = arrayBox.split(";");
+                List<String> arrBoxList = new ArrayList<>(Arrays.asList(arrBoxSplit));
+                photoBo.setArrayBox(arrBoxList);
+            }
+
+            photoBoList.add(photoBo);
+        }
+        return photoBoList;
+    }
+
+    @Override
+    public Integer getTotalSortie() throws ParseException {
+        DateBo dateBo = Utils.getMonthDay();
+        List<PlanePhotoEntity> recordIdNum = planePhotoMapper.getRecordIdNum(dateBo);
+        return recordIdNum.size();
+    }
+
+    @Override
+    public Integer getEffectiveSortie() throws ParseException {
+        DateBo dateBo = Utils.getMonthDay();
+        List<PlanePhotoEntity> photoEntityList = planePhotoMapper.getRecordIdNum(dateBo);
+        int effectiveSortie = 0;
+        if (photoEntityList.size() != 0){
+            // 只有在固定航线上的架次才是有效架次
+            for (PlanePhotoEntity photoEntity : photoEntityList){
+                if (ArrayUtil.contains(MissionConstant.MISSION_ID, photoEntity.getMissionId())){
+                    effectiveSortie+=1;
+                }
+            }
+        }
+        return effectiveSortie;
+    }
+
+    @Override
+    public Integer getEffectiveInspectionDate() throws ParseException {
+        DateBo dateBo = Utils.getMonthDay();
+        List<PlanePhotoEntity> inspectionDate = planePhotoMapper.getInspectionDate(dateBo);
+        return inspectionDate.size();
+    }
+
+    @Override
+    public Integer getFltFZ() throws ParseException {
+        DateBo dateBo = Utils.getMonthDay();
+        List<PlanePhotoEntity> abnormalFZNum = planePhotoMapper.getAbnormalFZNum(dateBo);
+        return abnormalFZNum.size();
+    }
+
+    @Override
+    public List<PlanePhotoEntity> queryNewRecordByMission() {
+
+        List<PlanePhotoEntity> photoList = new ArrayList<>();
+        for (int i = 0; i < 3; i++) {
+            Integer mission = MissionConstant.MISSION_ID[i];
+            List<PlanePhotoEntity> photoEntityList = planePhotoMapper.queryNewRecordByMission(mission);
+            PlanePhotoEntity photoEntity = photoEntityList.get(0);
+            photoList.add(photoEntity);
+        }
+        return photoList;
+    }
+
+}

src/main/java/com/keystar/plane/inspection/service/impl/ReportServiceImpl.java

@@ -6,30 +6,51 @@ package com.keystar.plane.inspection.service.impl;
  * @Describe 报告接口实现类
  */
 
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.StrUtil;
 import com.keystar.plane.inspection.bo.PlaneInspectionResultBo;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import com.keystar.plane.inspection.mapper.PhotoResultMapper;
 import com.keystar.plane.inspection.service.IReportService;
+import com.keystar.plane.inspection.service.PhotoResultService;
+import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.service.TangyangDataService;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.Version;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
 @Slf4j
+//@EnableAspectJAutoProxy(exposeProxy = true)
 public class ReportServiceImpl implements IReportService {
 
     final MinioService minioService;
 
     @Autowired
+    private PlanePhotoService planePhotoService;
+
+    @Resource
+    private PhotoResultMapper photoResultMapper;
+
+    @Autowired
+    private TangyangDataService tangyangDataService;
+
+    @Autowired
+    private PhotoResultService photoResultService;
+
+    @Autowired
     public ReportServiceImpl(MinioService minioService) {
         this.minioService = minioService;
     }
@@ -84,7 +105,7 @@ public class ReportServiceImpl implements IReportService {
             Template template = configuration.getTemplate("report.ftl", StandardCharsets.UTF_8.toString());
 
             //todo: 记得修改路径和名字(这里后面确定路径后要挂载目录)
-            mFile = new File("D:\\temp\\1.doc");
+            mFile = new File("F:\\temp\\1.doc");
 
             fileOutputStream = new FileOutputStream(mFile);
 
@@ -120,89 +141,152 @@ public class ReportServiceImpl implements IReportService {
     }
 
     @Override
-    public String pic2Base64FromMinio(String minioAddr) {
-
-        String[] paths = StrUtil.splitToArray(minioAddr, "/");
-
-        InputStream inputStream = null;
-        ByteArrayOutputStream byteArrayOutputStream = null;
-
-        try {
-            inputStream = minioService.getObject(paths[1], StrUtil.sub(minioAddr,
-                    CharSequenceUtil.length(paths[1]) + 2, CharSequenceUtil.length(minioAddr)));
-
-            byteArrayOutputStream = new ByteArrayOutputStream();
-
-            byte[] bytes = new byte[10240];
-            int mReadLength = 0;
-
-            while ((mReadLength = inputStream.read(bytes)) != -1) {
-                byteArrayOutputStream.write(bytes, 0, mReadLength);
-            }
-
-            return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
-        }catch (Exception e) {
-
-        }finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                }catch (Exception e) {
-
-                }
-            }
-            if (byteArrayOutputStream != null) {
-                try {
-                    byteArrayOutputStream.close();
-                }catch (Exception e) {
-
-                }
-            }
-        }
-
-        return "";
+    public void getMonthReport() throws ParseException {
+        //((ReportServiceImpl)AopContext.currentProxy()).genMonthReport();
+        genMonthReport();
     }
 
-    @Override
-    public String pic2Base64FromPath(String filePath) {
-
-        FileInputStream fileInputStream = null;
-        ByteArrayOutputStream byteArrayOutputStream = null;
-
-        try {
-
-            fileInputStream = new FileInputStream(filePath);
-
-            byteArrayOutputStream = new ByteArrayOutputStream();
-
-            byte[] bytes = new byte[10240];
-            int mReadLength = 0;
-
-            while ((mReadLength = fileInputStream.read(bytes)) != -1) {
-                byteArrayOutputStream.write(bytes, 0, mReadLength);
-            }
-
-            return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
-        }catch (Exception e) {
-
-        }finally {
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                }catch (Exception e) {
-
-                }
-            }
-            if (byteArrayOutputStream != null) {
-                try {
-                    byteArrayOutputStream.close();
-                }catch (Exception e) {
-
-                }
-            }
+    @Async
+    public void genMonthReport() throws ParseException {
+
+        Map<String, String> mFlyCountMap = new HashMap<>();
+
+        //本月飞行总架次
+        mFlyCountMap.put("TotalSortie", planePhotoService.getTotalSortie().toString());
+        //有效巡检架次
+        mFlyCountMap.put("EffectiveSortie", planePhotoService.getEffectiveSortie().toString());
+        //有效巡检天数
+        mFlyCountMap.put("EffectiveInspectionDate", planePhotoService.getEffectiveInspectionDate().toString());
+
+        Map<String, String> mSummaryMap = new HashMap<>();
+        //方阵总数(16不需要修改)
+        mSummaryMap.put("TotalFZ", "16");
+        //组串总数(4624不需要修改)
+        mSummaryMap.put("TotalPVString", "4624");
+        //光伏板总数(124848不需要修改)
+        mSummaryMap.put("TotalPVPanel", "124848");
+        //无人机巡检覆盖方阵数
+        mSummaryMap.put("CoveredFZ", "16");
+        //无人机巡检覆盖方阵百分比
+        mSummaryMap.put("CoveredFZPct", "100%");
+        //本月巡检覆盖组串总数
+        mSummaryMap.put("CoveredPVString", "4624");
+        //本月巡检覆盖组串百分比
+        mSummaryMap.put("CoveredPVStringPct", "100%");
+        //本月巡检覆盖光伏板总数
+        mSummaryMap.put("CoveredPVPanel", "124848");
+        //本月巡检覆盖光伏板百分比
+        mSummaryMap.put("CoveredPVPanelPct", "100%");
+        //无人机未巡检方阵数
+        mSummaryMap.put("UncoveredFZ", "0");
+        //无人机未巡检方阵百分比
+        mSummaryMap.put("UnCoveredFZPct", "0");
+        //本月未巡检组串总数
+        mSummaryMap.put("UncoveredPVString", "0");
+        //本月未巡检组串百分比
+        mSummaryMap.put("UncoveredPVStringPct", "0");
+        //本月未巡检光伏板总数
+        mSummaryMap.put("UncoveredPVPanel", "0");
+        //本月未巡检光伏板百分比
+        mSummaryMap.put("UncoveredPVPanelPct", "0");
+
+        //存在异常方阵数
+        Integer FltFZ =  planePhotoService.getFltFZ();
+        mSummaryMap.put("FltFZ", FltFZ.toString());
+        double FltFZPct = (FltFZ.doubleValue() / 16.0) * 100.0;
+        //存在异常方阵百分比
+        mSummaryMap.put("FltFZPct", Double.toString(FltFZPct));
+
+
+        Integer DioFZ = 0,DioPVString = 0,DioPVPanel = 0;
+        List<PlanePhotoEntity> photoEntityList = planePhotoService.queryNewRecordByMission();
+        for (PlanePhotoEntity photoEntity : photoEntityList){
+            Integer recordId = photoEntity.getRecordId();
+            DioFZ = DioFZ + photoResultMapper.queryFltPz(recordId, "diodeFault").size();
+            DioPVString = DioPVString + photoResultMapper.queryFltPVString(recordId, "diodeFault").size();
+            DioPVPanel = DioPVPanel + photoResultMapper.queryFltPVPanel(recordId, "diodeFault").size();
         }
-
-        return "";
-
+        //存在二极管故障的方阵数
+        mSummaryMap.put("DioFZ", Integer.toString(DioFZ));
+        //存在二极管故障的方阵百分比
+        mSummaryMap.put("DioFZPct", Double.toString((FltFZ.doubleValue() / 16.0) * 100.0));
+        //存在二极管故障的组串总数
+        mSummaryMap.put("DioPVString", Integer.toString(DioPVString));
+        //存在二极管故障的组串百分比
+        mSummaryMap.put("DioPVStringPct", Double.toString((DioPVString.doubleValue() / 4624.0) * 100.0));
+        //存在二极管故障的光伏板总数
+        mSummaryMap.put("DioPVPanel", Integer.toString(DioPVPanel));
+        //存在二极管故障的光伏板百分比
+        mSummaryMap.put("DioPVPanelPct", Double.toString((DioPVPanel.doubleValue() / 124848.0) * 100.0));
+
+
+        Integer HtsptFZ = 0,HtsptPVString = 0,HtsptPVPanel = 0;
+        for (PlanePhotoEntity photoEntity : photoEntityList){
+            Integer recordId = photoEntity.getRecordId();
+            HtsptFZ = HtsptFZ + photoResultMapper.queryFltPz(recordId, "covered").size();
+            HtsptPVString = HtsptPVString + photoResultMapper.queryFltPVString(recordId, "covered").size();
+            HtsptPVPanel = HtsptPVPanel + photoResultMapper.queryFltPVPanel(recordId, "covered").size();
+        }
+        //存在热斑的方阵数
+        mSummaryMap.put("HtsptFZ", Integer.toString(HtsptFZ));
+        //存在热斑的方阵百分比
+        mSummaryMap.put("HtsptFZPct", Double.toString((HtsptFZ.doubleValue() / 16.0) * 100.0));
+        //存在热斑的组串总数
+        mSummaryMap.put("HtsptPVString", Integer.toString(HtsptPVString));
+        //存在热斑的组串百分比
+        mSummaryMap.put("HtsptPVStringPct", Double.toString((HtsptPVString.doubleValue() / 4624.0) * 100.0));
+        //存在热斑的光伏板总数
+        mSummaryMap.put("HtsptPVPanel", Integer.toString(HtsptPVPanel));
+        //存在热斑的光伏板百分比
+        mSummaryMap.put("HtsptPVPanelPct", Double.toString((HtsptPVPanel.doubleValue() / 124848.0) * 100.0));
+
+        //存在掉串的方阵数
+        mSummaryMap.put("OcFZ", "0");
+        //存在掉串的方阵百分比
+        mSummaryMap.put("OcFZPct", "0%");
+        //存在掉串的组串总数
+        mSummaryMap.put("OcPVString", "0");
+        //存在掉串的组串百分比
+        mSummaryMap.put("OcPVStringPct", "0%");
+        //存在掉串的光伏板总数
+        mSummaryMap.put("OcPVPanel", "0");
+        //存在掉串的光伏板百分比
+        mSummaryMap.put("OcPVPanelPct", "0%");
+
+
+        //存在异常组串总数
+        Integer FltPVString = DioPVString + HtsptPVString;
+        mSummaryMap.put("FltPVString", String.valueOf(FltPVString));
+        //存在异常组串百分比
+        mSummaryMap.put("FltPVStringPct", Double.toString((FltPVString.doubleValue() / 4624.0) * 100.0));
+
+        //存在异常光伏板总数
+        Integer FltPVPanel = DioPVPanel + HtsptPVPanel;
+        mSummaryMap.put("FltPVPanel", String.valueOf(FltPVPanel));
+        //存在异常光伏板百分比
+        mSummaryMap.put("FltPVPanelPct", Double.toString((FltPVPanel.doubleValue() / 124848.0) * 100.0));
+
+        //下面这些可能要宇峰那边帮忙算
+        //二极管故障损失量
+        Double dioLose = tangyangDataService.getDioLose();
+        mSummaryMap.put("DioLose", String.valueOf(dioLose));
+        //热斑损失电量
+        Double htsptLose = tangyangDataService.getHtsptLose();
+        mSummaryMap.put("HtsptLose",String.valueOf(htsptLose));
+        //掉串损失电量
+        mSummaryMap.put("OcLose", "0");
+        //月度损失电量
+        Double totalLose = dioLose + htsptLose;
+        mSummaryMap.put("TotalLose", String.valueOf(totalLose));
+
+        System.out.println(mFlyCountMap.toString() + mSummaryMap.toString());
+
+        //查库组装巡检结果集合传入函数即可
+        List<PlaneInspectionResultBo> planeInspectionResultBoList = photoResultService.listInspectionResult();
+//        List<PlaneInspectionResultBo> planeInspectionResultBoList = photoResultService.listInspectionResult();
+
+//        reportService.createReport(mFlyCountMap, mSummaryMap, planeInspectionResultBoList);
+        // 多线程
+        createReport(mFlyCountMap, mSummaryMap, planeInspectionResultBoList);
     }
 }

src/main/java/com/keystar/plane/inspection/service/impl/TangyangDataServiceImpl.java

@@ -0,0 +1,97 @@
+package com.keystar.plane.inspection.service.impl;
+
+import com.keystar.plane.inspection.constant.MissionConstant;
+import com.keystar.plane.inspection.entity.PhotoResultEntity;
+import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import com.keystar.plane.inspection.mapper.PhotoResultMapper;
+import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.service.TangyangDataService;
+import com.keystar.plane.inspection.utils.FileUtil;
+import com.keystar.plane.inspection.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class TangyangDataServiceImpl implements TangyangDataService {
+
+    @Resource
+    PhotoResultMapper photoResultMapper;
+
+    @Autowired
+    PlanePhotoService planePhotoService;
+
+    @Override
+    public Double getMonthEquHour() {
+        // 获取当前月份
+        SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String format = monthFormat.format(new Date());
+        String url = "http://10.138.3.82:8080/home/getMonthEquHour/" + format;
+        log.info("请求url地址:" + url);
+        String s = HttpUtils.doGet(url, null);
+        log.info("返回结果:" + s);
+        return Double.parseDouble(s);
+    }
+
+    /**
+     *  计算当月热斑损失电量
+     **/
+    @Override
+    public Double getHtsptLose() {
+        // 额定功率P = 535MWp
+        Double p = 535.0;
+        // 月利用小时数
+//        Double monthEquHour = this.getMonthEquHour();
+        Double monthEquHour = 35.15;
+        // 获取每个航线的最新架次，计算全部的热斑组件数量
+        Double coveredNum = 0.0;
+//        for (int i = 0; i < 3; i++) {
+//            String recordId = FileUtil.getRecordIdByMissionId(MissionConstant.MISSION_ID[i]);
+//
+//            List<PhotoResultEntity> covered = photoResultMapper.queryFltPVPanel(Integer.valueOf(recordId), "covered");
+//            coveredNum = coveredNum + covered.size();
+//        }
+        List<PlanePhotoEntity> photoEntityList = planePhotoService.queryNewRecordByMission();
+        for (PlanePhotoEntity photoEntity : photoEntityList){
+            Integer recordId = photoEntity.getRecordId();
+            List<PhotoResultEntity> covered = photoResultMapper.queryFltPVPanel(recordId, "covered");
+            coveredNum = coveredNum + covered.size();
+        }
+        // 热斑的损失电量
+        return p * coveredNum * monthEquHour * 0.32;
+
+    }
+
+    @Override
+    public Double getDioLose() {
+        // 额定功率P = 535MWp
+        Double p = 535.0;
+        // 月利用小时数
+//        Double monthEquHour = this.getMonthEquHour();
+        Double monthEquHour = 35.15;
+        // 获取每个航线的最新架次，计算全部的热斑组件数量
+        Double coveredNum = 0.0;
+//        for (int i = 0; i < 3; i++) {
+//            String recordId = FileUtil.getRecordIdByMissionId(MissionConstant.MISSION_ID[i]);
+//
+//            List<PhotoResultEntity> covered = photoResultMapper.queryFltPVPanel(Integer.valueOf(recordId), "diodeFault");
+//            coveredNum = coveredNum + covered.size();
+//        }
+        List<PlanePhotoEntity> photoEntityList = planePhotoService.queryNewRecordByMission();
+        for (PlanePhotoEntity photoEntity : photoEntityList){
+            Integer recordId = photoEntity.getRecordId();
+            List<PhotoResultEntity> covered = photoResultMapper.queryFltPVPanel(recordId, "diodeFault");
+            coveredNum = coveredNum + covered.size();
+        }
+        // 二极管故障的损失电量
+        return p * coveredNum * monthEquHour * 0.33;
+    }
+}

src/main/java/com/keystar/plane/inspection/utils/FileUtil.java

@@ -53,12 +53,12 @@ public class FileUtil {
             for (int index = 0; index < mFeatureJSONArray.size(); index++) {
                 mFeatureJSONObject = mFeatureJSONArray.getJSONObject(index);
                 JSONObject mPropertieJSONObject = mFeatureJSONObject.getJSONObject("properties");
-                String mCurrentName = mPropertieJSONObject.getString("Name");
+                String mCurrentName = mPropertieJSONObject.getString("name");
                 JSONObject mGeometryJSONObject = mFeatureJSONObject.getJSONObject("geometry");
                 JSONArray mCoordinateJSONArray = mGeometryJSONObject.getJSONArray("coordinates");
                 JSONArray mCoordinateLLJSONArray = mCoordinateJSONArray.getJSONArray(0);
                 List<Location> mLocationList = new ArrayList<>();
-                for (int mIndex = 0; mIndex < 4; mIndex++) {
+                for (int mIndex = 0; mIndex < mCoordinateLLJSONArray.size()-1; mIndex++) {
                     JSONArray mCoordinateLLValueJSONArray = mCoordinateLLJSONArray.getJSONArray(mIndex);
                     Location mLocation = new Location();
                     mLocation.setLon(mCoordinateLLValueJSONArray.getDouble(0));
@@ -374,7 +374,7 @@ public class FileUtil {
      **/
     public static NewFileBo getNewFilePath(){
         // 获取最新修改的航线
-        File path = new File("/data/autoUpload/photo/");
+        File path = new File("/data/photo/");
 //        File path = new File("C:\\Users\\KR0282\\Desktop\\photo");
 //        File path = new File(photoPath);
         File[] files = path.listFiles();
@@ -398,37 +398,54 @@ public class FileUtil {
         NewFileBo newFileBo = new NewFileBo();
         newFileBo.setMissionId(Integer.valueOf(missionName));
         newFileBo.setRecordId(Integer.valueOf(recordName));
-        newFileBo.setPath("/data/autoUpload/photo/"+ missionName + "/" + recordName);
+        newFileBo.setPath("/data/photo/"+ missionName + "/" + recordName);
 //        newFileBo.setPath("C:\\Users\\KR0282\\Desktop\\photo\\"+ missionName + "\\" + recordName);
         return newFileBo;
     }
 
+//    /**
+//     *  读取读取resources目录下的文件
+//     **/
+//    public static String getContent(String filePath){
+//        String res = "";
+//        if(StringUtils.isEmpty(filePath)){
+//            log.info("文件路径不能为空");
+//            return res;
+//        }
+//        try {
+//            Resource resource = new ClassPathResource(filePath);
+//            BufferedReader br = new BufferedReader(new InputStreamReader(resource.getStream(), StandardCharsets.UTF_8));
+//            StringBuilder sb = new StringBuilder();
+//            String str = "";
+//            while((str=br.readLine())!=null) {
+//                sb.append(str);
+//            }
+//            res = sb.toString();
+//        } catch (Exception e) {
+//            log.info("读取文件{}时发生异常",filePath);
+//            e.printStackTrace();
+//        }
+//        return res;
+//
+//    }
+
+    // String Content = FileUtil.getContent("pv.json");
+    
     /**
-     *  读取读取resources目录下的文件
+     *  根据航线名字查询最新的架次
      **/
-    public static String getContent(String filePath){
-        String res = "";
-        if(StringUtils.isEmpty(filePath)){
-            log.info("文件路径不能为空");
-            return res;
-        }
-        try {
-            Resource resource = new ClassPathResource(filePath);
-            BufferedReader br = new BufferedReader(new InputStreamReader(resource.getStream(), StandardCharsets.UTF_8));
-            StringBuilder sb = new StringBuilder();
-            String str = "";
-            while((str=br.readLine())!=null) {
-                sb.append(str);
-            }
-            res = sb.toString();
-        } catch (Exception e) {
-            log.info("读取文件{}时发生异常",filePath);
-            e.printStackTrace();
+    public static String getRecordIdByMissionId(Integer missionName){
+        File record = new File("/data/photo/"+ missionName);
+        File[] records = record.listFiles();
+        String recordName ;
+        // 文件大于一个才进行排序
+        if (records.length > 1){
+            File[] sort1 = fileSort(records);
+            recordName = sort1[0].getName();
+        }else {
+            recordName = records[0].getName();
         }
-        return res;
-
+        return recordName;
     }
 
-    // String Content = FileUtil.getContent("pv.json");
-
 }

src/main/java/com/keystar/plane/inspection/utils/HttpUtils.java

@@ -1,5 +1,6 @@
 package com.keystar.plane.inspection.utils;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -18,6 +19,7 @@ import java.util.Map;
 import java.util.Set;
 
 
+@Slf4j
 public class HttpUtils {
 
 
@@ -27,7 +29,7 @@ public class HttpUtils {
     public static String doGet(String url,Map<String, String> headers) {
         // 创建Httpclient对象
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        String resultString = "";
+        String resultString = null;
         CloseableHttpResponse response = null;
         try {
             // 创建url
@@ -50,9 +52,15 @@ public class HttpUtils {
 //            httpGet.addHeader("Authorization", "eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoie1widXNlcm5hbWVcIjpcInN5c3RlbVwiLFwiaXBcIjpudWxsLFwiaWRcIjotMSxcImp3dFwiOlwiZXlKaGJHY2lPaUpJVXpJMU5pSjkuZXlKMWMyVnlJam9pZTF3aWRYTmxjbTVoYldWY0lqcGNJbk41YzNSbGJWd2lMRndpYVhCY0lqcHVkV3hzTEZ3aWFXUmNJam90TVN4Y0ltcDNkRndpT201MWJHeDlJaXdpYVdGMElqb3hOakk1TkRZMk1qWXhMQ0pxZEdraU9pSlpWRkUxV2xkTmVrOVVUWFJOYWs1cVRVTXdNRTlFV1RKTVYwWnNUVmROZEU1RVp6Rk9WRTVxVGxSbmVFNUhXVFFpTENKbGVIQWlPakUyTWprMU5USTJOakY5LkpVZjBZNVE2SnJVTlZoaXpZQ2dJNWpWVUJVTzluOGhlVnFqTkd4eGdZNHNcIn0iLCJpYXQiOjE2Mjk0NjYyNjEsImp0aSI6Ill6QXpOVFZrWVRZdE5UZGhNeTAwTURVMkxXRTBOVEF0TWpRMk5qVTNabVV4T1RneSIsImV4cCI6Mjc0MDU3NzM3Mn0.peHm3MmYLWyqne1-K-3JHqpZhW5jtQX-STDfgIaNjpI");
             // 执行请求
             response = httpclient.execute(httpGet);
+            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+            log.info("get请求：" + EntityUtils.toString(response.getEntity(), "UTF-8"));
+            log.info("resultString:" + resultString);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+                log.info("=====返回成功======");
+                //return EntityUtils.toString(response.getEntity(), "UTF-8");
+            }else {
+                log.info("返回状态：" + response.getStatusLine().getStatusCode());
             }
         } catch (Exception ignored) {
 

src/main/java/com/keystar/plane/inspection/utils/PhotoUtils.java

@@ -99,7 +99,7 @@ public class PhotoUtils {
         //显示视场角 dFov = 40.6
 
 //        double altitude = photoMessageVo.getAltitude() - 52;
-        double altitude = photoMessageVo.getAltitude() - 50;
+        double altitude = photoMessageVo.getAltitude() - 52;
 
         double dFov = 40.6;
         //对角线d  diagonal 根据dFov计算
@@ -166,5 +166,68 @@ public class PhotoUtils {
         return locations;
     }
 
+    /**
+     *  根据图片中的某个坐标求解出对应的经纬度坐标
+     *  l 横坐标 ， h 纵坐标
+     **/
+    public static Location getPointLocation(Double length , Double height, PhotoMessageVo photoMessageVo){
+
+        double altitude = photoMessageVo.getAltitude() - 52;
+
+        double dFov = 40.6;
+        //对角线d  diagonal 根据dFov计算
+        double a = Math.toRadians(dFov / 2);
+        double tan = Math.tan(a);
+        BigDecimal diagonal  = new BigDecimal(photoMessageVo.getFocalLength()).multiply(BigDecimal.valueOf(tan));
+        //开平方：高度的平方+宽度的平方
+        double num1 = Math.sqrt(Math.pow(photoMessageVo.getImageWidth(), 2) + Math.pow(photoMessageVo.getImageHigh(),2));
+        DegreesVo degreesVo = new DegreesVo();
+        //经度换算单位(w)
+        BigDecimal num2 = new BigDecimal(0.00001141);
+        //纬度换算单位(h)
+        BigDecimal num3 = new BigDecimal(0.00000899);
+        // w
+        BigDecimal w = BigDecimal.valueOf(photoMessageVo.getImageWidth()/num1).multiply(diagonal);
+        // h
+        BigDecimal h = BigDecimal.valueOf(photoMessageVo.getImageHigh()/num1).multiply(diagonal);
+        // HFov
+        BigDecimal divide = w.divide(BigDecimal.valueOf(photoMessageVo.getFocalLength()), 10, BigDecimal.ROUND_HALF_UP);
+        double atan = Math.atan(divide.doubleValue());
+        BigDecimal aa = BigDecimal.valueOf(Math.atan(atan)).multiply(BigDecimal.valueOf(180)).divide(BigDecimal.valueOf(Math.PI), 10, BigDecimal.ROUND_HALF_UP);
+        BigDecimal HFov = new BigDecimal(2).multiply(aa);
+
+        double wTan = Math.tan(Math.toRadians(HFov.divide(BigDecimal.valueOf(2),10,BigDecimal.ROUND_HALF_UP).doubleValue()));
+        // 实际精度的长度（米）
+        BigDecimal airLong = new BigDecimal(altitude).multiply(BigDecimal.valueOf(wTan));
+        // 实际经度 W（角度）
+        BigDecimal airLongitude = airLong.multiply(num2);
+        // 对于像素点距离（0,0）经度增量
+        BigDecimal lengthLon = airLongitude.multiply(new BigDecimal(length)).divide(BigDecimal.valueOf(photoMessageVo.getImageWidth()/2), 10, BigDecimal.ROUND_HALF_UP);
+
+
+        // VFov
+        BigDecimal HDivide = h.divide(BigDecimal.valueOf(photoMessageVo.getFocalLength()), 10, BigDecimal.ROUND_HALF_UP);
+        double bTan = Math.atan(HDivide.doubleValue());
+        BigDecimal H = BigDecimal.valueOf(Math.atan(bTan)).multiply(BigDecimal.valueOf(180)).divide(BigDecimal.valueOf(Math.PI), 10, BigDecimal.ROUND_HALF_UP);
+        BigDecimal VFov = new BigDecimal(2).multiply(H);
+
+        double HTan = Math.tan(Math.toRadians(VFov.divide(BigDecimal.valueOf(2),10,BigDecimal.ROUND_HALF_UP).doubleValue()));
+        // 实际纬度的高（米）
+        BigDecimal airHight = new BigDecimal(altitude).multiply(BigDecimal.valueOf(HTan));
+        //实际纬度H(角度)
+        BigDecimal airLatitude = airHight.multiply(num3);
+        // 对于像素点距离（0,0）纬度增量
+        BigDecimal heightLat = airLatitude.multiply(new BigDecimal(height)).divide(BigDecimal.valueOf(photoMessageVo.getImageHigh()/2), 10, BigDecimal.ROUND_HALF_UP);
+
+        // 像素点是左上角的坐标
+        Double lon = photoMessageVo.getLongitude() - airLongitude.doubleValue();
+        Double lat = photoMessageVo.getLatitude() + airLatitude.doubleValue();
+
+        Location location = new Location();
+        location.setLon(lon + lengthLon.doubleValue());
+        location.setLat(lat - heightLat.doubleValue());
+        return location;
+    }
+
 
 }

src/main/java/com/keystar/plane/inspection/utils/Utils.java

@@ -1,5 +1,6 @@
 package com.keystar.plane.inspection.utils;
 
+import com.keystar.plane.inspection.bo.DateBo;
 import com.keystar.plane.inspection.bo.Location;
 import org.apache.commons.codec.binary.Base64;
 
@@ -8,6 +9,10 @@ import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.interfaces .RSAPublicKey;
 import java.security.spec.X509EncodedKeySpec;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,14 +42,22 @@ public class Utils {
         return Double.parseDouble(s[0]);
     }
 
-
     /**
-     *  获取光伏区域坐标
+     *  获取当月的开始和结束日期
      **/
-    public static List<Location> getAllLocation(){
-        Location location = new Location();
-//        location.setLat();
-//        location.setLon();
-        return null;
+    public static DateBo getMonthDay() throws ParseException {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, 1);
+        calendar.roll(Calendar.DATE, -1);
+
+        int maxDate = calendar.get(Calendar.DATE);
+        SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM-");
+        String startTime = monthFormat.format(new Date()) + "01 00:00:00";
+        String endTime = monthFormat.format(new Date()) + maxDate + " 23:59:59";
+        DateBo dateBo = new DateBo();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dateBo.setStartTime(dateFormat.parse(startTime));
+        dateBo.setEndTime(dateFormat.parse(endTime));
+        return dateBo;
     }
 }

src/main/resources/border.json

@@ -9,141 +9,386 @@
         "coordinates" : [
           [
             [
-              117.81913354379537,
-              32.185632799709452
+              117.81633802076719,
+              32.188266628900607
             ],
             [
-              117.81980682571093,
-              32.185632731285288
+              117.81633800010593,
+              32.188291289765694
             ],
             [
-              117.81981241682524,
-              32.185632730525022
+              117.81633796417329,
+              32.188332388658473
             ],
             [
-              117.82026064830426,
-              32.185632684148651
+              117.81633794261373,
+              32.188357440271993
             ],
             [
-              117.82036688756133,
-              32.185632673504891
+              117.81633790757944,
+              32.188398149129164
             ],
             [
-              117.82048616406811,
-              32.18563266134062
+              117.81633788601988,
+              32.188423195402819
             ],
             [
-              117.82049128895682,
-              32.185632660580339
+              117.81633785008728,
+              32.188464298797548
             ],
             [
-              117.8211650361997,
-              32.185632592156225
+              117.816337829426,
+              32.188488958088548
             ],
             [
-              117.82117062641571,
-              32.185632591395944
+              117.81633779439171,
+              32.18853005841266
             ],
             [
-              117.82150423915267,
-              32.185632557183865
+              117.81633777193382,
+              32.188555112252423
             ],
             [
-              117.82150433347579,
-              32.186032483262785
+              117.81633773689953,
+              32.188595817219969
             ],
             [
-              117.82184400265437,
-              32.186032448290632
+              117.81633771533997,
+              32.188620872562204
             ],
             [
-              117.8218440278072,
-              32.186140149637268
+              117.81633768030568,
+              32.188661576740081
             ],
             [
-              117.8218440331971,
-              32.186165490754313
+              117.81633765784778,
+              32.188686624461766
             ],
             [
-              117.82184410596062,
-              32.186473154555657
+              117.81633762281349,
+              32.188727727737529
             ],
             [
-              117.82184411135052,
-              32.18649849634027
+              117.81633760125393,
+              32.18875277848192
             ],
             [
-              117.82184418411406,
-              32.186806555110842
+              117.81633756532132,
+              32.188793485641831
             ],
             [
-              117.82184418950392,
-              32.18683189528209
+              117.81633754376175,
+              32.188818540169336
             ],
             [
-              117.82184420028372,
-              32.186872680847344
+              117.81633750872747,
+              32.188859245019138
             ],
             [
-              117.82049158001097,
-              32.186872819974525
+              117.81633748716787,
+              32.188884296487593
             ],
             [
-              117.82048645512228,
-              32.186872819974525
+              117.81633745123528,
+              32.188925395112626
             ],
             [
-              117.81913383574782,
-              32.186872959101755
+              117.81633742967573,
+              32.18895044732318
             ],
             [
-              117.81913382676468,
-              32.186832175057162
+              117.81633739553973,
+              32.188991155154881
             ],
             [
-              117.81913382047648,
-              32.186806832605178
+              117.81633737308184,
+              32.189016206587027
             ],
             [
-              117.81913377915397,
-              32.186632213233629
+              117.81633734074251,
+              32.189054955251713
             ],
             [
-              117.81913377376408,
-              32.1866068722465
+              117.81600901908256,
+              32.189055463091805
             ],
             [
-              117.81913370100057,
-              32.186298812800196
+              117.8160034917486,
+              32.189055471454466
             ],
             [
-              117.81913369561065,
-              32.18627386705699
+              117.81567323511756,
+              32.18905598233551
             ],
             [
-              117.81913362284712,
-              32.185965806483757
+              117.81566770868193,
+              32.189055990698186
             ],
             [
-              117.81913361745721,
-              32.185940465311148
+              117.81533745294921,
+              32.189056501579216
             ],
             [
-              117.81913354379537,
-              32.185632799709452
+              117.81533238734932,
+              32.189056509181633
+            ],
+            [
+              117.81500166988253,
+              32.189057030706039
+            ],
+            [
+              117.81499660338432,
+              32.189057033746998
+            ],
+            [
+              117.81498112181873,
+              32.189057051992719
+            ],
+            [
+              117.81365995605562,
+              32.189059094756693
+            ],
+            [
+              117.81365995605562,
+              32.189057187315399
+            ],
+            [
+              117.81365995246236,
+              32.189016479513228
+            ],
+            [
+              117.81365994976743,
+              32.188991428841341
+            ],
+            [
+              117.81365994527586,
+              32.188950721009761
+            ],
+            [
+              117.81365994258088,
+              32.188925671080042
+            ],
+            [
+              117.81365993898764,
+              32.188884570174373
+            ],
+            [
+              117.81365993629267,
+              32.188859518705996
+            ],
+            [
+              117.81365993269944,
+              32.188818815376827
+            ],
+            [
+              117.81365993000449,
+              32.1887937608494
+            ],
+            [
+              117.81365992641119,
+              32.188753052929357
+            ],
+            [
+              117.81365992371627,
+              32.188728001424785
+            ],
+            [
+              117.81365991922469,
+              32.18868690042985
+            ],
+            [
+              117.81365991652974,
+              32.1886618527083
+            ],
+            [
+              117.81365991293649,
+              32.188621147010039
+            ],
+            [
+              117.81365991024155,
+              32.188596092428135
+            ],
+            [
+              117.81365990664827,
+              32.188555387460717
+            ],
+            [
+              117.81365990395335,
+              32.188530333620982
+            ],
+            [
+              117.81365990036008,
+              32.188489232536782
+            ],
+            [
+              117.81365989766513,
+              32.188464573245845
+            ],
+            [
+              117.81365989317356,
+              32.188423470611511
+            ],
+            [
+              117.8136598904786,
+              32.188398423577674
+            ],
+            [
+              117.81365988688532,
+              32.188357715480805
+            ],
+            [
+              117.8136598841904,
+              32.18833266310719
+            ],
+            [
+              117.81365987969882,
+              32.188291564214538
+            ],
+            [
+              117.81365987700387,
+              32.188266904869984
+            ],
+            [
+              117.81365987251232,
+              32.188225804427091
+            ],
+            [
+              117.81365986981734,
+              32.188200753537686
+            ],
+            [
+              117.81365986442748,
+              32.188160049153666
+            ],
+            [
+              117.8136598617325,
+              32.188134994444923
+            ],
+            [
+              117.81365985724092,
+              32.188094285470058
+            ],
+            [
+              117.813659854546,
+              32.188069234544393
+            ],
+            [
+              117.81365985005442,
+              32.188028130971261
+            ],
+            [
+              117.81365984735945,
+              32.188003083068381
+            ],
+            [
+              117.81365984286792,
+              32.187962374794793
+            ],
+            [
+              117.81365984017295,
+              32.187937323832884
+            ],
+            [
+              117.81365983568136,
+              32.187896617810615
+            ],
+            [
+              117.81365983298645,
+              32.187871563789543
+            ],
+            [
+              117.81365982849486,
+              32.187830921598852
+            ],
+            [
+              117.81398942576249,
+              32.187830790835875
+            ],
+            [
+              117.8139944922607,
+              32.187830788555132
+            ],
+            [
+              117.81432474889172,
+              32.187830657792148
+            ],
+            [
+              117.8143302762257,
+              32.187830655511362
+            ],
+            [
+              117.81466053195841,
+              32.187830525508645
+            ],
+            [
+              117.81466759451321,
+              32.187830522467642
+            ],
+            [
+              117.81477400445017,
+              32.18783047913341
+            ],
+            [
+              117.81482401456034,
+              32.1878304593669
+            ],
+            [
+              117.81496230480846,
+              32.18783040462889
+            ],
+            [
+              117.81499520201245,
+              32.187830391704658
+            ],
+            [
+              117.81500138242163,
+              32.187830389423915
+            ],
+            [
+              117.81521308299475,
+              32.187830305036165
+            ],
+            [
+              117.8160035079183,
+              32.187829991813238
+            ],
+            [
+              117.8160081162757,
+              32.188225750449583
+            ],
+            [
+              117.81600882414814,
+              32.188225743607369
+            ],
+            [
+              117.81602811457054,
+              32.188225561148208
+            ],
+            [
+              117.8163380584964,
+              32.188222625835969
+            ],
+            [
+              117.81633805580145,
+              32.18822552997807
+            ],
+            [
+              117.81633802076719,
+              32.188266628900607
             ]
           ]
         ]
       },
       "properties" : {
         "OBJECTID" : 1,
-        "FID" : 0,
         "OBJECTID_1" : 1,
+        "FID" : 0,
+        "OBJECTID_12" : 1,
         "Id" : 0,
         "Name" : "FZ16",
         "Shape_Leng" : 865.29250729399996,
-        "Shape_Length" : 929.67751091722585,
-        "Shape_Area" : 47227.637882500538
+        "Shape_Length" : 918.76488353139428,
+        "Shape_Area" : 46180.307844239374
       }
     },
     {
@@ -154,165 +399,182 @@
         "coordinates" : [
           [
             [
-              117.81811498541718,
-              32.187539464125486
+              117.81365349716876,
+              32.187830464688624
+            ],
+            [
+              117.81365351782996,
+              32.187871563789543
+            ],
+            [
+              117.81365353040641,
+              32.187896618570804
             ],
             [
-              117.81810939430285,
-              32.187539464125486
+              117.81365355016933,
+              32.187937325353353
             ],
             [
-              117.81743658040959,
-              32.187539534068755
+              117.81365356274573,
+              32.187962374794793
             ],
             [
-              117.81743653998538,
-              32.18736531067443
+              117.81365358250866,
+              32.188003083068381
             ],
             [
-              117.81743653369716,
-              32.187339966090128
+              117.8136535950851,
+              32.188028131731542
             ],
             [
-              117.81743646183197,
-              32.187032308259418
+              117.81365361574638,
+              32.188069235304646
             ],
             [
-              117.81743645554376,
-              32.187006963582391
+              117.81365362832277,
+              32.188094285470058
             ],
             [
-              117.81743638278023,
-              32.18669890929133
+              117.81365364808569,
+              32.188134994444923
             ],
             [
-              117.81743637739031,
-              32.186673567562501
+              117.81365366066211,
+              32.188160049153666
             ],
             [
-              117.81743628935543,
-              32.186298986900361
+              117.81365370557788,
+              32.188200755058141
             ],
             [
-              117.81743628306722,
-              32.186274041157205
+              117.81365371545932,
+              32.188225805187372
             ],
             [
-              117.81743621120202,
-              32.185965980584562
+              117.81365372983238,
+              32.188266904869984
             ],
             [
-              117.81743620491382,
-              32.185940638651722
+              117.81365372713744,
+              32.188291564214538
             ],
             [
-              117.81743613304857,
-              32.18563297381089
+              117.81365374600207,
+              32.188332663867442
             ],
             [
-              117.81810894604355,
-              32.185632905386711
+              117.81365375857847,
+              32.188357716241072
             ],
             [
-              117.81811453805621,
-              32.185632904626438
+              117.81365377744309,
+              32.188398423577674
             ],
             [
-              117.81912749004866,
-              32.185632800469683
+              117.8136537891212,
+              32.188423471371713
             ],
             [
-              117.81912753047287,
-              32.185807024899063
+              117.81365381068076,
+              32.188464574006098
             ],
             [
-              117.81912753586273,
-              32.185832366869114
+              117.81365382146058,
+              32.188489233297041
             ],
             [
-              117.81912757718524,
-              32.186006987774888
+              117.81365443141661,
+              32.18971699008695
             ],
             [
-              117.81912758347345,
-              32.186032329689283
+              117.81198087004231,
+              32.189716212367443
             ],
             [
-              117.81912762389767,
-              32.186206949451254
+              117.81198087004231,
+              32.189716120379096
             ],
             [
-              117.81912763018583,
-              32.186232291309977
+              117.8119808287198,
+              32.189675412871608
             ],
             [
-              117.81912767150833,
-              32.186406911448671
+              117.81198080266866,
+              32.18965036238108
             ],
             [
-              117.81912767689825,
-              32.186432253251667
+              117.81198076044787,
+              32.189609657885121
             ],
             [
-              117.81912771822076,
-              32.1866068722465
+              117.81198073529499,
+              32.189584603575312
             ],
             [
-              117.81912772361062,
-              32.186632213993896
+              117.81198068498936,
+              32.189543504487673
             ],
             [
-              117.81912776493313,
-              32.186806833365445
+              117.81198066253147,
+              32.18951845472111
             ],
             [
-              117.81912777122135,
-              32.186832175057162
+              117.81198063019214,
+              32.189477748645707
             ],
             [
-              117.81912781164556,
-              32.187006794045089
+              117.81197985314944,
+              32.188728152713033
             ],
             [
-              117.81912781793373,
-              32.187032134920869
+              117.81197983608141,
+              32.188711008484731
             ],
             [
-              117.81912785925624,
-              32.187206753525253
+              117.81197981811512,
+              32.188693050033301
             ],
             [
-              117.81912786464613,
-              32.187232095105657
+              117.81197893147794,
+              32.187830894990121
             ],
             [
-              117.81912790596864,
-              32.187406713326482
+              117.81198025559466,
+              32.187830894229855
             ],
             [
-              117.81912791135854,
-              32.187432054851193
+              117.81231097216315,
+              32.18783068896235
             ],
             [
-              117.81912793740968,
-              32.18753935997097
+              117.81231603955963,
+              32.187830685921369
             ],
             [
-              117.81811498541718,
-              32.187539464125486
+              117.81247722427111,
+              32.187830585568378
+            ],
+            [
+              117.81365349716876,
+              32.187829853447717
+            ],
+            [
+              117.81365349716876,
+              32.187830464688624
             ]
           ]
         ]
       },
       "properties" : {
         "OBJECTID" : 2,
-        "FID" : 1,
         "OBJECTID_1" : 2,
+        "FID" : 1,
+        "OBJECTID_12" : 2,
         "Id" : 0,
         "Name" : "FZ13",
         "Shape_Leng" : 816.533220132,
-        "Shape_Length" : 878.11651267907712,
-        "Shape_Area" : 47216.568454210326
+        "Shape_Length" : 868.92949552962023,
+        "Shape_Area" : 46236.512854778011
       }
     },
     {
@@ -323,133 +585,226 @@
         "coordinates" : [
           [
             [
-              117.81665456192047,
-              32.186806691957358
+              117.81187382679308,
+              32.187830646388385
+            ],
+            [
+              117.8118738708105,
+              32.187871747009666
+            ],
+            [
+              117.81187389865828,
+              32.187896801030689
+            ],
+            [
+              117.81187394267572,
+              32.187937506292613
+            ],
+            [
+              117.81187396962517,
+              32.187962558014739
+            ],
+            [
+              117.81187401454096,
+              32.188003266288305
+            ],
+            [
+              117.81187404149041,
+              32.188028313430827
+            ],
+            [
+              117.81187408640616,
+              32.188069417764126
+            ],
+            [
+              117.81187411335564,
+              32.188094469449993
+            ],
+            [
+              117.81187415827141,
+              32.188135176143994
+            ],
+            [
+              117.81187418611917,
+              32.188160231613018
+            ],
+            [
+              117.81187423013665,
+              32.188200936757148
+            ],
+            [
+              117.81187425708607,
+              32.188225987646518
+            ],
+            [
+              117.81187430290018,
+              32.188267086568843
             ],
             [
-              117.81664897170444,
-              32.186806691957358
+              117.8118743298496,
+              32.188291746673556
             ],
             [
-              117.81597522446158,
-              32.186806761140915
+              117.81187437476538,
+              32.188332847086656
             ],
             [
-              117.81597009867457,
-              32.186806761901131
+              117.81187441159632,
+              32.18836680041418
             ],
             [
-              117.81529635233001,
-              32.186806831084681
+              117.81187443495251,
+              32.188388559396095
             ],
             [
-              117.81529076031735,
-              32.186806831844898
+              117.81187509611253,
+              32.188992964526562
             ],
             [
-              117.81461748019845,
-              32.186806900268181
+              117.80919402563809,
+              32.188992506101727
             ],
             [
-              117.81461743887593,
-              32.18663267623193
+              117.80919427087817,
+              32.188753510595198
             ],
             [
-              117.81461743348603,
-              32.18660733524495
+              117.80919427357308,
+              32.188728459090711
             ],
             [
-              117.81461736072249,
-              32.186299275800209
+              117.80919434094673,
+              32.188687357335787
             ],
             [
-              117.81461735533263,
-              32.186274330057124
+              117.80919436699789,
+              32.188662308854049
             ],
             [
-              117.81461728256906,
-              32.185966269485462
+              117.809194410117,
+              32.18862160315598
             ],
             [
-              117.81461727628088,
-              32.185940928312974
+              117.80919443616816,
+              32.188596550854967
             ],
             [
-              117.81461720441564,
-              32.185633263473079
+              117.80919447749066,
+              32.188555845127496
             ],
             [
-              117.81529048543287,
-              32.185633194288684
+              117.8091945035418,
+              32.188530792048141
             ],
             [
-              117.8152960765472,
-              32.185633193528403
+              117.80919454666093,
+              32.188489690964175
             ],
             [
-              117.81596982379008,
-              32.185633124344015
+              117.80919457181378,
+              32.188465032433605
             ],
             [
-              117.81597494867876,
-              32.185633123583735
+              117.80919461493292,
+              32.188423929039217
             ],
             [
-              117.81664869681997,
-              32.185633055159556
+              117.80919464098405,
+              32.188398881245242
             ],
             [
-              117.816654287036,
-              32.185633054399339
+              117.80919468230655,
+              32.188358171628145
             ],
             [
-              117.81732756805322,
-              32.185632985214887
+              117.809194709256,
+              32.188333121535358
             ],
             [
-              117.81732763991846,
-              32.185940650055713
+              117.80919475147682,
+              32.188292021882638
             ],
             [
-              117.81732764620666,
-              32.185965991988581
+              117.80919477662964,
+              32.188267363298472
             ],
             [
-              117.81732771807187,
-              32.18627405256116
+              117.80919481974878,
+              32.188226261335345
             ],
             [
-              117.81732772436007,
-              32.186298998304331
+              117.80919484579994,
+              32.188201209685737
             ],
             [
-              117.81732779622531,
-              32.186607056989736
+              117.80919488712244,
+              32.188160506062246
             ],
             [
-              117.81732780251353,
-              32.186632398737075
+              117.80919491407187,
+              32.188135451353567
             ],
             [
-              117.81732784383603,
-              32.186806622773858
+              117.80919495539437,
+              32.188094743139168
             ],
             [
-              117.81665456192047,
-              32.186806691957358
+              117.80919498144553,
+              32.188069691453414
+            ],
+            [
+              117.80919502456469,
+              32.188028590161238
+            ],
+            [
+              117.8091950506158,
+              32.188003542258485
+            ],
+            [
+              117.80919509283662,
+              32.187962832464564
+            ],
+            [
+              117.80919511978607,
+              32.187937781502768
+            ],
+            [
+              117.80919516110858,
+              32.187897077001168
+            ],
+            [
+              117.80919518715974,
+              32.187872022220027
+            ],
+            [
+              117.80919523027885,
+              32.187830923119328
+            ],
+            [
+              117.80919523117718,
+              32.187830387903396
+            ],
+            [
+              117.81187382589474,
+              32.187830181115437
+            ],
+            [
+              117.81187382679308,
+              32.187830646388385
             ]
           ]
         ]
       },
       "properties" : {
         "OBJECTID" : 3,
-        "FID" : 2,
         "OBJECTID_1" : 3,
+        "FID" : 2,
+        "OBJECTID_12" : 3,
         "Id" : 0,
         "Name" : "FZ04",
         "Shape_Leng" : 849.04988263899997,
-        "Shape_Length" : 912.17751054510234,
-        "Shape_Area" : 46576.688730169066
+        "Shape_Length" : 902.44483336853148,
+        "Shape_Area" : 45614.198292977475
       }
     },
     {
@@ -460,2173 +815,3582 @@
         "coordinates" : [
           [
             [
-              117.81529661733302,
-              32.187939670721534
+              117.8118739112347,
+              32.189016664251497
             ],
             [
-              117.81529102711698,
-              32.187939671481793
+              117.81187390404817,
+              32.189057371293401
             ],
             [
-              117.81427807692117,
-              32.187939775635911
+              117.81187389955662,
+              32.189082420426615
             ],
             [
-              117.81427800505593,
-              32.187632906692762
+              117.81187389237006,
+              32.189123520482703
             ],
             [
-              117.81461208222188,
-              32.18763287248148
+              117.81187388787851,
+              32.189148182636131
             ],
             [
-              117.81461720890724,
-              32.187632870960961
+              117.81187388069195,
+              32.189189279621566
             ],
             [
-              117.81461720890724,
-              32.187632280245516
+              117.81187387530208,
+              32.189214334800383
             ],
             [
-              117.8146171774662,
-              32.187499037698323
+              117.81187386811558,
+              32.189255038712879
             ],
             [
-              117.81461764279349,
-              32.187499037698323
+              117.81187386362397,
+              32.189280089312206
             ],
             [
-              117.81461763650529,
-              32.187473696952516
+              117.81187385643747,
+              32.189321189279035
             ],
             [
-              117.81461756374175,
-              32.187165640439645
+              117.8118738519459,
+              32.189345846057222
             ],
             [
-              117.81461755835186,
-              32.187140694933973
+              117.81187384475935,
+              32.189386947514848
             ],
             [
-              117.81461748648664,
-              32.186833031107945
+              117.81187384026779,
+              32.189411998077816
             ],
             [
-              117.81529076660556,
-              32.186832962684676
+              117.81187383308126,
+              32.189452705703161
             ],
             [
-              117.81529635771992,
-              32.186832961924459
+              117.81187382858971,
+              32.189477760049222
             ],
             [
-              117.81597010496277,
-              32.186832892740917
+              117.81187382140315,
+              32.189518465364415
             ],
             [
-              117.81597523074979,
-              32.18683289198065
+              117.81187381511495,
+              32.189554863167153
             ],
             [
-              117.81664897799266,
-              32.186832822797172
+              117.81187381152168,
+              32.189573745134503
             ],
             [
-              117.81665456820869,
-              32.186832822797172
+              117.81187379355539,
+              32.189675424275094
             ],
             [
-              117.81732785012422,
-              32.186832752853419
+              117.81187378636886,
+              32.189716131782632
             ],
             [
-              117.81732792198943,
-              32.1871404166804
+              117.81187378187728,
+              32.189741178453808
             ],
             [
-              117.81732792737932,
-              32.18716536218615
+              117.81187377379244,
+              32.189782281253365
             ],
             [
-              117.81732801541423,
-              32.187539943084467
+              117.81187376930089,
+              32.189807334748508
             ],
             [
-              117.81732802170245,
-              32.187565280770833
+              117.81187376211436,
+              32.189848042957244
             ],
             [
-              117.81732809356767,
-              32.187873335931258
+              117.81187375762281,
+              32.189873094153612
             ],
             [
-              117.81732809985587,
-              32.187898683408044
+              117.81187375043626,
+              32.189913798531748
             ],
             [
-              117.81732810434745,
-              32.187919264115656
+              117.81187374594468,
+              32.189938848189534
             ],
             [
-              117.81732810973735,
-              32.18793946165308
+              117.81187373875815,
+              32.189979947858902
             ],
             [
-              117.81529661733302,
-              32.187939670721534
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 4,
-        "FID" : 3,
-        "OBJECTID_1" : 4,
-        "Id" : 0,
-        "Name" : "FZ05",
-        "Shape_Leng" : 903.20332125200002,
-        "Shape_Length" : 970.19821078969778,
-        "Shape_Area" : 45448.294551337829
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 5,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
+              117.81187373426657,
+              32.190004608259805
+            ],
+            [
+              117.81187372797838,
+              32.190045706378982
+            ],
+            [
+              117.81187372348681,
+              32.190070756760711
+            ],
+            [
+              117.81187371719859,
+              32.190111286197336
+            ],
+            [
+              117.81154459693637,
+              32.190111236782357
+            ],
+            [
+              117.81153906690747,
+              32.190111236022098
+            ],
+            [
+              117.81120881386968,
+              32.190111185086685
+            ],
+            [
+              117.81120328563742,
+              32.190111184326433
+            ],
+            [
+              117.81087302990468,
+              32.190111134911454
+            ],
+            [
+              117.81086796250818,
+              32.190111134151195
+            ],
+            [
+              117.81053724593971,
+              32.190111083975964
+            ],
+            [
+              117.81053218033981,
+              32.190111083215719
+            ],
+            [
+              117.81020146377134,
+              32.190111034560971
+            ],
+            [
+              117.81019639906975,
+              32.190111033800726
+            ],
+            [
+              117.80986614064207,
+              32.190110983625495
+            ],
+            [
+              117.80986061420644,
+              32.190110982865249
+            ],
+            [
+              117.80953035937202,
+              32.190110933450256
+            ],
+            [
+              117.80952483113978,
+              32.190110932690004
+            ],
+            [
+              117.80919457630533,
+              32.190110884035256
+            ],
+            [
+              117.8091895080105,
+              32.190110883275025
+            ],
+            [
+              117.80885879323864,
+              32.190110833099787
+            ],
             [
-              117.81743767725254,
-              32.189298373789804
+              117.80885852194746,
+              32.190110833099787
             ],
             [
-              117.81811089089612,
-              32.189298338058585
+              117.80885800002628,
+              32.18980847737933
             ],
             [
-              117.81811601668316,
-              32.189298338058585
+              117.80885872137345,
+              32.189808472817916
             ],
             [
-              117.81844959708077,
-              32.189298320573101
+              117.80899076743199,
+              32.189807631999756
             ],
             [
-              117.81844963121672,
-              32.18936483222042
+              117.80919523566877,
+              32.189806328199502
             ],
             [
-              117.81878973158668,
-              32.189364813974763
+              117.80919524375361,
+              32.189782556457942
             ],
             [
-              117.81879532180268,
-              32.189364813974763
+              117.80919525812664,
+              32.189741453658513
             ],
             [
-              117.81946853814124,
-              32.189364779003839
+              117.80919526621149,
+              32.189716406227156
             ],
             [
-              117.81946869624473,
-              32.189672395500764
+              117.80919528058453,
+              32.189675698719739
             ],
             [
-              117.81946870882115,
-              32.189697736394727
+              117.80919528956767,
+              32.189650648229346
             ],
             [
-              117.81946886782293,
-              32.190005354807383
+              117.8091953030424,
+              32.189609944493718
             ],
             [
-              117.81946888039936,
-              32.190030694088151
+              117.80919531202557,
+              32.189584890184051
             ],
             [
-              117.81946897023086,
-              32.190204889573934
+              117.80919532639862,
+              32.189543789576049
             ],
             [
-              117.81912933428993,
-              32.19020490705924
+              117.80919533538176,
+              32.189518739809543
             ],
             [
-              117.8191294034602,
-              32.190338721899138
+              117.80919534885646,
+              32.189478034494478
             ],
             [
-              117.81912941693496,
-              32.19036406184734
+              117.80919535783966,
+              32.189452981668936
             ],
             [
-              117.81912957503845,
-              32.190671281169898
+              117.80919537131436,
+              32.189412272523278
             ],
             [
-              117.81879599374253,
-              32.190671298655062
+              117.80919538029755,
+              32.18938722272064
             ],
             [
-              117.81879040352651,
-              32.190671300935769
+              117.80919539556889,
+              32.189346120502869
             ],
             [
-              117.81878993999581,
-              32.190671299415285
+              117.80919540365373,
+              32.18932146372476
             ],
             [
-              117.81879007743808,
-              32.190937740817319
+              117.80919541802673,
+              32.189280364518311
             ],
             [
-              117.81845044149712,
-              32.190937758302482
+              117.80919542700993,
+              32.189255312398615
             ],
             [
-              117.81845044059881,
-              32.190938550455833
+              117.80919544138297,
+              32.18921460772593
             ],
             [
-              117.81845045407351,
-              32.190963492640023
+              117.8091954503661,
+              32.189189554827891
             ],
             [
-              117.81845061217702,
-              32.191271106014469
+              117.80919546473916,
+              32.189148456322137
             ],
             [
-              117.81811703177942,
-              32.191271125020037
+              117.809195472824,
+              32.18912379568927
             ],
             [
-              117.81811190689075,
-              32.191271125020037
+              117.80919548809536,
+              32.18908269335256
             ],
             [
-              117.81743869324713,
-              32.191271160750411
+              117.80919549707848,
+              32.189057646500181
             ],
             [
-              117.81743853514364,
-              32.190963546615919
+              117.80919551145153,
+              32.189017300572395
             ],
             [
-              117.81743852256722,
-              32.190938604431743
+              117.80952457242496,
+              32.189017172852061
             ],
             [
-              117.81743836356543,
-              32.190630593855431
+              117.80953010155554,
+              32.189017170571361
             ],
             [
-              117.81743835098901,
-              32.190605256262153
+              117.80986035638996,
+              32.189017042090782
             ],
             [
-              117.81743819198721,
-              32.19029724455774
+              117.80986588372392,
+              32.189017039810068
             ],
             [
-              117.81743817941079,
-              32.190272302191019
+              117.81019613855833,
+              32.189016912089741
             ],
             [
-              117.8174380213073,
-              32.189964289359878
+              117.81020120595484,
+              32.189016909809041
             ],
             [
-              117.81743800783258,
-              32.189938951581119
+              117.81053192342162,
+              32.189016791211579
             ],
             [
-              117.81743784972909,
-              32.189630936861704
+              117.81053699081815,
+              32.189016789691124
             ],
             [
-              117.81743783625436,
-              32.189605995072604
+              117.8118739112347,
+              32.189016261324326
             ],
             [
-              117.81743767725254,
-              32.189298373789804
+              117.8118739112347,
+              32.189016664251497
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 5,
-        "FID" : 4,
-        "OBJECTID_1" : 5,
+        "OBJECTID" : 4,
+        "OBJECTID_1" : 4,
+        "FID" : 3,
+        "OBJECTID_12" : 4,
         "Id" : 0,
-        "Name" : "FZ15",
-        "Shape_Leng" : 903.17354536899995,
-        "Shape_Length" : 971.13875069482049,
-        "Shape_Area" : 47729.622969859622
+        "Name" : "FZ05",
+        "Shape_Leng" : 903.20332125200002,
+        "Shape_Length" : 958.94634968452249,
+        "Shape_Area" : 44416.167732354596
       }
     },
     {
       "type" : "Feature",
-      "id" : 6,
+      "id" : 5,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.81743678522545,
-              32.187565866164967
+              117.81298402500832,
+              32.193075780966254
+            ],
+            [
+              117.81298399446557,
+              32.193100433686489
+            ],
+            [
+              117.81298394236327,
+              32.193141529647583
+            ],
+            [
+              117.81298391092224,
+              32.193166580697607
+            ],
+            [
+              117.81298385881998,
+              32.193207278281434
+            ],
+            [
+              117.81298382737894,
+              32.19323232779297
+            ],
+            [
+              117.81298377617495,
+              32.193273027627981
+            ],
+            [
+              117.81298374473391,
+              32.193298074840769
+            ],
+            [
+              117.81298369173334,
+              32.193339167671816
+            ],
+            [
+              117.8129836602923,
+              32.193364214866413
+            ],
+            [
+              117.81298360998666,
+              32.193404526178526
+            ],
+            [
+              117.81265428670515,
+              32.193404707106922
+            ],
+            [
+              117.81264922020696,
+              32.193404710147739
+            ],
+            [
+              117.81231899861021,
+              32.193404891076135
+            ],
+            [
+              117.81231347127628,
+              32.193404894116945
+            ],
+            [
+              117.81219725712629,
+              32.193404957974039
+            ],
+            [
+              117.81198200730947,
+              32.193405075805558
+            ],
+            [
+              117.8119815554569,
+              32.192530505544006
+            ],
+            [
+              117.81198100029803,
+              32.191451996661769
+            ],
+            [
+              117.81298407621229,
+              32.191453921537942
+            ],
+            [
+              117.81298431965574,
+              32.191520466580116
+            ],
+            [
+              117.81298906635367,
+              32.191520465819934
+            ],
+            [
+              117.81331928974707,
+              32.191520414125016
+            ],
+            [
+              117.81332481797932,
+              32.191520413364792
+            ],
+            [
+              117.81365503957608,
+              32.19152036243009
+            ],
+            [
+              117.81366056780834,
+              32.191520361669909
+            ],
+            [
+              117.8139905836909,
+              32.191520310735221
+            ],
+            [
+              117.81399063309821,
+              32.191560752861463
+            ],
+            [
+              117.81399066274264,
+              32.191585408272772
+            ],
+            [
+              117.81399071214996,
+              32.191626502637298
+            ],
+            [
+              117.81399074359102,
+              32.191651550303234
+            ],
+            [
+              117.81399079299834,
+              32.191692253125865
+            ],
+            [
+              117.81399082443937,
+              32.191717296212396
+            ],
+            [
+              117.81399089360966,
+              32.191758394318512
+            ],
+            [
+              117.8139909070844,
+              32.191783049676232
+            ],
+            [
+              117.8139909537968,
+              32.191824143191333
+            ],
+            [
+              117.81399097176309,
+              32.191849194603989
+            ],
+            [
+              117.81399159699055,
+              32.19235230363001
+            ],
+            [
+              117.81365600346838,
+              32.192351725868797
+            ],
+            [
+              117.8136556872614,
+              32.192771266220177
+            ],
+            [
+              117.81365568276982,
+              32.192811963220549
+            ],
+            [
+              117.81365565761701,
+              32.19281275915862
+            ],
+            [
+              117.81332064979641,
+              32.192813167390476
+            ],
+            [
+              117.81332000929763,
+              32.192917382005007
+            ],
+            [
+              117.81331984760085,
+              32.192943873709439
+            ],
+            [
+              117.81331969309065,
+              32.192968924813862
+            ],
+            [
+              117.81331944335899,
+              32.193009623246233
+            ],
+            [
+              117.81331928884873,
+              32.193034667490757
+            ],
+            [
+              117.81331903552382,
+              32.193075762721335
+            ],
+            [
+              117.81331903462552,
+              32.193075968737162
+            ],
+            [
+              117.8131799152324,
+              32.193075770323347
+            ],
+            [
+              117.81298986854922,
+              32.193075499689996
+            ],
+            [
+              117.81298480294934,
+              32.193075492087914
+            ],
+            [
+              117.81298402500832,
+              32.193075491327761
+            ],
+            [
+              117.81298402500832,
+              32.193075780966254
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 5,
+        "OBJECTID_1" : 5,
+        "FID" : 4,
+        "OBJECTID_12" : 5,
+        "Id" : 0,
+        "Name" : "FZ15",
+        "Shape_Leng" : 903.17354536899995,
+        "Shape_Length" : 960.72714802793359,
+        "Shape_Area" : 46742.827890398345
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 6,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
+            [
+              117.81398963866322,
+              32.191428862414298
+            ],
+            [
+              117.81398959823902,
+              32.191453912415334
+            ],
+            [
+              117.81398953445866,
+              32.191493435465937
+            ],
+            [
+              117.81368573590765,
+              32.191494626729593
+            ],
+            [
+              117.81299118458112,
+              32.191497352115739
+            ],
+            [
+              117.812991107326,
+              32.191494666260994
+            ],
+            [
+              117.81298994221106,
+              32.1914539656307
+            ],
+            [
+              117.81298922535547,
+              32.191428915629686
+            ],
+            [
+              117.81298921457568,
+              32.191428543882161
+            ],
+            [
+              117.81298902143789,
+              32.191428543882161
+            ],
+            [
+              117.81298395404139,
+              32.191428551484378
+            ],
+            [
+              117.81273107379732,
+              32.191428930073876
+            ],
+            [
+              117.81198449474449,
+              32.19143004607659
+            ],
+            [
+              117.81198449204953,
+              32.191428968845067
+            ],
+            [
+              117.81198440131971,
+              32.191388266664973
+            ],
+            [
+              117.81198434472586,
+              32.191363218926519
+            ],
+            [
+              117.81198425309769,
+              32.191322122162468
+            ],
+            [
+              117.81198419740213,
+              32.191297077446741
+            ],
+            [
+              117.81198410577396,
+              32.191256378248511
+            ],
+            [
+              117.81198404918011,
+              32.191231326672693
+            ],
+            [
+              117.81198395845026,
+              32.191190628965529
+            ],
+            [
+              117.81198390185641,
+              32.191165577371613
+            ],
+            [
+              117.8119838093299,
+              32.191124484319388
+            ],
+            [
+              117.81198375273605,
+              32.19109943574815
+            ],
+            [
+              117.81198366110789,
+              32.191058734180885
+            ],
+            [
+              117.81198360451404,
+              32.191033686351794
+            ],
+            [
+              117.81198351378418,
+              32.190992983234658
+            ],
+            [
+              117.81198345719034,
+              32.190967936147693
+            ],
+            [
+              117.81198336466386,
+              32.190926841485776
+            ],
+            [
+              117.81198330896832,
+              32.190902185896114
+            ],
+            [
+              117.81198321644182,
+              32.190861091204489
+            ],
+            [
+              117.81198315984797,
+              32.190836044841468
+            ],
+            [
+              117.8119830682198,
+              32.190795343916598
+            ],
+            [
+              117.81198301162595,
+              32.190770292974129
+            ],
+            [
+              117.81198291909949,
+              32.190729195942303
+            ],
+            [
+              117.81198286250559,
+              32.190703680483601
+            ],
+            [
+              117.81198271338529,
+              32.190637381917838
+            ],
+            [
+              117.81198268463918,
+              32.190624582744142
+            ],
+            [
+              117.81198265050323,
+              32.190609359965933
+            ],
+            [
+              117.81198256875651,
+              32.190572650891859
+            ],
+            [
+              117.81198247623006,
+              32.19053195060949
+            ],
+            [
+              117.81198241963618,
+              32.190506899594467
+            ],
+            [
+              117.81198232710969,
+              32.190465806244909
+            ],
+            [
+              117.81198227141414,
+              32.190440758252592
+            ],
+            [
+              117.81198217978601,
+              32.190400054110107
+            ],
+            [
+              117.81198212319212,
+              32.190375006859981
+            ],
+            [
+              117.81198203156397,
+              32.190334303448275
+            ],
+            [
+              117.81198197586845,
+              32.190309256940232
+            ],
+            [
+              117.81198188334196,
+              32.190268161220729
+            ],
+            [
+              117.81198182674808,
+              32.19024350621288
+            ],
+            [
+              117.8119817342216,
+              32.190202411984117
+            ],
+            [
+              117.81198167852607,
+              32.190177364679535
+            ],
+            [
+              117.81198157611811,
+              32.190136661939739
+            ],
+            [
+              117.81198154108385,
+              32.190111612336402
+            ],
+            [
+              117.81198070026073,
+              32.189742104418805
+            ],
+            [
+              117.81198136321741,
+              32.189742103658553
+            ],
+            [
+              117.81231158571245,
+              32.189741792722884
+            ],
+            [
+              117.81231711394474,
+              32.189741787401204
+            ],
+            [
+              117.81264733464319,
+              32.189741476465521
+            ],
+            [
+              117.81265240114138,
+              32.189741471143904
+            ],
+            [
+              117.81280549832032,
+              32.1897413274597
+            ],
+            [
+              117.81365290517896,
+              32.189740529974266
+            ],
+            [
+              117.81365290697559,
+              32.189741282605866
+            ],
+            [
+              117.81365298692567,
+              32.189781984002032
+            ],
+            [
+              117.81365303633299,
+              32.189807033696084
+            ],
+            [
+              117.81365311538474,
+              32.189848126582866
+            ],
+            [
+              117.81365316569038,
+              32.189873179299653
+            ],
+            [
+              117.81365324564047,
+              32.189913877595913
+            ],
+            [
+              117.81365329414947,
+              32.189938925733173
+            ],
+            [
+              117.81365337409956,
+              32.189979628561453
+            ],
+            [
+              117.81365342350688,
+              32.190004674399944
+            ],
+            [
+              117.81365350255862,
+              32.190045771758911
+            ],
+            [
+              117.81365355106763,
+              32.190070424539648
+            ],
+            [
+              117.81365363101771,
+              32.190111521868928
+            ],
+            [
+              117.81365367952672,
+              32.190136574513211
+            ],
+            [
+              117.81365375947681,
+              32.190177273451944
+            ],
+            [
+              117.81365380888413,
+              32.190202320756484
+            ],
+            [
+              117.8136538888342,
+              32.190243415745527
+            ],
+            [
+              117.81365393734322,
+              32.190268073794321
+            ],
+            [
+              117.8136540181916,
+              32.190309166472957
+            ],
+            [
+              117.81365406670064,
+              32.190334215261693
+            ],
+            [
+              117.81365414665069,
+              32.190374917913189
+            ],
+            [
+              117.81365419515973,
+              32.190399965163387
+            ],
+            [
+              117.81365427421147,
+              32.190440668545683
+            ],
+            [
+              117.81365432361882,
+              32.190465662561799
+            ],
+            [
+              117.81399120981662,
+              32.19046515016823
+            ],
+            [
+              117.8139904848762,
+              32.190902079464713
+            ],
+            [
+              117.8139904669099,
+              32.190926734294173
+            ],
+            [
+              117.81399039055312,
+              32.190967828956154
+            ],
+            [
+              117.81399035012889,
+              32.190992876043133
+            ],
+            [
+              117.8139902836536,
+              32.1910335799205
+            ],
+            [
+              117.81399024322938,
+              32.191058626989445
+            ],
+            [
+              117.81399017585575,
+              32.191099328556767
+            ],
+            [
+              117.81399013543155,
+              32.191124376367803
+            ],
+            [
+              117.81399006805792,
+              32.1911654717007
+            ],
+            [
+              117.81399002673541,
+              32.191190521774246
+            ],
+            [
+              117.8139899611584,
+              32.191231220241704
+            ],
+            [
+              117.8139899198359,
+              32.191256271057306
+            ],
+            [
+              117.81398985425886,
+              32.191296971015774
+            ],
+            [
+              117.81398981293637,
+              32.191322015731529
+            ],
+            [
+              117.81398974646106,
+              32.191363111735441
+            ],
+            [
+              117.81398970513857,
+              32.191388160234112
+            ],
+            [
+              117.81398963866322,
+              32.191428862414298
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 6,
+        "OBJECTID_1" : 6,
+        "FID" : 5,
+        "OBJECTID_12" : 6,
+        "Id" : 0,
+        "Name" : "FZ14",
+        "Shape_Leng" : 854.35471662400005,
+        "Shape_Length" : 908.363064023069,
+        "Shape_Area" : 47023.516597113885
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 7,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
+            [
+              117.81187547789655,
+              32.192153394665887
+            ],
+            [
+              117.81187548957462,
+              32.19217844218683
+            ],
+            [
+              117.81187550933757,
+              32.192219536283638
+            ],
+            [
+              117.81187552101571,
+              32.192244193036892
+            ],
+            [
+              117.81187554167694,
+              32.192285285583559
+            ],
+            [
+              117.81187555335502,
+              32.192310333068193
+            ],
+            [
+              117.81187557221966,
+              32.19235103559614
+            ],
+            [
+              117.81187558389776,
+              32.192376079261692
+            ],
+            [
+              117.81187560366068,
+              32.192417176310045
+            ],
+            [
+              117.81187561533879,
+              32.192441832249521
+            ],
+            [
+              117.81187563510174,
+              32.192482925467168
+            ],
+            [
+              117.81187565396633,
+              32.192521512251545
+            ],
+            [
+              117.81187566205116,
+              32.192539142296837
+            ],
+            [
+              117.81187570966188,
+              32.192639467231956
+            ],
+            [
+              117.81187572942483,
+              32.192680563401218
+            ],
+            [
+              117.81187574200125,
+              32.192705612297509
+            ],
+            [
+              117.81187576086586,
+              32.192746313128296
+            ],
+            [
+              117.81187577254394,
+              32.192771359725839
+            ],
+            [
+              117.8118757914086,
+              32.192812059006819
+            ],
+            [
+              117.81187580308668,
+              32.192837108627096
+            ],
+            [
+              117.81187582284963,
+              32.192878202426499
+            ],
+            [
+              117.81187583542602,
+              32.192902858241077
+            ],
+            [
+              117.81187585518896,
+              32.192943952770968
+            ],
+            [
+              117.81187586686708,
+              32.192969001594768
+            ],
+            [
+              117.81187588663001,
+              32.193009700787314
+            ],
+            [
+              117.81187589830812,
+              32.193034743511383
+            ],
+            [
+              117.81187591717273,
+              32.193074779014651
+            ],
+            [
+              117.81154646543217,
+              32.19307492041294
+            ],
+            [
+              117.81154139803564,
+              32.19307492269359
+            ],
+            [
+              117.81121071470481,
+              32.193075065612319
+            ],
+            [
+              117.81120565090158,
+              32.193075067892934
+            ],
+            [
+              117.81087542571157,
+              32.193075210051489
+            ],
+            [
+              117.81086990017425,
+              32.193075212332097
+            ],
+            [
+              117.81053967588255,
+              32.193075355250819
+            ],
+            [
+              117.81053414944691,
+              32.193075357531477
+            ],
+            [
+              117.81020392605352,
+              32.193075499689996
+            ],
+            [
+              117.81019885865699,
+              32.193075501970647
+            ],
+            [
+              117.80986817712284,
+              32.193075644889376
+            ],
+            [
+              117.80986310972631,
+              32.193075647169977
+            ],
+            [
+              117.80953288812955,
+              32.193075789328546
+            ],
+            [
+              117.8095273607956,
+              32.193075791609139
+            ],
+            [
+              117.80919713740224,
+              32.193075934527876
+            ],
+            [
+              117.80919207090405,
+              32.19307593680854
+            ],
+            [
+              117.8090708010356,
+              32.193075988502514
+            ],
+            [
+              117.80852495592288,
+              32.19307622416644
+            ],
+            [
+              117.80852153783323,
+              32.192113332149823
+            ],
+            [
+              117.80852560181155,
+              32.192113332149823
+            ],
+            [
+              117.80885582520496,
+              32.192113313904713
+            ],
+            [
+              117.80886089260147,
+              32.192113313904713
+            ],
+            [
+              117.8091915759323,
+              32.192113295659553
+            ],
+            [
+              117.80919664153221,
+              32.192113295659553
+            ],
+            [
+              117.80952686492557,
+              32.192113278174617
+            ],
+            [
+              117.80953239046289,
+              32.192113278174617
+            ],
+            [
+              117.80986261385628,
+              32.192113260689723
+            ],
+            [
+              117.80986768125278,
+              32.192113260689723
+            ],
+            [
+              117.8101983645836,
+              32.192113243204787
+            ],
+            [
+              117.81020343018349,
+              32.192113243204787
+            ],
+            [
+              117.81053365267857,
+              32.19211322419941
+            ],
+            [
+              117.81053918001251,
+              32.19211322419941
+            ],
+            [
+              117.8108694034059,
+              32.1921132059543
+            ],
+            [
+              117.81087493073983,
+              32.1921132059543
+            ],
+            [
+              117.81120515503156,
+              32.192113188469349
+            ],
+            [
+              117.81121022063141,
+              32.192113188469349
+            ],
+            [
+              117.8115409030639,
+              32.192113170224239
+            ],
+            [
+              117.81154597046044,
+              32.192113170224239
+            ],
+            [
+              117.8118754581336,
+              32.192113151979072
+            ],
+            [
+              117.81187547789655,
+              32.192153394665887
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 7,
+        "OBJECTID_1" : 7,
+        "FID" : 6,
+        "OBJECTID_12" : 7,
+        "Id" : 0,
+        "Name" : "FZ08",
+        "Shape_Leng" : 940.82400603899998,
+        "Shape_Length" : 999.54083106312237,
+        "Shape_Area" : 47237.937246327332
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 8,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
+            [
+              117.8118752631992,
+              32.190309263022115
+            ],
+            [
+              117.81187526589416,
+              32.190334310290332
+            ],
+            [
+              117.8118752407413,
+              32.190375011421303
+            ],
+            [
+              117.8118752335548,
+              32.190400060191912
+            ],
+            [
+              117.8118752218767,
+              32.190440763574209
+            ],
+            [
+              117.81187521469015,
+              32.190465811566483
+            ],
+            [
+              117.81187520301206,
+              32.190506905676344
+            ],
+            [
+              117.81187519582554,
+              32.190531957451547
+            ],
+            [
+              117.81187518414745,
+              32.190572656213476
+            ],
+            [
+              117.81187517246936,
+              32.190613625597898
+            ],
+            [
+              117.81187516707948,
+              32.190631247650252
+            ],
+            [
+              117.81187513743508,
+              32.190729201263906
+            ],
+            [
+              117.81187512485863,
+              32.19077029905592
+            ],
+            [
+              117.81187511767213,
+              32.190795350758634
+            ],
+            [
+              117.81187510599401,
+              32.190836048642552
+            ],
+            [
+              117.8118750988075,
+              32.190861096526092
+            ],
+            [
+              117.81187508623108,
+              32.190902190457408
+            ],
+            [
+              117.81187507904455,
+              32.190926846807379
+            ],
+            [
+              117.81187506646813,
+              32.190967941469246
+            ],
+            [
+              117.81187505928163,
+              32.19099298931642
+            ],
+            [
+              117.81187504670521,
+              32.191033691673333
+            ],
+            [
+              117.81187503951868,
+              32.191058738742193
+            ],
+            [
+              117.81187502694226,
+              32.191099442590158
+            ],
+            [
+              117.81187502694226,
+              32.191100300881452
+            ],
+            [
+              117.80852482926042,
+              32.191099717030518
+            ],
+            [
+              117.80852421840603,
+              32.190268520809319
+            ],
+            [
+              117.80852465319063,
+              32.190268521569571
+            ],
+            [
+              117.80885487748233,
+              32.190269071975735
+            ],
+            [
+              117.8088599421839,
+              32.19026908033829
+            ],
+            [
+              117.80886009130425,
+              32.19026908033829
+            ],
+            [
+              117.80886007423625,
+              32.19026832847122
+            ],
+            [
+              117.80885704062554,
+              32.190137387960007
+            ],
+            [
+              117.80885987570858,
+              32.190137388720203
+            ],
+            [
+              117.80919055724274,
+              32.190137436614748
+            ],
+            [
+              117.80919562284265,
+              32.190137437374993
+            ],
+            [
+              117.80952584623604,
+              32.19013748602972
+            ],
+            [
+              117.80953137356997,
+              32.190137486789972
+            ],
+            [
+              117.80986159696336,
+              32.190137534684503
+            ],
+            [
+              117.80986666256325,
+              32.190137535444762
+            ],
+            [
+              117.81019734769072,
+              32.190137583339258
+            ],
+            [
+              117.81020241329057,
+              32.190137584099496
+            ],
+            [
+              117.81053263848062,
+              32.190137631233796
+            ],
+            [
+              117.81053816401794,
+              32.190137631994048
+            ],
+            [
+              117.81086838741133,
+              32.190137679888529
+            ],
+            [
+              117.81087391474526,
+              32.190137680648775
+            ],
+            [
+              117.81120413903696,
+              32.190137727783082
+            ],
+            [
+              117.81120920463684,
+              32.19013772854332
+            ],
+            [
+              117.81153988706933,
+              32.190137776437872
+            ],
+            [
+              117.81154495356752,
+              32.190137777198061
+            ],
+            [
+              117.81187517606261,
+              32.190137825092606
+            ],
+            [
+              117.81187531080992,
+              32.190137825092606
+            ],
+            [
+              117.8118752631992,
+              32.190309263022115
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 8,
+        "OBJECTID_1" : 8,
+        "FID" : 7,
+        "OBJECTID_12" : 8,
+        "Id" : 0,
+        "Name" : "FZ06",
+        "Shape_Leng" : 940.82474379999996,
+        "Shape_Length" : 999.58913929985886,
+        "Shape_Area" : 46576.896364393782
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 9,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
+            [
+              117.81187856360953,
+              32.191124133856817
+            ],
+            [
+              117.81187718739054,
+              32.191599285301045
+            ],
+            [
+              117.8118771254068,
+              32.191620972049705
+            ],
+            [
+              117.81187610312398,
+              32.191980800121534
+            ],
+            [
+              117.81187596388514,
+              32.192021897348447
+            ],
+            [
+              117.81187589112156,
+              32.192046944905584
+            ],
+            [
+              117.81187577344228,
+              32.192087647551325
+            ],
+            [
+              117.81187577254394,
+              32.192087918187624
+            ],
+            [
+              117.80852610486812,
+              32.192089047105938
+            ],
+            [
+              117.80852610486812,
+              32.192087824681252
+            ],
+            [
+              117.80852610396981,
+              32.192047123555987
+            ],
+            [
+              117.80852610396981,
+              32.19202207523869
+            ],
+            [
+              117.8085261030715,
+              32.19198097953231
+            ],
+            [
+              117.8085261030715,
+              32.191955934997885
+            ],
+            [
+              117.8085261030715,
+              32.191915236094331
+            ],
+            [
+              117.8085261030715,
+              32.191890183939627
+            ],
+            [
+              117.8085261030715,
+              32.191849487287307
+            ],
+            [
+              117.8085261030715,
+              32.191824435114512
+            ],
+            [
+              117.8085261030715,
+              32.19178334235977
+            ],
+            [
+              117.8085261030715,
+              32.191758685481659
+            ],
+            [
+              117.8085261030715,
+              32.191717588896147
+            ],
+            [
+              117.8085261030715,
+              32.19169254504947
+            ],
+            [
+              117.8085261030715,
+              32.191651842987191
+            ],
+            [
+              117.8085261030715,
+              32.191626795321326
+            ],
+            [
+              117.8085261030715,
+              32.191585701717123
+            ],
+            [
+              117.8085261030715,
+              32.191561045545697
+            ],
+            [
+              117.8085261030715,
+              32.19151995115157
+            ],
+            [
+              117.8085261030715,
+              32.191494904209627
+            ],
+            [
+              117.8085261030715,
+              32.191454205099859
+            ],
+            [
+              117.8085261030715,
+              32.191429154338735
+            ],
+            [
+              117.8085261030715,
+              32.191388451398446
+            ],
+            [
+              117.8085261030715,
+              32.191363404420322
+            ],
+            [
+              117.8085261030715,
+              32.191322306896069
+            ],
+            [
+              117.8085261030715,
+              32.19129726294063
+            ],
+            [
+              117.8085261030715,
+              32.191256563742485
+            ],
+            [
+              117.8085261030715,
+              32.19123151292694
+            ],
+            [
+              117.8085261030715,
+              32.191190812939205
+            ],
+            [
+              117.8085261030715,
+              32.191165761345346
+            ],
+            [
+              117.8085261030715,
+              32.191124668293206
+            ],
+            [
+              117.8085261030715,
+              32.191123540883389
+            ],
+            [
+              117.81187856360953,
+              32.191124133856817
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 9,
+        "OBJECTID_1" : 9,
+        "FID" : 8,
+        "OBJECTID_12" : 9,
+        "Id" : 0,
+        "Name" : "FZ07",
+        "Shape_Leng" : 940.92118996099998,
+        "Shape_Length" : 999.85901896518317,
+        "Shape_Area" : 47335.158750018032
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 10,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
+            [
+              117.80640651288725,
+              32.194459671672618
+            ],
+            [
+              117.80540466946162,
+              32.194459841195979
+            ],
+            [
+              117.80540478444597,
+              32.194393746057919
+            ],
+            [
+              117.80506912534678,
+              32.194393535483876
+            ],
+            [
+              117.80506359711451,
+              32.194393533203318
+            ],
+            [
+              117.80473402499973,
+              32.19439332414963
+            ],
+            [
+              117.80473391450697,
+              32.194352847552899
+            ],
+            [
+              117.80473384623498,
+              32.19432779454884
+            ],
+            [
+              117.80473373304723,
+              32.194286691521441
+            ],
+            [
+              117.80473366477528,
+              32.194262030760413
+            ],
+            [
+              117.8047335524859,
+              32.194220926943117
+            ],
+            [
+              117.8047334833156,
+              32.194195873902736
+            ],
+            [
+              117.80473337192451,
+              32.194155164597881
             ],
             [
-              117.81810999976737,
-              32.18756582967287
+              117.80473330275422,
+              32.194130167033784
             ],
             [
-              117.81811512465606,
-              32.18756582967287
+              117.80450524745306,
+              32.194129839388751
             ],
             [
-              117.81912797693555,
-              32.187565775694964
+              117.80439427766768,
+              32.194129679747299
             ],
             [
-              117.81912806586877,
-              32.187739979699352
+              117.80439430192222,
+              32.194088744634151
             ],
             [
-              117.81912807844519,
-              32.187765318090229
+              117.80439431539693,
+              32.194064139313909
             ],
             [
-              117.81912816827669,
-              32.187939920083231
+              117.80439433785483,
+              32.194023034647024
             ],
             [
-              117.81912818175141,
-              32.187965254617211
+              117.804394725927,
+              32.193338810375941
             ],
             [
-              117.81912827158297,
-              32.188139852425444
+              117.80439474838489,
+              32.193298097646895
             ],
             [
-              117.81912828505769,
-              32.188165189944833
+              117.80439476275795,
+              32.193273043592264
             ],
             [
-              117.8191283398549,
-              32.18827288116568
+              117.80439478611413,
+              32.193232335394981
             ],
             [
-              117.81912835422796,
-              32.188298217127567
+              117.80439480048719,
+              32.193207279041637
             ],
             [
-              117.81912835422796,
-              32.188298610934964
+              117.80439482384338,
+              32.193166175508161
             ],
             [
-              117.81946798927059,
-              32.188298593449304
+              117.80439482384338,
+              32.193165722425803
             ],
             [
-              117.81946814737408,
-              32.188606218110962
+              117.80473315093896,
+              32.193165513369308
             ],
             [
-              117.81946815995049,
-              32.188631556260781
+              117.80473322190586,
+              32.193142065592511
             ],
             [
-              117.81946831895232,
-              32.188939178276669
+              117.80473334587334,
+              32.193100962789799
             ],
             [
-              117.81946833152868,
-              32.18896451633379
+              117.80473342223017,
+              32.193075908680882
             ],
             [
-              117.81946898909551,
-              32.189339044974524
+              117.80473354619767,
+              32.193035198114835
             ],
             [
-              117.81845567238705,
-              32.189339099711567
+              117.80473362165617,
+              32.193010143987813
             ],
             [
-              117.81845563825104,
-              32.189272587285259
+              117.80473374742029,
+              32.192969073814403
             ],
             [
-              117.81743766557445,
-              32.189272245178209
+              117.80506274102005,
+              32.192969145273878
             ],
             [
-              117.81743750657263,
-              32.18896462504815
+              117.80506826835398,
+              32.192969146794326
             ],
             [
-              117.8174374930979,
-              32.188939286991108
+              117.80539855373114,
+              32.192969218253744
             ],
             [
-              117.81743733499441,
-              32.188631664975532
+              117.80540408286171,
+              32.192969219774177
             ],
             [
-              117.81743732151969,
-              32.188606329866772
+              117.80573436734056,
+              32.192969291233609
             ],
             [
-              117.81743712928022,
-              32.188231794409944
+              117.80573943383875,
+              32.192969291993826
             ],
             [
-              117.81743711580549,
-              32.188206456148833
+              117.80606971831756,
+              32.192969364213518
             ],
             [
-              117.817436957702,
-              32.187898435566758
+              117.80607524834646,
+              32.192969365733902
             ],
             [
-              117.81743694512558,
-              32.187873493302902
+              117.80640553372362,
+              32.192969437193383
             ],
             [
-              117.81743678522545,
-              32.187565866164967
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 6,
-        "FID" : 5,
-        "OBJECTID_1" : 6,
-        "Id" : 0,
-        "Name" : "FZ14",
-        "Shape_Leng" : 854.35471662400005,
-        "Shape_Length" : 918.64500366713969,
-        "Shape_Area" : 48093.86009054046
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 7,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
+              117.80641106195584,
+              32.192969438713767
+            ],
+            [
+              117.806741347333,
+              32.192969510933459
+            ],
+            [
+              117.80674145782577,
+              32.192969510933459
+            ],
             [
-              117.81732962519524,
-              32.190272308272853
+              117.80674142368981,
+              32.193075766522313
             ],
             [
-              117.81732963777164,
-              32.190297249879393
+              117.80674142728309,
+              32.193100820631322
             ],
             [
-              117.81732965933119,
-              32.190338819208449
+              117.806741429978,
+              32.193141925714706
             ],
             [
-              117.81732974107788,
-              32.190497178564236
+              117.80674144075779,
+              32.193166586019082
             ],
             [
-              117.81732979677345,
-              32.190605263104189
+              117.8067414057235,
+              32.193207689552317
             ],
             [
-              117.81732980934984,
-              32.190630599937293
+              117.80674140033358,
+              32.193232746665764
             ],
             [
-              117.81732996745333,
-              32.190937818360183
+              117.80674139224877,
+              32.193273454862862
             ],
             [
-              117.81665675291143,
-              32.190937854090684
+              117.80674138685887,
+              32.193298508917387
             ],
             [
-              117.81665162892104,
-              32.190937854090684
+              117.80674137877402,
+              32.193339220125871
             ],
             [
-              117.81597794815352,
-              32.190937889821193
+              117.80674137338416,
+              32.193364271881698
             ],
             [
-              117.81597235703917,
-              32.190937890581424
+              117.80674136440099,
+              32.19340537836645
             ],
             [
-              117.81529867627162,
-              32.190937926311925
+              117.8067413590111,
+              32.193430433144883
             ],
             [
-              117.81529355138295,
-              32.190937926311925
+              117.80674135092626,
+              32.193471142013763
             ],
             [
-              117.81461987151373,
-              32.190937962802735
+              117.80674134553637,
+              32.193496199054664
             ],
             [
-              117.81461474662501,
-              32.190937962802735
+              117.80674133565489,
+              32.193536907133925
             ],
             [
-              117.81394152938817,
-              32.190937998533236
+              117.80674133026503,
+              32.193561961876128
             ],
             [
-              117.81394137128471,
-              32.190630780871196
+              117.80674132128183,
+              32.193603062189993
             ],
             [
-              117.81394135780994,
-              32.190605443277917
+              117.80674131589197,
+              32.193627723889861
             ],
             [
-              117.81394119970645,
-              32.190297430813963
+              117.80674130780713,
+              32.193668830255618
             ],
             [
-              117.81394118713006,
-              32.190272489207473
+              117.80674129792565,
+              32.193715798511057
             ],
             [
-              117.81394102812823,
-              32.18996487093748
+              117.8067412754678,
+              32.193825413311949
             ],
             [
-              117.81461424536511,
-              32.189964835966776
+              117.80674126738296,
+              32.193866514267114
             ],
             [
-              117.81461937025378,
-              32.189964835966776
+              117.80674126199304,
+              32.193891571199153
             ],
             [
-              117.81529305102136,
-              32.189964799475646
+              117.8067412539082,
+              32.193932280621915
             ],
             [
-              117.81529817591003,
-              32.189964799475646
+              117.80674124851834,
+              32.193957337535856
             ],
             [
-              117.81597185577925,
-              32.189964763744747
+              117.80674123863686,
+              32.193998046169042
             ],
             [
-              117.8159774468936,
-              32.189964762984509
+              117.80674123324695,
+              32.194023094702729
             ],
             [
-              117.81665112766115,
-              32.189964727253574
+              117.80674122516211,
+              32.194063725766256
             ],
             [
-              117.81665625165149,
-              32.189964727253574
+              117.80641171862433,
+              32.194063396600626
             ],
             [
-              117.81732946709175,
-              32.189964690002228
+              117.80640644731027,
+              32.194063391279201
             ],
             [
-              117.81732962519524,
-              32.190272308272853
+              117.80640651288725,
+              32.194459671672618
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 7,
-        "FID" : 6,
-        "OBJECTID_1" : 7,
+        "OBJECTID" : 10,
+        "OBJECTID_1" : 10,
+        "FID" : 9,
+        "OBJECTID_12" : 10,
         "Id" : 0,
-        "Name" : "FZ08",
-        "Shape_Leng" : 940.82400603899998,
-        "Shape_Length" : 1010.4080257866289,
-        "Shape_Area" : 48283.24984038782
+        "Name" : "FZ03",
+        "Shape_Leng" : 839.30256765000001,
+        "Shape_Length" : 914.38142790138181,
+        "Shape_Area" : 46014.22667690878
       }
     },
     {
       "type" : "Feature",
-      "id" : 8,
+      "id" : 11,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.8173285957259,
-              32.188272975436213
+              117.8084178048758,
+              32.192612478261644
             ],
             [
-              117.81732860920062,
-              32.1882983136788
+              117.80841780846906,
+              32.192639557696921
             ],
             [
-              117.81732876730415,
-              32.188606332147486
+              117.80841781385894,
+              32.192680272241013
             ],
             [
-              117.81732878077887,
-              32.188631670297262
+              117.80841781655388,
+              32.192705321897613
             ],
             [
-              117.81732893888235,
-              32.188938899268379
+              117.80841782194378,
+              32.192746430200458
             ],
             [
-              117.81665572434045,
-              32.188938934239431
+              117.80841782463872,
+              32.192771485920517
             ],
             [
-              117.81665060035006,
-              32.188938934239431
+              117.80841782913032,
+              32.192812194323864
             ],
             [
-              117.8159769186842,
-              32.188938970730959
+              117.80841783182525,
+              32.192837251546202
             ],
             [
-              117.81597132846819,
-              32.188938970730959
+              117.80841783721517,
+              32.192877960680427
             ],
             [
-              117.81529764770063,
-              32.188939006462306
+              117.80841783991009,
+              32.192903013323452
             ],
             [
-              117.81529252281196,
-              32.188939007222508
+              117.80841784529999,
+              32.192944118496158
             ],
             [
-              117.81461884204441,
-              32.188939042953862
+              117.80841784799493,
+              32.192968775813256
             ],
             [
-              117.81461371715571,
-              32.188939043714122
+              117.80841785338481,
+              32.193009882476716
             ],
             [
-              117.81394049991886,
-              32.188939079445397
+              117.80841785607976,
+              32.193034936603802
             ],
             [
-              117.81394034181537,
-              32.188631851235165
+              117.80841786146965,
+              32.193075156837082
             ],
             [
-              117.81394032923896,
-              32.188606513085425
+              117.80808926941683,
+              32.193075568868792
             ],
             [
-              117.81394020527142,
-              32.188365403843349
+              117.80808420291864,
+              32.19307557495042
             ],
             [
-              117.81394019179672,
-              32.188340064098981
+              117.80800242209177,
+              32.193075677578229
             ],
             [
-              117.81394006872749,
-              32.188099349479863
+              117.80674559097442,
+              32.193077253485455
             ],
             [
-              117.81427365002345,
-              32.188099331233936
+              117.80674528015733,
+              32.192945949075089
             ],
             [
-              117.81427877491214,
-              32.188099330473683
+              117.80473460351475,
+              32.192944581462299
             ],
             [
-              117.81427923934115,
-              32.188099331233936
+              117.80473460171814,
+              32.192944378486999
             ],
             [
-              117.81427917106916,
-              32.187965909191448
+              117.8047343178505,
+              32.192903274834791
             ],
             [
-              117.81461321679409,
-              32.187965891705716
+              117.80473414537396,
+              32.192878219911229
             ],
             [
-              117.8146183416828,
-              32.187965891705716
+              117.80473386509962,
+              32.192837511537412
             ],
             [
-              117.81529202155201,
-              32.187965855974035
+              117.80473369172473,
+              32.192812455835529
             ],
             [
-              117.8152971464407,
-              32.187965855213783
+              117.80473341055205,
+              32.192771747432239
             ],
             [
-              117.81597082720825,
-              32.187965819482109
+              117.80473323807553,
+              32.192746690191861
             ],
             [
-              117.81597641742425,
-              32.187965819482109
+              117.8047329533096,
+              32.192705582649374
             ],
             [
-              117.81665009909011,
-              32.187965782990169
+              117.80473278173137,
+              32.192680532992838
             ],
             [
-              117.8166552230805,
-              32.187965782990169
+              117.80473250055869,
+              32.192639820729532
             ],
             [
-              117.81732843762241,
-              32.187965746498172
+              117.80473232718383,
+              32.192614766493669
             ],
             [
-              117.8173285957259,
-              32.188272975436213
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 8,
-        "FID" : 7,
-        "OBJECTID_1" : 8,
-        "Id" : 0,
-        "Name" : "FZ06",
-        "Shape_Leng" : 940.82474379999996,
-        "Shape_Length" : 1010.4087258733422,
-        "Shape_Area" : 47620.789702750582
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 9,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
+              117.80473223375905,
+              32.192601249199505
+            ],
+            [
+              117.8047320424179,
+              32.192573535737473
+            ],
+            [
+              117.80497807839778,
+              32.192574040517087
+            ],
+            [
+              117.80506250386482,
+              32.192574213845027
+            ],
             [
-              117.81732911046056,
-              32.18927264734404
+              117.80506803030045,
+              32.192574225248208
             ],
             [
-              117.81732912393529,
-              32.189297985308343
+              117.80506835189732,
+              32.192574226008425
             ],
             [
-              117.81732917873252,
-              32.189406068231399
+              117.80506835189732,
+              32.192574033675193
             ],
             [
-              117.81732926047921,
-              32.189564428449792
+              117.80506833303272,
+              32.192548976380401
             ],
             [
-              117.81732928203878,
-              32.189606001914662
+              117.80506830159169,
+              32.192507873309822
             ],
             [
-              117.81732929461521,
-              32.189630942943587
+              117.80506828362537,
+              32.192483211306559
             ],
             [
-              117.81732945361699,
-              32.189938560821673
+              117.80506825308262,
+              32.192442107446055
             ],
             [
-              117.81665623817679,
-              32.189938597312874
+              117.80506823421803,
+              32.192417053915989
             ],
             [
-              117.8166511150847,
-              32.189938597312874
+              117.80506820277699,
+              32.192376341534775
             ],
             [
-              117.81597743341887,
-              32.189938633043774
+              117.80506818391235,
+              32.192351287226387
             ],
             [
-              117.81597184230453,
-              32.189938633804012
+              117.80506815336967,
+              32.192310180265459
             ],
             [
-              117.81529816243531,
-              32.189938669534911
+              117.80506813540335,
+              32.192285520489229
             ],
             [
-              117.81529303754658,
-              32.189938669534911
+              117.80506810396233,
+              32.192244418059914
             ],
             [
-              117.81461935677905,
-              32.189938706026062
+              117.80506808509769,
+              32.192219363715203
             ],
             [
-              117.81461423189037,
-              32.189938706026062
+              117.80506805365664,
+              32.192178655046675
             ],
             [
-              117.81394101465351,
-              32.189938741756961
+              117.80506803479206,
+              32.192153596882783
             ],
             [
-              117.81394085655002,
-              32.189631123879494
+              117.80506800424931,
+              32.192113448462571
             ],
             [
-              117.8139408439736,
-              32.18960618133017
+              117.8053980389965,
+              32.192113229520935
             ],
             [
-              117.81394068497183,
-              32.189298166244917
+              117.80540356722874,
+              32.192113225719851
             ],
             [
-              117.8139406723954,
-              32.189272828280657
+              117.80573385350421,
+              32.192113007538381
             ],
             [
-              117.81394051339359,
-              32.188965205111622
+              117.80573892000241,
+              32.192113004497543
             ],
             [
-              117.81461373063043,
-              32.188965170140598
+              117.80602116796975,
+              32.192112817484862
             ],
             [
-              117.81461885551916,
-              32.188965170140598
+              117.80841774648532,
+              32.192111232438371
             ],
             [
-              117.81529253628666,
-              32.188965133648999
+              117.80841774648532,
+              32.192112647957124
             ],
             [
-              117.81529766117539,
-              32.188965133648999
+              117.80841775097687,
+              32.192153361976708
             ],
             [
-              117.81597134104459,
-              32.188965097917716
+              117.80841775367182,
+              32.192178417859978
             ],
             [
-              117.81597693215892,
-              32.188965097157478
+              117.80841775816343,
+              32.192219127288887
             ],
             [
-              117.81665061382481,
-              32.188965061426188
+              117.80841776085835,
+              32.192244180873445
             ],
             [
-              117.81665573781518,
-              32.188965061426188
+              117.80841776534993,
+              32.192285284063118
             ],
             [
-              117.81732895235707,
-              32.188965024174408
+              117.80841776804488,
+              32.19230994383939
             ],
             [
-              117.81732911046056,
-              32.18927264734404
+              117.80841777343477,
+              32.192351050040195
+            ],
+            [
+              117.80841777612972,
+              32.192376103588423
+            ],
+            [
+              117.80841778062127,
+              32.192416817490148
+            ],
+            [
+              117.80841778331624,
+              32.192441870260112
+            ],
+            [
+              117.80841778870611,
+              32.192482974120715
+            ],
+            [
+              117.80841779229938,
+              32.192506532297898
+            ],
+            [
+              117.8084178048758,
+              32.192612478261644
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 9,
-        "FID" : 8,
-        "OBJECTID_1" : 9,
+        "OBJECTID" : 11,
+        "OBJECTID_1" : 11,
+        "FID" : 10,
+        "OBJECTID_12" : 11,
         "Id" : 0,
-        "Name" : "FZ07",
-        "Shape_Leng" : 940.92118996099998,
-        "Shape_Length" : 1010.5128258240351,
-        "Shape_Area" : 48303.011362755606
+        "Name" : "FZ02",
+        "Shape_Leng" : 1012.14716111,
+        "Shape_Length" : 1073.8039810252346,
+        "Shape_Area" : 45882.059325205715
       }
     },
     {
       "type" : "Feature",
-      "id" : 10,
+      "id" : 12,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.81010446728023,
-              32.192405060056743
+              117.80841820282947,
+              32.191296829614714
+            ],
+            [
+              117.80841822259242,
+              32.19132188421338
+            ],
+            [
+              117.80841825403346,
+              32.191362597066238
+            ],
+            [
+              117.80841827379638,
+              32.191387650886625
+            ],
+            [
+              117.80841830613572,
+              32.191428755983523
             ],
             [
-              117.81010431995651,
-              32.192163505508894
+              117.80841832589864,
+              32.191453809025461
             ],
             [
-              117.81010478618215,
-              32.192163505508894
+              117.8084183573397,
+              32.19149452105907
             ],
             [
-              117.81010477091075,
-              32.192138556051461
+              117.80841837800094,
+              32.191519576363554
             ],
             [
-              117.81010430558348,
-              32.192138556051461
+              117.80841840944197,
+              32.191560289128027
             ],
             [
-              117.81010412053051,
-              32.191830474274582
+              117.80841844627292,
+              32.191608027052411
             ],
             [
-              117.81010458585784,
-              32.191830474274582
+              117.80841853161284,
+              32.191717268084382
             ],
             [
-              117.81010457058647,
-              32.191805127132469
+              117.80841856305391,
+              32.191757979239981
             ],
             [
-              117.81010410525916,
-              32.191805127132469
+              117.80841858461349,
+              32.191783033711694
             ],
             [
-              117.81010408369958,
-              32.191768976539961
+              117.80841861605451,
+              32.191824137109627
             ],
             [
-              117.81010399296976,
-              32.191617019674908
+              117.80841863491912,
+              32.191848800051702
             ],
             [
-              117.81010392020622,
-              32.191497040425823
+              117.80841866725847,
+              32.191889904940339
             ],
             [
-              117.81010399117312,
-              32.191497040425823
+              117.80841868791971,
+              32.19191495861557
             ],
             [
-              117.81010438553351,
-              32.191497040425823
+              117.80841871936074,
+              32.191955671203139
             ],
             [
-              117.81010437026217,
-              32.191472092306093
+              117.80841873912368,
+              32.19198072410002
             ],
             [
-              117.81010399117312,
-              32.191472092306093
+              117.80841877146304,
+              32.192021436658173
             ],
             [
-              117.81010390493483,
-              32.191472092306093
+              117.80841879032766,
+              32.192046491057425
             ],
             [
-              117.81010371988191,
-              32.191164005232402
+              117.80841882266701,
+              32.192087595096545
             ],
             [
-              117.81010370461054,
-              32.191138660945555
+              117.80841882356533,
+              32.192089177102588
             ],
             [
-              117.81010351955757,
-              32.190831361856503
+              117.8056565840167,
+              32.192087789711429
             ],
             [
-              117.81010351955757,
-              32.190830570462467
+              117.80540355016076,
+              32.192087662755632
             ],
             [
-              117.81010398398658,
-              32.190830570462467
+              117.80539802552174,
+              32.19208765971478
             ],
             [
-              117.81058327381821,
-              32.190830536252335
+              117.80506777428057,
+              32.192087493227795
             ],
             [
-              117.81077732698758,
-              32.190830522568291
+              117.80506773205978,
+              32.192046727484176
             ],
             [
-              117.8107773278859,
-              32.190831313962327
+              117.8050677158901,
+              32.192021673845218
             ],
             [
-              117.81078291900025,
-              32.190830524848941
+              117.80506769163557,
+              32.191980962047403
             ],
             [
-              117.81125567718144,
-              32.190830491399055
+              117.80506767726251,
+              32.191955907630167
             ],
             [
-              117.81145626020459,
-              32.190830476954822
+              117.80506765300804,
+              32.19191519428243
             ],
             [
-              117.81145626020459,
-              32.190830869991025
+              117.80506763773667,
+              32.191890139847089
             ],
             [
-              117.81146185221723,
-              32.190830476194584
+              117.80506761258385,
+              32.191849037999432
             ],
             [
-              117.81213565964724,
-              32.190830429060647
+              117.8050675982108,
+              32.191824375057408
             ],
             [
-              117.81213565964724,
-              32.190830625198629
+              117.80506757395629,
+              32.191783270899357
             ],
             [
-              117.81213584470021,
-              32.191138517263539
+              117.80506755958324,
+              32.191758216427694
             ],
             [
-              117.81213537847455,
-              32.191138517263539
+              117.80506753443042,
+              32.191717503751754
             ],
             [
-              117.81213585997155,
-              32.191163861550365
+              117.80506751826073,
+              32.191692450782455
             ],
             [
-              117.81213599202388,
-              32.191383115412776
+              117.80506749490455,
+              32.191651736556686
             ],
             [
-              117.81213599921041,
-              32.191395006776943
+              117.80506747873486,
+              32.191626682809002
             ],
             [
-              117.81213604592281,
-              32.191471948624624
+              117.80506745448037,
+              32.191585579321966
             ],
             [
-              117.81213606029583,
-              32.191496896744376
+              117.80506743920898,
+              32.19156052631628
             ],
             [
-              117.8121362453488,
-              32.191804983451512
+              117.80506741495449,
+              32.191519812791732
             ],
             [
-              117.81213626062015,
-              32.19183032603236
+              117.8050673987848,
+              32.191494759007725
             ],
             [
-              117.81213632619718,
-              32.191938433316068
+              117.8050673745303,
+              32.191454046213984
             ],
             [
-              117.81213679242281,
-              32.191938827867958
+              117.80506735925893,
+              32.191428993172117
             ],
             [
-              117.81196618977394,
-              32.191938445479501
+              117.80506733500442,
+              32.19138788883555
             ],
             [
-              117.81179688519066,
-              32.19193845840315
+              117.80506731883476,
+              32.191362835015234
             ],
             [
-              117.81179684746139,
-              32.192351447631133
+              117.80506730266508,
+              32.191322121402244
             ],
             [
-              117.81179683039342,
-              32.192537995139084
+              117.80506728469877,
+              32.191297066803649
             ],
             [
-              117.81089562433073,
-              32.192538058996767
+              117.80506727122405,
+              32.191256568303828
             ],
             [
-              117.81078394667291,
-              32.19253806735906
+              117.80539752426183,
+              32.191256542456316
             ],
             [
-              117.81078394667291,
-              32.192537969291884
+              117.80540181820889,
+              32.191256542456316
             ],
             [
-              117.81078394577459,
-              32.192537671289379
+              117.80540301656147,
+              32.191199221752633
             ],
             [
-              117.81077835286364,
-              32.192538065838676
+              117.8054032070043,
+              32.1911901728324
             ],
             [
-              117.81061335390552,
-              32.192538078002023
+              117.80540372263731,
+              32.191165509711837
             ],
             [
-              117.81044440236016,
-              32.192538090165364
+              117.80540458412166,
+              32.191124406016463
             ],
             [
-              117.81044424515497,
-              32.192538089405197
+              117.80540460388458,
+              32.191123448896455
             ],
             [
-              117.8104442056291,
-              32.192471820303474
+              117.80841806808216,
+              32.191124050232347
             ],
             [
-              117.81044416610322,
-              32.192405037250396
+              117.80841806808216,
+              32.191124193154202
             ],
             [
-              117.81027403237493,
-              32.192405047133157
+              117.80841810042153,
+              32.191165296849682
             ],
             [
-              117.81010446728023,
-              32.192405060056743
+              117.80841811928615,
+              32.191189959210057
+            ],
+            [
+              117.80841815072718,
+              32.19123106363601
+            ],
+            [
+              117.80841817049013,
+              32.191256118252852
+            ],
+            [
+              117.80841820282947,
+              32.191296829614714
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 10,
-        "FID" : 9,
-        "OBJECTID_1" : 10,
+        "OBJECTID" : 12,
+        "OBJECTID_1" : 12,
+        "FID" : 11,
+        "OBJECTID_12" : 12,
         "Id" : 0,
-        "Name" : "FZ03",
-        "Shape_Leng" : 839.30256765000001,
-        "Shape_Length" : 902.32095211203841,
-        "Shape_Area" : 47167.241292535982
+        "Name" : "FZ01",
+        "Shape_Leng" : 941.74177608499997,
+        "Shape_Length" : 999.50086423950074,
+        "Shape_Area" : 46677.562537626676
       }
     },
     {
       "type" : "Feature",
-      "id" : 11,
+      "id" : 13,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.81010339109848,
-              32.190618668181223
-            ],
-            [
-              117.81010327880911,
-              32.19043100604592
-            ],
-            [
-              117.81027232737252,
-              32.190430993122035
-            ],
-            [
-              117.81043738651775,
-              32.19043098247883
+              117.81120745561699,
+              32.194854562991367
             ],
             [
-              117.81044297853042,
-              32.19043098247883
+              117.81087613268569,
+              32.194854418555011
             ],
             [
-              117.81044289858035,
-              32.190297528883505
+              117.81087106259425,
+              32.194854415514264
             ],
             [
-              117.81044288330901,
-              32.190272184355443
+              117.81054076374237,
+              32.194854258914866
             ],
             [
-              117.81044283839324,
-              32.19019754118969
+              117.8105352364084,
+              32.194854256634258
             ],
             [
-              117.81044269825607,
-              32.189964488540731
+              117.81020493845486,
+              32.194854104596033
             ],
             [
-              117.81044285366458,
-              32.189964488540731
+              117.81019940932428,
+              32.194854102315475
             ],
             [
-              117.81111650568604,
-              32.189964441406332
+              117.8098699387191,
+              32.194853951797619
             ],
             [
-              117.81111650658436,
-              32.189964835966776
+              117.80986990637973,
+              32.194813738432011
             ],
             [
-              117.81315936357534,
-              32.189964296962216
+              117.80986988571851,
+              32.194789079334171
             ],
             [
-              117.81383270567805,
-              32.189964249067579
+              117.8098698524808,
+              32.194747975754971
             ],
             [
-              117.81383317100534,
-              32.189964249067579
+              117.80986983271788,
+              32.194722925140248
             ],
             [
-              117.81383335605831,
-              32.190271944883108
+              117.80986979948023,
+              32.19468221379055
             ],
             [
-              117.81383357165393,
-              32.190630723854206
+              117.80986977792067,
+              32.194657163157729
             ],
             [
-              117.81383371179116,
-              32.190862836680189
+              117.809869744683,
+              32.194616453299034
             ],
             [
-              117.8138337567069,
-              32.190938417416653
+              117.80986972402174,
+              32.194591401887891
             ],
             [
-              117.8138335213483,
-              32.190938417416653
+              117.80986968988579,
+              32.194550299739824
             ],
             [
-              117.81315994927692,
-              32.190938464550541
+              117.80986967012284,
+              32.194525246790072
             ],
             [
-              117.81315994927692,
-              32.190938069234079
+              117.80986963688515,
+              32.194484538392764
             ],
             [
-              117.81315435816258,
-              32.190938465310715
+              117.8098696171222,
+              32.19445948618511
             ],
             [
-              117.81298659239337,
-              32.190938476714102
+              117.80986958298625,
+              32.194418776237981
             ],
             [
-              117.812748228026,
-              32.190938494199266
+              117.80986956322333,
+              32.194393722491867
             ],
             [
-              117.81248054983425,
-              32.190938512444617
+              117.80986952998566,
+              32.194352622535078
             ],
             [
-              117.81247542404726,
-              32.190938513204848
+              117.80986951022271,
+              32.194327569530905
             ],
             [
-              117.81214108457323,
-              32.190938536771803
+              117.80986947608673,
+              32.194286861045185
             ],
             [
-              117.81214085101126,
-              32.190938536771803
+              117.80986945542547,
+              32.194261807262748
             ],
             [
-              117.8121408249601,
-              32.190894243072755
+              117.80986942218782,
+              32.194221097987345
             ],
             [
-              117.81214077106122,
-              32.190805610756655
+              117.80986940062823,
+              32.194196046467368
             ],
             [
-              117.81214077106122,
-              32.190805479997941
+              117.80986936739059,
+              32.194154944900902
             ],
             [
-              117.81194874179619,
-              32.190805493681985
+              117.80986934762764,
+              32.194130282583757
             ],
             [
-              117.81180153756551,
-              32.190805504325162
+              117.80986931438999,
+              32.194089182507987
             ],
             [
-              117.81179594555287,
-              32.190805504325162
+              117.80986929283043,
+              32.194064130191506
             ],
             [
-              117.81112446116617,
-              32.190805552219359
+              117.80986925959274,
+              32.194023420067516
             ],
             [
-              117.81078290462719,
-              32.190805576546516
+              117.8098692389315,
+              32.193998367732966
             ],
             [
-              117.81078290462719,
-              32.19080544426739
+              117.8098692047955,
+              32.19395765681935
             ],
             [
-              117.81078290462719,
-              32.190805180469297
+              117.80986911226904,
+              32.193845427090885
             ],
             [
-              117.81077731081791,
-              32.190805576546516
+              117.80986905747183,
+              32.193800688569127
             ],
             [
-              117.81010396961356,
-              32.190805624440706
+              117.80986903411559,
+              32.193759978327279
             ],
             [
-              117.81010350428623,
-              32.190805624440706
-            ],
-            [
-              117.81010350428623,
-              32.190805229123676
-            ],
-            [
-              117.81010339109848,
-              32.190618668181223
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 11,
-        "FID" : 10,
-        "OBJECTID_1" : 11,
-        "Id" : 0,
-        "Name" : "FZ02",
-        "Shape_Leng" : 1012.14716111,
-        "Shape_Length" : 1086.9253989791455,
-        "Shape_Area" : 46913.964418040741
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 12,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
-            [
-              117.81044249793173,
-              32.189631051657138
+              117.80986901255604,
+              32.193734926680392
             ],
             [
-              117.81044228233607,
-              32.189272664829538
+              117.80986898650487,
+              32.193693824905644
             ],
             [
-              117.81044223472536,
-              32.189193949006672
+              117.80986896943689,
+              32.193668772480308
             ],
             [
-              117.81044217723317,
-              32.189098024340083
+              117.80986894338577,
+              32.193628061419318
             ],
             [
-              117.81044217723317,
-              32.189097628255389
+              117.80986892631779,
+              32.193603009736094
             ],
             [
-              117.81078094450322,
-              32.189097603927713
+              117.80986855711019,
+              32.193168103388899
             ],
             [
-              117.81078086365484,
-              32.188964545983168
+              117.80986871611201,
+              32.193168103388899
             ],
             [
-              117.81078156523908,
-              32.188964546743421
+              117.81019855502646,
+              32.193168098067488
             ],
             [
-              117.81111590471313,
-              32.188964522415709
+              117.81020408415701,
+              32.193168098067488
             ],
             [
-              117.81111590471313,
-              32.188964916220236
+              117.81053438121225,
+              32.193168091985797
             ],
             [
-              117.81315876260243,
-              32.188964377970024
+              117.81053991034284,
+              32.193168091985797
             ],
             [
-              117.81383233736875,
-              32.18896433007491
+              117.81087020649979,
+              32.193168086664372
             ],
             [
-              117.8138325700324,
-              32.18896433007491
+              117.81087527838784,
+              32.193168086664372
             ],
             [
-              117.81383275508537,
-              32.189272425354567
+              117.81120603448221,
+              32.193168081342975
             ],
             [
-              117.81383297068103,
-              32.189630812183175
+              117.81121110008209,
+              32.193168081342975
             ],
             [
-              117.81383315573399,
-              32.189938905206951
+              117.81154139893395,
+              32.193168075261283
             ],
             [
-              117.81383292486697,
-              32.189938905206951
+              117.81154692626794,
+              32.193168075261283
             ],
             [
-              117.813159348304,
-              32.189938952341308
+              117.81187676697897,
+              32.193168069939873
             ],
             [
-              117.813159348304,
-              32.189938554739825
+              117.81187707959269,
+              32.193168069939873
             ],
             [
-              117.81111649041468,
-              32.189938699183969
+              117.81187849982918,
+              32.194262584183214
             ],
             [
-              117.81111649041468,
-              32.189938857312306
+              117.81154166124203,
+              32.19426298100565
             ],
             [
-              117.81111649041468,
-              32.189939096785452
+              117.81154267543998,
+              32.194788521353409
             ],
             [
-              117.810443148312,
-              32.18993914468011
+              117.81146559549705,
+              32.194788267449361
             ],
             [
-              117.81044268388301,
-              32.189939143919858
+              117.81121192114225,
+              32.194787429717984
             ],
             [
-              117.81044268388301,
-              32.189938747078614
+              117.81120779518015,
+              32.194787415274313
             ],
             [
-              117.81044249793173,
-              32.189631051657138
+              117.81120745561699,
+              32.194854562991367
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 12,
-        "FID" : 11,
-        "OBJECTID_1" : 12,
+        "OBJECTID" : 13,
+        "OBJECTID_1" : 13,
+        "FID" : 12,
+        "OBJECTID_12" : 13,
         "Id" : 0,
-        "Name" : "FZ01",
-        "Shape_Leng" : 941.74177608499997,
-        "Shape_Length" : 1011.3950463036214,
-        "Shape_Area" : 47705.751089909383
+        "Name" : "FZ11",
+        "Shape_Leng" : 838.29890171399995,
+        "Shape_Length" : 890.96215595356989,
+        "Shape_Area" : 46362.049863303204
       }
     },
     {
       "type" : "Feature",
-      "id" : 13,
+      "id" : 14,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.81529922334563,
-              32.191031162410859
-            ],
-            [
-              117.81597259239777,
-              32.191031151007486
-            ],
-            [
-              117.81597818351213,
-              32.191031151007486
-            ],
-            [
-              117.81665201699326,
-              32.191031140364423
-            ],
-            [
-              117.81665713918701,
-              32.191031139604171
-            ],
-            [
-              117.81733051273073,
-              32.191031129721267
-            ],
-            [
-              117.81733066634264,
-              32.191338810526752
-            ],
-            [
-              117.81733067891906,
-              32.191363757162613
-            ],
-            [
-              117.8173308352259,
-              32.191671832156906
-            ],
-            [
-              117.81733084780232,
-              32.191697175535062
-            ],
-            [
-              117.81733100410918,
-              32.192005249400758
-            ],
-            [
-              117.8173310166856,
-              32.192030195093707
+              117.81120836201708,
+              32.197424635216237
             ],
             [
-              117.81733107238117,
-              32.192137903787909
+              117.80987124307289,
+              32.1974246587815
             ],
             [
-              117.81699135918511,
-              32.192137909869615
+              117.80987124217455,
+              32.197423426546287
             ],
             [
-              117.81699149303408,
-              32.192404798543912
+              117.80987121163187,
+              32.197383107132225
             ],
             [
-              117.81699150650881,
-              32.192430141717949
+              117.8098711927672,
+              32.197358055722539
             ],
             [
-              117.81699162778138,
-              32.192670895057574
+              117.80987116042789,
+              32.197317347072129
             ],
             [
-              117.81665797372192,
-              32.192670901139245
+              117.80987114156325,
+              32.197292296404569
             ],
             [
-              117.81665284703659,
-              32.192670902659636
+              117.80987110922391,
+              32.197251195476376
             ],
             [
-              117.81665238170928,
-              32.192670901139245
+              117.80987109035928,
+              32.197226536278848
             ],
             [
-              117.81665238081096,
-              32.19267169403772
+              117.80987105801995,
+              32.197185433800627
             ],
             [
-              117.81665239338739,
-              32.192696641068402
+              117.80987103915533,
+              32.197160384617028
             ],
             [
-              117.81665241494694,
-              32.192737821595045
+              117.80987100771429,
+              32.19711967967902
             ],
             [
-              117.81530008842327,
-              32.192737842880852
+              117.80987098884968,
+              32.197094624396009
             ],
             [
-              117.81530006776201,
-              32.192696663114447
+              117.80987095651031,
+              32.197053915627741
             ],
             [
-              117.81530005518562,
-              32.192671716844004
+              117.80987093764568,
+              32.197028863367237
             ],
             [
-              117.81529989887876,
-              32.192363645234273
+              117.80987090620465,
+              32.196987761559924
             ],
             [
-              117.81529988630234,
-              32.192338302041726
+              117.80987088734004,
+              32.196962712321898
             ],
             [
-              117.81529972999547,
-              32.192030229303398
+              117.80987085589902,
+              32.19692200729547
             ],
             [
-              117.81529971741908,
-              32.192005282850218
+              117.80987083703435,
+              32.196896951958031
             ],
             [
-              117.81529956111223,
-              32.191697208984635
+              117.80987080649167,
+              32.19685624462165
             ],
             [
-              117.8152995485358,
-              32.191671865606502
+              117.80987078762703,
+              32.196831191546593
             ],
             [
-              117.81529939222891,
-              32.191363790612314
+              117.80987075528769,
+              32.196790091930488
             ],
             [
-              117.81529937965249,
-              32.191338843976467
+              117.80987073642305,
+              32.19676543412838
             ],
             [
-              117.81529922334563,
-              32.191031162410859
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 13,
-        "FID" : 12,
-        "OBJECTID_1" : 13,
-        "Id" : 0,
-        "Name" : "FZ11",
-        "Shape_Leng" : 838.29890171399995,
-        "Shape_Length" : 901.24254175661724,
-        "Shape_Area" : 47447.562107303347
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 14,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
-            [
-              117.81530010099968,
-              32.192763979620061
+              117.80987070498203,
+              32.196724331441835
             ],
             [
-              117.81597347005182,
-              32.192763968216909
+              117.80987068611742,
+              32.196699280611028
             ],
             [
-              117.81597906116615,
-              32.192763968216909
+              117.80987065467639,
+              32.196658571665878
             ],
             [
-              117.81665242752334,
-              32.19276395681382
+              117.80987063581176,
+              32.196633518536359
             ],
             [
-              117.81665258383019,
-              32.193071235693907
+              117.80987060437073,
+              32.196592416550452
             ],
             [
-              117.81665259640661,
-              32.193096577922148
+              117.80987058550612,
+              32.196567759454908
             ],
             [
-              117.81665275181516,
-              32.193404248704297
+              117.80987055316675,
+              32.19652665819951
             ],
             [
-              117.81631303951742,
-              32.193404254785918
+              117.80987053430214,
+              32.196501606554037
             ],
             [
-              117.81631303951742,
-              32.193404653132475
+              117.8098705037594,
+              32.196460902081547
             ],
             [
-              117.81631305209385,
-              32.193429995267884
+              117.80987048489482,
+              32.196435847377273
             ],
             [
-              117.81631320750239,
-              32.193737664162683
+              117.80987045255544,
+              32.196395142115179
             ],
             [
-              117.81631322097711,
-              32.193763009246162
+              117.80987036901212,
+              32.196286026806618
             ],
             [
-              117.81631337638566,
-              32.194071073078135
+              117.80987033307949,
+              32.196238172748018
             ],
             [
-              117.81631338986041,
-              32.19409641654839
+              117.80987027648564,
+              32.196197460555872
             ],
             [
-              117.81631342399636,
-              32.194163335195753
+              117.80987026031595,
+              32.196172412620754
             ],
             [
-              117.8166531371924,
-              32.19416332911419
+              117.80987024324797,
+              32.196131311186711
             ],
             [
-              117.81665325846497,
-              32.194404080909571
+              117.80987022348505,
+              32.196106652445906
             ],
             [
-              117.81665327104139,
-              32.194429425047289
+              117.80987019384065,
+              32.19606555174235
             ],
             [
-              117.81665342734829,
-              32.194737486623353
+              117.80987017677263,
+              32.196040499969946
             ],
             [
-              117.81665343992465,
-              32.194762832188587
+              117.8098701516198,
+              32.19599979073007
             ],
             [
-              117.81665359533322,
-              32.195070495817149
+              117.80987013545013,
+              32.195974739699764
             ],
             [
-              117.81665360880795,
-              32.195095840529419
+              117.80987010939899,
+              32.195933638176442
             ],
             [
-              117.8166537300805,
-              32.195336590617991
+              117.80987009412765,
+              32.19590897786172
             ],
             [
-              117.8159803637233,
-              32.195336602020781
+              117.8098700734664,
+              32.195867877068899
             ],
             [
-              117.81597477260898,
-              32.195336602020781
+              117.80987006358494,
+              32.19584282372174
             ],
             [
-              117.81530140445516,
-              32.195336613423599
+              117.80987003843208,
+              32.195802120474902
             ],
             [
-              117.8153012822843,
-              32.195095862574881
+              117.80987002944896,
+              32.195777064068899
             ],
             [
-              117.81530126970785,
-              32.195070518622821
+              117.80987000788937,
+              32.195736359272246
             ],
             [
-              117.81530111340099,
-              32.194762854234114
+              117.80986999351632,
+              32.195711303608348
             ],
             [
-              117.8153011008246,
-              32.194737508668901
+              117.80986929283043,
+              32.194880538722295
             ],
             [
-              117.81530094451773,
-              32.194429447092908
+              117.80986958478289,
+              32.194880538722295
             ],
             [
-              117.81530093194131,
-              32.194404102195051
+              117.81019942190068,
+              32.194880481708033
             ],
             [
-              117.81530077653279,
-              32.194096431752307
+              117.81020495013294,
+              32.19488048094783
             ],
             [
-              117.81530076305806,
-              32.194071089802492
+              117.81053524988316,
+              32.194880425453839
             ],
             [
-              117.81530060764949,
-              32.193763025970561
+              117.81054077721708,
+              32.1948804246937
             ],
             [
-              117.81530059417477,
-              32.193737680887097
+              117.81087107606895,
+              32.194880369199716
             ],
             [
-              117.81530043876623,
-              32.193430011992348
+              117.81087614616041,
+              32.194880368439506
             ],
             [
-              117.81530042618981,
-              32.193404669856953
+              117.8112061063474,
+              32.194880312945585
             ],
             [
-              117.81530026988295,
-              32.193096600728325
+              117.81120615755141,
+              32.194920579495054
             ],
             [
-              117.81530025730653,
-              32.193071257739852
+              117.81120618899244,
+              32.194945632335987
             ],
             [
-              117.81530010099968,
-              32.192763979620061
-            ]
-          ]
-        ]
-      },
-      "properties" : {
-        "OBJECTID" : 14,
-        "FID" : 13,
-        "OBJECTID_1" : 14,
-        "Id" : 0,
-        "Name" : "FZ12",
-        "Shape_Leng" : 979.36161396800003,
-        "Shape_Length" : 1053.5464622106701,
-        "Shape_Area" : 47169.187531132309
-      }
-    },
-    {
-      "type" : "Feature",
-      "id" : 15,
-      "geometry" : {
-        "type" : "Polygon",
-        "coordinates" : [
-          [
-            [
-              117.81247527402859,
-              32.191031208784466
+              117.81120624109471,
+              32.194986340527024
             ],
             [
-              117.813127992609,
-              32.191031198141339
+              117.81120627253574,
+              32.195011392589635
             ],
             [
-              117.81314817595678,
-              32.191031197381093
+              117.81120632463804,
+              32.195052493009094
             ],
             [
-              117.81315376796945,
-              32.191031197381093
+              117.81120635607905,
+              32.195077545813653
             ],
             [
-              117.81382760145057,
-              32.191031186738016
+              117.81120640818138,
+              32.195118256226294
             ],
             [
-              117.81383272723761,
-              32.191031185977778
+              117.81120643962241,
+              32.195143310533133
             ],
             [
-              117.81450702694437,
-              32.191031175334651
+              117.81120649082636,
+              32.195184017875611
             ],
             [
-              117.81451215273138,
-              32.191031175334651
+              117.81120652316574,
+              32.195209069123592
             ],
             [
-              117.81518552268182,
-              32.191031164691509
+              117.81120657436969,
+              32.195250170213981
             ],
             [
-              117.81518567809039,
-              32.191338845496936
+              117.81120662287871,
+              32.195274829947081
             ],
             [
-              117.81518569066678,
-              32.19136379289295
+              117.81120665701469,
+              32.195315930247574
             ],
             [
-              117.81518584607535,
-              32.191671867887131
+              117.81120668576078,
+              32.195340983739797
             ],
             [
-              117.81518585955006,
-              32.191697210505033
+              117.81120690674635,
+              32.195513348417037
             ],
             [
-              117.8151860149586,
-              32.192005284370673
+              117.81087102666163,
+              32.195514154974099
             ],
             [
-              117.81518602753502,
-              32.192030230823796
+              117.81087101767845,
+              32.195645134881119
             ],
             [
-              117.81518618384189,
-              32.192338304322341
+              117.81087102666163,
+              32.195670182961436
             ],
             [
-              117.81518625211383,
-              32.19247135277363
+              117.81087104283129,
+              32.195711285363892
             ],
             [
-              117.81517832807474,
-              32.192471352013413
+              117.81087105450939,
+              32.195736341788063
             ],
             [
-              117.81451288216338,
-              32.192471362656377
+              117.81087107067906,
+              32.195777048865196
             ],
             [
-              117.81449890168263,
-              32.192471363416601
+              117.81087107786558,
+              32.195802102990662
             ],
             [
-              117.8138334566696,
-              32.192471374059501
+              117.81087109223864,
+              32.19584280927824
             ],
             [
-              117.81382832998428,
-              32.192471374059501
+              117.8108710967302,
+              32.195867861105071
             ],
             [
-              117.81349467772145,
-              32.192471379381018
+              117.81087111469651,
+              32.195908961897906
             ],
             [
-              117.81349447470218,
-              32.192071439019657
+              117.81087112278135,
+              32.195933622212614
             ],
             [
-              117.81315476240442,
-              32.192071444341181
+              117.81087110481504,
+              32.195974721455428
             ],
             [
-              117.81315470760721,
-              32.191963740129644
+              117.81087110930662,
+              32.195999774006083
             ],
             [
-              117.81315469503082,
-              32.191938396065495
+              117.81087111559482,
+              32.196040483245966
             ],
             [
-              117.81315462675883,
-              32.191804950001988
+              117.81087112008638,
+              32.19606553501837
             ],
             [
-              117.81281491446113,
-              32.191804955323477
+              117.81087112727293,
+              32.196106636482057
             ],
             [
-              117.81281485966386,
-              32.191697248515943
+              117.81087113086619,
+              32.196131295983072
             ],
             [
-              117.81281484708747,
-              32.191671905137817
+              117.8108711380527,
+              32.196172396656927
             ],
             [
-              117.81281481295149,
-              32.191604985418707
+              117.81087114164599,
+              32.196197448393022
             ],
             [
-              117.81247556508275,
-              32.19160499074021
+              117.81087114793417,
+              32.196238156024066
             ],
             [
-              117.8124754429119,
-              32.19136383622552
+              117.81087115242575,
+              32.196262753154741
             ],
             [
-              117.81247543033548,
-              32.191338890349911
+              117.81120835752553,
+              32.196261330098729
             ],
             [
-              117.81247527402859,
-              32.191031208784466
+              117.81120836201708,
+              32.197424635216237
             ]
           ]
         ]
       },
       "properties" : {
-        "OBJECTID" : 15,
-        "FID" : 14,
-        "OBJECTID_1" : 15,
+        "OBJECTID" : 14,
+        "OBJECTID_1" : 14,
+        "FID" : 13,
+        "OBJECTID_12" : 14,
         "Id" : 0,
-        "Name" : "FZ09",
-        "Shape_Leng" : 914.13047813000003,
-        "Shape_Length" : 982.29523501813287,
-        "Shape_Area" : 47547.290459794414
+        "Name" : "FZ12",
+        "Shape_Leng" : 979.36161396800003,
+        "Shape_Length" : 1042.0431440807397,
+        "Shape_Area" : 46140.078431800219
       }
     },
     {
       "type" : "Feature",
-      "id" : 16,
+      "id" : 15,
       "geometry" : {
         "type" : "Polygon",
         "coordinates" : [
           [
             [
-              117.81349468939952,
-              32.192497513916074
+              117.80975829968884,
+              32.19459409297265
             ],
             [
-              117.81450776895277,
-              32.192497497951663
+              117.80808130225856,
+              32.194594614465316
             ],
             [
-              117.81451289563812,
-              32.192497497191447
+              117.80808093574592,
+              32.194197078814568
             ],
             [
-              117.81518626469025,
-              32.192497486548483
+              117.80774426334712,
+              32.194197579023992
             ],
             [
-              117.81518642009878,
-              32.192804767088489
+              117.80774396330982,
+              32.193930919105604
             ],
             [
-              117.8151864326752,
-              32.192830109390925
+              117.80774266524423,
+              32.193930916064815
             ],
             [
-              117.81518658898206,
-              32.193138179421645
+              117.80741282992304,
+              32.193930222003132
             ],
             [
-              117.81518660155851,
-              32.193163126324521
+              117.80740729091102,
+              32.193930210600193
             ],
             [
-              117.81518675786536,
-              32.19347119522795
+              117.80740672676897,
+              32.193737975084716
             ],
             [
-              117.81518677044176,
-              32.193496537344821
+              117.8070708125483,
+              32.193739187604635
             ],
             [
-              117.81518692674862,
-              32.193804605119631
+              117.80707052418909,
+              32.193155786541347
             ],
             [
-              117.81518693932505,
-              32.193829554880615
+              117.80975783885312,
+              32.19315574244942
             ],
             [
-              117.81518709473356,
-              32.194137618487339
+              117.80975805534707,
+              32.193831971555717
             ],
             [
-              117.81518710731001,
-              32.19416296041863
+              117.80975805983866,
+              32.193845544921849
             ],
             [
-              117.81518726361686,
-              32.194471025937496
+              117.80975806433024,
+              32.193859363070167
             ],
             [
-              117.81518727619326,
-              32.19449597247494
-            ],
+              117.80975829968884,
+              32.19459409297265
+            ]
+          ]
+        ]
+      },
+      "properties" : {
+        "OBJECTID" : 15,
+        "OBJECTID_1" : 15,
+        "FID" : 14,
+        "OBJECTID_12" : 15,
+        "Id" : 0,
+        "Name" : "FZ09",
+        "Shape_Leng" : 914.13047813000003,
+        "Shape_Length" : 976.79274994446928,
+        "Shape_Area" : 47161.69759838732
+      }
+    },
+    {
+      "type" : "Feature",
+      "id" : 16,
+      "geometry" : {
+        "type" : "Polygon",
+        "coordinates" : [
+          [
             [
-              117.81518739926246,
-              32.194737115649566
+              117.80875713718618,
+              32.196830262613091
             ],
             [
-              117.81451402931201,
-              32.194737127052413
+              117.80875564957604,
+              32.196830262613091
             ],
             [
-              117.81450890442331,
-              32.194737127052413
+              117.80875548248942,
+              32.196500080877819
             ],
             [
-              117.81417478054496,
-              32.194737131613593
+              117.80875548248942,
+              32.196499690906791
             ],
             [
-              117.81417461256001,
-              32.194403730459683
+              117.80875502165368,
+              32.196499690906791
             ],
             [
-              117.81383536918283,
-              32.19440373578103
+              117.80875144366392,
+              32.196499690906791
             ],
             [
-              117.81383534762328,
-              32.19436294902922
+              117.80842160924104,
+              32.196499695467821
             ],
             [
-              117.81383533504687,
-              32.194337602592469
+              117.80841910922958,
+              32.196499695467821
             ],
             [
-              117.81383517874002,
-              32.194029540422882
+              117.80841870858097,
+              32.195707400823153
             ],
             [
-              117.8138351661636,
-              32.194004590716794
+              117.80841870858097,
+              32.19570701008854
             ],
             [
-              117.81383501075506,
-              32.193696526659764
+              117.80841778151961,
+              32.19570701008854
             ],
             [
-              117.8138349972803,
-              32.193671183078145
+              117.80841521682945,
+              32.19570701008854
             ],
             [
-              117.81383496404263,
-              32.193604265589258
+              117.80808538060997,
+              32.195707013889454
             ],
             [
-              117.81349525084659,
-              32.193604269390264
+              117.80808186999383,
+              32.195707013889454
             ],
             [
-              117.81349519604937,
-              32.193496563951918
+              117.80808131303839,
+              32.194613604854986
             ],
             [
-              117.81349518347295,
-              32.193471222595264
+              117.80975915757996,
+              32.194615061385221
             ],
             [
-              117.81349509543807,
-              32.193296597763897
+              117.80975943426107,
+              32.19574611243084
             ],
             [
-              117.81349508196332,
-              32.193271255591341
+              117.80975943875265,
+              32.19576603228478
             ],
             [
-              117.81349499392843,
-              32.193096630376346
+              117.80975969836572,
+              32.196830247409572
             ],
             [
-              117.81349498135202,
-              32.193071287387895
+              117.80975817212807,
+              32.196830247409572
             ],
             [
-              117.8134948924188,
-              32.192896661789185
+              117.80942833051868,
+              32.196830251970653
             ],
             [
-              117.81349487984238,
-              32.192871318745055
+              117.80942280408303,
+              32.196830251970653
             ],
             [
-              117.81349479180749,
-              32.192696692762659
+              117.8090925061295,
+              32.196830257291843
             ],
             [
-              117.81349477923109,
-              32.192671746492167
+              117.80908744052959,
+              32.196830257291843
             ],
             [
-              117.81349468939952,
-              32.192497513916074
+              117.80875713718618,
+              32.196830262613091
             ]
           ]
         ]
       },
       "properties" : {
         "OBJECTID" : 16,
-        "FID" : 15,
         "OBJECTID_1" : 16,
+        "FID" : 15,
+        "OBJECTID_12" : 16,
         "Id" : 0,
         "Name" : "FZ10",
         "Shape_Leng" : 897.94587383600003,
-        "Shape_Length" : 965.83015422856761,
-        "Shape_Area" : 48184.740257751437
+        "Shape_Length" : 956.48603139911961,
+        "Shape_Area" : 47266.759042974678
       }
     }
   ]

src/main/resources/mapper/PhotoResultMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.keystar.plane.inspection.mapper.PhotoResultMapper">
+
+
+    <select id="queryResultByPhotoId" resultType="com.keystar.plane.inspection.entity.PhotoResultEntity">
+        SELECT
+            *
+        FROM
+            kr_photo_result
+        WHERE
+            photo_id = #{photoId}
+    </select>
+
+    <select id="queryFltPVString" resultType="com.keystar.plane.inspection.entity.PhotoResultEntity">
+        SELECT DISTINCT
+            r.photo_id, array_index
+        FROM
+			`kr_plane_photo` AS p,
+            `kr_photo_result` AS r
+        WHERE
+			p.id = r.photo_id
+		AND
+			p.record_id = #{recordId}
+		<if test = "type != null">
+		     AND `type` = #{type}
+        </if>
+    </select>
+
+    <select id="queryFltPVPanel" resultType="com.keystar.plane.inspection.entity.PhotoResultEntity">
+        SELECT DISTINCT
+            r.photo_id, array_index, row_index, column_index
+        FROM
+			`kr_plane_photo` AS p,
+            `kr_photo_result` AS r
+        WHERE
+			p.id = r.photo_id
+		AND
+			p.record_id = #{recordId}
+        <if test = "type != null">
+            AND `type` = #{type}
+        </if>
+    </select>
+
+
+    <select id="queryFltPz" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity">
+        SELECT DISTINCT
+        p.pz_name
+        FROM
+        `kr_plane_photo` AS p,
+        `kr_photo_result` AS r
+        WHERE
+        p.id = r.photo_id
+        AND
+        p.record_id = #{recordId}
+        <if test = "type != null">
+            AND `type` = #{type}
+        </if>
+    </select>
+
+
+    <select id="queryResultByRecordId" resultType="com.keystar.plane.inspection.entity.PhotoResultEntity">
+        SELECT
+            *
+        FROM
+            kr_photo_result
+        WHERE
+            photo_id = #{recoedId}
+    </select>
+</mapper>

src/main/resources/mapper/PlanePhotoMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.keystar.plane.inspection.mapper.PlanePhotoMapper">
+<!--    <resultMap id="bo" type="com.keystar.plane.inspection.bo.PhotoBo">-->
+<!--        <id property="id" column="id"/>-->
+<!--        <result property="missionId" column="mission_id"/>-->
+<!--        <result property="recordId" column="record_id"/>-->
+<!--        <result property="visibleImagePath" column="visible_image_path"/>-->
+<!--        <result property="infraredImagePath" column="infrared_image_path"/>-->
+<!--        <result property="pzName" column="pz_name"/>-->
+<!--        <result property="pvName" column="pv_name"/>-->
+<!--        <result property="arrayBox" column="array_box"/>-->
+
+<!--        <collection property="results" ofType="com.keystar.plane.inspection.bo.PhotoResultBo">-->
+<!--            <id property="id" column="r_photo_id"/>-->
+<!--            <result property="arrayIndex" column="r_array_index"/>-->
+
+<!--            <collection property="resultBos" ofType="com.keystar.plane.inspection.bo.AbnormalResultBo">-->
+<!--                <id property="id" column="r_array_index"/>-->
+<!--                <result property="rowIndex" column="r_row_index"/>-->
+<!--                <result property="columnIndex" column="r_column_index"/>-->
+<!--                <result property="type" column="r_type"/>-->
+<!--                <result property="coordinates" column="r_coordinates"/>-->
+<!--            </collection>-->
+<!--        </collection>-->
+<!--    </resultMap>-->
+
+
+    <select id="getPhotoBo" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" parameterType="com.keystar.plane.inspection.bo.PvNameBo">
+        SELECT
+            p.*
+        FROM
+            kr_plane_photo AS p
+        WHERE
+            p.pv_name LIKE concat(concat("%",#{pvName}),"%")
+        ORDER BY p.time DESC
+        <if test="startIndex != null">
+            LIMIT #{startIndex}, #{pageSize}
+        </if>
+
+    </select>
+
+    <select id="getRecordIdNum" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" parameterType="com.keystar.plane.inspection.bo.DateBo">
+        SELECT
+            *
+        FROM
+            `kr_plane_photo`
+        WHERE
+            `time` >= #{startTime}
+        AND
+            `time` &lt;= #{endTime}
+        GROUP BY record_id
+    </select>
+
+    <select id="getInspectionDate" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" parameterType="com.keystar.plane.inspection.bo.DateBo">
+        SELECT
+            *
+        FROM
+            `kr_plane_photo`
+        WHERE
+            `time` >= #{startTime}
+        AND
+            `time` &lt;= #{endTime}
+        GROUP BY `date`
+    </select>
+
+    <select id="getAbnormalFZNum" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" parameterType="com.keystar.plane.inspection.bo.DateBo">
+        SELECT
+        p.*
+        FROM
+            `kr_plane_photo` AS p,
+            `kr_photo_result` AS r
+        WHERE
+            p.id = r.photo_id
+        AND
+            `time` >= #{startTime}
+        AND
+            `time` &lt;= #{endTime}
+        GROUP BY p.pz_name
+    </select>
+
+    <select id="queryNewRecordByMission" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" >
+        SELECT
+        *
+        FROM
+            `kr_plane_photo`
+        WHERE
+            mission_id = #{missionId}
+        GROUP BY record_id
+		ORDER BY `time` DESC
+    </select>
+
+    <select id="queryPhotoByRecordId" resultType="com.keystar.plane.inspection.entity.PlanePhotoEntity" >
+        SELECT
+        *
+        FROM
+            `kr_plane_photo`
+        WHERE
+            record_id = #{recordId}
+    </select>
+
+
+
+</mapper>

src/test/java/com/keystar/plane/inspection/PlaneInspectionApplicationTests.java

@@ -5,19 +5,22 @@ import com.drew.imaging.jpeg.JpegProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
-import com.keystar.plane.inspection.bo.Location;
+import com.keystar.plane.inspection.bo.*;
 //import com.keystar.plane.inspection.config.MinIoConfig;
 import com.keystar.plane.inspection.constant.LocationConstant;
+import com.keystar.plane.inspection.constant.MissionConstant;
 import com.keystar.plane.inspection.dao.DegreesVo;
 import com.keystar.plane.inspection.dao.PhotoMessageVo;
+import com.keystar.plane.inspection.dao.PhotoResultVo;
 import com.keystar.plane.inspection.dao.PlanePhotoVo;
+import com.keystar.plane.inspection.entity.PhotoResultEntity;
 import com.keystar.plane.inspection.entity.PlanePhotoEntity;
+import com.keystar.plane.inspection.mapper.PhotoResultMapper;
+import com.keystar.plane.inspection.mapper.PlanePhotoMapper;
 import com.keystar.plane.inspection.mqtt.PlaneMqttHandler;
-import com.keystar.plane.inspection.service.MqttService;
-import com.keystar.plane.inspection.service.NestService;
-import com.keystar.plane.inspection.service.PhotoService;
-import com.keystar.plane.inspection.service.PlanePhotoService;
+import com.keystar.plane.inspection.service.*;
 import com.keystar.plane.inspection.service.impl.MinioService;
+import com.keystar.plane.inspection.service.impl.ReportServiceImpl;
 import com.keystar.plane.inspection.utils.*;
 import io.minio.messages.Item;
 import org.junit.jupiter.api.Test;
@@ -30,6 +33,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,6 +50,21 @@ class PlaneInspectionApplicationTests {
     @Autowired
     MinioService minioService;
 
+    @Autowired
+    PlanePhotoMapper planePhotoMapper;
+
+    @Autowired
+    PhotoResultMapper photoResultMapper;
+
+    @Autowired
+    TangyangDataService tangyangDataService;
+
+    @Autowired
+    PhotoResultService photoResultService;
+
+    @Autowired
+    private IReportService reportService;
+
 //    @Autowired
 //    MinIoConfig minIoConfig;
 
@@ -220,7 +240,7 @@ class PlaneInspectionApplicationTests {
         planePhotoEntity.setId(1L);
         planePhotoEntity.setMissionId(1);
         planePhotoEntity.setRecordId(1);
-        planePhotoEntity.setPath("123/123");
+        planePhotoEntity.setInfraredImagePath("123/123");
         planePhotoEntity.setPvName("pvName");
         planePhotoEntity.setPzName("pzName");
         planePhotoEntity.setTime(new Date());
@@ -231,7 +251,7 @@ class PlaneInspectionApplicationTests {
 
     @Test
     public void test() throws IOException, JpegProcessingException {
-	    photoService.queryPhoto("C:\\Users\\KR0282\\Desktop\\photo\\3\\3.2\\20230217174008_DJI_20230217173108_0001_THRM.jpg");
+	    photoService.queryPhoto("F:\\1871\\1871\\方阵13-16巡检任务0224-2023-02-26-15-18-25-DJI_20230226144258_0005_THRM.jpg");
 	}
 
 	/**
@@ -241,7 +261,7 @@ class PlaneInspectionApplicationTests {
     public void CongHe() throws IOException, JpegProcessingException {
         List<Location> location1 = LocationConstant.PZLocation.get("FZ01");
         // 获取图片中的信息
-        PhotoMessageVo photoMessage = PhotoUtils.getPhotoMessage("C:\\Users\\KR0282\\Desktop\\photo\\3\\32\\1113_THRM.jpg");
+            PhotoMessageVo photoMessage = PhotoUtils.getPhotoMessage("F:\\1871\\1871\\方阵13-16巡检任务0224-2023-02-26-15-18-25-DJI_20230226144258_0005_THRM.jpg");
         // 根据图片信息，获取图片四个角的经纬度，判断图片在哪个光伏区
         List<Location> degrees = PhotoUtils.getDegrees(photoMessage);
         List<Location> locations = LocationConstant.PVLocation.get("01").get("01HL09-3    01HL09-4");
@@ -328,4 +348,105 @@ class PlaneInspectionApplicationTests {
         System.out.println(System.getProperty("file.encoding"));
         System.out.println(Charset.defaultCharset());
     }
+
+    /**
+     * 根据图片中的某个坐标求解出对应的经纬度坐标
+     **/
+    @Test
+    public void testPhoto() throws IOException, JpegProcessingException {
+        // 获取图片中的信息
+        PhotoMessageVo photoMessage = PhotoUtils.getPhotoMessage("F:\\1871\\1871\\方阵13-16巡检任务0224-2023-02-26-15-21-02-DJI_20230226144408_0040_THRM.jpg");
+        Location pointLocation = PhotoUtils.getPointLocation(569.0,409.0 , photoMessage);
+        System.out.println(""+ pointLocation.toString());
+    }
+
+    @Test
+    public void testMapper(){
+        PvNameBo pvNameBo = new PvNameBo();
+        pvNameBo.setPvName("04HL15-07");
+//        pvNameBo.setStartIndex(2);
+//        pvNameBo.setPageSize(15);
+        List<PlanePhotoEntity> photoBo = planePhotoMapper.getPhotoBo(pvNameBo);
+        System.out.println(photoBo.toString());
+    }
+
+    @Test
+    public void testService(){
+        PvNameBo pvNameBo = new PvNameBo();
+        pvNameBo.setPvName("04HL15-07 ");
+        pvNameBo.setStartIndex(1);
+        pvNameBo.setPageSize(15);
+        PhotoResultVo photoMsg = photoService.getPhotoMsg(pvNameBo);
+        System.out.println(photoMsg.toString());
+    }
+
+    @Test
+    public void testResultMapper(){
+        List<PhotoResultEntity> photoResultEntities = photoResultMapper.queryResultByPhotoId(1630493587477725184L);
+        System.out.println(photoResultEntities);
+    }
+
+    @Test
+    public void testBo(){
+        Map<String, List<Location>> fz01 = LocationConstant.PVLocation.get("FZ01");
+        System.out.println(fz01.toString());
+    }
+
+    @Test
+    public void testMonth(){
+        DateBo dateBo = new DateBo();
+        try {
+            dateBo = Utils.getMonthDay();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        System.out.println(dateBo.toString());
+    }
+
+    @Test
+    public void testRecordIdNum() throws ParseException {
+        Integer recordIdNum = planePhotoService.getTotalSortie();
+        System.out.println(recordIdNum);
+    }
+
+    @Test
+    public void testEff() throws ParseException {
+        Integer effectiveSortie = planePhotoService.getEffectiveSortie();
+        System.out.println(effectiveSortie);
+    }
+
+    @Test
+    public void testDate() throws ParseException {
+        Integer effectiveInspectionDate = planePhotoService.getEffectiveInspectionDate();
+        System.out.println(effectiveInspectionDate);
+    }
+
+    @Test
+    public void testMapper2(){
+        List<PhotoResultEntity> photoResultEntities = photoResultMapper.queryFltPVString(1889, "covered");
+        int size = photoResultEntities.size();
+        System.out.println(size);
+    }
+
+    @Test
+    public void testMapper3(){
+        List<PlanePhotoEntity> photoEntityList = planePhotoMapper.queryNewRecordByMission(2420);
+        System.out.println(photoEntityList);
+        // 499
+    }
+
+    @Test
+    public void testgetHour(){
+        List<PlaneInspectionResultBo> planeInspectionResultBos = photoResultService.listInspectionResult();
+        System.out.println(planeInspectionResultBos);
+    }
+
+    /*@Test
+    public void testFile(){
+        String url = "F:/photo" + "/nest/photo/2420/1887/方阵13-16巡检任务0224-2023-03-04-11-04-02-DJI_20230304103720_0025_Z.JPG";
+        String s = reportService.pic2Base64FromPath(url);
+        System.out.println(s);
+    }*/
+
+
 }