From ef0af0b2dab894fb1e3b842dc79710cc1027ffae Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Fri, 28 Nov 2025 10:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=95=BF=E6=9C=9F=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SurvDeviceDeployController.java | 4 +-- .../controller/SurvStationInfoController.java | 27 ++++++++++++++++++- .../applet/controller/UserInfoController.java | 1 + .../applet/mapper/SurvDeviceDeployMapper.java | 2 +- .../mapper/xml/SurvDeviceDeployMapper.xml | 6 +++++ .../service/ISurvDeviceDeployService.java | 2 +- .../impl/SurvDeviceDeployServiceImpl.java | 4 +-- 7 files changed, 39 insertions(+), 7 deletions(-) diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java index 0af03d1..6a380ff 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java @@ -92,7 +92,7 @@ public class SurvDeviceDeployController { // deployTypes.add(PollutionConstants.CAMERA); deployTypes.add(PollutionConstants.AIR_SURV); deployTypes.add(PollutionConstants.SOIL_SURV); - List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes); + List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes,null); return R.ok(deploys); } @@ -131,7 +131,7 @@ public class SurvDeviceDeployController { deployTypes.add(PollutionConstants.WATER_QULITY); deployTypes.add(PollutionConstants.WATER_ORIENT); deployTypes.add(PollutionConstants.WATER_LIVE); - List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes); + List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes,null); return R.ok(deploys); } } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java index ff52c94..4706565 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java @@ -423,7 +423,32 @@ public class SurvStationInfoController { } + /** + * 各站点设备查询 + * + * @return + */ + @ApiOperation(value="非站点监测设备查询", notes="各站点设备查询") + @GetMapping(value = "/fdeviceList") + @ApiLogin + public R fdeviceList(@RequestParam(required = false) String stationCode,@RequestParam(required = false) String stationFilter) { + JSONArray joa = new JSONArray(); + List deployTypes = new ArrayList<>(); +// deployTypes.add(PollutionConstants.CAMERA); + deployTypes.add(PollutionConstants.AIR_SURV); + deployTypes.add(PollutionConstants.SOIL_SURV); + List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes,stationFilter); + List adds = new ArrayList<>(); + if(!deploys.isEmpty()){ + for (SurvDeviceDeploy deploy : deploys) { + deploy.setStationName("长期定位监测点位"); + } + adds = iotutils.addOnlineStatus(deploys); + } + joa.add(adds); + return R.ok(joa); + } /** @@ -482,7 +507,7 @@ public class SurvStationInfoController { // deployTypes.add(PollutionConstants.CAMERA); deployTypes.add(PollutionConstants.AIR_SURV); deployTypes.add(PollutionConstants.SOIL_SURV); - List deploys = survDeviceDeployService.getDeviceListByStation(null,deployTypes); + List deploys = survDeviceDeployService.getDeviceListByStation(null,deployTypes,null); if(!deploys.isEmpty()){ for (SurvDeviceDeploy deploy : deploys) { CommonLocationTrans ent = new CommonLocationTrans(); diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/UserInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/UserInfoController.java index afa2117..dd79b4f 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/UserInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/UserInfoController.java @@ -347,6 +347,7 @@ public class UserInfoController { userInfoService.updateProCity(request, userInfo.getId()); }); } + return R.ok(userInfo); } catch (Exception e) { e.printStackTrace(); diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java index 910a14f..1dafc44 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java @@ -23,7 +23,7 @@ public interface SurvDeviceDeployMapper extends BaseMapper { List getDeviceByStationNoCam(String stationCode, String deployType); - List getDeviceListByStations(@Param("stationCode")String stationCode,@Param("deployTypeList") List deployTypeList); + List getDeviceListByStations(@Param("stationCode")String stationCode,@Param("deployTypeList") List deployTypeList,@Param("stationFilter")String stationFilter); SurvDeviceDeploy getDeployZhibiao(@Param("deployId") String deployId); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml index b6b5cbe..e1359b9 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml @@ -111,6 +111,12 @@ and STATION_CODE = #{stationCode} + + and STATION_CODE <> '' + + + and (STATION_CODE is null or STATION_CODE = '') + order by SORT_NO,CREATE_TIME desc diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java index 8130141..c36e93b 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java @@ -22,7 +22,7 @@ public interface ISurvDeviceDeployService extends IService { List getDeviceByStationNoCam(String stationCode, String deployType); - List getDeviceListByStation(String stationCode, List deployTypes); + List getDeviceListByStation(String stationCode, List deployTypes,String stationFilter); SurvDeviceDeploy getDeployZhibiao(String deployId); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java index 97c73de..0a566fb 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java @@ -41,8 +41,8 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl getDeviceListByStation(String stationCode, List deployTypes) { - return baseMapper.getDeviceListByStations(stationCode,deployTypes); + public List getDeviceListByStation(String stationCode, List deployTypes,String stationFilter) { + return baseMapper.getDeviceListByStations(stationCode,deployTypes,stationFilter); } @Override