diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java index 54926fc..86e1fca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 设备mapper @@ -21,6 +22,8 @@ List getDeviceInfoList(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + List> getDeviceStatusGroup(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + DeviceInfo getDeviceInfo(@Param("devCode") String devCode); DeviceInfo getByIndexCode(@Param("srcIndex") String srcIndex); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java index 54926fc..86e1fca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 设备mapper @@ -21,6 +22,8 @@ List getDeviceInfoList(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + List> getDeviceStatusGroup(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + DeviceInfo getDeviceInfo(@Param("devCode") String devCode); DeviceInfo getByIndexCode(@Param("srcIndex") String srcIndex); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml index b6cf2e5..11aa503 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml @@ -70,6 +70,22 @@ ORDER by create_time DESC + + SELECT * FROM bus_device_info WHERE ip = #{ip} - \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java index 54926fc..86e1fca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 设备mapper @@ -21,6 +22,8 @@ List getDeviceInfoList(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + List> getDeviceStatusGroup(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + DeviceInfo getDeviceInfo(@Param("devCode") String devCode); DeviceInfo getByIndexCode(@Param("srcIndex") String srcIndex); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml index b6cf2e5..11aa503 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml @@ -70,6 +70,22 @@ ORDER by create_time DESC + + SELECT * FROM bus_device_info WHERE ip = #{ip} - \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java new file mode 100644 index 0000000..a8f9b9f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/6/6 13:40 + */ +@Data +public class DeviceStatusDTO { + private Long online; + private Long offline; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java index 54926fc..86e1fca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 设备mapper @@ -21,6 +22,8 @@ List getDeviceInfoList(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + List> getDeviceStatusGroup(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + DeviceInfo getDeviceInfo(@Param("devCode") String devCode); DeviceInfo getByIndexCode(@Param("srcIndex") String srcIndex); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml index b6cf2e5..11aa503 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml @@ -70,6 +70,22 @@ ORDER by create_time DESC + + SELECT * FROM bus_device_info WHERE ip = #{ip} - \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java new file mode 100644 index 0000000..a8f9b9f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/6/6 13:40 + */ +@Data +public class DeviceStatusDTO { + private Long online; + private Long offline; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java index 4e9ec09..9eba60e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.dto.DeviceInfoRequest; +import com.casic.missiles.modular.dto.DeviceStatusDTO; import com.casic.missiles.modular.dto.GateGroupDTO; import com.casic.missiles.modular.dto.GateGroupRequest; import com.casic.missiles.modular.model.DeviceInfo; @@ -22,6 +23,8 @@ List deviceInfoList(DeviceInfoRequest deviceInfoRequest); + DeviceStatusDTO deviceStatusGroup(DeviceInfoRequest deviceInfoRequest); + Object addDeviceInfo(DeviceInfo deviceInfo); Object updateDeviceInfo(DeviceInfo deviceInfo); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java index b50d3d4..c839ae5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java @@ -15,11 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; /** * @Description: 设备管理Controller @@ -56,6 +54,16 @@ } /** + * 在线离线统计 + */ + @GetMapping("/offlineCount") + @ResponseBody + public Object deviceStatus(@RequestBody DeviceInfoRequest deviceInfoRequest) { + DeviceStatusDTO response = deviceInfoService.deviceStatusGroup(deviceInfoRequest); + return ResponseData.success(response); + } + + /** * 根据图纸编号查设备信息 */ @GetMapping("/drawNo") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java index 54926fc..86e1fca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/DeviceInfoMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 设备mapper @@ -21,6 +22,8 @@ List getDeviceInfoList(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + List> getDeviceStatusGroup(@Param("deviceInfoRequest") DeviceInfoRequest deviceInfoRequest); + DeviceInfo getDeviceInfo(@Param("devCode") String devCode); DeviceInfo getByIndexCode(@Param("srcIndex") String srcIndex); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml index b6cf2e5..11aa503 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/DeviceInfoMapper.xml @@ -70,6 +70,22 @@ ORDER by create_time DESC + + SELECT * FROM bus_device_info WHERE ip = #{ip} - \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java new file mode 100644 index 0000000..a8f9b9f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/dto/DeviceStatusDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/6/6 13:40 + */ +@Data +public class DeviceStatusDTO { + private Long online; + private Long offline; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java index 4e9ec09..9eba60e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/DeviceInfoService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.dto.DeviceInfoRequest; +import com.casic.missiles.modular.dto.DeviceStatusDTO; import com.casic.missiles.modular.dto.GateGroupDTO; import com.casic.missiles.modular.dto.GateGroupRequest; import com.casic.missiles.modular.model.DeviceInfo; @@ -22,6 +23,8 @@ List deviceInfoList(DeviceInfoRequest deviceInfoRequest); + DeviceStatusDTO deviceStatusGroup(DeviceInfoRequest deviceInfoRequest); + Object addDeviceInfo(DeviceInfo deviceInfo); Object updateDeviceInfo(DeviceInfo deviceInfo); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/DeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/DeviceInfoServiceImpl.java index 281114c..73e9b34 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/DeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/DeviceInfoServiceImpl.java @@ -96,6 +96,22 @@ } @Override + public DeviceStatusDTO deviceStatusGroup(DeviceInfoRequest deviceInfoRequest) { + List> list = deviceInfoMapper. getDeviceStatusGroup(deviceInfoRequest); + DeviceStatusDTO response = new DeviceStatusDTO(); + response.setOnline(0l); + response.setOffline(0l); + list.forEach(o -> { + if("1".equals(o.get("status"))){ + response.setOnline(o.get("amount")); + } else if("2".equals(o.get("status"))){ + response.setOffline(o.get("amount")); + } + }); + return response; + } + + @Override @Transactional(rollbackFor = Exception.class) public Object addDeviceInfo(DeviceInfo deviceInfo) { DeviceInfo device = deviceInfoMapper.getDeviceInfo(deviceInfo.getDevCode());