From 4b8a75694db82a45ac7785b1a88b7b501c5a3361 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Thu, 8 Aug 2024 15:50:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B6=89=E5=AF=86=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/SysNetworknumController.java | 38 +++++++++++++++++++ .../templates/system/network/netinfo/add.html | 2 +- .../system/domain/TdPropertyNetinfo.java | 20 +++++----- .../mapper/TdPropertyNetinfoMapper.java | 3 +- .../service/ITdPropertyNetinfoService.java | 1 - .../mapper/system/TdPropertyNetinfoMapper.xml | 12 +++--- 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java index b7cb811..8fab6ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java @@ -1,12 +1,16 @@ package com.ruoyi.web.controller.system.count; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.TdPropertyInfo; import com.ruoyi.system.domain.TdPropertyNet; import com.ruoyi.system.domain.TdPropertyNetinfo; +import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ITdPropertyNetService; import com.ruoyi.system.service.ITdPropertyNetinfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -15,7 +19,10 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; @Controller @RequestMapping("/system/networknum") @@ -63,4 +70,35 @@ public class SysNetworknumController extends BaseController { return prefix + "/print"; } + /** + * + * 网络设备种类统计 + * @param null + * @return + */ + + @Autowired + private ISysDictDataService dictDataService; + @PostMapping("/countNetInfo") + @ResponseBody + public AjaxResult countNetInfo() { + SysDictData sysDictData = new SysDictData(); + sysDictData.setDictType("sys_net_type"); + List smType = dictDataService.selectDictDataList(sysDictData); + List list = smType.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); + List yAxisData = new ArrayList<>(); + smType.forEach(xAxis -> { + AtomicReference yAxis = new AtomicReference<>(0L); + Integer count = tdPropertyNetinfoService.lambdaQuery() + .eq(TdPropertyNetinfo::getNetName, xAxis.getDictValue()) + .count(); + yAxis.set(Long.valueOf(count)); + yAxisData.add(yAxis.get()); + }); + JSONObject obj = new JSONObject(); + obj.put("xAxisData", list.toArray()); + obj.put("yAxisData", yAxisData); + return AjaxResult.success(obj); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html index 6860636..2c54a10 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html @@ -51,7 +51,7 @@
- +
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java index 265bcfc..ae039cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java @@ -44,7 +44,7 @@ public class TdPropertyNetinfo extends BaseEntity /** 登记人员 */ @Excel(name = "登记人员") - private String netname; + private String registName; /** 责任人 */ @Excel(name = "责任人") @@ -129,15 +129,7 @@ public class TdPropertyNetinfo extends BaseEntity { return netSn; } - public void setNetname(String netname) - { - this.netname = netname; - } - public String getNetname() - { - return netname; - } public void setNetManager(String netManager) { this.netManager = netManager; @@ -184,6 +176,14 @@ public class TdPropertyNetinfo extends BaseEntity return depart; } + public String getRegistName() { + return registName; + } + + public void setRegistName(String registName) { + this.registName = registName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -195,7 +195,7 @@ public class TdPropertyNetinfo extends BaseEntity .append("netName", getNetName()) .append("netSn", getNetSn()) .append("remark", getRemark()) - .append("netname", getNetname()) + .append("registName", getRegistName()) .append("netManager", getNetManager()) .append("netMiji", getNetMiji()) .append("netsmname", getNetsmname()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyNetinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyNetinfoMapper.java index e8ca876..4ee8d00 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyNetinfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyNetinfoMapper.java @@ -3,8 +3,8 @@ package com.ruoyi.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.system.domain.TdPropertyInfo; import com.ruoyi.system.domain.TdPropertyNetinfo; +import org.apache.ibatis.annotations.Mapper; /** * 涉密网络登记Mapper接口 @@ -12,6 +12,7 @@ import com.ruoyi.system.domain.TdPropertyNetinfo; * @author ruoyi * @date 2024-05-09 */ +@Mapper public interface TdPropertyNetinfoMapper extends BaseMapper { /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyNetinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyNetinfoService.java index f33cd51..9462f58 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyNetinfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyNetinfoService.java @@ -3,7 +3,6 @@ package com.ruoyi.system.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.system.domain.TdPropertyInfo; import com.ruoyi.system.domain.TdPropertyNetinfo; /** diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml index 7c84ce7..4d1b542 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, net_id, net_brand, net_ip, net_no, net_name, net_sn, remark, netname, net_manager, net_miji, netsmname, is_curcial, depart from td_property_netinfo + select id, net_id, net_brand, net_ip, net_no, net_name, net_sn, remark, regist_name, net_manager, net_miji, netsmname, is_curcial, depart from td_property_netinfo