Commit 6b078298 authored by wujipeng's avatar wujipeng
Browse files

根据路段或设备名查询设备

parent 97c6e594
package com.ruzhoukj.rx.controller; package com.ruzhoukj.rx.controller;
import com.ruzhoukj.rx.common.Result; import com.ruzhoukj.rx.common.Result;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO;
import com.ruzhoukj.rx.service.EquipmentService; import com.ruzhoukj.rx.service.EquipmentService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -27,11 +25,15 @@ public class EquipmentController { ...@@ -27,11 +25,15 @@ public class EquipmentController {
return Result.success(equipmentService.getDeviceDataByDeviceId(deviceId)); return Result.success(equipmentService.getDeviceDataByDeviceId(deviceId));
} }
@ApiOperation(value = "根据设备id查询设备信息") @ApiOperation(value = "根据设备id查询设备信息")
@GetMapping("/info/{deviceId}") @GetMapping("/info/{deviceId}")
public Result getDeviceInfoByDeviceId(@PathVariable String deviceId) { public Result getDeviceInfoByDeviceId(@PathVariable String deviceId) {
return Result.success(equipmentService.getDeviceInfoByDeviceId(deviceId)); return Result.success(equipmentService.getDeviceInfoByDeviceId(deviceId));
} }
@ApiOperation(value = "根据路段或设备名查询设备")
@PostMapping("/info/list")
public Result getDeviceInfoList(@RequestBody EquipmentDTO equipmentDTO) {
return Result.success(equipmentService.getDeviceInfoList(equipmentDTO));
}
} }
package com.ruzhoukj.rx.dao; package com.ruzhoukj.rx.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity; import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import com.ruzhoukj.rx.pojo.vo.EquipmentVO; import com.ruzhoukj.rx.pojo.vo.EquipmentVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
...@@ -20,4 +23,12 @@ public interface EquipmentDao extends BaseMapper<EquipmentEntity> { ...@@ -20,4 +23,12 @@ public interface EquipmentDao extends BaseMapper<EquipmentEntity> {
* @return EquipmentVO * @return EquipmentVO
*/ */
EquipmentVO getDeviceInfoByDeviceId(@Param("deviceId") String deviceId); EquipmentVO getDeviceInfoByDeviceId(@Param("deviceId") String deviceId);
/**
* 根据路段或设备名查询设备
*
* @param equipmentDTO equipmentDTO
* @return List<EquipmentVO>
*/
List<EquipmentVO> getDeviceInfoList(EquipmentDTO equipmentDTO);
} }
package com.ruzhoukj.rx.service; package com.ruzhoukj.rx.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity; import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import com.ruzhoukj.rx.pojo.vo.DeviceVO; import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import com.ruzhoukj.rx.pojo.vo.EquipmentVO; import com.ruzhoukj.rx.pojo.vo.EquipmentVO;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
...@@ -22,4 +25,10 @@ public interface EquipmentService extends IService<EquipmentEntity> { ...@@ -22,4 +25,10 @@ public interface EquipmentService extends IService<EquipmentEntity> {
* @return EquipmentVO * @return EquipmentVO
*/ */
EquipmentVO getDeviceInfoByDeviceId(String deviceId); EquipmentVO getDeviceInfoByDeviceId(String deviceId);
/**
* @param equipmentDTO equipmentDTO
* @return List<EquipmentVO>
*/
List<EquipmentVO> getDeviceInfoList(EquipmentDTO equipmentDTO);
} }
...@@ -3,6 +3,7 @@ package com.ruzhoukj.rx.service.impl; ...@@ -3,6 +3,7 @@ package com.ruzhoukj.rx.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.dao.DeviceDao; import com.ruzhoukj.rx.dao.DeviceDao;
import com.ruzhoukj.rx.dao.EquipmentDao; import com.ruzhoukj.rx.dao.EquipmentDao;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity; import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import com.ruzhoukj.rx.pojo.vo.DeviceVO; import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import com.ruzhoukj.rx.pojo.vo.EquipmentVO; import com.ruzhoukj.rx.pojo.vo.EquipmentVO;
...@@ -10,6 +11,7 @@ import com.ruzhoukj.rx.service.EquipmentService; ...@@ -10,6 +11,7 @@ import com.ruzhoukj.rx.service.EquipmentService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
...@@ -31,4 +33,9 @@ public class EquipmentServiceImpl ...@@ -31,4 +33,9 @@ public class EquipmentServiceImpl
public EquipmentVO getDeviceInfoByDeviceId(String deviceId) { public EquipmentVO getDeviceInfoByDeviceId(String deviceId) {
return baseMapper.getDeviceInfoByDeviceId(deviceId); return baseMapper.getDeviceInfoByDeviceId(deviceId);
} }
@Override
public List<EquipmentVO> getDeviceInfoList(EquipmentDTO equipmentDTO) {
return baseMapper.getDeviceInfoList(equipmentDTO);
}
} }
...@@ -21,4 +21,28 @@ ...@@ -21,4 +21,28 @@
where where
device_id = #{deviceId}; device_id = #{deviceId};
</select> </select>
<select id="getDeviceInfoList" resultType="com.ruzhoukj.rx.pojo.vo.EquipmentVO">
select
id,
section as section,
sewage_plant_name as sewagePlantName,
sewage_plant_id as sewagePlantId,
device_name as deviceName,
device_id as deviceId,
serial_number as serialNumber,
longitude,
latitude,
type,
threshold_value as thresholdValue
from
equipment
<where>
<if test="section != null and section != ''">
section like concat('%', #{section}, '%')
</if>
<if test="deviceName != null and deviceName != ''">
and device_name like concat('%', #{deviceName}, '%')
</if>
</where>
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment