From f4245d8fd73deb43885c4bb2b2c409cc3b94a1f7 Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Thu, 17 Aug 2023 18:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=93=E5=BA=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/api/entity/WareHouse.java | 4 ++ .../monitor/biz/device/YDeviceService.java | 4 +- .../biz/wareHouse/YWareHouseMapper.java | 2 + .../monitor/biz/wareHouse/YWareHouseRest.java | 35 ++++++++++++++++++ .../biz/wareHouse/YWareHouseService.java | 37 +++++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseRest.java diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java index 0fd80c9..cea63c7 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java @@ -87,4 +87,8 @@ public class WareHouse { @ApiModelProperty("是否隐藏") private boolean showStatus; + @ApiModelProperty("仓库统计") + @TableField(exist = false) + private String wareHouseCount; + } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index e333c44..60afd7c 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java @@ -95,7 +95,9 @@ public class YDeviceService extends ServiceImpl { queryWrapper.eq("type", deviceType); } queryWrapper.eq("isDelete", 0); - queryWrapper.eq("ckId", ckId); + if(ckId != null){ + queryWrapper.eq("ckId", ckId); + } queryWrapper.isNotNull("status"); queryWrapper.notIn("type", "4,5".split(",")); queryWrapper.select("status", "count(status) as total"); diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java index 3f32e4e..aa14359 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java @@ -7,8 +7,10 @@ import com.yxt.supervise.monitor.api.entity.WareHouse; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; @Mapper public interface YWareHouseMapper extends BaseMapper { + } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseRest.java new file mode 100644 index 0000000..54338d3 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseRest.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.monitor.biz.wareHouse; + +import com.alibaba.fastjson.JSONObject; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.api.vo.PageVo; +import com.yxt.supervise.monitor.biz.device.YDeviceService; +import com.yxt.supervise.monitor.biz.scheduled.SyncService; +import com.yxt.supervise.monitor.biz.util.HttpUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; + +@Api(tags = "设备控制器") +@RestController("com.yxt.supervise.monitor.biz.device.YWareHouseRest") +@RequestMapping("/wareHouse") +public class YWareHouseRest { + + @Autowired + private YWareHouseService yWareHouseService; + + + @ApiOperation("获取仓库数量") + @GetMapping("/getWareHouseCount") + public ResultBean getWareHouseCount() { + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yWareHouseService.getWareHouseCount()); + return rb; + } + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java index 25ebce8..71652a1 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java @@ -25,4 +25,41 @@ import java.util.Map; @Service public class YWareHouseService extends ServiceImpl { + + public Map getWareHouseCount() { + Map map = new HashMap<>(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("provinceName", "count(sid) as wareHouseCount"); + wrapper.groupBy("provinceName"); + List wareHouses = this.list(wrapper); + for (WareHouse wareHouse : wareHouses) { + if (wareHouse.getWareHouseCount() == null) { + wareHouse.setWareHouseCount("0"); + } + switch (wareHouse.getProvinceName()) { + case "河北省": + map.put("hebeis", wareHouse.getWareHouseCount()); + break; + case "江西省": + map.put("jiangxis", wareHouse.getWareHouseCount()); + break; + case "辽宁省": + map.put("liaonings", wareHouse.getWareHouseCount()); + break; + case "福建省": + map.put("fujians", wareHouse.getWareHouseCount()); + break; + case "山东省": + map.put("shandongs", wareHouse.getWareHouseCount()); + break; + case "河南省": + map.put("henans", wareHouse.getWareHouseCount()); + break; + case "北京市": + map.put("beijings", wareHouse.getWareHouseCount()); + break; + } + } + return map; + } }