rain
2024-03-29 85e37ac89f2d73e899ffff577618e4b55fa0bd66
新增概况信息模块,新增图斑图片查询接口,图斑删除接口
7 files modified
5 files added
168 ■■■■■ changed files
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java 24 ●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/patches/service/GetPatchesService.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/summarize/controller/SummarizeController.java 32 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/summarize/dao/SummarizeMapper.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java 37 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/summarize/service/SummarizeService.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 4 ●●●● patch | view | raw | blame | history
src/main/resources/application-prod.yml 4 ●●●● patch | view | raw | blame | history
src/main/resources/application.yml 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
@@ -3,14 +3,13 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RequestMapping("${url.patches.prefix}${url.patches.version}")
@RestController
public class GetPatchesController {
@@ -28,4 +27,21 @@
        PaginationData<LotInfo> data = getPatchesService.limitGet(param);
        return ResponseResult.success(data);
    }
    @DeleteMapping("/delPatches")
    public ResponseResult del(){
        getPatchesService.delPatches();
        return ResponseResult.success();
    }
    @GetMapping("/GetPhoto")
    public ResponseResult<PaginationData<MediaFileEntity>>  GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
                                                                            @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
                                                                            @RequestParam String dkbh){
        PatchesParam param=PatchesParam.builder()
                .page(page)
                .pageSize(pageSize).build();
        getPatchesService.getPhoto(param,dkbh);
        return ResponseResult.success(getPatchesService.getPhoto(param,dkbh));
    }
}
src/main/java/com/dji/sample/patches/service/GetPatchesService.java
@@ -1,9 +1,13 @@
package com.dji.sample.patches.service;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
public interface GetPatchesService {
    PaginationData<LotInfo> limitGet(PatchesParam param);
    void delPatches();
    PaginationData<MediaFileEntity> getPhoto(PatchesParam param,String dkbh);
}
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -1,8 +1,12 @@
package com.dji.sample.patches.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.media.dao.IFileMapper;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
@@ -16,6 +20,8 @@
public class GetPatchesServiceImpl implements GetPatchesService {
    @Autowired
    private GetPatchesMapper mapper;
    @Autowired
    private IFileMapper fileMapper;
    @Override
    public PaginationData<LotInfo> limitGet(PatchesParam param) {
@@ -26,4 +32,18 @@
        return new PaginationData<LotInfo>(records, new Pagination(page));
    }
    @Override
    public void delPatches() {
        mapper.delete(null);
    }
    @Override
    public PaginationData<MediaFileEntity> getPhoto(PatchesParam param,String dkbh) {
        Page<MediaFileEntity> page=fileMapper.selectPage(new Page<MediaFileEntity>(param.getPage(), param.getPageSize()),
                new LambdaQueryWrapper<MediaFileEntity>().like(MediaFileEntity::getFileName, "%" + dkbh + "%") );
        List<MediaFileEntity> records = page.getRecords()
                .stream()
                .collect(Collectors.toList());
        return new PaginationData<MediaFileEntity>(records, new Pagination(page));
    }
}
src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
@@ -13,7 +13,7 @@
        String tmpFileDir = null;
        // 创建临时文件
        String randomFileName = UUID.randomUUID().toString();
        tmpFileDir = "${patches.zip.temple.path}" + randomFileName;
        tmpFileDir = "/home/drone/server/temp" + randomFileName;
        File file = new File(tmpFileDir);
        InputStream inputStream = null;
        FileOutputStream outputStream = null;
src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
New file
@@ -0,0 +1,32 @@
package com.dji.sample.summarize.controller;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.summarize.model.entity.FlyInfo;
import com.dji.sample.summarize.service.SummarizeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("${url.summarize.prefix}${url.summarize.version}")
public class SummarizeController {
    @Autowired
    private SummarizeService summarizeService;
    @GetMapping("/getSummarize")
    public ResponseResult<FlyInfo> getSummarize(){
        FlyInfo summarize=summarizeService.findData();
        return ResponseResult.success(summarize);
    }
    @PutMapping("/upSummarize")
    public ResponseResult upSummarize(@RequestBody FlyInfo summarize){
        FlyInfo flyInfo= FlyInfo.builder()
                .id(summarize.getId())
                .hour(summarize.getHour())
                .min(summarize.getMin())
                .flyCount(summarize.getFlyCount())
                .accumulateData(summarize.getAccumulateData())
                .flightMileage(summarize.getFlightMileage())
                .build();
        summarizeService.updateData(flyInfo);
        return ResponseResult.success();
    }
}
src/main/java/com/dji/sample/summarize/dao/SummarizeMapper.java
New file
@@ -0,0 +1,9 @@
package com.dji.sample.summarize.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dji.sample.summarize.model.entity.FlyInfo;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SummarizeMapper extends BaseMapper<FlyInfo> {
}
src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java
New file
@@ -0,0 +1,37 @@
package com.dji.sample.summarize.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "tb_fly_info")
public class FlyInfo {
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableField("hour")
    private String hour;
    @TableField("min")
    private String min;
    @TableField("fly_count")
    private String flyCount;
    @TableField("accumulate_data")
    private String accumulateData;
    @TableField("flight_mileage")
    private String flightMileage;
}
src/main/java/com/dji/sample/summarize/service/SummarizeService.java
New file
@@ -0,0 +1,8 @@
package com.dji.sample.summarize.service;
import com.dji.sample.summarize.model.entity.FlyInfo;
public interface SummarizeService {
    FlyInfo findData();
    void updateData( FlyInfo flyInfo);
}
src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java
New file
@@ -0,0 +1,21 @@
package com.dji.sample.summarize.service.impl;
import com.dji.sample.summarize.dao.SummarizeMapper;
import com.dji.sample.summarize.model.entity.FlyInfo;
import com.dji.sample.summarize.service.SummarizeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SummarizeServiceImpl implements SummarizeService {
    @Autowired
    private SummarizeMapper mapper;
    @Override
    public FlyInfo findData() {
        return mapper.selectById(1);
    }
    @Override
    public void updateData(FlyInfo flyInfo) {
       mapper.updateById(flyInfo);}
}
src/main/resources/application-dev.yml
@@ -73,7 +73,3 @@
  object-dir-prefix:
  out-net-file-address: http://dev.jxpskj.com:9000
patches:
  zip:
    temple:
      path: D:/tmp/
src/main/resources/application-prod.yml
@@ -73,8 +73,4 @@
  object-dir-prefix:
  out-net-file-address: http://dev.jxpskj.com:9000
patches:
  zip:
    temple:
      path: /home/drone/server/temp
src/main/resources/application.yml
@@ -42,6 +42,9 @@
  patches:
    prefix: /patches
    version: /api/v1
  summarize:
    prefix: /summarize
    version: /api/v1
# Tutorial: https://www.alibabacloud.com/help/en/object-storage-service/latest/use-a-temporary-credential-provided-by-sts-to-access-oss
#oss: