diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 53ce7b4..4c9ee46 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 53ce7b4..4c9ee46 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..23b45d3 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/device/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 53ce7b4..4c9ee46 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..23b45d3 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/device/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java new file mode 100644 index 0000000..974e3f6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1='1' " + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID ") + List> deviceList(@Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + + "FROM data_tube " + + "WHERE datediff(now(),UPTIME) <3" + + "AND datediff(now(),UPTIME) >0 " + + "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1=#{wellGroupId}" + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID") + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM data_tube " + + "WHERE id=#{id} ") + Map deviceDetail(@Param("id") String id); + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 53ce7b4..4c9ee46 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..23b45d3 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/device/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java new file mode 100644 index 0000000..974e3f6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1='1' " + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID ") + List> deviceList(@Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + + "FROM data_tube " + + "WHERE datediff(now(),UPTIME) <3" + + "AND datediff(now(),UPTIME) >0 " + + "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1=#{wellGroupId}" + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID") + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM data_tube " + + "WHERE id=#{id} ") + Map deviceDetail(@Param("id") String id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java new file mode 100644 index 0000000..92b3d95 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.core.datascope.DataScope; + +public interface DeviceTubeService { + + /** + * 获取点位信息 + * + * @return + */ + Object deviceList(DataScope dataScope); + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + Object deviceGroupList(String wellGroupId, DataScope dataScope); + + /** + * 获取详情信息 + */ + Object deviceDetail(String id); + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 53ce7b4..4c9ee46 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..23b45d3 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/device/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java new file mode 100644 index 0000000..974e3f6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1='1' " + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID ") + List> deviceList(@Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM bus_well_info bwi, " + + "bus_device_well bdw, " + + "bus_device bd " + + "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + + "FROM data_tube " + + "WHERE datediff(now(),UPTIME) <3" + + "AND datediff(now(),UPTIME) >0 " + + "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + + "WHERE bd.DEVICE_TYPE='16' " + + "AND bwi.WELL_FLAG_1=#{wellGroupId}" + + "AND bdw.WELL_ID=bwi.ID " + + "AND bd.ID=bdw.DEVICE_ID") + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + @Select("SELECT * " + + "FROM data_tube " + + "WHERE id=#{id} ") + Map deviceDetail(@Param("id") String id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java new file mode 100644 index 0000000..92b3d95 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.core.datascope.DataScope; + +public interface DeviceTubeService { + + /** + * 获取点位信息 + * + * @return + */ + Object deviceList(DataScope dataScope); + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + Object deviceGroupList(String wellGroupId, DataScope dataScope); + + /** + * 获取详情信息 + */ + Object deviceDetail(String id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java new file mode 100644 index 0000000..7b0309d --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -0,0 +1,86 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.DeviceTubeMapper; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class DeviceTubeServiceImpl implements DeviceTubeService { + + private final DeviceTubeMapper deviceTubeMapper; + + public DeviceTubeServiceImpl(DeviceTubeMapper deviceTubeMapper) { + this.deviceTubeMapper = deviceTubeMapper; + } + + /** + * 获取点位信息 + * + * @return + */ + public Object deviceList(DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeWellList = deviceTubeMapper.deviceList(dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeWellList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:获取点位信息列表出现异常,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + public Object deviceGroupList(String wellGroupId, DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.deviceGroupList(wellGroupId, dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取详情信息 + */ + public Object deviceDetail(String id) { + ResponseData responseData = new ResponseData(); + try { + Map tubeDeviceData = deviceTubeMapper.deviceDetail(id); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceData); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + +}