From 19f8e107145f27e2bb3893d0408d4ce5658d0531 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Wed, 17 Sep 2025 16:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E7=A8=8B=E9=87=8F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=9B=9E=E9=80=80=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BA=A7=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusMrpBaseController.java | 30 +++++++++---------- .../controller/GpsEquipmentController.java | 10 +++++++ .../controller/GpsEquipmentSonController.java | 9 ++++++ .../gps/service/IGpsEquipmentSonService.java | 2 ++ .../impl/GpsEquipmentSonServiceImpl.java | 7 +++++ 5 files changed, 43 insertions(+), 15 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java index 7dbfd7a3..24e1a8f5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java @@ -182,19 +182,19 @@ public class BusMrpBaseController extends BaseController { @GetMapping("/coryEngineeringList") public R> obtainTheList(CoryObtainTheListReq req) { // public R> obtainTheList(CoryObtainTheListReq req) { -// BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() -// .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 -// .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId()) -// .eq(BusBillofquantitiesVersions::getVersions, req.getVersions()) -// .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) -// .last("limit 1") -// ); -// if (one == null){ -// throw new ServiceException("请先完成物资工程量清单"); -// } -// List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() -// .eq(BusBillofquantities::getVersions, one.getVersions()) -// ); + BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() + .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 + .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId()) + .eq(BusBillofquantitiesVersions::getVersions, req.getVersions()) + .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) + .last("limit 1") + ); + if (one == null){ + throw new ServiceException("请先完成物资工程量清单"); + } + List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() + .eq(BusBillofquantities::getVersions, one.getVersions()) + ); // List obtainTheListRes = new ArrayList<>(); // list.forEach(billofquantities -> { // ObtainTheListRes res = new ObtainTheListRes(); @@ -208,8 +208,8 @@ public class BusMrpBaseController extends BaseController { // // 3. 递归组装树形结构，从顶级节点（pid=0）开始 // List treeList = buildTree("0", parentMap); // return R.ok(treeList); -// return R.ok(list); - return R.ok(busBillofquantitiesService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(BusBillofquantities::getPid, req.getSid()))); + return R.ok(list); +// return R.ok(busBillofquantitiesService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(BusBillofquantities::getPid, req.getSid()))); } private List buildTree(String parentId, Map> parentMap) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java index d59ccdb5..21b3ee0f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java @@ -92,6 +92,16 @@ public class GpsEquipmentController extends BaseController { return gpsEquipmentService.queryPageList(bo, pageQuery); } + + /** + * 查询GPS设备详细列表 + */ + @SaCheckPermission("gps:equipment:list") + @GetMapping("/list") + public R> list(GpsEquipmentBo bo) { + return R.ok(gpsEquipmentService.queryList(bo)); + } + /** * 查询GPS设备用户列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentSonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentSonController.java index 2e8473e2..6623dd68 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentSonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentSonController.java @@ -56,6 +56,15 @@ public class GpsEquipmentSonController extends BaseController { return R.ok(gpsEquipmentSonService.queryList(bo)); } + /** + * 查询GPS设备定位信息列表(大屏获取人员最后一次位置) + */ + @SaCheckPermission("gps:equipmentSon:getList") + @GetMapping("/largerScreen/getList") + public R> getLargerScreenList(GpsEquipmentSonBo bo) { + return R.ok(gpsEquipmentSonService.getLargerScreenList(bo)); + } + /** * 查询GPS设备定位信息列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java index 55483177..8e5b9ca5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java @@ -72,4 +72,6 @@ public interface IGpsEquipmentSonService extends IService{ List getClientList(Long projectId); Map getAppList(GpsEquipmentSonBo bo); + + List getLargerScreenList(GpsEquipmentSonBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java index 733f577d..45e650a2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java @@ -175,4 +175,11 @@ public class GpsEquipmentSonServiceImpl extends ServiceImpl getLargerScreenList(GpsEquipmentSonBo bo) { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(GpsEquipmentSon::getProjectId, bo.getProjectId()) + .apply("row_number() over (partition by {0} order by {1} desc) = 1","user_id","create_time")); + } }