diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java index 32556a7..a816f73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.system.check; import java.util.List; + +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 检查报告管理Controller * @@ -34,6 +38,9 @@ public class TdCheckController extends BaseController @Autowired private ITdCheckService tdCheckService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:check:view") @GetMapping() public String check() @@ -64,6 +71,10 @@ public class TdCheckController extends BaseController public AjaxResult export(TdCheck tdCheck) { List list = tdCheckService.selectTdCheckList(tdCheck); + list.forEach(tdCheck1 -> { + tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework())); + tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea())); + }); ExcelUtil util = new ExcelUtil(TdCheck.class); return util.exportExcel(list, "检查报告管理数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java index 58e5fab..2050ea6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java @@ -8,12 +8,14 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.TdCheck; import com.ruoyi.system.service.ITdCheckService; +import com.ruoyi.web.controller.manager.SysAreaManager; 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 javax.annotation.Resource; import java.util.List; import java.util.Objects; @@ -24,6 +26,9 @@ public class TdCheckResultController extends BaseController { @Autowired private ITdCheckService tdCheckService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:checkresult:view") @GetMapping() public String checkresult() @@ -54,6 +59,10 @@ public class TdCheckResultController extends BaseController { public AjaxResult export(TdCheck tdCheck) { List list = tdCheckService.selectTdCheckList(tdCheck); + list.forEach(tdCheck1 -> { + tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework())); + tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea())); + }); ExcelUtil util = new ExcelUtil(TdCheck.class); return util.exportExcel(list, "检查结果管理数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java index 0a15924..c5ee92a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.system.check; import java.util.List; + +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 检查通知Controller * @@ -34,6 +38,9 @@ public class TdNotifyController extends BaseController @Autowired private ITdNotifyService tdNotifyService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:notify:view") @GetMapping() public String notice() @@ -64,6 +71,10 @@ public class TdNotifyController extends BaseController public AjaxResult export(TdNotify tdNotify) { List list = tdNotifyService.selectTdNotifyList(tdNotify); + list.forEach(tdNotify1 -> { + tdNotify1.setFramework(sysAreaManager.getAreaName(tdNotify1.getFramework())); + tdNotify1.setArea(sysAreaManager.getAreaName(tdNotify1.getArea())); + }); ExcelUtil util = new ExcelUtil(TdNotify.class); return util.exportExcel(list, "检查通知数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java index 1ad5f04..999127a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system.filemanager; import java.util.ArrayList; import java.util.List; +import cn.hutool.core.convert.Convert; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.sql.SqlUtil; @@ -13,6 +14,7 @@ import com.ruoyi.system.domain.TdFileReceive; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ITdFileReceiveService; +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,6 +33,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 文件下发Controller * @@ -70,6 +74,9 @@ public class TdFileProvideController extends BaseController return getDataTable(list); } + + @Resource + private SysAreaManager sysAreaManager; /** * 导出文件下发列表 */ @@ -80,6 +87,10 @@ public class TdFileProvideController extends BaseController public AjaxResult export(TdFileProvide tdFileProvide) { List list = tdFileProvideService.selectTdFileProvideList(tdFileProvide); + list.forEach(tdFileProvide1 -> { + tdFileProvide1.setFrameworkId(sysAreaManager.getAreaName(tdFileProvide1.getFrameworkId())); + tdFileProvide1.setAreaid(sysAreaManager.getAreaName(tdFileProvide1.getAreaid())); + }); ExcelUtil util = new ExcelUtil(TdFileProvide.class); return util.exportExcel(list, "文件下发数据"); } 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 4924566..4af7e8d 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 @@ -6,6 +6,7 @@ import java.util.List; import com.ruoyi.common.utils.uuid.Seq; import com.ruoyi.system.domain.TdPropertyInfo; import com.ruoyi.system.service.ITdPropertyInfoService; +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -24,6 +25,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 资产登记Controller * @@ -41,6 +44,9 @@ public class TdPropertyManagerController extends BaseController @Autowired private ITdPropertyInfoService tdPropertyInfoService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:property:view") @GetMapping() public String property() @@ -71,6 +77,10 @@ public class TdPropertyManagerController extends BaseController public AjaxResult export(TdPropertyManager tdPropertyManager) { List list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager); + list.forEach(tdPropertyManager1 -> { + tdPropertyManager1.setPart(sysAreaManager.getAreaName(tdPropertyManager1.getPart())); + tdPropertyManager1.setAreaId(sysAreaManager.getAreaName(tdPropertyManager1.getAreaId())); + }); ExcelUtil util = new ExcelUtil(TdPropertyManager.class); return util.exportExcel(list, "资产登记数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java index a7b3f86..25c068d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system.property; import java.util.List; import com.ruoyi.common.utils.uuid.Seq; +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,6 +22,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 涉密网络设备Controller * @@ -36,6 +39,9 @@ public class TdPropertyNetController extends BaseController @Autowired private ITdPropertyNetService tdPropertyNetService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:network:view") @GetMapping() public String network() @@ -66,6 +72,10 @@ public class TdPropertyNetController extends BaseController public AjaxResult export(TdPropertyNet tdPropertyNet) { List list = tdPropertyNetService.selectTdPropertyNetList(tdPropertyNet); + list.forEach(tdPropertyNet1 -> { + tdPropertyNet1.setFramework(sysAreaManager.getAreaName(tdPropertyNet1.getFramework())); + tdPropertyNet1.setArea(sysAreaManager.getAreaName(tdPropertyNet1.getArea())); + }); ExcelUtil util = new ExcelUtil(TdPropertyNet.class); return util.exportExcel(list, "涉密网络设备数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java index e543ba0..c0044b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.web.controller.manager.SysAreaManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -22,6 +23,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 涉密人员培训Controller * @@ -37,6 +40,9 @@ public class TdTrainController extends BaseController @Autowired private ITdTrainService tdTrainService; + @Resource + private SysAreaManager sysAreaManager; + @RequiresPermissions("system:train:view") @GetMapping() public String train() @@ -67,6 +73,10 @@ public class TdTrainController extends BaseController public AjaxResult export(TdTrain tdTrain) { List list = tdTrainService.selectTdTrainList(tdTrain); + list.forEach(tdTrain1 -> { + tdTrain1.setAREAID(sysAreaManager.getAreaName(tdTrain1.getAREAID())); + tdTrain1.setFRAMEWORK(sysAreaManager.getAreaName(tdTrain1.getFRAMEWORK())); + }); ExcelUtil util = new ExcelUtil(TdTrain.class); return util.exportExcel(list, "涉密人员培训数据"); } diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html index c53a567..3a3101c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html @@ -13,10 +13,10 @@
- 请选择后缀为 “xls”或“xlsx”的文件。 + 提示:请下载导入模板(试题导入模板.xlsx),
按照模板要求填写后导入。
- +
{{file.name}} diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html index 30de060..48d19c3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html @@ -27,7 +27,7 @@ - 考试状态:{{ item.state | paperStateFilter }} + 考试状态:{{ item.stateName}} @@ -38,13 +38,27 @@