Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
rx
Commits
6b078298
Commit
6b078298
authored
Aug 23, 2024
by
wujipeng
Browse files
根据路段或设备名查询设备
parent
97c6e594
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/rx/controller/EquipmentController.java
View file @
6b078298
package
com.ruzhoukj.rx.controller
;
import
com.ruzhoukj.rx.common.Result
;
import
com.ruzhoukj.rx.pojo.dto.EquipmentDTO
;
import
com.ruzhoukj.rx.service.EquipmentService
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
...
...
@@ -27,11 +25,15 @@ public class EquipmentController {
return
Result
.
success
(
equipmentService
.
getDeviceDataByDeviceId
(
deviceId
));
}
@ApiOperation
(
value
=
"根据设备id查询设备信息"
)
@GetMapping
(
"/info/{deviceId}"
)
public
Result
getDeviceInfoByDeviceId
(
@PathVariable
String
deviceId
)
{
return
Result
.
success
(
equipmentService
.
getDeviceInfoByDeviceId
(
deviceId
));
}
@ApiOperation
(
value
=
"根据路段或设备名查询设备"
)
@PostMapping
(
"/info/list"
)
public
Result
getDeviceInfoList
(
@RequestBody
EquipmentDTO
equipmentDTO
)
{
return
Result
.
success
(
equipmentService
.
getDeviceInfoList
(
equipmentDTO
));
}
}
src/main/java/com/ruzhoukj/rx/dao/EquipmentDao.java
View file @
6b078298
package
com.ruzhoukj.rx.dao
;
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.vo.EquipmentVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* @author wujipeng
* @version 1.0
...
...
@@ -20,4 +23,12 @@ public interface EquipmentDao extends BaseMapper<EquipmentEntity> {
* @return EquipmentVO
*/
EquipmentVO
getDeviceInfoByDeviceId
(
@Param
(
"deviceId"
)
String
deviceId
);
/**
* 根据路段或设备名查询设备
*
* @param equipmentDTO equipmentDTO
* @return List<EquipmentVO>
*/
List
<
EquipmentVO
>
getDeviceInfoList
(
EquipmentDTO
equipmentDTO
);
}
src/main/java/com/ruzhoukj/rx/service/EquipmentService.java
View file @
6b078298
package
com.ruzhoukj.rx.service
;
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.vo.DeviceVO
;
import
com.ruzhoukj.rx.pojo.vo.EquipmentVO
;
import
java.util.List
;
/**
* @author wujipeng
* @version 1.0
...
...
@@ -22,4 +25,10 @@ public interface EquipmentService extends IService<EquipmentEntity> {
* @return EquipmentVO
*/
EquipmentVO
getDeviceInfoByDeviceId
(
String
deviceId
);
/**
* @param equipmentDTO equipmentDTO
* @return List<EquipmentVO>
*/
List
<
EquipmentVO
>
getDeviceInfoList
(
EquipmentDTO
equipmentDTO
);
}
src/main/java/com/ruzhoukj/rx/service/impl/EquipmentServiceImpl.java
View file @
6b078298
...
...
@@ -3,6 +3,7 @@ package com.ruzhoukj.rx.service.impl;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.rx.dao.DeviceDao
;
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.vo.DeviceVO
;
import
com.ruzhoukj.rx.pojo.vo.EquipmentVO
;
...
...
@@ -10,6 +11,7 @@ import com.ruzhoukj.rx.service.EquipmentService;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
* @author wujipeng
...
...
@@ -31,4 +33,9 @@ public class EquipmentServiceImpl
public
EquipmentVO
getDeviceInfoByDeviceId
(
String
deviceId
)
{
return
baseMapper
.
getDeviceInfoByDeviceId
(
deviceId
);
}
@Override
public
List
<
EquipmentVO
>
getDeviceInfoList
(
EquipmentDTO
equipmentDTO
)
{
return
baseMapper
.
getDeviceInfoList
(
equipmentDTO
);
}
}
src/main/resources/mapper/com/ruzhoukj/rx/dao/EquipmentDao.xml
View file @
6b078298
...
...
@@ -21,4 +21,28 @@
where
device_id = #{deviceId};
</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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment