diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java index e4475c3..4453ff9 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java @@ -17,6 +17,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.IotConstants; import org.jeecg.common.constant.PollutionConstants; +import org.jeecg.common.dto.DeviceFilterDTO; import org.jeecg.common.entity.*; import org.jeecg.common.iot.common.DTOCamControl; import org.jeecg.common.iot.common.IotDeviceCtlResult; @@ -345,4 +346,12 @@ public class SurvDeviceDeployController extends JeecgController> getDeviceList(@RequestBody DeviceFilterDTO deviceFilterDTO) { + List pageList = survDeviceDeployService.getDeviceListByStation(null,deviceFilterDTO.getDeployTypes()); + return Result.OK(pageList); + } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java index f4b08da..890983b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java @@ -64,13 +64,13 @@ public class SurvHisdataSoilController extends JeecgController page = new Page(pageNo, pageSize); //查询站点设备 List deviceList = new ArrayList<>(); - if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ - deviceList = deployService.getDeviceListByStation(survHisdataSoil.getStationCode(), PollutionConstants.SOIL_SURV); - if(deviceList.size() ==0){//如果没有此类设备，则返回空 - IPage emptyPage = new Page(1,1); - return Result.OK(emptyPage); - } - } +// if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ +// deviceList = deployService.getDeviceListByStation(survHisdataSoil.getStationCode(), PollutionConstants.SOIL_SURV); +// if(deviceList.size() ==0){//如果没有此类设备，则返回空 +// IPage emptyPage = new Page(1,1); +// return Result.OK(emptyPage); +// } +// } IPage pageList = survHisdataSoilService.pages(page, survHisdataSoil,deviceList); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataSoilController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataSoilController.java index c4f849d..6fdaa3e 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataSoilController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataSoilController.java @@ -65,13 +65,13 @@ public class SurvTransdataSoilController extends JeecgController page = new Page(pageNo, pageSize); //查询站点设备 List deviceList = new ArrayList<>(); - if(StringUtils.isNotBlank(survTransdataSoil.getStationCode())){ - deviceList = deployService.getDeviceListByStation(survTransdataSoil.getStationCode(), PollutionConstants.SOIL_SURV); - if(deviceList.size() ==0){//如果没有此类设备，则返回空 - IPage emptyPage = new Page(1,1); - return Result.OK(emptyPage); - } - } +// if(StringUtils.isNotBlank(survTransdataSoil.getStationCode())){ +// deviceList = deployService.getDeviceListByStation(survTransdataSoil.getStationCode(), PollutionConstants.SOIL_SURV); +// if(deviceList.size() ==0){//如果没有此类设备，则返回空 +// IPage emptyPage = new Page(1,1); +// return Result.OK(emptyPage); +// } +// } IPage pageList = survTransdataSoilService.pages(page,survTransdataSoil,deviceList); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml index 8cb6b6d..26f0ff5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml @@ -39,6 +39,7 @@ + @@ -54,7 +55,7 @@ - ID,DEPLOY_CODE,STATION_CODE,RUN_STATUS,POWER_STATUS,LASTSYNC_TIME,DEVICE_CODE,DEPLOY_DES,DEPLOY_PIC,DEVICE_URL,SORT_NO,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_TYPE,DEVICE_LATITUDE,DEVICE_LONGITUDE,GROUP_ID,IZ_BAOJING,IP_ADDR,PORT,SEND_INFO,MAP_ICON,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,DEVICE_LONGLAT,PROTOCOL_CODE,PROTOCOL_TYPE,DEPLOY_CATE,DEPLOY_SECONDARY_TYPE,CATE_ID,SURV_CONFIG_ID + ID,DEPLOY_CODE,STATION_CODE,RUN_STATUS,POWER_STATUS,LASTSYNC_TIME,DEVICE_CODE,DEPLOY_DES,DEPLOY_PIC,DEVICE_URL,SORT_NO,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_TYPE,DEVICE_LATITUDE,DEVICE_LONGITUDE,GROUP_ID,IZ_BAOJING,IP_ADDR,PORT,SEND_INFO,MAP_ICON,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,DEVICE_LONGLAT,PROTOCOL_CODE,PROTOCOL_TYPE,DEPLOY_CATE,DEPLOY_SECONDARY_TYPE,CATE_ID,SURV_CONFIG_ID,DEVICE_CONFIG diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataAirMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataAirMapper.xml index e3d17f5..e97315c 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataAirMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataAirMapper.xml @@ -30,11 +30,12 @@ + - ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID + ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DEPLOY_TYPE diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml index 0d132b4..ee97da7 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataSoilMapper.xml @@ -63,12 +63,12 @@ - + ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID, - DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DATA_SOIL_PH, + DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DEPLOY_TYPE,DATA_SOIL_PH, DATA_SOIL_NION,DATA_SOIL_PION,DATA_SOIL_KION,DATA_SOIL_NION2,DATA_SOIL_PION2,DATA_SOIL_KION2,DATA_SOIL_NION3,DATA_SOIL_PION3,DATA_SOIL_KION3,DATA_SOIL_NION4,DATA_SOIL_PION4,DATA_SOIL_KION4, DATA_SOIL_NHION,DATA_SOIL_NOION,DATA_SOIL_CUION,DATA_SOIL_PBION,DATA_SOIL_CDION, DATA_WATER_NTU,DATA_WATER_DO,DATA_WATER_TEMP,DATA_WATER_PH,DATA_WATER_DDL @@ -92,12 +92,24 @@ and DEPLOY_CODE = #{query.deployCode} + + and DEPLOY_ID = #{query.deployId} + + + and STATION_CODE = #{query.stationCode} + and DEPLOY_CODE IN #{id} + + and DEPLOY_TYPE IN + + #{id} + + order by DATA_DATE_TIME desc diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataAirMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataAirMapper.xml index 4413c77..a76796d 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataAirMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataAirMapper.xml @@ -30,6 +30,7 @@ + @@ -45,14 +46,15 @@ + - ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID + ID,DATA_AIR_TEMP,DATA_AIR_WET,DATA_AIR_PRESS,DATA_RAIN_FALL,DATA_WIND_SPEED,DATA_WIND_DIRECTION,DATA_SUN_FALLOUT,DATA_SUN_TOTAL,DATA_RAIN_TOTAL,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DEPLOY_TYPE \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml index 9ad30b4..ad3ef08 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataSoilMapper.xml @@ -61,6 +61,7 @@ + @@ -108,11 +109,12 @@ + ID,DATA_SOIL_TEMP,DATA_SOIL_WET,DATA_SOIL_SALT,DATA_DATE_TIME,DATA_SOIL_TEMP2,DATA_SOIL_WET2,DATA_SOIL_TEMP3,DATA_SOIL_WET3,DATA_SOIL_DDL,DATA_SOIL_DDL2,DATA_SOIL_DDL3,DATA_GATHER_TYPE,STATION_ID, - DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DATA_SOIL_PH, + DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_ID,DEPLOY_TYPE,DATA_SOIL_PH, DATA_SOIL_NION,DATA_SOIL_PION,DATA_SOIL_KION,DATA_SOIL_NION2,DATA_SOIL_PION2,DATA_SOIL_KION2,DATA_SOIL_NION3,DATA_SOIL_PION3,DATA_SOIL_KION3,DATA_SOIL_NION4,DATA_SOIL_PION4,DATA_SOIL_KION4, DATA_SOIL_NHION,DATA_SOIL_NOION,DATA_SOIL_CUION,DATA_SOIL_PBION,DATA_SOIL_CDION, DATA_WATER_NTU,DATA_WATER_DO,DATA_WATER_TEMP,DATA_WATER_PH,DATA_WATER_DDL @@ -135,6 +137,12 @@ and DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d') + + and STATION_CODE = #{query.stationCode} + + + and DEPLOY_ID = #{query.deployId} + and DEPLOY_CODE = #{query.deployCode} @@ -144,6 +152,12 @@ #{id} + + and DEPLOY_TYPE IN + + #{id} + + order by DATA_DATE_TIME desc \ No newline at end of file diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvStationInfoService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvStationInfoService.java index 995935e..287fb78 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvStationInfoService.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvStationInfoService.java @@ -19,4 +19,6 @@ public interface ISurvStationInfoService extends IService { List getAllStationAndDevice(String stationCode,String deviceType,String token); SurvStationInfo getStationByCode(String stationCode); + + List getStationByCode(List stationCode); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java index 3fe98d1..f2be601 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.appmana.service.impl; import cn.hutool.core.lang.Assert; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; @@ -66,7 +67,16 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl pages(IPage page, SurvDeviceDeploy survDeviceDeploy) { - return baseMapper.pages(page,survDeviceDeploy); + + IPage pageList= baseMapper.pages(page,survDeviceDeploy); + if (!pageList.getRecords().isEmpty()) { + pageList.getRecords().forEach(item -> { + if (item.getDeviceConfig() != null) { + item.setConfigJsonStr(JSONUtil.toJsonStr(item.getDeviceConfig())); + } + }); + } + return pageList; } @Override @@ -155,6 +165,10 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl implements ISurvHisdataAirService { + @Lazy + @Autowired + private SurvDeviceDeployServiceImpl deployService; + @Lazy + @Autowired + private SurvStationInfoServiceImpl survStationInfoService; + + @Override public IPage pages(Page page, SurvHisdataAir survHisdataAir, List deviceList) { - return baseMapper.pages(page,survHisdataAir,deviceList); + List deployList = new ArrayList<>(); + if(StringUtils.isNotBlank(survHisdataAir.getDeployType())){ + String[] ss= survHisdataAir.getDeployType().split(","); + deployList = Arrays.asList(ss); + } + survHisdataAir.setDeployList(deployList); + IPage p = baseMapper.pages(page,survHisdataAir,deviceList); + fill(p.getRecords()); + return p; } @Override @@ -34,11 +55,47 @@ public class SurvHisdataAirServiceImpl extends ServiceImpl listByParams(String deployCode, LocalDateTime startDateTime, LocalDateTime endDateTime) { - return baseMapper.listByParams(deployCode,startDateTime,endDateTime); + List l = baseMapper.listByParams(deployCode,startDateTime,endDateTime); + fill(l); + return l; } @Override public List integrateSummary(String tenantId, List airDevice,String timeDataFormat, LocalDateTime startTime, LocalDateTime endTime) { return baseMapper.integrateSummary(tenantId,airDevice,timeDataFormat, startTime, endTime); } + + public void fill(List list){ + if(list!=null && !list.isEmpty()){ + List stationCode = new ArrayList<>(); + List depIds = new ArrayList<>(); + for (SurvHisdataAir survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + stationCode.add(survHisdataSoil.getStationCode()); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + depIds.add(survHisdataSoil.getDeployId()); + } + } + List deploys = deployService.listByIds(depIds); + List stations = survStationInfoService.getStationByCode(stationCode); + Map depMap = new HashMap<>(); + Map stationMap = new HashMap<>(); + + if(!deploys.isEmpty()){ + deploys.forEach(item-> depMap.put(item.getId(),item.getDeployDes())); + } + if(!stations.isEmpty()){ + stations.forEach(item-> stationMap.put(item.getStationCode(),item.getStationName())); + } + for (SurvHisdataAir survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + survHisdataSoil.setStationName(stationMap.get(survHisdataSoil.getStationCode())); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + survHisdataSoil.setDeployDes(depMap.get(survHisdataSoil.getDeployId())); + } + } + } + } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java index 560ec1d..8a5756c 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java @@ -2,17 +2,22 @@ package org.jeecg.modules.appmana.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.entity.SurvDeviceDeploy; import org.jeecg.common.entity.SurvHisdataSoil; +import org.jeecg.common.entity.SurvStationInfo; import org.jeecg.common.iot.common.VOSurvIntegrateSoilDetail; import org.jeecg.common.vo.DataTrans; import org.jeecg.modules.appmana.mapper.SurvHisdataSoilMapper; import org.jeecg.modules.appmana.service.ISurvHisdataSoilService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.time.LocalDateTime; -import java.util.List; +import java.util.*; /** * @Description: surv_hisdata_soil @@ -22,6 +27,12 @@ import java.util.List; */ @Service public class SurvHisdataSoilServiceImpl extends ServiceImpl implements ISurvHisdataSoilService { + @Lazy + @Autowired + private SurvDeviceDeployServiceImpl deployService; + @Lazy + @Autowired + private SurvStationInfoServiceImpl survStationInfoService; @Override public List getMonthSummry(List soilList) { @@ -30,12 +41,22 @@ public class SurvHisdataSoilServiceImpl extends ServiceImpl pages(IPage page, SurvHisdataSoil survHisdataSoil,List deviceList) { - return baseMapper.pages(page,survHisdataSoil,deviceList); + List deployList = new ArrayList<>(); + if(StringUtils.isNotBlank(survHisdataSoil.getDeployType())){ + String[] ss= survHisdataSoil.getDeployType().split(","); + deployList = Arrays.asList(ss); + } + survHisdataSoil.setDeployList(deployList); + IPage p = baseMapper.pages(page,survHisdataSoil,deviceList); + fill(p.getRecords()); + return p; } @Override public List listByParams(String deployCode, LocalDateTime startDateTime, LocalDateTime endDateTime) { - return baseMapper.listByParams(deployCode,startDateTime,endDateTime); + List l = baseMapper.listByParams(deployCode,startDateTime,endDateTime); + fill(l); + return l; } @Override @@ -43,4 +64,42 @@ public class SurvHisdataSoilServiceImpl extends ServiceImpl list){ + if(list!=null && !list.isEmpty()){ + List stationCode = new ArrayList<>(); + List depIds = new ArrayList<>(); + for (SurvHisdataSoil survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + stationCode.add(survHisdataSoil.getStationCode()); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + depIds.add(survHisdataSoil.getDeployId()); + } + } + Map depMap = new HashMap<>(); + Map stationMap = new HashMap<>(); + if(!depIds.isEmpty()) { + List deploys = deployService.listByIds(depIds); + if(!deploys.isEmpty()){ + deploys.forEach(item-> depMap.put(item.getId(),item.getDeployDes())); + } + } + if(!stationCode.isEmpty()){ + List stations = survStationInfoService.getStationByCode(stationCode); + if(!stations.isEmpty()){ + stations.forEach(item-> stationMap.put(item.getStationCode(),item.getStationName())); + } + } + + for (SurvHisdataSoil survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + survHisdataSoil.setStationName(stationMap.get(survHisdataSoil.getStationCode())); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + survHisdataSoil.setDeployDes(depMap.get(survHisdataSoil.getDeployId())); + } + } + } + } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvStationInfoServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvStationInfoServiceImpl.java index 5c86811..0c3787b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvStationInfoServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvStationInfoServiceImpl.java @@ -36,4 +36,11 @@ public class SurvStationInfoServiceImpl extends ServiceImpl getStationByCode(List stationCode) { + List s = lambdaQuery().in(SurvStationInfo::getStationCode,stationCode) + .list(); + return s; + } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java index 977b891..44fc7e1 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java @@ -3,16 +3,20 @@ package org.jeecg.modules.appmana.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvStationInfo; import org.jeecg.common.entity.SurvTransdataAir; import org.jeecg.common.vo.SurvTransdataAirVo; import org.jeecg.modules.appmana.mapper.SurvTransdataAirMapper; import org.jeecg.modules.appmana.service.ISurvTransdataAirService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; /** * @Description: surv_transdata_air @@ -22,6 +26,12 @@ import java.util.List; */ @Service public class SurvTransdataAirServiceImpl extends ServiceImpl implements ISurvTransdataAirService { + @Lazy + @Autowired + private SurvDeviceDeployServiceImpl deployService; + @Lazy + @Autowired + private SurvStationInfoServiceImpl survStationInfoService; @Override public SurvTransdataAirVo getNewestData(String deployCode) { @@ -30,7 +40,15 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl pages(Page page, SurvTransdataAir survTransdataAir, List deviceList) { - return baseMapper.pages(page,survTransdataAir,deviceList); + List deployList = new ArrayList<>(); + if(StringUtils.isNotBlank(survTransdataAir.getDeployType())){ + String[] ss= survTransdataAir.getDeployType().split(","); + deployList = Arrays.asList(ss); + } + survTransdataAir.setDeployList(deployList); + IPage p = baseMapper.pages(page,survTransdataAir,deviceList); + fill(p.getRecords()); + return p; } @Override @@ -40,4 +58,38 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl list){ + if(list!=null && !list.isEmpty()){ + List stationCode = new ArrayList<>(); + List depIds = new ArrayList<>(); + for (SurvTransdataAir survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + stationCode.add(survHisdataSoil.getStationCode()); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + depIds.add(survHisdataSoil.getDeployId()); + } + } + List deploys = deployService.listByIds(depIds); + List stations = survStationInfoService.getStationByCode(stationCode); + Map depMap = new HashMap<>(); + Map stationMap = new HashMap<>(); + + if(!deploys.isEmpty()){ + deploys.forEach(item-> depMap.put(item.getId(),item.getDeployDes())); + } + if(!stations.isEmpty()){ + stations.forEach(item-> stationMap.put(item.getStationCode(),item.getStationName())); + } + for (SurvTransdataAir survTransdataAir : list) { + if(StringUtils.isNotBlank(survTransdataAir.getStationCode())){ + survTransdataAir.setStationName(stationMap.get(survTransdataAir.getStationCode())); + } + if(StringUtils.isNotBlank(survTransdataAir.getDeployId())){ + survTransdataAir.setDeployDes(depMap.get(survTransdataAir.getDeployId())); + } + } + } + } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataSoilServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataSoilServiceImpl.java index 448475a..55921e1 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataSoilServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataSoilServiceImpl.java @@ -3,16 +3,20 @@ package org.jeecg.modules.appmana.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvStationInfo; import org.jeecg.common.entity.SurvTransdataSoil; -import org.jeecg.common.vo.DataTrans; import org.jeecg.common.vo.SurvTransdataSoilVo; import org.jeecg.modules.appmana.mapper.SurvTransdataSoilMapper; import org.jeecg.modules.appmana.service.ISurvTransdataSoilService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.List; +import java.util.*; /** * @Description: surv_transdata_soil @@ -23,6 +27,13 @@ import java.util.List; @Service public class SurvTransdataSoilServiceImpl extends ServiceImpl implements ISurvTransdataSoilService { + @Lazy + @Autowired + private SurvDeviceDeployServiceImpl deployService; + @Lazy + @Autowired + private SurvStationInfoServiceImpl survStationInfoService; + @Override public SurvTransdataSoilVo getNewestData(String deployCode) { return baseMapper.getNewestData(deployCode); @@ -30,7 +41,15 @@ public class SurvTransdataSoilServiceImpl extends ServiceImpl pages(Page page, SurvTransdataSoil survTransdataSoil, List deviceList) { - return baseMapper.pages(page,survTransdataSoil,deviceList); + List deployList = new ArrayList<>(); + if(StringUtils.isNotBlank(survTransdataSoil.getDeployType())){ + String[] ss= survTransdataSoil.getDeployType().split(","); + deployList = Arrays.asList(ss); + } + survTransdataSoil.setDeployList(deployList); + IPage p = baseMapper.pages(page,survTransdataSoil,deviceList); + fill(p.getRecords()); + return p; } @Override @@ -40,4 +59,43 @@ public class SurvTransdataSoilServiceImpl extends ServiceImpl list){ + if(list!=null && !list.isEmpty()){ + List stationCode = new ArrayList<>(); + List depIds = new ArrayList<>(); + for (SurvTransdataSoil survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + stationCode.add(survHisdataSoil.getStationCode()); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + depIds.add(survHisdataSoil.getDeployId()); + } + } + Map depMap = new HashMap<>(); + Map stationMap = new HashMap<>(); + if(!depIds.isEmpty()) { + List deploys = deployService.listByIds(depIds); + if(!deploys.isEmpty()){ + deploys.forEach(item-> depMap.put(item.getId(),item.getDeployDes())); + } + } + if(!stationCode.isEmpty()){ + List stations = survStationInfoService.getStationByCode(stationCode); + if(!stations.isEmpty()){ + stations.forEach(item-> stationMap.put(item.getStationCode(),item.getStationName())); + } + } + + for (SurvTransdataSoil survHisdataSoil : list) { + if(StringUtils.isNotBlank(survHisdataSoil.getStationCode())){ + survHisdataSoil.setStationName(stationMap.get(survHisdataSoil.getStationCode())); + } + if(StringUtils.isNotBlank(survHisdataSoil.getDeployId())){ + survHisdataSoil.setDeployDes(depMap.get(survHisdataSoil.getDeployId())); + } + } + } + } } 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 3e3d9f0..24b766c 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 @@ -38,6 +38,7 @@ + @@ -66,7 +67,7 @@ - ID,DEPLOY_CODE,STATION_CODE,RUN_STATUS,POWER_STATUS,LASTSYNC_TIME,DEVICE_CODE,DEPLOY_DES,DEPLOY_PIC,DEVICE_URL,SORT_NO,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_TYPE,DEVICE_LATITUDE,DEVICE_LONGITUDE,GROUP_ID,IZ_BAOJING,IP_ADDR,PORT,SEND_INFO,MAP_ICON,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,DEVICE_LONGLAT,PROTOCOL_CODE,PROTOCOL_TYPE,DEPLOY_CATE,DEPLOY_SECONDARY_TYPE,CATE_ID,SURV_CONFIG_ID + ID,DEPLOY_CODE,STATION_CODE,RUN_STATUS,POWER_STATUS,LASTSYNC_TIME,DEVICE_CODE,DEPLOY_DES,DEPLOY_PIC,DEVICE_URL,SORT_NO,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DEPLOY_TYPE,DEVICE_LATITUDE,DEVICE_LONGITUDE,GROUP_ID,IZ_BAOJING,IP_ADDR,PORT,SEND_INFO,MAP_ICON,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,DEVICE_LONGLAT,PROTOCOL_CODE,PROTOCOL_TYPE,DEPLOY_CATE,DEPLOY_SECONDARY_TYPE,CATE_ID,SURV_CONFIG_ID,DEVICE_CONFIG SELECT t1.index,IFNULL(t2.dataAirTemp,0) as dataAirTemp,IFNULL(t2.dataAirWet,0) as dataAirWet,IFNULL(t2.dataAirPress,0) as dataAirPress,IFNULL(t2.dataRainFall,0) as dataRainFall,IFNULL(t2.dataWindSpeed,0) as dataWindSpeed,IFNULL(t2.dataWindDirection,0) as dataWindDirection ,IFNULL(t2.dataSunTotal,0) as dataSunTotal,IFNULL(t2.dataSunFallout,0) as dataSunFallout,IFNULL(t2.dataRainTotal,0) as dataRainTotal @@ -41,7 +46,7 @@ - select * from surv_transdata_air where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 + select from surv_transdata_air where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1