fix:涉密资产统计

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java

@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.system.property;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.uuid.Seq;
+import com.ruoyi.system.service.ITdPropertyNetinfoService;
 import com.ruoyi.web.controller.manager.SysAreaManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,26 +28,27 @@ import javax.annotation.Resource;
 
 /**
  * 涉密网络设备Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-05-09
  */
 @Controller
 @RequestMapping("/system/network")
-public class TdPropertyNetController extends BaseController
+public class TdPropertyNetController extends BaseController {
-{
     private String prefix = "system/network/network";
 
     @Autowired
     private ITdPropertyNetService tdPropertyNetService;
 
+    @Autowired
+    private ITdPropertyNetinfoService tdPropertyNetinfoService;
+
     @Resource
     private SysAreaManager sysAreaManager;
 
     @RequiresPermissions("system:network:view")
     @GetMapping()
-    public String network()
+    public String network() {
-    {
         return prefix + "/network";
     }
 
@@ -55,8 +58,7 @@ public class TdPropertyNetController extends BaseController
     @RequiresPermissions("system:network:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TdPropertyNet tdPropertyNet)
+    public TableDataInfo list(TdPropertyNet tdPropertyNet) {
-    {
         startPage();
         List<TdPropertyNet> list = tdPropertyNetService.selectTdPropertyNetList(tdPropertyNet);
         return getDataTable(list);
@@ -69,8 +71,7 @@ public class TdPropertyNetController extends BaseController
     @Log(title = "涉密网络设备", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(TdPropertyNet tdPropertyNet)
+    public AjaxResult export(TdPropertyNet tdPropertyNet) {
-    {
         List<TdPropertyNet> list = tdPropertyNetService.selectTdPropertyNetList(tdPropertyNet);
         list.forEach(tdPropertyNet1 -> {
             tdPropertyNet1.setFramework(sysAreaManager.getAreaName(tdPropertyNet1.getFramework()));
@@ -84,9 +85,8 @@ public class TdPropertyNetController extends BaseController
      * 新增涉密网络设备
      */
     @GetMapping("/add")
-    public String add(ModelMap mmap)
+    public String add(ModelMap mmap) {
-    {
+        mmap.put("sysuser", getSysUser());
-        mmap.put("sysuser",getSysUser());
         return prefix + "/add";
     }
 
@@ -97,9 +97,8 @@ public class TdPropertyNetController extends BaseController
     @Log(title = "涉密网络设备", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(TdPropertyNet tdPropertyNet)
+    public AjaxResult addSave(TdPropertyNet tdPropertyNet) {
-    {
+        tdPropertyNet.setNetId("Net_" + Seq.getId(Seq.commSeqType));
-        tdPropertyNet.setNetId("Net_"+ Seq.getId(Seq.commSeqType));
         return toAjax(tdPropertyNetService.insertTdPropertyNet(tdPropertyNet));
     }
 
@@ -108,8 +107,7 @@ public class TdPropertyNetController extends BaseController
      */
     @RequiresPermissions("system:network:edit")
     @GetMapping("/edit/{netId}")
-    public String edit(@PathVariable("netId") String netId, ModelMap mmap)
+    public String edit(@PathVariable("netId") String netId, ModelMap mmap) {
-    {
         TdPropertyNet tdPropertyNet = tdPropertyNetService.selectTdPropertyNetByNetId(netId);
         mmap.put("tdPropertyNet", tdPropertyNet);
         return prefix + "/edit";
@@ -122,8 +120,7 @@ public class TdPropertyNetController extends BaseController
     @Log(title = "涉密网络设备", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TdPropertyNet tdPropertyNet)
+    public AjaxResult editSave(TdPropertyNet tdPropertyNet) {
-    {
         return toAjax(tdPropertyNetService.updateTdPropertyNet(tdPropertyNet));
     }
 
@@ -132,10 +129,12 @@ public class TdPropertyNetController extends BaseController
      */
     @RequiresPermissions("system:network:remove")
     @Log(title = "涉密网络设备", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
+    @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
+    public AjaxResult remove(String ids) {
-    {
+        QueryWrapper queryWrapper= new QueryWrapper();
+        queryWrapper.in("net_id",ids.split(","));
+        tdPropertyNetinfoService.remove(queryWrapper);
         return toAjax(tdPropertyNetService.deleteTdPropertyNetByNetIds(ids));
     }
 
@@ -144,9 +143,8 @@ public class TdPropertyNetController extends BaseController
      */
     @RequiresPermissions("system:network:list")
     @GetMapping("/detail/{netId}")
-    public String detail(@PathVariable("netId") String netId, ModelMap mmap)
+    public String detail(@PathVariable("netId") String netId, ModelMap mmap) {
-    {
+        mmap.put("netId", netId);
-        mmap.put("netId",netId);
         return "system/network/netinfo/netinfo";
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyNetinfoMapper.java

@@ -1,6 +1,9 @@
 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;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.system.domain.TdPropertyNetinfo;
  * @author ruoyi
  * @date 2024-05-09
  */
-public interface TdPropertyNetinfoMapper 
+public interface TdPropertyNetinfoMapper extends BaseMapper<TdPropertyNetinfo>
 {
     /**
      * 查询涉密网络登记

ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyNetinfoService.java

@@ -1,6 +1,9 @@
 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;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.system.domain.TdPropertyNetinfo;
  * @author ruoyi
  * @date 2024-05-09
  */
-public interface ITdPropertyNetinfoService 
+public interface ITdPropertyNetinfoService extends IService<TdPropertyNetinfo>
 {
     /**
      * 查询涉密网络登记

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyNetinfoServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TdPropertyNetinfoMapper;
@@ -15,7 +17,8 @@ import com.ruoyi.common.core.text.Convert;
  * @date 2024-05-09
  */
 @Service
-public class TdPropertyNetinfoServiceImpl implements ITdPropertyNetinfoService 
+public class TdPropertyNetinfoServiceImpl extends ServiceImpl<TdPropertyNetinfoMapper, TdPropertyNetinfo> implements ITdPropertyNetinfoService
+
 {
     @Autowired
     private TdPropertyNetinfoMapper tdPropertyNetinfoMapper;