From 993f7cf3e3391294ce59ded17434491dfdbb2558 Mon Sep 17 00:00:00 2001 From: zhangyeguang Date: Mon, 23 Dec 2024 09:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiagutech/ams/controller/DeviceController.java | 5 +++-- .../ams/controller/MessageDataController.java | 7 +++++++ .../jiagutech/ams/controller/RegionController.java | 1 + .../java/com/jiagutech/ams/mapper/DeviceMapper.java | 2 +- .../java/com/jiagutech/ams/model/dto/DeviceDTO.java | 1 - .../jiagutech/ams/model/response/DeviceInfo.java | 3 +++ .../com/jiagutech/ams/service/DeviceService.java | 2 +- .../jiagutech/ams/service/DeviceServiceImpl.java | 12 ++++++------ .../com/jiagutech/ams/service/JobServiceImpl.java | 4 ++-- social/src/main/resources/mapper/DeviceMapper.xml | 8 +++++--- .../jiagutech/ams/controller/DeptController.java | 5 ++++- .../com/jiagutech/ams/service/UserServiceImpl.java | 6 +++--- .../com/jiagutech/ams/config/SaTokenConfigure.java | 13 ++++++++++++- 13 files changed, 48 insertions(+), 21 deletions(-) diff --git a/social/src/main/java/com/jiagutech/ams/controller/DeviceController.java b/social/src/main/java/com/jiagutech/ams/controller/DeviceController.java index 7f15217..6f79022 100644 --- a/social/src/main/java/com/jiagutech/ams/controller/DeviceController.java +++ b/social/src/main/java/com/jiagutech/ams/controller/DeviceController.java @@ -7,6 +7,7 @@ import com.jiagutech.ams.model.common.PageResult; import com.jiagutech.ams.model.common.R; import com.jiagutech.ams.model.dto.DeviceDTO; import com.jiagutech.ams.model.request.DeviceRequest; +import com.jiagutech.ams.model.request.JobPageRequest; import com.jiagutech.ams.model.response.ChartItem; import com.jiagutech.ams.model.response.DeviceDetail; import com.jiagutech.ams.model.response.DeviceInfo; @@ -43,10 +44,10 @@ public class DeviceController { } - @Operation(summary = "设备列表") + @Operation(summary = "分页设备列表") @PostMapping("/page") @SaCheckRole(value = {"manager", "admin", "gov"}, mode = SaMode.OR) - public R> page(@RequestBody PageRequest pageRequest) { + public R> page(@RequestBody PageRequest pageRequest) { return R.ok(deviceService.page(pageRequest)); } diff --git a/social/src/main/java/com/jiagutech/ams/controller/MessageDataController.java b/social/src/main/java/com/jiagutech/ams/controller/MessageDataController.java index b733d9c..a7453a9 100644 --- a/social/src/main/java/com/jiagutech/ams/controller/MessageDataController.java +++ b/social/src/main/java/com/jiagutech/ams/controller/MessageDataController.java @@ -6,6 +6,9 @@ import com.jiagutech.ams.model.request.MachImage; import com.jiagutech.ams.model.request.RealTimeData; import com.jiagutech.ams.model.request.WorkRecord; import com.jiagutech.ams.service.MessageDataService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -16,10 +19,12 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/MessageDataService") +@Tag(name = "中农云推送") public class MessageDataController { private final MessageDataService messageDataService; + @Operation(description = "实时推送") @PostMapping("/machineryRealtimeData") public R addRealTimeData(@RequestBody List realTimeDatas) { //if (checkSign(request,response)) { @@ -29,6 +34,7 @@ public class MessageDataController { } + @Operation(description = "图片推送") @PostMapping(value = "/machineryImage", consumes = "multipart/form-data") public R machineryImage(@ModelAttribute MachImage machImage) { @@ -38,6 +44,7 @@ public class MessageDataController { } + @Operation(description = "作业记录推送") @PostMapping("/machineryAreaDataList") public R addWorkData(@RequestBody List workRecords) { log.info("WorkRecord:{}", JSONObject.toJSONString(workRecords)); diff --git a/social/src/main/java/com/jiagutech/ams/controller/RegionController.java b/social/src/main/java/com/jiagutech/ams/controller/RegionController.java index 3509f6b..5c18f9e 100644 --- a/social/src/main/java/com/jiagutech/ams/controller/RegionController.java +++ b/social/src/main/java/com/jiagutech/ams/controller/RegionController.java @@ -40,6 +40,7 @@ public class RegionController { @Operation(summary = "从历史作业中获取区域列表") @GetMapping("getHistoryJobRegions") + @SaCheckRole(value = {"admin", "manager", "machinist"}, mode = SaMode.OR) public R> getHistoryJobRegions() { List historyJobRegions = regionService.getHistoryJobRegions(); return R.ok(historyJobRegions); diff --git a/social/src/main/java/com/jiagutech/ams/mapper/DeviceMapper.java b/social/src/main/java/com/jiagutech/ams/mapper/DeviceMapper.java index 7c9e073..b5efbce 100644 --- a/social/src/main/java/com/jiagutech/ams/mapper/DeviceMapper.java +++ b/social/src/main/java/com/jiagutech/ams/mapper/DeviceMapper.java @@ -17,7 +17,7 @@ public interface DeviceMapper extends BaseMapper { DeviceDetail selectDetail(@Param("ew") QueryWrapper queryWrapper); - Page deivcePage(Page page, @Param("ew") QueryWrapper queryWrapper); + Page deivcePage(Page page, @Param("ew") QueryWrapper queryWrapper); List selectChart(@Param("level") int level, @Param("regionPath") String regionPath); } diff --git a/social/src/main/java/com/jiagutech/ams/model/dto/DeviceDTO.java b/social/src/main/java/com/jiagutech/ams/model/dto/DeviceDTO.java index eef7826..46f5ec2 100644 --- a/social/src/main/java/com/jiagutech/ams/model/dto/DeviceDTO.java +++ b/social/src/main/java/com/jiagutech/ams/model/dto/DeviceDTO.java @@ -31,7 +31,6 @@ public class DeviceDTO { private Long deptId; - private String deptName; private Double lat; diff --git a/social/src/main/java/com/jiagutech/ams/model/response/DeviceInfo.java b/social/src/main/java/com/jiagutech/ams/model/response/DeviceInfo.java index 562f5c9..b91995d 100644 --- a/social/src/main/java/com/jiagutech/ams/model/response/DeviceInfo.java +++ b/social/src/main/java/com/jiagutech/ams/model/response/DeviceInfo.java @@ -32,4 +32,7 @@ public class DeviceInfo { private String licensePlate; + private Long deptId; + + private String deptName; } diff --git a/social/src/main/java/com/jiagutech/ams/service/DeviceService.java b/social/src/main/java/com/jiagutech/ams/service/DeviceService.java index 718f783..30aa699 100644 --- a/social/src/main/java/com/jiagutech/ams/service/DeviceService.java +++ b/social/src/main/java/com/jiagutech/ams/service/DeviceService.java @@ -13,7 +13,7 @@ import java.util.List; public interface DeviceService { List onlineAndRound(double maxLng, double maxLat, double minLng, double minLat); - PageResult page(PageRequest pageRequest); + PageResult page(PageRequest pageRequest); List deviceList(); diff --git a/social/src/main/java/com/jiagutech/ams/service/DeviceServiceImpl.java b/social/src/main/java/com/jiagutech/ams/service/DeviceServiceImpl.java index f62c761..1fa73ab 100644 --- a/social/src/main/java/com/jiagutech/ams/service/DeviceServiceImpl.java +++ b/social/src/main/java/com/jiagutech/ams/service/DeviceServiceImpl.java @@ -97,16 +97,16 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public PageResult page(PageRequest pageRequest) { - Page page = new Page(pageRequest.getPageNum(), pageRequest.getPageSize()); - QueryWrapper queryWrapper = buildQueryWrapper(pageRequest.getRequest()); + public PageResult page(PageRequest pageRequest) { + Page page = new Page(pageRequest.getPageNum(), pageRequest.getPageSize()); + QueryWrapper queryWrapper = buildQueryWrapper(pageRequest.getRequest()); - Page result = deviceMapper.deivcePage(page, queryWrapper); + Page result = deviceMapper.deivcePage(page, queryWrapper); return PageResult.of((int) result.getTotal(), pageRequest.getPageSize(), (int) result.getCurrent(), result.getRecords()); } - private QueryWrapper buildQueryWrapper(DeviceRequest deviceRequest) { - QueryWrapper queryWrapper = Wrappers.query(); + private QueryWrapper buildQueryWrapper(DeviceRequest deviceRequest) { + QueryWrapper queryWrapper = Wrappers.query(); if (!ObjectUtils.isEmpty(deviceRequest)) { if (deviceRequest.getRegionCode() != null && deviceRequest.getRegionCode() != 0L) { queryWrapper.eq("dp.region_code", deviceRequest.getRegionCode()); diff --git a/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java b/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java index 9b52a96..39c0873 100644 --- a/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java +++ b/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java @@ -127,7 +127,7 @@ public class JobServiceImpl implements JobService { @Override public void exportJobs(JobPageRequest jobPageRequest, HttpServletResponse response) { QueryWrapper queryWrapper = buildQueryWrapper(jobPageRequest); - queryWrapper.in("finish_type", 1, 3); + queryWrapper.in("finished_type", 1, 3); List jobItems = jobMapper.jobList(queryWrapper); ExcelUtil.exportExcel(jobItems, "作业记录", JobItem.class, response); } @@ -135,7 +135,7 @@ public class JobServiceImpl implements JobService { @Override public void exportByFarmer(JobPageRequest jobPageRequest, HttpServletResponse response) { QueryWrapper queryWrapper = buildQueryWrapper(jobPageRequest); - queryWrapper.in("finish_type", 1, 3); + queryWrapper.in("finished_type", 1, 3); List jobItems = jobMapper.jobListCountByFarmer(queryWrapper); List jobPolyItems = JobMapping.INSTANCE.jobItemListToJobPolyItemList(jobItems); ExcelUtil.exportExcel(jobPolyItems, "作业记录", JobPolyItem.class, response); diff --git a/social/src/main/resources/mapper/DeviceMapper.xml b/social/src/main/resources/mapper/DeviceMapper.xml index c261494..1b50c26 100644 --- a/social/src/main/resources/mapper/DeviceMapper.xml +++ b/social/src/main/resources/mapper/DeviceMapper.xml @@ -45,9 +45,11 @@ ${ew.getCustomSqlSegment} - + select d.*, dp.name as deptName + from ams_device_info d + left join ams_dept dp on d.dept_id = dp.id + ${ew.getCustomSqlSegment}