diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java index 65218845..32556a73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.check; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java index a8620e7b..e6b3775f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.check; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdNotifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdNotifyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java index 82904084..0a159240 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdNotifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.check; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTrainnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTrainnumController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java index 91eeb822..6b37bbac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTrainnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.count; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUsernumController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index 23474264..37184389 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.count; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java index 37c5b9b6..5c253f9c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.count; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java index 7db63a3e..eb4396e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.exam; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.entity.SysUser; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdQuestionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdQuestionController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java index dc42a781..f2829d14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdQuestionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.exam; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java index e551c195..06cd602c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.exam; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.entity.SysUser; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdFileProvideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdFileProvideController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java index 0fa5c73c..dd2ba0b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdFileProvideController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java @@ -1,13 +1,16 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.filemanager; import java.util.List; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.uuid.Seq; import com.ruoyi.framework.web.domain.server.Sys; import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.ITdFileReceiveService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,7 +44,9 @@ public class TdFileProvideController extends BaseController @Autowired private ITdFileProvideService tdFileProvideService; @Autowired - private ISysPostService postService; + private ISysDeptService deptService; + @Autowired + private ITdFileReceiveService tdFileReceiveService; @RequiresPermissions("system:fileprovide:view") @GetMapping() @@ -81,9 +86,9 @@ public class TdFileProvideController extends BaseController * 新增文件下发 */ @GetMapping("/add") - public String add(SysPost post, ModelMap mmap) + public String add(SysDept dept, ModelMap mmap) { - mmap.put("post",postService.selectPostList(post)); + mmap.put("dept",deptService.selectDeptList(dept)); mmap.put("user",getSysUser()); return prefix + "/add"; } @@ -98,6 +103,7 @@ public class TdFileProvideController extends BaseController public AjaxResult addSave(TdFileProvide tdFileProvide) { tdFileProvide.setFileId("File_"+Seq.getId(Seq.commSeqType)); + System.out.println(tdFileProvide.getTargetDepart()); return toAjax(tdFileProvideService.insertTdFileProvide(tdFileProvide)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java new file mode 100644 index 00000000..48f15cd3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java @@ -0,0 +1,127 @@ +package com.ruoyi.web.controller.system.filemanager; + +import java.util.List; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.TdFileReceive; +import com.ruoyi.system.service.ITdFileReceiveService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 涉密文件接收Controller + * + * @author ruoyi + * @date 2024-05-14 + */ +@Controller +@RequestMapping("/system/filereceive") +public class TdFileReceiveController extends BaseController +{ + private String prefix = "system/filereceive"; + + @Autowired + private ITdFileReceiveService tdFileReceiveService; + + @RequiresPermissions("system:filereceive:view") + @GetMapping() + public String filereceive() + { + return prefix + "/filereceive"; + } + + /** + * 查询涉密文件接收列表 + */ + @RequiresPermissions("system:filereceive:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdFileReceive tdFileReceive) + { + startPage(); + List list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); + return getDataTable(list); + } + + /** + * 导出涉密文件接收列表 + */ + @RequiresPermissions("system:filereceive:export") + @Log(title = "涉密文件接收", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TdFileReceive tdFileReceive) + { + List list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); + ExcelUtil util = new ExcelUtil(TdFileReceive.class); + return util.exportExcel(list, "涉密文件接收数据"); + } + + /** + * 新增涉密文件接收 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存涉密文件接收 + */ + @RequiresPermissions("system:filereceive:add") + @Log(title = "涉密文件接收", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TdFileReceive tdFileReceive) + { + return toAjax(tdFileReceiveService.insertTdFileReceive(tdFileReceive)); + } + + /** + * 修改涉密文件接收 + */ + @RequiresPermissions("system:filereceive:edit") + @GetMapping("/edit/{receiveId}") + public String edit(@PathVariable("receiveId") Long receiveId, ModelMap mmap) + { + TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId); + mmap.put("tdFileReceive", tdFileReceive); + return prefix + "/edit"; + } + + /** + * 修改保存涉密文件接收 + */ + @RequiresPermissions("system:filereceive:edit") + @Log(title = "涉密文件接收", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TdFileReceive tdFileReceive) + { + return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive)); + } + + /** + * 删除涉密文件接收 + */ + @RequiresPermissions("system:filereceive:remove") + @Log(title = "涉密文件接收", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tdFileReceiveService.deleteTdFileReceiveByReceiveIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyChangeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyChangeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java index f80a06b3..6937ef90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyChangeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.property; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java index 56db2a4c..b91c72e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.property; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyManagerController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java index 9a9b11a1..bdf04137 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyManagerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.property; import java.util.Collections; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java index 7bb5db75..1e66a855 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.property; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetinfoController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java index 739be5c3..bc623b83 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyNetinfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.property; import java.util.List; @@ -73,6 +73,7 @@ public class TdPropertyNetinfoController extends BaseController public String add(@PathVariable("netId") String netId, ModelMap mmap) { mmap.put("netId", netId); + mmap.put("sysuser",getSysUser()); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysCaptchaController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysCaptchaController.java index 739c4693..3c734629 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysCaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysConfigController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysConfigController.java index 2be9e631..55e6c4b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java index f7ab2236..96a2ea6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictDataController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictDataController.java index 610fd6b6..46910dff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictTypeController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictTypeController.java index 0a66af1d..417cd63f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysIndexController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysIndexController.java index 667fea5f..20fce80f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysIndexController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.Date; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysLoginController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysLoginController.java index f643188d..d96efef9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysMenuController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysMenuController.java index 9acbffa4..3b81387e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysNoticeController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysNoticeController.java index 93e1be90..9f993fdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysPostController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysPostController.java index e12cc2c6..c8d6add2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysProfileController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysProfileController.java index e95868a5..41850a90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRegisterController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRegisterController.java index e8dc001a..cc1517f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRegisterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRoleController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRoleController.java index 228814bf..85d3e027 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java index fc2a4c42..4ab20708 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java index 248defac..8e0f543b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -22,6 +22,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; +/** + * 涉密人员审核 + */ @Controller @RequestMapping("/system/userexamine") public class SysUserExamineController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdIndentureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdIndentureController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java index a742b530..396ac352 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdIndentureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdLeaveController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdLeaveController.java index 0facfe78..19d7a8f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdLeaveController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java index 2cc85fd8..946dda10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.system.system; import java.util.List; diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html new file mode 100644 index 00000000..19dd3f18 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/add.html @@ -0,0 +1,111 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html new file mode 100644 index 00000000..73709d27 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html @@ -0,0 +1,112 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html new file mode 100644 index 00000000..f9fd337a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html @@ -0,0 +1,179 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • +  搜索 +  重置 +
  • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file 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 240d122d..b7a27045 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 @@ -6,19 +6,16 @@
-
- -
- -
-
-
- + +
+
- +
-
+
@@ -36,26 +33,13 @@
-
- -
- -
-
-
- -
- -
-
+
@@ -68,6 +52,12 @@
+
+ +
+ +
+
@@ -91,12 +81,12 @@
-
- +
+
- -
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html index e8a29d82..91160c8a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html @@ -7,13 +7,27 @@
+
+ +
+ +
+
- +
-
+
+ +
+ +
+
+
@@ -31,36 +45,28 @@
-
- -
- -
-
+ + + + + +
- -
- -
-
-
- +
- +
-
- +
+
- +
@@ -86,10 +92,10 @@
-
- +
+
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html index f0a483ef..bd28a324 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html @@ -69,7 +69,7 @@ var isCurcialDatas = [[${@dict.getType('sys_yes_no')}]]; var prefix = ctx + "system/network/netinfo"; var obj = {netId:''}; - obj.netId = [[${netId}]] + '' + obj.netId = [[${netId}]] // 添加信息 function hanldAdd() { table.set(); @@ -80,7 +80,7 @@ var options = { url: prefix + "/list", queryParams:obj, - createUrl: prefix + "/add/{netId}", + createUrl: prefix + "/add/{id}", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", @@ -89,9 +89,13 @@ checkbox: true }, { - field: 'netId', - title: '网络编号' + field: 'id', + title: '设备编号' }, + // { + // field: 'netId', + // title: '网络编号' + // }, { field: 'netBrand', title: '网络设备品牌' @@ -115,10 +119,6 @@ field: 'netSn', title: '序列号' }, - { - field: 'netManager', - title: '责任人' - }, { field: 'depart', title: '单位名称' @@ -127,13 +127,6 @@ field: 'netsmname', title: '涉密网络名称' }, - { - field: 'isCurcial', - title: '是否属于要害部门部位', - formatter: function(value, row, index) { - return $.table.selectDictLabel(isCurcialDatas, value); - } - }, { field: 'netMiji', title: '密级', diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/network.html b/ruoyi-admin/src/main/resources/templates/system/network/network/network.html index d936acba..2b798b2a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/network.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/network.html @@ -75,8 +75,8 @@ }, { field: 'netId', - title: '网络设备id', - visible: false + title: '网络编号', + // visible: false }, { field: 'framework', diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html index f888fe59..be82b871 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html @@ -93,10 +93,10 @@ field: 'id', title: '登记编号' }, - { - field: 'useId', - title: '资产编号' - }, + // { + // field: 'useId', + // title: '资产编号' + // }, { field: 'propertyBrand', title: '设备品牌' 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 2a2221cb..2a79c7bd 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 @@ -19,7 +19,7 @@
  • - +
  • @@ -101,8 +101,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); actions.push('列表 '); + actions.push('编辑 '); actions.push('删除'); return actions.join(''); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java new file mode 100644 index 00000000..d1ee1b20 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java @@ -0,0 +1,181 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 涉密文件接收对象 td_file_receive + * + * @author ruoyi + * @date 2024-05-14 + */ +public class TdFileReceive extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 接收编号 */ + private Long receiveId; + + /** 文件编号 */ + @Excel(name = "文件编号") + private String fileId; + + /** 接收单位 */ + @Excel(name = "接收单位") + private String receiveDepartid; + + /** 接收状态(1:已接收2:未接收) */ + @Excel(name = "接收状态", readConverterExp = "1=:已接收2:未接收") + private String receiveState; + + /** 接收人员 */ + @Excel(name = "接收人员") + private String receiveUserid; + + /** 接收日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "接收日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date receiveDate; + + /** 提取状态(1:已提取2:未提取) */ + @Excel(name = "提取状态", readConverterExp = "1=:已提取2:未提取") + private String extractState; + + /** 提取单位 */ + @Excel(name = "提取单位") + private String extractDepartid; + + /** 提取人员 */ + @Excel(name = "提取人员") + private String extractUserid; + + /** 提取日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提取日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date extractDate; + + /** 销毁状态 */ + @Excel(name = "销毁状态") + private String destoryState; + + public void setReceiveId(Long receiveId) + { + this.receiveId = receiveId; + } + + public Long getReceiveId() + { + return receiveId; + } + public void setFileId(String fileId) + { + this.fileId = fileId; + } + + public String getFileId() + { + return fileId; + } + public void setReceiveDepartid(String receiveDepartid) + { + this.receiveDepartid = receiveDepartid; + } + + public String getReceiveDepartid() + { + return receiveDepartid; + } + public void setReceiveState(String receiveState) + { + this.receiveState = receiveState; + } + + public String getReceiveState() + { + return receiveState; + } + public void setReceiveUserid(String receiveUserid) + { + this.receiveUserid = receiveUserid; + } + + public String getReceiveUserid() + { + return receiveUserid; + } + public void setReceiveDate(Date receiveDate) + { + this.receiveDate = receiveDate; + } + + public Date getReceiveDate() + { + return receiveDate; + } + public void setExtractState(String extractState) + { + this.extractState = extractState; + } + + public String getExtractState() + { + return extractState; + } + public void setExtractDepartid(String extractDepartid) + { + this.extractDepartid = extractDepartid; + } + + public String getExtractDepartid() + { + return extractDepartid; + } + public void setExtractUserid(String extractUserid) + { + this.extractUserid = extractUserid; + } + + public String getExtractUserid() + { + return extractUserid; + } + public void setExtractDate(Date extractDate) + { + this.extractDate = extractDate; + } + + public Date getExtractDate() + { + return extractDate; + } + public void setDestoryState(String destoryState) + { + this.destoryState = destoryState; + } + + public String getDestoryState() + { + return destoryState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("receiveId", getReceiveId()) + .append("fileId", getFileId()) + .append("receiveDepartid", getReceiveDepartid()) + .append("receiveState", getReceiveState()) + .append("receiveUserid", getReceiveUserid()) + .append("receiveDate", getReceiveDate()) + .append("extractState", getExtractState()) + .append("extractDepartid", getExtractDepartid()) + .append("extractUserid", getExtractUserid()) + .append("extractDate", getExtractDate()) + .append("destoryState", getDestoryState()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java new file mode 100644 index 00000000..39aa7887 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.TdFileReceive; + +/** + * 涉密文件接收Mapper接口 + * + * @author ruoyi + * @date 2024-05-14 + */ +public interface TdFileReceiveMapper +{ + /** + * 查询涉密文件接收 + * + * @param receiveId 涉密文件接收主键 + * @return 涉密文件接收 + */ + public TdFileReceive selectTdFileReceiveByReceiveId(Long receiveId); + + /** + * 查询涉密文件接收列表 + * + * @param tdFileReceive 涉密文件接收 + * @return 涉密文件接收集合 + */ + public List selectTdFileReceiveList(TdFileReceive tdFileReceive); + + /** + * 新增涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + public int insertTdFileReceive(TdFileReceive tdFileReceive); + + /** + * 修改涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + public int updateTdFileReceive(TdFileReceive tdFileReceive); + + /** + * 删除涉密文件接收 + * + * @param receiveId 涉密文件接收主键 + * @return 结果 + */ + public int deleteTdFileReceiveByReceiveId(Long receiveId); + + /** + * 批量删除涉密文件接收 + * + * @param receiveIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTdFileReceiveByReceiveIds(String[] receiveIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java new file mode 100644 index 00000000..0a742d57 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.TdFileReceive; + +/** + * 涉密文件接收Service接口 + * + * @author ruoyi + * @date 2024-05-14 + */ +public interface ITdFileReceiveService +{ + /** + * 查询涉密文件接收 + * + * @param receiveId 涉密文件接收主键 + * @return 涉密文件接收 + */ + public TdFileReceive selectTdFileReceiveByReceiveId(Long receiveId); + + /** + * 查询涉密文件接收列表 + * + * @param tdFileReceive 涉密文件接收 + * @return 涉密文件接收集合 + */ + public List selectTdFileReceiveList(TdFileReceive tdFileReceive); + + /** + * 新增涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + public int insertTdFileReceive(TdFileReceive tdFileReceive); + + /** + * 修改涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + public int updateTdFileReceive(TdFileReceive tdFileReceive); + + /** + * 批量删除涉密文件接收 + * + * @param receiveIds 需要删除的涉密文件接收主键集合 + * @return 结果 + */ + public int deleteTdFileReceiveByReceiveIds(String receiveIds); + + /** + * 删除涉密文件接收信息 + * + * @param receiveId 涉密文件接收主键 + * @return 结果 + */ + public int deleteTdFileReceiveByReceiveId(Long receiveId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java new file mode 100644 index 00000000..0508044f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.TdFileReceiveMapper; +import com.ruoyi.system.domain.TdFileReceive; +import com.ruoyi.system.service.ITdFileReceiveService; +import com.ruoyi.common.core.text.Convert; + +/** + * 涉密文件接收Service业务层处理 + * + * @author ruoyi + * @date 2024-05-14 + */ +@Service +public class TdFileReceiveServiceImpl implements ITdFileReceiveService +{ + @Autowired + private TdFileReceiveMapper tdFileReceiveMapper; + + /** + * 查询涉密文件接收 + * + * @param receiveId 涉密文件接收主键 + * @return 涉密文件接收 + */ + @Override + public TdFileReceive selectTdFileReceiveByReceiveId(Long receiveId) + { + return tdFileReceiveMapper.selectTdFileReceiveByReceiveId(receiveId); + } + + /** + * 查询涉密文件接收列表 + * + * @param tdFileReceive 涉密文件接收 + * @return 涉密文件接收 + */ + @Override + public List selectTdFileReceiveList(TdFileReceive tdFileReceive) + { + return tdFileReceiveMapper.selectTdFileReceiveList(tdFileReceive); + } + + /** + * 新增涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + @Override + public int insertTdFileReceive(TdFileReceive tdFileReceive) + { + return tdFileReceiveMapper.insertTdFileReceive(tdFileReceive); + } + + /** + * 修改涉密文件接收 + * + * @param tdFileReceive 涉密文件接收 + * @return 结果 + */ + @Override + public int updateTdFileReceive(TdFileReceive tdFileReceive) + { + return tdFileReceiveMapper.updateTdFileReceive(tdFileReceive); + } + + /** + * 批量删除涉密文件接收 + * + * @param receiveIds 需要删除的涉密文件接收主键 + * @return 结果 + */ + @Override + public int deleteTdFileReceiveByReceiveIds(String receiveIds) + { + return tdFileReceiveMapper.deleteTdFileReceiveByReceiveIds(Convert.toStrArray(receiveIds)); + } + + /** + * 删除涉密文件接收信息 + * + * @param receiveId 涉密文件接收主键 + * @return 结果 + */ + @Override + public int deleteTdFileReceiveByReceiveId(Long receiveId) + { + return tdFileReceiveMapper.deleteTdFileReceiveByReceiveId(receiveId); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml new file mode 100644 index 00000000..53c832a9 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + select receive_id, file_id, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state from td_file_receive + + + + + + + + insert into td_file_receive + + file_id, + receive_departid, + receive_state, + receive_userid, + receive_date, + extract_state, + extract_departid, + extract_userid, + extract_date, + destory_state, + + + #{fileId}, + #{receiveDepartid}, + #{receiveState}, + #{receiveUserid}, + #{receiveDate}, + #{extractState}, + #{extractDepartid}, + #{extractUserid}, + #{extractDate}, + #{destoryState}, + + + + + update td_file_receive + + file_id = #{fileId}, + receive_departid = #{receiveDepartid}, + receive_state = #{receiveState}, + receive_userid = #{receiveUserid}, + receive_date = #{receiveDate}, + extract_state = #{extractState}, + extract_departid = #{extractDepartid}, + extract_userid = #{extractUserid}, + extract_date = #{extractDate}, + destory_state = #{destoryState}, + + where receive_id = #{receiveId} + + + + delete from td_file_receive where receive_id = #{receiveId} + + + + delete from td_file_receive where receive_id in + + #{receiveId} + + + + \ No newline at end of file