diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 02507e5..8a4e092 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -22,4 +22,10 @@ //任务结束 String STOP_TASK = "endPatrolTask"; + //任务启用状态 + String TASK_STATUS = "status"; + + //任务执行状态 + String TASK_EXECUTE = "taskStatus"; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml index b04843c..996baf5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml @@ -33,14 +33,20 @@ and bp.MONITOR_ID = #{busPlan.monitorId} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_DATE = ]]> #{busPlan.beginDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.END_DATE #{busPlan.endDate} - - and bp.LINE_NUM = #{busPlan.lineNum} + + and bp.BEGIN_TIME = ]]> #{busPlan.beginTime} + + + and bp.END_TIME #{busPlan.endTime} + + + and bp.TASK_NAME like concat('%',#{busPlan.keyword},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 1c27890..120e9e9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,10 +45,11 @@ - SELECT bo.LINE_NUM as id, - bo.LINE_NAME as lineName + bo.LINE_NAME as lineName, + bm.DEVICE_IP as ip FROM bus_obserpoi_info bo LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID @@ -65,7 +66,8 @@ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 1c27890..120e9e9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,10 +45,11 @@ - SELECT bo.LINE_NUM as id, - bo.LINE_NAME as lineName + bo.LINE_NAME as lineName, + bm.DEVICE_IP as ip FROM bus_obserpoi_info bo LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID @@ -65,7 +66,8 @@ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 1c27890..120e9e9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,10 +45,11 @@ - SELECT bo.LINE_NUM as id, - bo.LINE_NAME as lineName + bo.LINE_NAME as lineName, + bm.DEVICE_IP as ip FROM bus_obserpoi_info bo LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID @@ -65,7 +66,8 @@ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 1c27890..120e9e9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,10 +45,11 @@ - SELECT bo.LINE_NUM as id, - bo.LINE_NAME as lineName + bo.LINE_NAME as lineName, + bm.DEVICE_IP as ip FROM bus_obserpoi_info bo LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID @@ -65,7 +66,8 @@ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java index 27a859a..ed71dde 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java @@ -84,7 +84,14 @@ @TableField("TS") private Date ts; + @TableField(exist = false) + private String keyword; + @TableField(exist = false) + private String taskStatusName; + + @TableField(exist = false) + private String statusName; @Override diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java index 1189487..671ce37 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.DictEnum; @@ -52,6 +53,9 @@ @Autowired private IBusMonipoiInfoService monipoiInfoService; + @Autowired + private AbstractDictService dictService; + @Transactional @Override public boolean saveOrUpdateBusPlan(BusPlan busPlan) { @@ -127,6 +131,11 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); + List busPlanList =this.baseMapper.pageList(page,busPlan,dataScope); + for(BusPlan busPlan1:busPlanList){ + busPlan1.setTaskStatusName(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getTaskStatus())); + busPlan1.setStatus(dictService.getDictNameByCode(DictEnum.TASK_EXECUTE,busPlan1.getStatus())); + } return this.baseMapper.pageList(page,busPlan,dataScope); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java index d001cd3..7070935 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java @@ -31,16 +31,13 @@ @Autowired private IBusObserpoiInfoService busObserpoiInfoService; - /** * 获取巡航预置点信息列表 */ @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); - queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId()); + return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO)); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index 06f6092..f106b73 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BusObserpoiRequest; +import com.casic.missiles.modular.system.dto.BusObserpoiResponse; import com.casic.missiles.modular.system.model.BusObserpoiInfo; import org.apache.ibatis.annotations.Param; @@ -28,7 +29,7 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); - List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 1c27890..120e9e9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,10 +45,11 @@ - SELECT bo.LINE_NUM as id, - bo.LINE_NAME as lineName + bo.LINE_NAME as lineName, + bm.DEVICE_IP as ip FROM bus_obserpoi_info bo LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID @@ -65,7 +66,8 @@