Skip to content

A
amos-boot-biz
Commit 8ae87a00 authored by chenzhao's avatar chenzhao
Browse files
Options

bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序

parent 5d1ba33a
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 122 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ 8ae87a00
...@@ -126,16 +126,16 @@ ...@@ -126,16 +126,16 @@
<if test="alertSourceCode!= null "> <if test="alertSourceCode!= null ">
and alert_source_code = #{alertSourceCode} and alert_source_code = #{alertSourceCode}
</if> </if>
<if test="data != null and lift == 'ascend'">
order by #{data} ASC limit #{current},#{size}
</if>
<if test="data != null and lift == 'descend'">
order by #{data} DESC limit #{current},#{size}
</if>
<if test="data == null ">
order by call_time DESC limit #{current},#{size}
</if>
</where> </where>
<if test="data != null and lift == 'ascend'">
order by #{data} ASC limit #{current},#{size}
</if>
<if test="data != null and lift == 'descend'">
order by #{data} DESC limit #{current},#{size}
</if>
<if test="data == null ">
order by call_time DESC limit #{current},#{size}
</if>
</select> </select>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ 8ae87a00
...@@ -132,16 +132,21 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -132,16 +132,21 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
/** /**
* 接警记录 列表分页查询 * 接警记录 列表分页查询
**/ /* bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序 陈召 2021-09-03 开始*/ **/ /* bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序 陈召 2021-09-03 开始*/
public IPage<AlertCalled> queryForCalledList(Page pageBean,Integer alertStatus, public IPage<AlertCalled> queryForCalledList(Page pageBean, Integer alertStatus,
String alertTypeCode , String alertTypeCode,
String alertSourceCode, String alertSourceCode,
String startTime, String startTime,
String endTime, String endTime,
String sort) { String sort) {
String[] split = sort.split(","); String data = null;
String data = RedisKey.humpToLine(split[0]); String lift = null;
String lift =split[1]; if (StringUtils.isNotEmpty(sort)) {
List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift); String[] split = sort.split(",");
data = RedisKey.humpToLine(split[0]);
lift = split[1];
}
List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime, data, lift);
IPage<AlertCalled> iPage = new Page<>(); IPage<AlertCalled> iPage = new Page<>();
iPage.setRecords(list); iPage.setRecords(list);
iPage.setTotal(list.size()); iPage.setTotal(list.size());
...@@ -150,8 +155,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -150,8 +155,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
} }
/** /**
* 根据灾情id 查询灾情详情 * 根据灾情id 查询灾情详情
**/ **/
...@@ -416,11 +419,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -416,11 +419,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone())); listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone())); listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
list.stream().forEach(AlertFormValue -> { list.stream().forEach(AlertFormValue -> {
String valueCode = AlertFormValue.getFieldValueCode(); String valueCode = AlertFormValue.getFieldValueCode();
if(null == valueCode) { if (null == valueCode) {
valueCode = AlertFormValue.getFieldValue(); valueCode = AlertFormValue.getFieldValue();
} }
listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(),valueCode)); listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(), valueCode));
}); });
map.put("data", listdate); map.put("data", listdate);
return map; return map;
...@@ -476,108 +479,94 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -476,108 +479,94 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
} }
@Transactional(rollbackFor = RuntimeException.class) @Transactional(rollbackFor = RuntimeException.class)
public Boolean controlEquip() throws Exception public Boolean controlEquip() throws Exception {
{ /**
/** * 获取控制器设备
* 获取控制器设备 */
*/ List<ControllerEquipDto> controllerEquipDtoList = controllerEquipService.queryAllForList();
List<ControllerEquipDto> controllerEquipDtoList = controllerEquipService.queryAllForList(); Map<Long, List<String>> controllerEquipMap = new HashMap<>();
Map<Long, List<String>> controllerEquipMap = new HashMap<>(); for (ControllerEquipDto controllerEquipDto : controllerEquipDtoList) {
for (ControllerEquipDto controllerEquipDto : controllerEquipDtoList) List<String> numList = controllerEquipMap.get(controllerEquipDto.getControllerSeq());
{ if (ValidationUtil.isEmpty(numList)) {
List<String> numList = controllerEquipMap.get(controllerEquipDto.getControllerSeq()); numList = new ArrayList<>();
if (ValidationUtil.isEmpty(numList)) }
{ numList.add(controllerEquipDto.getNum());
numList = new ArrayList<>(); controllerEquipMap.put(controllerEquipDto.getControllerSeq(), numList);
} }
numList.add(controllerEquipDto.getNum()); /**
controllerEquipMap.put(controllerEquipDto.getControllerSeq(), numList); * 获取联动控制器
} */
/** List<ControllerDto> controllerDtoList = controllerService.queryAllForList();
* 获取联动控制器 StringBuilder bellNumSb = new StringBuilder();
*/ StringBuilder broadcastNumSb = new StringBuilder();
List<ControllerDto> controllerDtoList = controllerService.queryAllForList(); for (ControllerDto controllerDto : controllerDtoList) {
StringBuilder bellNumSb =new StringBuilder(); //消防警铃
StringBuilder broadcastNumSb =new StringBuilder(); if (controllerDto.getType().equals(ControllerTypeEnum.BELL.getCode())) {
for (ControllerDto controllerDto : controllerDtoList) List<String> bellNumList = controllerEquipMap.get(controllerDto.getSequenceNbr());
{ if (!ValidationUtil.isEmpty(bellNumList)) {
//消防警铃 for (String num : bellNumList) {
if (controllerDto.getType().equals(ControllerTypeEnum.BELL.getCode())) bellNumSb.append(num).append(",");
{ }
List<String> bellNumList = controllerEquipMap.get(controllerDto.getSequenceNbr()); }
if (!ValidationUtil.isEmpty(bellNumList)) }
{ //广播
for (String num : bellNumList) if (controllerDto.getType().equals(ControllerTypeEnum.BROADCAST.getCode())) {
{ List<String> broadcastList = controllerEquipMap.get(controllerDto.getSequenceNbr());
bellNumSb.append(num).append(","); if (!ValidationUtil.isEmpty(broadcastList)) {
} for (String num : broadcastList) {
} broadcastNumSb.append(num).append(",");
} }
//广播 }
if (controllerDto.getType().equals(ControllerTypeEnum.BROADCAST.getCode())) }
{ }
List<String> broadcastList = controllerEquipMap.get(controllerDto.getSequenceNbr()); /**
if (!ValidationUtil.isEmpty(broadcastList)) * 打开消防警铃
{ */
for (String num : broadcastList) if (!ValidationUtil.isEmpty(bellNumSb.toString())) {
{ String bellNum = bellNumSb.toString();
broadcastNumSb.append(num).append(","); bellNum = bellNum.substring(0, bellNum.length() - 1);
} jcsControlServerClient.sendBellAction(bellNum, "1");
} }
} /**
} * 播放广播
/** */
* 打开消防警铃 if (!ValidationUtil.isEmpty(broadcastNumSb.toString())) {
*/ String broadcastNum = broadcastNumSb.toString();
if (!ValidationUtil.isEmpty(bellNumSb.toString())) broadcastNum = broadcastNum.substring(0, broadcastNum.length() - 1);
{ jcsControlServerClient.sendFileAction(broadcastNum, "1490075199246.mp3");
String bellNum = bellNumSb.toString(); }
bellNum = bellNum.substring(0, bellNum.length() -1); /**
jcsControlServerClient.sendBellAction(bellNum, "1"); * 打开北站车库门
} */
/** List<ControllerDto> northDoor = controllerService.queryForList("3", ControllerTypeEnum.DOOR.getCode());
* 播放广播 if (!ValidationUtil.isEmpty(northDoor)) {
*/ ControllerDto controllerDto = northDoor.get(0);
if (!ValidationUtil.isEmpty(broadcastNumSb.toString())) //打开北站车库门
{ jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1,1,1,1");
String broadcastNum = broadcastNumSb.toString(); //打开北站车库门弱电警铃
broadcastNum = broadcastNum.substring(0, broadcastNum.length() -1); jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
jcsControlServerClient.sendFileAction(broadcastNum, "1490075199246.mp3"); }
} /**
/** * 打开南站车库门
* 打开北站车库门 */
*/ List<ControllerDto> southDoor = controllerService.queryForList("2", ControllerTypeEnum.DOOR.getCode());
List<ControllerDto> northDoor = controllerService.queryForList("3", ControllerTypeEnum.DOOR.getCode()); if (!ValidationUtil.isEmpty(southDoor)) {
if (!ValidationUtil.isEmpty(northDoor)) ControllerDto controllerDto = southDoor.get(0);
{ //打开南站车库门
ControllerDto controllerDto = northDoor.get(0); jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1");
//打开北站车库门 //打开南站车库门弱电警铃
jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1,1,1,1"); jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
//打开北站车库门弱电警铃 }
jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
} return true;
/**
* 打开南站车库门
*/
List<ControllerDto> southDoor = controllerService.queryForList("2", ControllerTypeEnum.DOOR.getCode());
if (!ValidationUtil.isEmpty(southDoor))
{
ControllerDto controllerDto = southDoor.get(0);
//打开南站车库门
jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1");
//打开南站车库门弱电警铃
jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
}
return true;
} }
/** /**
* 警情重新定位 * 警情重新定位
* *
* @param alertId 警情id * @param alertId 警情id
* @param longitude 经度 * @param longitude 经度
* @param latitude 纬度 * @param latitude 纬度
* @return * @return
*/ */
public Boolean reLocate(String alertId, String longitude, String latitude) { public Boolean reLocate(String alertId, String longitude, String latitude) {
......
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