From 9e528dfb085c53ca2da7bca638c2b89233183ae0 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Tue, 20 Aug 2024 14:38:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=89=E5=AF=86=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=94=80=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TdPropertyEmentDestoryController.java | 68 +++++++++++++++++++ .../property/ementDestory/ementDestory.html | 10 +++ .../property/ementDestory/ementList.html | 10 +++ 3 files changed, 88 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyEmentDestoryController.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyEmentDestoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyEmentDestoryController.java new file mode 100644 index 0000000..e4e9379 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyEmentDestoryController.java @@ -0,0 +1,68 @@ +package com.ruoyi.web.controller.system.property; + +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.TdPropertyEment; +import com.ruoyi.web.controller.manager.TdPropertyEmentManager; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 涉密设备销毁Controller + */ +@Controller +@RequestMapping("/system/ementDestory") +public class TdPropertyEmentDestoryController extends BaseController { + private String prefix = "system/property/ementDestory"; + + @Autowired + private TdPropertyEmentManager tdPropertyEmentManager; + + @RequiresPermissions("system:ementDestory:view") + @GetMapping() + public String ementDestory() { + return prefix + "/ementList"; + } + + /** + * 涉密设备销毁列表 + */ + @RequiresPermissions("system:ementDestory:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdPropertyEment tdPropertyEment) { + startPage(); + List tdPropertyEments = tdPropertyEmentManager.selectEmentList(tdPropertyEment); + return getDataTable(tdPropertyEments); + } + + /** + * 涉密设备维修列变更 + */ + @RequiresPermissions("system:ementDestory:destroy") + @GetMapping("/destory/{id}") + public String ementDestory(@PathVariable("id") String id, ModelMap mmap) { + TdPropertyEment tdPropertyEment = tdPropertyEmentManager.selecttdEment(id); + mmap.put("tdPropertyEment", tdPropertyEment); + return prefix + "/ementDestory"; + } + + /** + * 保存维修修改 + */ + @RequiresPermissions("system:ementDestory:destroy") + @Log(title = "涉密设备销毁", businessType = BusinessType.UPDATE) + @PostMapping("/update") + @ResponseBody + public AjaxResult update(TdPropertyEment tdPropertyEment) { + return toAjax(tdPropertyEmentManager.saveOrUpdate(tdPropertyEment)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file From c5cec4615989cf2afdafe21863e3dc7ecd16e7d8 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Tue, 20 Aug 2024 14:43:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=89=E5=AF=86=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/TdPropertyManagerController.java | 10 ++ .../system/property/ementdata/add.html | 47 ++++++- .../system/property/ementdata/detail.html | 47 ++++++- .../property/ementdata/propertyEment.html | 123 +++++++++++++++++- .../system/property/property/property.html | 16 ++- 5 files changed, 224 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java index 9c99644..ea5d589 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java @@ -154,4 +154,14 @@ public class TdPropertyManagerController extends BaseController { return "system/property/data/propertyinfo"; } + /** + * 添加密品条目 + */ + @RequiresPermissions("system:property:list") + @GetMapping("/ementDetail/{useId}") + public String ementDetail(@PathVariable("useId") String useId, ModelMap mmap) { + mmap.put("useId", useId); + return "system/property/ementdata/propertyEment"; + } + } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html index 566549b..8654ae1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html @@ -1,10 +1,47 @@ - + - - Title + + - + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html index 566549b..2446812 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html @@ -1,10 +1,47 @@ - + - - Title + + - + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html index 566549b..7f9bd2d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html @@ -1,10 +1,123 @@ - + - - Title + - + +
+
+
+
+
+
    +
  • + + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+ + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html index 0220437..46afcde 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html @@ -128,7 +128,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('密品登记 '); + var rowData = encodeURIComponent(JSON.stringify(row)); + actions.push('密品登记 '); actions.push('编辑 '); actions.push('删除'); return actions.join(''); @@ -180,9 +181,16 @@ } }) /*密品列表-详细*/ - function detail(useId) { - var url = prefix + '/detail/' + useId; - $.modal.openTab("密品列表数据", url); + function detail(element) { + var rowData = $(element).data('row'); + var row = JSON.parse(decodeURIComponent(rowData)); + if (row.secretsType == '1'){ + var url = prefix + '/detail/' + row.useId; + $.modal.openTab("涉密信息设备登记列表", url); + }else{ + var url = prefix + '/ementDetail/' + row.useId; + $.modal.openTab("涉密设备登记列表", url); + } } From 0a2e0eacaa9a5367176d49771d7b186ee22101ce Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Tue, 20 Aug 2024 15:10:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=89=E5=AF=86=E5=AF=86=E5=93=81?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E3=80=81=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TdPropertyChangeListController.java | 10 ++ .../system/property/ementChange/destory.html | 49 +++++++ .../property/ementChange/ementChange.html | 135 ++++++++++++++++++ .../property/ementChange/ementEdit.html | 79 ++++++++++ .../propertychange/list/property.html | 17 ++- 5 files changed, 285 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java index 028e671..5b11019 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java @@ -62,4 +62,14 @@ public class TdPropertyChangeListController extends BaseController { mmap.put("useId",useId); return "system/property/propertychange/changeproperty"; } + /** + * 添加密品条目 + */ + @RequiresPermissions("system:change:detail") + @GetMapping("/ementChDetail/{useId}") + public String ementChDetail(@PathVariable("useId") String useId, ModelMap mmap) + { + mmap.put("useId",useId); + return "system/property/ementChange/ementChange"; + } } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html new file mode 100644 index 0000000..a3272ac --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html @@ -0,0 +1,49 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html new file mode 100644 index 0000000..6082d8f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html @@ -0,0 +1,135 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html new file mode 100644 index 0000000..9988afe --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html @@ -0,0 +1,79 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html index 9b0d47d..f8a4706 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html @@ -113,7 +113,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('密品维修 '); + var rowData = encodeURIComponent(JSON.stringify(row)); + actions.push('密品维修 '); return actions.join(''); } }] @@ -162,10 +163,16 @@ } } }) - /*密品列表-详细*/ - function detail(useId) { - var url = prefix + '/detail/' + useId; - $.modal.openTab("密品列表数据", url); + function detail(element) { + var rowData = $(element).data('row'); + var row = JSON.parse(decodeURIComponent(rowData)); + if (row.secretsType == '1'){ + var url = prefix + '/detail/' + row.useId; + $.modal.openTab("涉密信息设备登记列表", url); + }else{ + var url = prefix + '/ementChDetail/' + row.useId; + $.modal.openTab("涉密设备登记列表", url); + } }