检查，资产，文件

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

@@ -0,0 +1,77 @@
+package com.ruoyi.web.controller.system;
+
+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.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.TdTrain;
+import com.ruoyi.system.service.ITdTrainService;
+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
+@RequestMapping("/system/trainnum")
+public class SysTrainnumController extends BaseController {
+    private String prefix = "system/trainnum";
+    @Autowired
+    private ITdTrainService tdTrainService;
+
+    @RequiresPermissions("system:trainnum:view")
+    @GetMapping()
+    public String trainnum()
+    {
+        return prefix + "/trainnum";
+    }
+
+    /**
+     * 培训列表
+     * @param tdTrain
+     * @return
+     */
+    @RequiresPermissions("system:trainnum:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdTrain tdTrain)
+    {
+        startPage();
+        List<TdTrain> list = tdTrainService.selectTdTrainList(tdTrain);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出培训数据
+     * @param tdTrain
+     * @return
+     */
+    @Log(title = "培训统计", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:trainnum:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdTrain tdTrain)
+    {
+        List<TdTrain> list = tdTrainService.selectTdTrainList(tdTrain);
+        ExcelUtil<TdTrain> util = new ExcelUtil<TdTrain>(TdTrain.class);
+        return util.exportExcel(list, "培训统计数据");
+    }
+
+    /**
+     * 打印
+     */
+    @RequiresPermissions("system:trainnum:print")
+    @GetMapping("/print/{traiId}")
+    @ResponseBody
+    public String print(@PathVariable("trainId") Long trainId, ModelMap mmap){
+        TdTrain tdTrain = tdTrainService.selectTdTrainByID(trainId);
+        mmap.put("train", tdTrain);
+        return prefix + "/print";
+    }
+
+}

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

@@ -329,4 +329,7 @@ public class SysUserController extends BaseController
         mmap.put("dept", deptService.selectDeptById(deptId));
         return prefix + "/deptTree";
     }
+
+
+
 }

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

@@ -103,4 +103,8 @@ public class SysUserExamineController extends BaseController {
         mmap.put("posts", postService.selectPostsByUserIds(userId));
         return prefix + "/examineprint";
     }
+
+
+
+
 }

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

@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.system;
+
+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.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+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
+@RequestMapping("/system/usernum")
+public class SysUsernumController extends BaseController {
+    private String prefix = "system/usernum";
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysPostService postService;
+    @Autowired
+    private ISysRoleService roleService;
+
+    @RequiresPermissions("system:usernum:view")
+    @GetMapping()
+    public String user()
+    {
+        return prefix + "/usernum";
+    }
+
+    /**
+     * 用户列表
+     * @param user
+     * @return
+     */
+    @RequiresPermissions("system:usernum:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户
+     * @param user
+     * @return
+     */
+    @Log(title = "用户统计", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:usernum:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户统计数据");
+    }
+
+    /**
+     * 用户详情
+     * @param userId
+     * @param mmap
+     * @return
+     */
+    @RequiresPermissions("system:usernum:detail")
+    @GetMapping("/detail/{userId}")
+    public String detail(@PathVariable("userId") Long userId, ModelMap mmap){
+        mmap.put("user",userService.selectUserById(userId));
+        mmap.put("role",roleService.selectRolesByUserIds(userId));
+        mmap.put("post",postService.selectPostsByUserIds(userId));
+        return prefix + "/detail";
+    }
+
+    /**
+     * 打印
+     */
+    @RequiresPermissions("system:usernum:print")
+    @PostMapping("/print")
+    @ResponseBody
+    public AjaxResult print(SysUser user){
+        List<SysUser> sysUsers = userService.selectUserList(user);
+        return AjaxResult.success(sysUsers);
+    }
+}

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

@@ -0,0 +1,164 @@
+package com.ruoyi.web.controller.system;
+
+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.TdCheck;
+import com.ruoyi.system.service.ITdCheckService;
+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-06
+ */
+@Controller
+@RequestMapping("/system/check")
+public class TdCheckController extends BaseController
+{
+    private String prefix = "system/check";
+
+    @Autowired
+    private ITdCheckService tdCheckService;
+
+    @RequiresPermissions("system:check:view")
+    @GetMapping()
+    public String check()
+    {
+        return prefix + "/check";
+    }
+
+    /**
+     * 查询检查报告管理列表
+     */
+    @RequiresPermissions("system:check:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCheck tdCheck)
+    {
+        startPage();
+        List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查报告管理列表
+     */
+    @RequiresPermissions("system:check:export")
+    @Log(title = "检查报告管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdCheck tdCheck)
+    {
+        List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+        ExcelUtil<TdCheck> util = new ExcelUtil<TdCheck>(TdCheck.class);
+        return util.exportExcel(list, "检查报告管理数据");
+    }
+
+    /**
+     * 新增检查报告管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存检查报告管理
+     */
+    @RequiresPermissions("system:check:add")
+    @Log(title = "检查报告管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdCheck tdCheck)
+    {
+        return toAjax(tdCheckService.insertTdCheck(tdCheck));
+    }
+
+    /**
+     * 修改检查报告管理
+     */
+    @RequiresPermissions("system:check:edit")
+    @GetMapping("/edit/{checkId}")
+    public String edit(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存检查报告管理
+     */
+    @RequiresPermissions("system:check:edit")
+    @Log(title = "检查报告管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCheck tdCheck)
+    {
+        return toAjax(tdCheckService.updateTdCheck(tdCheck));
+    }
+
+    /**
+     * 删除检查报告管理
+     */
+    @RequiresPermissions("system:check:remove")
+    @Log(title = "检查报告管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdCheckService.deleteTdCheckByCheckIds(ids));
+    }
+
+    /**
+     * 自行检查 报告管理
+     */
+    @RequiresPermissions("system:check:selfcheck")
+    @GetMapping("/selfcheck/{checkId}")
+    public String selfcheck(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/selfcheck";
+    }
+
+    /**
+     * 保存自行检查报告结果
+     */
+    @RequiresPermissions("system:check:selfcheck")
+    @Log(title = "检查报告管理", businessType = BusinessType.CHECK)
+    @PostMapping("/selfcheck")
+    @ResponseBody
+    public AjaxResult selfcheckSave(TdCheck tdCheck)
+    {
+        return toAjax(tdCheckService.updateTdCheck(tdCheck));
+    }
+
+    /**
+     * 打印操作
+     */
+    @RequiresPermissions("system:check:print")
+    @GetMapping("/checkprint/{checkId}")
+    public String checkPrint(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/checkprint";
+    }
+
+}

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

@@ -0,0 +1,137 @@
+package com.ruoyi.web.controller.system;
+
+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.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.TdCheck;
+import com.ruoyi.system.service.ITdCheckService;
+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
+@RequestMapping("/system/checkresult")
+public class TdCheckResultController extends BaseController {
+    private String prefix = "system/checkresult";
+    @Autowired
+    private ITdCheckService tdCheckService;
+
+    @RequiresPermissions("system:checkresult:view")
+    @GetMapping()
+    public String checkresult()
+    {
+        return prefix + "/checkresult";
+    }
+
+    /**
+     * 查询检查结果管理列表
+     */
+    @RequiresPermissions("system:checkresult:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCheck tdCheck)
+    {
+        startPage();
+        List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查结果管理列表
+     */
+    @RequiresPermissions("system:checkresult:export")
+    @Log(title = "检查结果管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdCheck tdCheck)
+    {
+        List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+        ExcelUtil<TdCheck> util = new ExcelUtil<TdCheck>(TdCheck.class);
+        return util.exportExcel(list, "检查结果管理数据");
+    }
+
+
+    /**
+     * 修改检查结果管理
+     */
+    @RequiresPermissions("system:checkresult:edit")
+    @GetMapping("/edit/{checkId}")
+    public String edit(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存检查结果管理
+     */
+    @RequiresPermissions("system:checkresult:edit")
+    @Log(title = "检查结果管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCheck tdCheck)
+    {
+        return toAjax(tdCheckService.updateTdCheck(tdCheck));
+    }
+
+    /**
+     * 删除检查结果管理
+     */
+    @RequiresPermissions("system:checkresult:remove")
+    @Log(title = "检查结果管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdCheckService.deleteTdCheckByCheckIds(ids));
+    }
+
+    /**
+     * 检查 报告管理
+     */
+    @RequiresPermissions("system:checkresult:edit")
+    @GetMapping("/checkresult/{checkId}")
+    public String selfcheck(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/docheck";
+    }
+
+    /**
+     * 保存检查检查结果
+     */
+    @RequiresPermissions("system:checkresult:check")
+    @Log(title = "检查结果管理", businessType = BusinessType.CHECK)
+    @PostMapping("/checkresult")
+    @ResponseBody
+    public AjaxResult selfcheckSave(TdCheck tdCheck)
+    {
+        return toAjax(tdCheckService.updateTdCheck(tdCheck));
+    }
+
+
+    /**
+     * 打印操作
+     */
+    @RequiresPermissions("system:checkresult:print")
+    @GetMapping("/checkprint/{checkId}")
+    public String checkresultPrint(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheckResult = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheckResult", tdCheckResult);
+        return prefix + "/CheckResultPrint";
+    }
+
+
+
+
+}

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

@@ -0,0 +1,140 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+
+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.ISysPostService;
+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.TdFileProvide;
+import com.ruoyi.system.service.ITdFileProvideService;
+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-04-23
+ */
+@Controller
+@RequestMapping("/system/fileprovide")
+public class TdFileProvideController extends BaseController
+{
+    private String prefix = "system/fileprovide";
+
+    @Autowired
+    private ITdFileProvideService tdFileProvideService;
+    @Autowired
+    private ISysPostService postService;
+
+    @RequiresPermissions("system:fileprovide:view")
+    @GetMapping()
+    public String fileprovide()
+    {
+        return prefix + "/fileprovide";
+    }
+
+    /**
+     * 查询文件下发列表
+     */
+    @RequiresPermissions("system:fileprovide:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdFileProvide tdFileProvide)
+    {
+        startPage();
+        List<TdFileProvide> list = tdFileProvideService.selectTdFileProvideList(tdFileProvide);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出文件下发列表
+     */
+    @RequiresPermissions("system:fileprovide:export")
+    @Log(title = "文件下发", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdFileProvide tdFileProvide)
+    {
+        List<TdFileProvide> list = tdFileProvideService.selectTdFileProvideList(tdFileProvide);
+        ExcelUtil<TdFileProvide> util = new ExcelUtil<TdFileProvide>(TdFileProvide.class);
+        return util.exportExcel(list, "文件下发数据");
+    }
+
+    /**
+     * 新增文件下发
+     */
+    @GetMapping("/add")
+    public String add(SysPost post, ModelMap mmap)
+    {
+        mmap.put("post",postService.selectPostList(post));
+        mmap.put("user",getSysUser());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存文件下发
+     */
+    @RequiresPermissions("system:fileprovide:add")
+    @Log(title = "文件下发", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdFileProvide tdFileProvide)
+    {
+        tdFileProvide.setFileId("File_"+Seq.getId(Seq.commSeqType));
+        return toAjax(tdFileProvideService.insertTdFileProvide(tdFileProvide));
+    }
+
+    /**
+     * 修改文件下发
+     */
+    @RequiresPermissions("system:fileprovide:edit")
+    @GetMapping("/edit/{fileId}")
+    public String edit(@PathVariable("fileId") String fileId, ModelMap mmap)
+    {
+        TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
+        mmap.put("user",getSysUser());
+        mmap.put("tdFileProvide", tdFileProvide);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存文件下发
+     */
+    @RequiresPermissions("system:fileprovide:edit")
+    @Log(title = "文件下发", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdFileProvide tdFileProvide)
+    {
+        return toAjax(tdFileProvideService.updateTdFileProvide(tdFileProvide));
+    }
+
+    /**
+     * 删除文件下发
+     */
+    @RequiresPermissions("system:fileprovide:remove")
+    @Log(title = "文件下发", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdFileProvideService.deleteTdFileProvideByFileIds(ids));
+    }
+}

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

@@ -145,6 +145,11 @@ public class TdLeaveController extends BaseController
     @ResponseBody
     public AjaxResult examinesave(TdLeave tdLeave)
     {
+        if (tdLeave.getLeavestate().equals("1")){
+            SysUser sysUser = userService.selectUserById(tdLeave.getUserId());
+            sysUser.setStatus("1");
+            userService.updateUser(sysUser);
+        }
         return toAjax(tdLeaveService.updateTdLeave(tdLeave));
     }
 

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

@@ -0,0 +1,128 @@
+package com.ruoyi.web.controller.system;
+
+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.TdNotify;
+import com.ruoyi.system.service.ITdNotifyService;
+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-06
+ */
+@Controller
+@RequestMapping("/system/notify")
+public class TdNotifyController extends BaseController
+{
+    private String prefix = "system/notify";
+
+    @Autowired
+    private ITdNotifyService tdNotifyService;
+
+    @RequiresPermissions("system:notify:view")
+    @GetMapping()
+    public String notice()
+    {
+        return prefix + "/notify";
+    }
+
+    /**
+     * 查询检查通知列表
+     */
+    @RequiresPermissions("system:notify:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdNotify tdNotify)
+    {
+        startPage();
+        List<TdNotify> list = tdNotifyService.selectTdNotifyList(tdNotify);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查通知列表
+     */
+    @RequiresPermissions("system:notify:export")
+    @Log(title = "检查通知", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdNotify tdNotify)
+    {
+        List<TdNotify> list = tdNotifyService.selectTdNotifyList(tdNotify);
+        ExcelUtil<TdNotify> util = new ExcelUtil<TdNotify>(TdNotify.class);
+        return util.exportExcel(list, "检查通知数据");
+    }
+
+    /**
+     * 新增检查通知
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("sysuser", getSysUser());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存检查通知
+     */
+    @RequiresPermissions("system:notify:add")
+    @Log(title = "检查通知", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdNotify tdNotify)
+    {
+        return toAjax(tdNotifyService.insertTdNotify(tdNotify));
+    }
+
+    /**
+     * 修改检查通知
+     */
+    @RequiresPermissions("system:notify:edit")
+    @GetMapping("/edit/{notifyId}")
+    public String edit(@PathVariable("notifyId") Long notifyId, ModelMap mmap)
+    {
+        TdNotify tdNotify = tdNotifyService.selectTdNotifyByNotifyId(notifyId);
+        mmap.put("tdNotify", tdNotify);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存检查通知
+     */
+    @RequiresPermissions("system:notify:edit")
+    @Log(title = "检查通知", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdNotify tdNotify)
+    {
+        return toAjax(tdNotifyService.updateTdNotify(tdNotify));
+    }
+
+    /**
+     * 删除检查通知
+     */
+    @RequiresPermissions("system:notify:remove")
+    @Log(title = "检查通知", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdNotifyService.deleteTdNotifyByNotifyIds(ids));
+    }
+}

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

@@ -0,0 +1,137 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.uuid.Seq;
+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.TdPropertyInfo;
+import com.ruoyi.system.service.ITdPropertyInfoService;
+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-04-29
+ */
+@Controller
+@RequestMapping("/system/propertyinfo")
+public class TdPropertyInfoController extends BaseController
+{
+    private String prefix = "system/propertyinfo";
+
+    @Autowired
+    private ITdPropertyInfoService tdPropertyInfoService;
+
+    @RequiresPermissions("system:propertyinfo:view")
+    @GetMapping()
+    public String propertyinfo()
+    {
+        return prefix + "/propertyinfo";
+    }
+
+    /**
+     * 查询资产管理列表
+     */
+    @RequiresPermissions("system:propertyinfo:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdPropertyInfo tdPropertyInfo)
+    {
+        startPage();
+        List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资产管理列表
+     */
+    @RequiresPermissions("system:propertyinfo:export")
+    @Log(title = "资产管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdPropertyInfo tdPropertyInfo)
+    {
+        List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
+        ExcelUtil<TdPropertyInfo> util = new ExcelUtil<TdPropertyInfo>(TdPropertyInfo.class);
+        return util.exportExcel(list, "资产管理数据");
+    }
+
+    /**
+     * 新增资产管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存资产管理
+     */
+    @RequiresPermissions("system:propertyinfo:add")
+    @Log(title = "资产管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdPropertyInfo tdPropertyInfo)
+    {
+        tdPropertyInfo.setId("Register" + Seq.getId(Seq.commSeqType));
+        return toAjax(tdPropertyInfoService.insertTdPropertyInfo(tdPropertyInfo));
+    }
+
+    /**
+     * 修改资产管理
+     */
+    @RequiresPermissions("system:propertyinfo:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        TdPropertyInfo tdPropertyInfo = tdPropertyInfoService.selectTdPropertyInfoById(id);
+        mmap.put("tdPropertyInfo", tdPropertyInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存资产管理
+     */
+    @RequiresPermissions("system:propertyinfo:edit")
+    @Log(title = "资产管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdPropertyInfo tdPropertyInfo)
+    {
+        return toAjax(tdPropertyInfoService.updateTdPropertyInfo(tdPropertyInfo));
+    }
+
+    /**
+     * 删除资产管理
+     */
+    @RequiresPermissions("system:propertyinfo:remove")
+    @Log(title = "资产管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdPropertyInfoService.deleteTdPropertyInfoByIds(ids));
+    }
+
+    /**
+     * 添加设备信息
+     */
+
+
+}

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

@@ -0,0 +1,150 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.ruoyi.common.utils.uuid.Seq;
+import com.ruoyi.system.domain.TdPropertyInfo;
+import com.ruoyi.system.service.ITdPropertyInfoService;
+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.TdPropertyManager;
+import com.ruoyi.system.service.ITdPropertyManagerService;
+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-04-26
+ */
+@Controller
+@RequestMapping("/system/property")
+public class TdPropertyManagerController extends BaseController
+{
+    private String prefix = "system/property";
+
+    @Autowired
+    private ITdPropertyManagerService tdPropertyManagerService;
+    @Autowired
+    private ITdPropertyInfoService tdPropertyInfoService;
+
+    @RequiresPermissions("system:property:view")
+    @GetMapping()
+    public String property()
+    {
+        return prefix + "/property";
+    }
+
+    /**
+     * 查询资产登记列表
+     */
+    @RequiresPermissions("system:property:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdPropertyManager tdPropertyManager)
+    {
+        startPage();
+        List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资产登记列表
+     */
+    @RequiresPermissions("system:property:export")
+    @Log(title = "资产登记", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdPropertyManager tdPropertyManager)
+    {
+        List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+        ExcelUtil<TdPropertyManager> util = new ExcelUtil<TdPropertyManager>(TdPropertyManager.class);
+        return util.exportExcel(list, "资产登记数据");
+    }
+
+    /**
+     * 新增资产登记
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存资产登记
+     */
+    @RequiresPermissions("system:property:add")
+    @Log(title = "资产登记", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdPropertyManager tdPropertyManager)
+    {
+        tdPropertyManager.setUseId("Property_"+ Seq.getId(Seq.commSeqType));
+        return toAjax(tdPropertyManagerService.insertTdPropertyManager(tdPropertyManager));
+    }
+
+    /**
+     * 修改资产登记
+     */
+    @RequiresPermissions("system:property:edit")
+    @GetMapping("/edit/{useId}")
+    public String edit(@PathVariable("useId") String useId, ModelMap mmap)
+    {
+        TdPropertyManager tdPropertyManager = tdPropertyManagerService.selectTdPropertyManagerByUseId(useId);
+        mmap.put("tdPropertyManager", tdPropertyManager);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存资产登记
+     */
+    @RequiresPermissions("system:property:edit")
+    @Log(title = "资产登记", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdPropertyManager tdPropertyManager)
+    {
+        return toAjax(tdPropertyManagerService.updateTdPropertyManager(tdPropertyManager));
+    }
+
+    /**
+     * 删除资产登记
+     */
+    @RequiresPermissions("system:property:remove")
+    @Log(title = "资产登记", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tdPropertyManagerService.deleteTdPropertyManagerByUseIds(ids));
+    }
+
+    /**
+     * 添加资产条目
+     */
+    @RequiresPermissions("system:property:addproperty")
+    @GetMapping("/propertyinfo/{useId}")
+    public String addproperty(@PathVariable("useId") String useId,ModelMap mmap)
+    {
+        List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.listByIds(Collections.singleton(useId));
+        mmap.put("tdPropertyInfos", tdPropertyInfos);
+        return  prefix + "/propertyinfo";
+    }
+
+
+
+}

ruoyi-admin/src/main/resources/application.yml

@@ -5,7 +5,7 @@ ruoyi:
   # 版本
   version: 4.7.7
   # 版权年份
-  copyrightYear: 2023
+  copyrightYear: 2024
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
@@ -125,7 +125,7 @@ shiro:
     kickoutAfter: false
   rememberMe:
     # 是否开启记住我
-    enabled: true
+    enabled: false
 
 # 防止XSS攻击
 xss:
@@ -139,4 +139,18 @@ xss:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
+
+# 滑块验证码
+aj:
+  captcha:
+    # blockPuzzle滑块 clickWord文字点选  default默认两者都实例化
+    type: blockPuzzle
+    # 右下角显示字
+    water-mark: 保密业务辅助管理系统
+    # 校验滑动拼图允许误差偏移量(默认5像素)
+    slip-offset: 5
+    # aes加密坐标开启或者禁用(true|false)
+    aes-status: true
+    # 滑动干扰项(0/1/2)
+    interference-options: 0

ruoyi-admin/src/main/resources/static/ajax/libs/captcha/ase.js

@@ -0,0 +1,12 @@
+// 加密数据函数 工具crypto.js 文件工具
+/**
+ * @word 要加密的内容
+ * @keyWord String  服务器随机返回的关键字
+ *  */
+function aesEncrypt(word,keyWord){
+  // var keyWord = keyWord || "XwKsGlMcdPMEhR1B"
+  var key = CryptoJS.enc.Utf8.parse(keyWord);
+  var srcs = CryptoJS.enc.Utf8.parse(word);
+  var encrypted = CryptoJS.AES.encrypt(srcs, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
+  return encrypted.toString();
+}

ruoyi-admin/src/main/resources/static/ajax/libs/captcha/ase.min.js

@@ -0,0 +1 @@
+function aesEncrypt(d,e){var a=CryptoJS.enc.Utf8.parse(e);var c=CryptoJS.enc.Utf8.parse(d);var b=CryptoJS.AES.encrypt(c,a,{mode:CryptoJS.mode.ECB,padding:CryptoJS.pad.Pkcs7});return b.toString()};

ruoyi-admin/src/main/resources/static/ajax/libs/captcha/css/verify.css

@@ -0,0 +1,275 @@
+.verify-code {
+	font-size: 20px;
+	text-align: center;
+	cursor: pointer;
+	margin-bottom: 5px;
+	border: 1px solid #ddd;
+}
+
+.cerify-code-panel {
+	height:100%;
+	overflow:hidden;
+}
+
+.verify-code-area {
+	float:left;
+}
+
+.verify-input-area {
+	float: left;
+	width: 60%;
+	padding-right: 10px;
+	
+}
+
+.verify-change-area {
+	line-height: 30px;
+	float: left;
+}
+
+.varify-input-code {
+	display:inline-block; 
+	width: 100%;
+	height: 25px;
+}
+
+.verify-change-code {
+	color: #337AB7;
+	cursor: pointer;
+}
+
+.verify-btn {
+	width: 200px;
+	height: 30px;
+	background-color: #337AB7;
+	color:#FFFFFF;
+	border:none;
+	margin-top: 10px;
+}
+
+.verifybox{
+    position: relative;
+    box-sizing: border-box;
+    border-radius: 2px;
+    border: 1px solid #e4e7eb;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0,0,0,.3);
+    left: 50%;
+    top:50%;
+    transform: translate(-50%,-50%);
+}
+.verifybox-top{
+    padding: 0 15px;
+    height: 40px;
+    line-height: 40px;
+    text-align: left;
+    font-size: 16px;
+    color: #45494c;
+    border-bottom: 1px solid #e4e7eb;
+    box-sizing: border-box;
+}
+.verifybox-bottom{
+    padding: 15px;
+    box-sizing: border-box;
+}
+.verifybox-close{
+    position: absolute;
+    top: 8px;
+    right: 9px;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    cursor: pointer;
+    transition: transform 0.2s ease;
+}
+
+.verifybox-close .icon-close{
+    font-weight: bold;
+}
+
+.verifybox-close:hover {
+    transition: transform 0.2s ease;
+    transform:rotate(60deg);
+    -ms-transform:rotate(60deg);
+    -moz-transform:rotate(60deg);
+    -webkit-transform:rotate(60deg);
+    -o-transform:rotate(60deg);
+}
+
+.mask{
+    position: fixed;
+    top: 0;
+    left:0;
+    z-index: 1001;
+    width: 100%;
+    height: 100vh;
+    background: rgba(0,0,0,.3);
+    /* display: none; */
+    transition: all .5s;
+    display: none;
+}
+
+.verify-tips{
+    position: absolute;
+    display: none;
+    left: 0px;
+    bottom:-35px;
+    width: 100%;
+    height: 30px;
+    /* transition: all .5s; */
+    line-height:30px;
+    color: #fff;
+    /* animation:move 1.5s linear; */
+}
+
+@keyframes move {
+    0%{
+        bottom:-35px;
+    }
+    50%,80%{
+        bottom:0px;
+    }
+    100%{
+        bottom:-35px;
+    }
+}
+
+.suc-bg{
+   background-color:rgba(92, 184, 92,.5);  
+   filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
+}
+.err-bg{
+   background-color:rgba(217, 83, 79,.5);  
+   filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
+}
+
+/*滑动验证码*/
+.verify-bar-area {
+    position: relative;
+    background: #FFFFFF;
+   	text-align: center;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+   	border: 1px solid #ddd;
+   	-webkit-border-radius: 4px;
+}
+ 
+.verify-bar-area .verify-move-block {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    background: #fff;
+    cursor: move;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    box-shadow: 0 0 2px #888888;
+    -webkit-border-radius: 1px;
+}
+
+.verify-bar-area .verify-move-block:hover {
+    background-color: #337ab7;
+    color: #FFFFFF;
+}
+
+.verify-bar-area .verify-left-bar {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+   	background: #f0fff0;
+    cursor: pointer;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    border: 1px solid #ddd;
+}
+
+.verify-img-panel {
+	margin:0;
+	-webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+	border: 1px solid #ddd;
+	border-radius: 3px;
+	position: relative;
+}
+
+/*.verify-img-panel .verify-refresh {*/
+/*	width: 25px;*/
+/*	height: 25px;*/
+/*	text-align:center;*/
+/*	padding: 5px;*/
+/*	cursor: pointer;*/
+/*	position: absolute;*/
+/*	top: 0;*/
+/*	right: 0;*/
+/*	z-index: 2;*/
+/*}*/
+
+.verify-img-panel .verify-refresh img {
+    pointer-events: auto;
+    display: block;
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    transition: 200ms;
+    cursor: pointer;
+}
+
+.verify-img-panel .icon-refresh {
+	font-size: 20px;
+	color: #fff;
+}
+
+.verify-img-panel .verify-gap {
+	background-color: #fff;
+	position: relative;
+	z-index: 2;
+	border:1px solid #fff;
+}
+
+.verify-bar-area .verify-move-block .verify-sub-block {
+	position: absolute;
+    text-align: center;
+	z-index: 3;
+	/* border: 1px solid #fff; */
+}
+
+.verify-bar-area .verify-move-block .verify-icon {
+	font-size: 18px;
+}
+
+.verify-bar-area .verify-msg {
+	z-index : 3;
+    font-weight: 700;
+    color: #40485b;
+}
+
+/*字体图标的css*/
+@font-face {font-family: "iconfont";
+  src: url('../fonts/iconfont.eot?t=1508229193188'); /* IE9*/
+  src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAaAAAsAAAAACUwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kiSY21hcAAAAYAAAAB3AAABuM+qBlRnbHlmAAAB+AAAAnQAAALYnrUwT2hlYWQAAARsAAAALwAAADYPNwajaGhlYQAABJwAAAAcAAAAJAfeA4dobXR4AAAEuAAAABMAAAAYF+kAAGxvY2EAAATMAAAADgAAAA4CvAGsbWF4cAAABNwAAAAfAAAAIAEVAF1uYW1lAAAE/AAAAUUAAAJtPlT+fXBvc3QAAAZEAAAAPAAAAE3oPPXPeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sM4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDxbwtzwv4EhhrmBoQEozAiSAwAw1A0UeJzFkcENgCAMRX8RjCGO4gTe9eQcnhzAfXC2rqG/hYsT8MmD9gdS0gJIAAaykAjIBYHppCvuD8juR6zMJ67A89Zdn/f1aNPikUn8RvYo8G20CjKim6Rf6b9m34+WWd/vBr+oW8V6q3vF5qKlYrPRp4L0Ad5nGL8AeJxFUc9rE0EYnTezu8lMsrvtbrqb3TRt0rS7bdOmdI0JbWmCtiItIv5oi14qevCk9SQVLFiQgqAF8Q9QLKIHLx48FkHo3ZNnFUXwD5C2B6dO6sFhmI83w7z3fe8RnZCjb2yX5YlLhskkmScXCIFRxYBFiyjH9Rqtoqes9/g5i8WVuJyqDNTYLPwBI+cljXrkGynDhoU+nCgnjbhGY5yst+gMEq8IBIXwsjPU67CnEPm4b0su0h309Fd67da4XBhr55KSm17POk7gOE/Shq6nKdVsC7d9j+tcGPKVboc9u/0jtB/ZIA7PXTVLBef6o/paccjnwOYm3ELJetPuDrvV3gg91wlSXWY6H5qVwRzWf2TybrYYfSdqoXOwh/Qa8RWIjBTiSI3h614/vKSNRhONOrsnQi6Xf4nQFQDTmJE1NKbhI6crHEJO/+S5QPxhYJRRyvBFBP+5T9EPpEAIVzzRQIrjmJ6jY1WTo+NXTMchuBsKuS8PRZATSMl9oTA4uNLkeIA0V1UeqOoGQh7IAxGo+7T83fn3T+voqCNPPAUazUYUI7LgKSV1Jk2oUeghYGhZ+cKOe2FjVu5ZKEY2VkE13AK1+jI4r1KLbPlZfrKiPhOXKPRj7q9sj9XJ7LFHNmrKJS3VCdhXGSdKrtmoQaWeMjQVt0KD6sGPOx0oH2fgtzoNROxtNq8F3tzYM/n+TjKSX5qf2jx941276TIr9FjXxKr8eX/6bK4yuopwo9py1sw8F9kdw4AmurRpLUM3tYx5ZnKpfHPi8dzz19vJ6MjyxYUrpqeb1uLs3eGV6vr21pSqpeWkqonAN9oUyIiXpv8XvlN5e3icY2BkYGAA4n0vN4fG89t8ZeBmYQCBa9wPPRH0/wcsDMwmQC4HAxNIFABAfAqaAHicY2BkYGBu+N/AEMPCAAJAkpEBFbABAEcMAm94nGNhYGBgfsnAwMKAigESnwEBAAAAAAAAdgCkANoBCAFsAAB4nGNgZGBgYGMIZGBlAAEmIOYCQgaG/2A+AwARSAFzAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nGNgYoAALgbsgI2RiZGZkYWRlZGNkZ2BsYI1OSM1OZs1OSe/OJW1KDM9o4S9KDWtKLU4g4EBAJ79CeQ=') format('woff'),
+  url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family:"iconfont" !important;
+  font-size:16px;
+  font-style:normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-check:before { content: "\e645"; }
+
+.icon-close:before { content: "\e646"; }
+
+.icon-right:before { content: "\e6a3"; }
+
+.icon-refresh:before { content: "\e6a4"; }

ruoyi-admin/src/main/resources/static/ajax/libs/captcha/fonts/iconfont.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="check" unicode="&#58949;" d="M887.904 597.792c-12.864 12.064-33.152 11.488-45.216-1.408L415.936 142.016l-233.12 229.696C170.208 384.128 149.952 384 137.536 371.392c-12.416-12.576-12.256-32.864 0.352-45.248l256.48-252.672c0.096-0.096 0.224-0.128 0.32-0.224 0.096-0.096 0.128-0.224 0.224-0.32 2.016-1.92 4.448-3.008 6.784-4.288 1.152-0.672 2.144-1.664 3.36-2.144 3.776-1.472 7.776-2.24 11.744-2.24 4.192 0 8.384 0.832 12.288 2.496 1.312 0.544 2.336 1.664 3.552 2.368 2.4 1.408 4.896 2.592 6.944 4.672 0.096 0.096 0.128 0.256 0.224 0.352 0.064 0.096 0.192 0.128 0.288 0.224l449.184 478.208C901.44 565.408 900.768 585.664 887.904 597.792z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="close" unicode="&#58950;" d="M557.312 382.752l265.28 263.904c12.544 12.48 12.608 32.704 0.128 45.248-12.512 12.576-32.704 12.608-45.248 0.128l-265.344-263.936-263.04 263.84C236.64 704.416 216.384 704.48 203.84 692 191.328 679.52 191.296 659.264 203.776 646.72l262.976-263.776L201.6 119.2c-12.544-12.48-12.608-32.704-0.128-45.248 6.24-6.272 14.464-9.44 22.688-9.44 8.16 0 16.32 3.104 22.56 9.312l265.216 263.808 265.44-266.24c6.24-6.272 14.432-9.408 22.656-9.408 8.192 0 16.352 3.136 22.592 9.344 12.512 12.48 12.544 32.704 0.064 45.248L557.312 382.752z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="right" unicode="&#59043;" d="M761.056 363.872c0.512 0.992 1.344 1.824 1.792 2.848 8.8 18.304 5.92 40.704-9.664 55.424L399.936 756.256c-19.264 18.208-49.632 17.344-67.872-1.888-18.208-19.264-17.376-49.632 1.888-67.872l316.96-299.84-315.712-304.288c-19.072-18.4-19.648-48.768-1.248-67.872 9.408-9.792 21.984-14.688 34.56-14.688 12 0 24 4.48 33.312 13.44l350.048 337.376c0.672 0.672 0.928 1.6 1.6 2.304 0.512 0.48 1.056 0.832 1.568 1.344C757.76 357.12 759.2 360.608 761.056 363.872z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh" unicode="&#59044;" d="M939.456 639.776c-16.672 5.984-34.976-2.72-40.896-19.36l-24.768-69.344c-28.992 65.312-74.784 122.72-133.088 165.92C555.328 854.272 291.296 816.768 152.32 633.344c-67.264-88.768-95.616-198.176-79.84-308.032 15.84-110.304 74.208-207.776 164.352-274.496 75.424-55.808 163.808-82.752 251.456-82.752 128.032 0 254.56 57.44 336.992 166.272 36.48 48.128 61.472 102.08 74.208 160.416 3.776 17.248-7.136 34.304-24.416 38.08-17.216 3.712-34.304-7.104-38.08-24.416-10.784-49.184-31.872-94.752-62.72-135.456-117.888-155.52-341.92-187.232-499.392-70.72-76.288 56.48-125.664 138.912-139.072 232.16-13.344 92.8 10.656 185.248 67.488 260.288 117.856 155.584 341.792 187.424 499.328 70.848 57.024-42.24 99.84-100.608 122.976-166.624l-109.984 42.944c-16.416 6.368-35.008-1.696-41.44-18.176-6.432-16.48 1.728-35.008 18.176-41.44l161.856-63.2c3.808-1.472 7.744-2.208 11.616-2.208 0.544 0 1.024 0.192 1.568 0.224 1.216-0.128 2.432-0.64 3.648-0.64 13.12 0 25.472 8.16 30.112 21.248l57.632 161.184C964.768 615.52 956.096 633.856 939.456 639.776z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

ruoyi-admin/src/main/resources/static/ajax/libs/captcha/verify.js

@@ -0,0 +1,705 @@
+/*! Verify&admin MIT License by anji-plus*/
+
+;(function($, window, document,undefined) {
+
+	    // 初始话 uuid 
+		uuid()
+		function uuid() {
+			var s = [];
+			var hexDigits = "0123456789abcdef";
+			for (var i = 0; i < 36; i++) {
+					s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+			}
+			s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
+			s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
+			s[8] = s[13] = s[18] = s[23] = "-";
+	
+			var slider = 'slider'+ '-'+s.join("");
+			var point = 'point'+ '-'+s.join("");
+			if(!localStorage.getItem('slider')) {
+				localStorage.setItem('slider', slider)
+			}
+			if(!localStorage.getItem('point')) {
+				localStorage.setItem("point",point);
+			}
+		}
+
+	    var startX,startY;
+ 
+		document.addEventListener("touchstart",function(e){
+		
+				startX = e.targetTouches[0].pageX;
+				startY = e.targetTouches[0].pageY;
+		});
+		
+		document.addEventListener("touchmove",function(e){
+		
+				var moveX = e.targetTouches[0].pageX;
+				var moveY = e.targetTouches[0].pageY;
+				
+				if(Math.abs(moveX-startX)>Math.abs(moveY-startY)){
+						e.preventDefault();
+				}
+		},{passive:false});
+		
+    //请求图片get事件
+    function getPictrue(data,baseUrl,resolve,reject){
+		$.ajax({
+			type : "post",
+			contentType: "application/json;charset=UTF-8",
+			url : baseUrl + "captcha/get",
+			data :JSON.stringify(data),
+			cache: false,
+            crossDomain: true == !(document.all),
+			success:function(res){
+				resolve(res)
+			},
+			fail: function(err) {
+				reject(err)
+			}
+		})
+	}
+	//验证图片check事件
+	function checkPictrue(data,baseUrl,resolve,reject){
+		$.ajax({
+			type : "post",
+			contentType: "application/json;charset=UTF-8",
+			url : baseUrl + "captcha/check",
+			data :JSON.stringify(data),
+			cache: false,
+            crossDomain: true == !(document.all),
+			success:function(res){
+				resolve(res)
+			},
+			fail: function(err) {
+				reject(err)
+			}
+		})
+	}
+   
+    //定义Slide的构造函数
+    var Slide = function(ele, opt) {
+		this.$element = ele,
+		this.backToken = null,
+		this.moveLeftDistance = 0,
+		this.secretKey = '',
+        this.defaults = {
+			baseUrl:"https://captcha.anji-plus.com/captcha-api",
+			containerId:'',
+        	captchaType:"blockPuzzle",
+        	mode : 'fixed',	//弹出式pop，固定fixed
+        	vOffset: 5,
+            vSpace : 5,
+            explain : '向右滑动完成验证',
+            imgSize : {
+	        	width: '360px',
+	        	height: '155px',
+			},
+			blockSize : {
+	        	width: '50px',
+	        	height: '50px',
+	        },
+            circleRadius: '10px',
+	        barSize : {
+	        	width : '360px',
+	        	height : '40px',
+			},
+			beforeCheck:function(){ return true},
+            ready : function(){},
+        	success : function(){},
+            error : function(){}
+            
+        },
+        this.options = $.extend({}, this.defaults, opt)
+    };
+    
+    
+    //定义Slide的方法
+    Slide.prototype = {
+        init: function() {
+			var _this = this;
+        	//加载页面
+        	this.loadDom();
+			_this.refresh();
+        	this.options.ready();
+        	
+        	this.$element[0].onselectstart = document.body.ondrag = function(){ 
+				return false; 
+			};
+        	
+        	if(this.options.mode == 'pop')	{
+
+				_this.$element.find('.verifybox-close').on('click', function() {
+					_this.$element.find(".mask").css("display","none");
+					_this.refresh();
+				});
+				
+				var clickBtn = document.getElementById(this.options.containerId);
+				clickBtn && (clickBtn.onclick = function(){
+					if (_this.options.beforeCheck()) {
+						_this.$element.find(".mask").css("display","block");
+					}
+				})
+        	}
+        	
+					//按下
+        	this.htmlDoms.move_block.on('touchstart', function(e) {
+        		_this.start(e);
+        	});
+        	
+        	this.htmlDoms.move_block.on('mousedown', function(e) {
+        		_this.start(e);
+        	});
+        	
+        	//拖动
+            window.addEventListener("touchmove", function(e) {
+            	_this.move(e);
+            });
+
+            window.addEventListener("mousemove", function(e) {
+            	_this.move(e);
+            });
+            
+            //鼠标松开
+            window.addEventListener("touchend", function() {
+            	_this.end();
+            });
+            window.addEventListener("mouseup", function() {
+            	_this.end();
+            });
+            
+            //刷新
+            _this.$element.find('.verify-refresh').on('click', function() {
+				_this.refresh();
+            });
+        },
+        
+        //初始化加载
+        loadDom : function() {
+			this.status = false;	//鼠标状态
+        	this.isEnd = false;		//是够验证完成
+			this.setSize = this.resetSize(this);	//重新设置宽度高度
+			this.plusWidth = 0;
+			this.plusHeight = 0;
+            this.x = 0;
+            this.y = 0;
+        	var panelHtml = '';
+        	var wrapHtml = '';
+			this.lengthPercent = (parseInt(this.setSize.img_width)-parseInt(this.setSize.block_width)- parseInt(this.setSize.circle_radius) - parseInt(this.setSize.circle_radius) * 0.8)/(parseInt(this.setSize.img_width)-parseInt(this.setSize.bar_height));
+			
+			wrapStartHtml = '<div class="mask">'+
+								'<div class="verifybox" style="width:'+(parseInt(this.setSize.img_width)+30)+'px">'+
+									'<div class="verifybox-top">'+
+										'请完成安全验证'+
+										'<span class="verifybox-close">'+
+											'<i class="iconfont icon-close"></i>'+
+										'</span>'+
+									'</div>'+
+									'<div class="verifybox-bottom" style="padding:10px 15px 15px 15px">'+
+										'<div style="position: relative;">';
+
+			if (this.options.mode == 'pop') {
+				panelHtml = wrapStartHtml
+			}
+			panelHtml += '<div class="verify-img-out">'+
+							'<div class="verify-img-panel">'+
+								'<div class="verify-refresh" style="z-index:3">'+
+									'<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAMAAABHPGVmAAAARVBMVEUAAAAFBQUAAAABAQFHcEwAAAAAAAAAAAAAAAAAAAABAQESEhL5+fn8/Pzl5eXY2NikpKS7u7vz8/N5eXns7OzHx8f///8m8Yz0AAAAFnRSTlMBJBYfAA4SBQkCGi3f8qGOVWPNQbV5nvGdEgAABohJREFUaN69mumWpCoMgKO1aBWKu+//qCN7EkBxpqf5c889Y/F1FpKQAM/CBalV+tvS7T+JVUqCEoLbtEGLgP4FgghNepVx4ByBAS1bnPMXEIdAgBddAXSFgQKE3f/NlgUVYCDHcAhDUJvWdf316/gfC7IciymGWDE8QgPUzg+0DElzLjFwJoYjmP0rtgzJcSwmSUlCvBgWYQDjINd57vq977pVDpPQIIsx0mQokGUYMSxiHOZ+52uWo+JojBUmrbI0xImhEFW1DN2eWb3iHOIQTESBjCCWcSCmdT9d8+SlyVEgLYhmKDGmbr9cBnNCiSFGEMNY1r1ozYsR5lCZo1xBjCCHroZ+L12DESZNyUCUIEu331haGK2ymJKF1N95v7cmpTJPwWbJQ6aUx3bzvK6rOpFJlWUoeYhkW3TrNgq/lk3G2pSMkoMcHmztLtmhE8KGrEoFGVEJMUou0Bqsj80CccHQGEkGJMQmTKAywff7sPFSiK2LZanNeUlAfJXjIO/K/Zn94EKhTiN6mcCvMMzNB0shCoNkTaJjymR+vi6WUNPEqBPAgWEHdjsoxiwMQuqqEOTH9YjpI04bJuOa/75d/BQbEWZUFKow8EER1z02zNc+17pEi9bLZYJDGGyZbnEKIxBcljQNzbo+l4caiH5Ta8rMXIwqDFy6jSqrUJ+gqqTBIrchH4g5VhiDuFSod2YgVF/RQtirVVOwxuaKKQxIuj1+8oqUTysrQL7oXITbZWOiQMhSSjuTTFsgyt0e4yko1vUCieI+1idDqffR7Vvt8jUpdhOJ26vAUiQ9kgRiM6HS7ff4rl9CIj2/H2CK9rGgsD5YBcCndGO/UXugjaQtvhik608c6g7KSHIL0hfOtpX5UyYfr6/vBKHsUKKsxME4xDAkNRuNpOeUSJRw7DXEW25kWaFN1B25etOKMmPTB6OAU1ZVdSRbh8BwTfGiBDfusL6AK8soLI6k1xTqYFrnxw4GYq02phLcTVHwWZmQvqAhnkUUVmr7oC907PF5BCvIwEoTESWFc9O3rTn2Pn/NeIc2HEOqsEKIPypv6l/OripuWEhcLY5IX2UnRUOCRhYUWjRkiMvBrjq8uMAo4aDUNBaPwUU1ZElVnTIqOi4hR4W0hKQivCgaki6txxIIi15CBPcSRpRjDwUZ0lV69y2CEG1FEC2KguTuIVPBQcHBXjEIxFkFWv/vQSD18eHCr6g8zx7F9jVl/tLuoECQlEBKA7GHfDP6GCzE2gy5uKAREgqCyntM3/JqDfGibMjFRVWYUdBRlCnI4iDW/caUixdCVFCpEgob9DYQ/G9BjlEe6tExiRU2PzzEZRwUQXVqbIsgKJ3IRAA0kJAMWAQ1ee1WOuni67A+Jyh5Bvea7qUTb9eJxVh34sFZBX8yiKockqiq2J0LtOUO71DSosTIrxiFomCFhUIBnkhftCi6LcqbFUWVqxHhifQVjDIjUcrrO6WwlSiLF5HHFwvV582iyHpYn6iqnlhfIXutN6IXkEbcRDwrqrmJC460tQAng5sPvnN9H2s4hsGogEJLTx2sRj0yuByt2Muwqhjklzdykudxl8Jbrslf5+IWw7ve9u5h7oRIDTgwoLpldJT27GKaaDG85eR76/4ahUPLhvsXVaDkrtjR7AaNV3wzEvgVY8YFsW+RtulmQRO2xZzWNRisQYBfMXBSmEXoKifaHg0e3vAeA55CAMuh6Mh6jdVnDZzQ5Ym++XjPipIC6ysJP1agXRfbivLDoTASoC2GJ4ck7lz9Jly/P9lUU91I1XyTY9xi8PdziIoOfiFaF4NJtgdVf8jot59Qe5u1MSCuNlnqUcII14bkjc4qNDr7Ckch0saAVCSt2LCBt2z1BC1q2Q4MEvfqSSMnouy9XFzz2a2o+by6qJsfN6GO8DfSmBZHbktoo4/byms5iVtcOQilJC8tfafnAemBwHQNIRTdwiif0Ng7UwHkiTtxumy9NUDplnDHPJszBoptkZaPm/qhItn2ZARIKTeEWRfSiLuAwAdPMg9htoLBVucHTZk6DZ5nFD3MnO9MGT/XEEIxwqjBr+zzY9mFz0sLBsysd22lqSYZy9PPckoMmAun2MCn8SZQTYOcO3UM9ZEcxoqOyps7o3IyhYiH/gJP/enQ/3Nj6E9fSIT05F4vqPlc5vkCFD9f+J2HGL/0pCT5OOb1049jfumZD63bm//1YCm6HyT2/4GnV7/1iOz0NVzpj/8AwGROkG+dyqIAAAAASUVORK5CYII=">'+
+								'</div>'+
+								'<span class="verify-tips"  class="suc-bg"></span>'+
+								'<img src="" class="backImg" style="width:100%;height:100%;display:block">'+
+							'</div>'+
+						'</div>';
+
+			this.plusWidth = parseInt(this.setSize.block_width) + parseInt(this.setSize.circle_radius) * 2 - parseInt(this.setSize.circle_radius) * 0.2;
+			this.plusHeight = parseInt(this.setSize.block_height) + parseInt(this.setSize.circle_radius) * 2 - parseInt(this.setSize.circle_radius) * 0.2;
+			
+			panelHtml +='<div class="verify-bar-area" style="width:'+this.setSize.img_width+',height:'+this.setSize.bar_height+',line-height:'+this.setSize.bar_height+'">'+
+									'<span  class="verify-msg">'+this.options.explain+'</span>'+
+									'<div class="verify-left-bar">'+
+										'<span class="verify-msg"></span>'+
+										'<div  class="verify-move-block">'+
+											'<i  class="verify-icon iconfont icon-right"></i>'+
+											'<div class="verify-sub-block">'+
+												'<img src="" class="bock-backImg" alt=""  style="width:100%;height:100%;display:block">'+
+											'</div>'+
+										'</div>'+
+									'</div>'+
+								'</div>';
+			wrapEndHtml = '</div></div></div></div>';
+			if (this.options.mode == 'pop') {
+				panelHtml += wrapEndHtml
+			}
+
+        	this.$element.append(panelHtml);
+        	this.htmlDoms = {
+        		tips: this.$element.find('.verify-tips'),
+        		sub_block : this.$element.find('.verify-sub-block'),
+        		out_panel : this.$element.find('.verify-img-out'),
+        		img_panel : this.$element.find('.verify-img-panel'),
+				img_canvas : this.$element.find('.verify-img-canvas'),
+        		bar_area : this.$element.find('.verify-bar-area'),
+        		move_block : this.$element.find('.verify-move-block'),
+        		left_bar : this.$element.find('.verify-left-bar'),
+        		msg : this.$element.find('.verify-msg'),
+        		icon : this.$element.find('.verify-icon'),
+        		refresh :this.$element.find('.verify-refresh')
+        	};
+        	
+        	this.$element.css('position', 'relative');
+
+			this.htmlDoms.sub_block.css({'height':this.setSize.img_height,'width':Math.floor(parseInt(this.setSize.img_width)*47/310)+ 'px',
+									'top':-(parseInt(this.setSize.img_height) + this.options.vSpace) + 'px'})
+			this.htmlDoms.out_panel.css('height', parseInt(this.setSize.img_height) + this.options.vSpace + 'px');
+			this.htmlDoms.img_panel.css({'width': this.setSize.img_width, 'height': this.setSize.img_height});
+			this.htmlDoms.bar_area.css({'width': this.setSize.img_width, 'height': this.setSize.bar_height, 'line-height':this.setSize.bar_height});
+        	this.htmlDoms.move_block.css({'width': this.setSize.bar_height, 'height': this.setSize.bar_height});
+        	this.htmlDoms.left_bar.css({'width': this.setSize.bar_height, 'height': this.setSize.bar_height});
+        },
+        
+
+        //鼠标按下
+        start: function(e) {
+					if(!e.originalEvent.targetTouches) {    //兼容移动端
+						var x = e.clientX;
+					}else {     //兼容PC端
+							var x = e.originalEvent.targetTouches[0].pageX;
+					}
+					// if(!e.touches) {    //兼容移动端
+					// 	var x = e.clientX;
+					// }else {     //兼容PC端
+					// 		var x = e.touches[0].pageX;
+					// }
+			this.startLeft = Math.floor(x - this.htmlDoms.bar_area[0].getBoundingClientRect().left);
+			this.startMoveTime = new Date().getTime();
+        	if(this.isEnd == false) {
+	        	this.htmlDoms.msg.text('');
+	        	this.htmlDoms.move_block.css('background-color', '#337ab7');
+	        	this.htmlDoms.left_bar.css('border-color', '#337AB7');
+	        	this.htmlDoms.icon.css('color', '#fff');
+	        	e.stopPropagation();
+	        	this.status = true;
+        	}
+        },
+        
+        //鼠标移动
+        move: function(e) {
+        	if(this.status && this.isEnd == false) {
+	            if(!e.touches) {    //兼容移动端
+	                var x = e.clientX;
+	            }else {     //兼容PC端
+	                var x = e.touches[0].pageX;
+	            }
+				var bar_area_left = this.htmlDoms.bar_area[0].getBoundingClientRect().left;
+				var move_block_left = x - bar_area_left; //小方块相对于父元素的left值
+				if(move_block_left >= (this.htmlDoms.bar_area[0].offsetWidth - parseInt(this.setSize.bar_height) + parseInt(parseInt(this.setSize.block_width)/2) - 2) ) {
+					move_block_left = (this.htmlDoms.bar_area[0].offsetWidth - parseInt(this.setSize.bar_height) + parseInt(parseInt(this.setSize.block_width)/2)- 2);
+				}
+	            if(move_block_left <= parseInt(parseInt(this.setSize.block_width)/2)) {
+            		move_block_left = parseInt(parseInt(this.setSize.block_width)/2);
+            	}
+				//拖动后小方块的left值
+	            this.htmlDoms.move_block.css('left', move_block_left-this.startLeft + "px");
+	            this.htmlDoms.left_bar.css('width', move_block_left-this.startLeft + "px");
+				this.htmlDoms.sub_block.css('left', "0px");
+				this.moveLeftDistance = move_block_left - this.startLeft
+	        }
+        },
+        
+        //鼠标松开
+        end: function() {
+			this.endMovetime = new Date().getTime();
+        	var _this = this;
+        	//判断是否重合
+        	if(this.status  && this.isEnd == false) {
+				var vOffset = parseInt(this.options.vOffset);
+				this.moveLeftDistance = this.moveLeftDistance * 310/ parseInt(this.setSize.img_width)
+				//图片滑动
+
+				var data = {
+					captchaType:this.options.captchaType,
+					"pointJson": this.secretKey ? aesEncrypt(JSON.stringify({x:this.moveLeftDistance,y:5.0}),this.secretKey):JSON.stringify({x:this.moveLeftDistance,y:5.0}),
+					"token":this.backToken,
+					clientUid: localStorage.getItem('slider'), 
+					ts: Date.now()
+				}
+				var captchaVerification = this.secretKey ? aesEncrypt(this.backToken+'---'+JSON.stringify({x:this.moveLeftDistance,y:5.0}),this.secretKey):this.backToken+'---'+JSON.stringify({x:this.moveLeftDistance,y:5.0})
+				checkPictrue(data,this.options.baseUrl,function(res){
+					// 请求反正成功的判断
+					if (res.repCode=="0000") {
+						_this.htmlDoms.move_block.css('background-color', '#5cb85c');
+						_this.htmlDoms.left_bar.css({'border-color': '#5cb85c', 'background-color': '#fff'});
+						_this.htmlDoms.icon.css('color', '#fff');
+						_this.htmlDoms.icon.removeClass('icon-right');
+						_this.htmlDoms.icon.addClass('icon-check');
+						//提示框
+						_this.htmlDoms.tips.addClass('suc-bg').removeClass('err-bg')
+						_this.htmlDoms.tips.css({"display":"block",animation:"move 1s cubic-bezier(0, 0, 0.39, 1.01)"});
+						_this.htmlDoms.tips.text(((_this.endMovetime-_this.startMoveTime)/1000).toFixed(2) + 's验证成功');
+						_this.isEnd = true;
+						setTimeout(function(){
+							_this.$element.find(".mask").css("display","none");
+							_this.htmlDoms.tips.css({"display":"none",animation:"none"});
+							_this.refresh();
+						}, 1000)
+						_this.options.success({'__captchaVerification':captchaVerification});
+					}else{
+						_this.htmlDoms.move_block.css('background-color', '#d9534f');
+						_this.htmlDoms.left_bar.css('border-color', '#d9534f');
+						_this.htmlDoms.icon.css('color', '#fff');
+						_this.htmlDoms.icon.removeClass('icon-right');
+						_this.htmlDoms.icon.addClass('icon-close');
+
+						_this.htmlDoms.tips.addClass('err-bg').removeClass('suc-bg')
+						_this.htmlDoms.tips.css({"display":"block",animation:"move 1.3s cubic-bezier(0, 0, 0.39, 1.01)"});
+						_this.htmlDoms.tips.text(res.repMsg)
+						setTimeout(function () { 
+							_this.refresh();
+						}, 800);
+
+						 setTimeout(function () {
+						 	_this.htmlDoms.tips.css({"display":"none",animation:"none"});
+						 }, 1300)
+						_this.options.error(this);
+					}
+				})
+	            this.status = false;
+        	}
+		},
+		
+        resetSize : function(obj) {
+        	var img_width,img_height,bar_width,bar_height,block_width,block_height,circle_radius;	//图片的宽度、高度，移动条的宽度、高度
+        	var parentWidth = obj.$element.parent().width() || $(window).width();
+        	var parentHeight = obj.$element.parent().height() || $(window).height();
+        	
+       		if(obj.options.imgSize.width.indexOf('%')!= -1){
+        		img_width = parseInt(obj.options.imgSize.width)/100 * parentWidth + 'px';
+		　　}else {
+				img_width = obj.options.imgSize.width;
+			}
+		
+			if(obj.options.imgSize.height.indexOf('%')!= -1){
+        		img_height = parseInt(obj.options.imgSize.height)/100 * parentHeight + 'px';
+		　　}else {
+				img_height = obj.options.imgSize.height;
+			}
+		
+			if(obj.options.barSize.width.indexOf('%')!= -1){
+        		bar_width = parseInt(obj.options.barSize.width)/100 * parentWidth + 'px';
+		　　}else {
+				bar_width = obj.options.barSize.width;
+			}
+		
+			if(obj.options.barSize.height.indexOf('%')!= -1){
+        		bar_height = parseInt(obj.options.barSize.height)/100 * parentHeight + 'px';
+		　　}else {
+				bar_height = obj.options.barSize.height;
+			}
+			
+			if(obj.options.blockSize) {
+				if(obj.options.blockSize.width.indexOf('%')!= -1){
+					block_width = parseInt(obj.options.blockSize.width)/100 * parentWidth + 'px';
+			　　}else {
+					block_width = obj.options.blockSize.width;
+				}
+				
+			
+				if(obj.options.blockSize.height.indexOf('%')!= -1){
+					block_height = parseInt(obj.options.blockSize.height)/100 * parentHeight + 'px';
+			　　}else {
+					block_height = obj.options.blockSize.height;
+				}
+			}
+
+			if(obj.options.circleRadius) {
+				if(obj.options.circleRadius.indexOf('%')!= -1){
+					circle_radius = parseInt(obj.options.circleRadius)/100 * parentHeight + 'px';
+			　　}else {
+					circle_radius = obj.options.circleRadius;
+				}
+			}
+		
+			return {img_width : img_width, img_height : img_height, bar_width : bar_width, bar_height : bar_height, block_width : block_width, block_height : block_height, circle_radius : circle_radius};
+       	},
+
+        //刷新
+        refresh: function() {
+			var _this = this;
+        	this.htmlDoms.refresh.show();
+        	this.$element.find('.verify-msg:eq(1)').text('');
+        	this.$element.find('.verify-msg:eq(1)').css('color', '#000');
+        	this.htmlDoms.move_block.animate({'left':'0px'}, 'fast');
+			this.htmlDoms.left_bar.animate({'width': parseInt(this.setSize.bar_height)}, 'fast');
+			this.htmlDoms.left_bar.css({'border-color': '#ddd'});
+			
+			this.htmlDoms.move_block.css('background-color', '#fff');
+			this.htmlDoms.icon.css('color', '#000');
+			this.htmlDoms.icon.removeClass('icon-close');
+			this.htmlDoms.icon.addClass('icon-right');
+			this.$element.find('.verify-msg:eq(0)').text(this.options.explain);
+			this.isEnd = false;
+			getPictrue({captchaType:"blockPuzzle", clientUid: localStorage.getItem('slider'), ts: Date.now()},this.options.baseUrl,function (res) {
+				if (res.repCode=="0000") {
+					_this.$element.find(".backImg")[0].src = 'data:image/png;base64,'+res.repData.originalImageBase64
+					_this.$element.find(".bock-backImg")[0].src = 'data:image/png;base64,'+res.repData.jigsawImageBase64
+					_this.secretKey = res.repData.secretKey
+					_this.backToken = res.repData.token
+				} else {
+					_this.$element.find(".backImg")[0].src = 'images/default.jpg'
+					_this.$element.find(".bock-backImg")[0].src = ''
+					_this.htmlDoms.tips.addClass('err-bg').removeClass('suc-bg')
+					_this.htmlDoms.tips.animate({"bottom":"0px"});
+					_this.htmlDoms.tips.text(res.repMsg)
+					setTimeout(function () { 
+							_this.htmlDoms.tips.animate({"bottom":"-35px"});
+						}, 1000);
+					}
+			});
+			this.htmlDoms.sub_block.css('left', "0px");
+        },
+    };
+
+
+    //定义Points的构造函数
+    var Points = function(ele, opt) {
+		this.$element = ele,
+		this.backToken = null,
+		this.secretKey = '',
+        this.defaults = {
+			baseUrl:"https://captcha.anji-plus.com/captcha-api",
+			captchaType:"clickWord",
+			containerId:'',
+        	mode : 'fixed',	//弹出式pop，固定fixed
+		    checkNum : 3,	//校对的文字数量
+		    vSpace : 5,	//间隔
+		    explain : '向右拖动滑块填充拼图',
+        	imgSize : {
+	        	width: '310px',
+	        	height: '155px',
+	        },
+	        barSize : {
+	        	width : '310px',
+	        	height : '50px',
+			},
+			beforeCheck: function(){ return true},
+	        ready : function(){},
+        	success : function(){},
+            error : function(){}
+        },
+        this.options = $.extend({}, this.defaults, opt)
+    };
+    
+    //定义Points的方法
+    Points.prototype = {
+    	init : function() {
+			var _this = this;
+			//加载页面
+        	_this.loadDom();
+        	 
+        	_this.refresh();
+        	_this.options.ready();
+        	
+        	this.$element[0].onselectstart = document.body.ondrag = function(){ 
+				return false; 
+			};
+			
+			if(this.options.mode == 'pop')	{
+				
+				_this.$element.find('.verifybox-close').on('click', function() {
+					_this.$element.find(".mask").css("display","none");
+				});
+				
+				var clickBtn = document.getElementById(this.options.containerId);
+				clickBtn && (clickBtn.onclick = function(){
+					if (_this.options.beforeCheck()) {
+						_this.$element.find(".mask").css("display","block");
+					}
+				})
+				
+        	}
+		 	// 注册点击验证事件
+        	_this.$element.find('.back-img').on('click', function(e) {
+        		
+				_this.checkPosArr.push(_this.getMousePos(this, e));
+				
+				if(_this.num == _this.options.checkNum) {
+					_this.num = _this.createPoint(_this.getMousePos(this, e));
+					 //按比例转换坐标值
+					 _this.checkPosArr = _this.pointTransfrom(_this.checkPosArr,_this.setSize);
+					setTimeout(function(){
+						var data = {
+							captchaType:_this.options.captchaType,
+							"pointJson":_this.secretKey ? aesEncrypt(JSON.stringify(_this.checkPosArr),_this.secretKey):JSON.stringify(_this.checkPosArr),
+							"token":_this.backToken,
+							clientUid: localStorage.getItem('point'), 
+							ts: Date.now()
+						}
+						var captchaVerification = _this.secretKey ? aesEncrypt(_this.backToken+'---'+JSON.stringify(_this.checkPosArr),_this.secretKey):_this.backToken+'---'+JSON.stringify(_this.checkPosArr)
+						checkPictrue(data, _this.options.baseUrl,function(res){
+							if (res.repCode=="0000") {
+								_this.$element.find('.verify-bar-area').css({'color': '#4cae4c', 'border-color': '#5cb85c'});
+								_this.$element.find('.verify-msg').text('验证成功');
+								// _this.$element.find('.verify-refresh').hide();
+								_this.$element.find('.verify-img-panel').unbind('click');
+								setTimeout(function(){
+									_this.$element.find(".mask").css("display","none");
+									_this.refresh();
+								},1000)
+								_this.options.success({'captchaVerification':captchaVerification});
+							}else{
+								_this.options.error(_this);
+								_this.$element.find('.verify-bar-area').css({'color': '#d9534f', 'border-color': '#d9534f'});
+								_this.$element.find('.verify-msg').text('验证失败');
+								setTimeout(function () { 
+									_this.$element.find('.verify-bar-area').css({'color': '#000','border-color': '#ddd'});
+									_this.refresh();
+								}, 400);
+							}
+						})
+					}, 400);
+					
+				}
+				if(_this.num < _this.options.checkNum) {
+					_this.num = _this.createPoint(_this.getMousePos(this, e));
+				}
+        	});
+        	
+        	 //刷新
+            _this.$element.find('.verify-refresh').on('click', function() {
+            	_this.refresh();
+            });
+        	
+    	},
+    	
+    	//加载页面
+    	loadDom : function() {
+    		
+    		this.fontPos = [];	//选中的坐标信息
+    		this.checkPosArr = [];	//用户点击的坐标
+    		this.num = 1;	//点击的记数
+    		
+			var panelHtml = '';
+			var wrapStartHtml = '';
+        	
+			this.setSize = Slide.prototype.resetSize(this);	//重新设置宽度高度
+			
+			wrapStartHtml = '<div class="mask">'+
+								'<div class="verifybox" style="width:'+(parseInt(this.setSize.img_width)+30)+'px">'+
+									'<div class="verifybox-top">'+
+										'请完成安全验证'+
+										'<span class="verifybox-close">'+
+											'<i class="iconfont icon-close"></i>'+
+										'</span>'+
+									'</div>'+
+									'<div class="verifybox-bottom" style="padding:15px">'+
+										'<div style="position: relative;">';
+
+			if (this.options.mode == 'pop') {
+				panelHtml = wrapStartHtml
+			}
+        	
+			panelHtml += '<div class="verify-img-out">'+
+							'<div class="verify-img-panel">'+
+								'<div class="verify-refresh" style="z-index:3">'+
+									'<i class="iconfont icon-refresh"></i>'+
+								'</div>'+
+								'<img src="" class="back-img" width="'+this.setSize.img_width+'" height="'+this.setSize.img_height+'">'+
+							'</div>'+
+						'</div>'+
+						'<div class="verify-bar-area" style="width:'+this.setSize.img_width+',height:'+this.setSize.bar_height+',line-height:'+this.setSize.bar_height+'">'+
+							'<span  class="verify-msg"></span>'+
+						'</div>';
+			
+			wrapEndHtml = '</div></div></div></div>';
+
+			if (this.options.mode == 'pop') {
+				panelHtml += wrapEndHtml
+			}
+        	
+        	this.$element.append(panelHtml);
+        	
+        	this.htmlDoms = {
+				back_img : this.$element.find('.back-img'),
+        		out_panel : this.$element.find('.verify-img-out'),
+        		img_panel : this.$element.find('.verify-img-panel'),
+        		bar_area : this.$element.find('.verify-bar-area'),
+        		msg : this.$element.find('.verify-msg'),
+        	};
+        	
+        	this.$element.css('position', 'relative');
+
+        	this.htmlDoms.out_panel.css('height', parseInt(this.setSize.img_height) + this.options.vSpace + 'px');
+    		this.htmlDoms.img_panel.css({'width': this.setSize.img_width, 'height': this.setSize.img_height, 'background-size' : this.setSize.img_width + ' '+ this.setSize.img_height, 'margin-bottom': this.options.vSpace + 'px'});
+    		this.htmlDoms.bar_area.css({'width': this.setSize.img_width, 'height': this.setSize.bar_height, 'line-height':this.setSize.bar_height});
+    		
+    	},
+    	
+    	//获取坐标
+    	getMousePos :function(obj, event) {
+            var e = event || window.event;
+            var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+            var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+            var x = e.clientX - ($(obj).offset().left - $(window).scrollLeft());
+    		var y = e.clientY - ($(obj).offset().top - $(window).scrollTop());
+    		
+            return {'x': x, 'y': y};
+     	},
+     	
+       	//创建坐标点
+       	createPoint : function (pos) {
+			   this.htmlDoms.img_panel.append('<div class="point-area" style="background-color:#1abd6c;color:#fff;z-index:9999;width:20px;height:20px;text-align:center;line-height:20px;border-radius: 50%;position:absolute;'
+			   										+'top:'+parseInt(pos.y-10)+'px;left:'+parseInt(pos.x-10)+'px;">'+this.num+'</div>');
+       		return ++this.num;
+       	},
+ 
+       	//刷新
+        refresh: function() {
+        	var _this = this;
+        	this.$element.find('.point-area').remove();
+        	this.fontPos = [];
+        	this.checkPosArr = [];
+        	this.num = 1;
+			getPictrue({captchaType:"clickWord", clientUid: localStorage.getItem('point'), ts: Date.now()},_this.options.baseUrl,function(res){
+				if (res.repCode=="0000") {
+					_this.htmlDoms.back_img[0].src ='data:image/png;base64,'+ res.repData.originalImageBase64;
+					_this.backToken = res.repData.token;
+					_this.secretKey = res.repData.secretKey;
+					var text = '请依次点击【' + res.repData.wordList.join(",") + '】';
+					_this.$element.find('.verify-msg').text(text);
+				} else {
+					_this.htmlDoms.back_img[0].src = 'images/default.jpg';
+					_this.$element.find('.verify-msg').text(res.repMsg);
+				}
+			})
+        
+		},
+		pointTransfrom:function(pointArr,imgSize){
+			var newPointArr = pointArr.map(function(p){
+				var x = Math.round(310 * p.x/parseInt(imgSize.img_width))
+				var y =Math.round(155 * p.y/parseInt(imgSize.img_height))
+				return {'x':x,'y':y}
+			})
+			return newPointArr
+		}
+    };
+    //在插件中使用slideVerify对象
+    $.fn.slideVerify = function(options, callbacks) {
+		var slide = new Slide(this, options);
+		if (slide.options.mode=="pop" && slide.options.beforeCheck()) {
+			slide.init();
+		}else if (slide.options.mode=="fixed") {
+			slide.init();
+		}
+    };
+    
+    //在插件中使用clickVerify对象
+    $.fn.pointsVerify = function(options, callbacks) {
+        var points = new Points(this, options);
+		if (points.options.mode=="pop" && points.options.beforeCheck()) {
+			points.init();
+		}else if (points.options.mode=="fixed") {
+			points.init();
+		}
+    };
+   
+})(jQuery, window, document);

ruoyi-admin/src/main/resources/static/ruoyi/login.js

@@ -2,39 +2,29 @@
 $(function() {
     validateKickout();
     validateRule();
-    $('.imgcode').click(function() {
+    refreshCode();
-        var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random();
-        $(".imgcode").attr("src", url);
-    });
 });
 
 $.validator.setDefaults({
     submitHandler: function() {
-        login();
+    	showVerfyImage();
     }
 });
 
-function login() {
+function showVerfyImage() {
+	$("#verfyImg").find(".mask").css("display", "block");
+}
+
+function postLogin(data){
     $.modal.loading($("#btnSubmit").data("loading"));
-    var username = $.common.trim($("input[name='username']").val());
-    var password = $.common.trim($("input[name='password']").val());
-    var validateCode = $("input[name='validateCode']").val();
-    var rememberMe = $("input[name='rememberme']").is(':checked');
     $.ajax({
         type: "post",
         url: ctx + "login",
-        data: {
+        data: data,
-            "username": username,
-            "password": password,
-            "validateCode": validateCode,
-            "rememberMe": rememberMe
-        },
         success: function(r) {
             if (r.code == web_status.SUCCESS) {
                 location.href = ctx + 'index';
             } else {
-            	$('.imgcode').click();
-            	$(".code").val("");
             	$.modal.msg(r.msg);
             }
             $.modal.closeLoading();
@@ -42,6 +32,28 @@ function login() {
     });
 }
 
+/* 刷新验证码 */
+function refreshCode() {
+	/** 初始化验证码  弹出式 */
+	$('#verfyImg').slideVerify({
+		baseUrl: ctx,
+		mode: 'pop',
+		success : function(params) {
+			var username = $.common.trim($("input[name='username']").val());
+		    var password = $.common.trim($("input[name='password']").val());
+		    var rememberMe = $("input[name='rememberme']").is(':checked');
+		    var data = {
+		        "username": username,
+		        "password": password,
+		        "rememberMe": rememberMe
+		    };
+			data = $.extend(data, params);
+			postLogin(data);
+		},
+		error : function() {}
+	});
+}
+
 function validateRule() {
     var icon = "<i class='fa fa-times-circle'></i> ";
     $("#signupForm").validate({

ruoyi-admin/src/main/resources/static/ruoyi/register.js

@@ -1,33 +1,28 @@
 
 $(function() {
     validateRule();
-    $('.imgcode').click(function() {
+    refreshCode();
-        var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random();
-        $(".imgcode").attr("src", url);
-    });
 });
 
 $.validator.setDefaults({
     submitHandler: function() {
-    	register();
+    	showVerfyImage();
     }
 });
 
-function register() {
+function showVerfyImage() {
-    $.modal.loading($("#btnSubmit").data("loading"));
+	$("#verfyImg").find(".mask").css("display", "block");
-    var username = $.common.trim($("input[name='username']").val());
+}
-    var password = $.common.trim($("input[name='password']").val());
+
-    var validateCode = $("input[name='validateCode']").val();
+function postRegister(data){
+	$.modal.loading($("#btnSubmit").data("loading"));
     $.ajax({
         type: "post",
         url: ctx + "register",
-        data: {
+        data: data,
-            "loginName": username,
-            "password": password,
-            "validateCode": validateCode
-        },
         success: function(r) {
             if (r.code == web_status.SUCCESS) {
+            	var username = $.common.trim($("input[name='username']").val());
             	layer.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", {
             	    icon: 1,
             	    title: "系统提示"
@@ -39,14 +34,32 @@ function register() {
             	});
             } else {
             	$.modal.closeLoading();
-            	$('.imgcode').click();
-            	$(".code").val("");
             	$.modal.msg(r.msg);
             }
         }
     });
 }
 
+/* 刷新验证码 */
+function refreshCode() {
+	/** 初始化验证码  弹出式 */
+	$('#verfyImg').slideVerify({
+		baseUrl: ctx,
+		mode: 'pop',
+		success : function(params) {
+			var username = $.common.trim($("input[name='username']").val());
+		    var password = $.common.trim($("input[name='password']").val());
+		    var data = {
+		        "loginName": username,
+		        "password": password
+		    };
+			data = $.extend(data, params);
+			postRegister(data);
+		},
+		error : function() {}
+	});
+}
+
 function validateRule() {
     var icon = "<i class='fa fa-times-circle'></i> ";
     $("#registerForm").validate({

ruoyi-admin/src/main/resources/templates/index.html

@@ -72,7 +72,7 @@
 					</ul>
                 </li>
                 <li th:if="${demoEnabled}">
-/*                   <!-- <a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a> -->
+					<a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>
                     <ul class="nav nav-second-level collapse">
                         <li> <a>表单<span class="fa arrow"></span></a>
                             <ul class="nav nav-third-level">
@@ -251,7 +251,7 @@
         </div>
 
         <div th:if="${footer}" class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] ZHKY Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->

ruoyi-admin/src/main/resources/templates/login.html

@@ -3,13 +3,14 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>登录保密业务辅助管理系统系统</title>
+    <title>登录保密业务辅助管理系统</title>
-    <meta name="description" content="后台管理框架">
+    <meta name="description" content="若依后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
+    <link href="../static/ajax/libs/captcha/css/verify.min.css" th:href="@{/ajax/libs/captcha/css/verify.min.css}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
@@ -21,53 +22,47 @@
     </script>
 </head>
 <body class="signin">
+<div id="verfyImg">
+</div>
     <div class="signinpanel">
         <div class="row">
             <div class="col-sm-7">
                 <div class="signin-info">
                     <div class="logopanel m-b">
-                        <h1> 保密业务辅助管理系统 </h1>
                     </div>
                     <div class="m-b"></div>
-                    <ul class="m-b">
+                    <h4>欢迎使用 <strong>保密业务辅助后台管理系统</strong></h4>
 
-                    </ul>
                     <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
                 </div>
             </div>
             <div class="col-sm-5">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">   </p>
                     <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
                     <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
-					<div class="row m-t" th:if="${captchaEnabled==true}">
+                    <div class="checkbox-custom m-t" th:if="${isRemembered}">
-						<div class="col-xs-6">
-						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
-						</div>
-						<div class="col-xs-6">
-							<a href="javascript:void(0);" title="点击更换验证码">
-								<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-							</a>
-						</div>
-					</div>
-                    <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
 				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
 				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
+                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
                 </form>
             </div>
         </div>
         <div class="signup-footer">
             <div class="pull-right">
-                Copyright © 2024 zky.vip All Rights Reserved. <br>
+                Copyright © 2018-2024 ZHKY All Rights Reserved. <br>
             </div>
         </div>
     </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+<script th:inline="javascript"> var ctx = [[@{/}]];</script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
 <!-- 全局js -->
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
+<!-- 验证码 -->
+<script src="../static/ajax/libs/captcha/crypto-js.min.js" th:src="@{/ajax/libs/captcha/crypto-js.min.js}"></script>
+<script src="../static/ajax/libs/captcha/ase.min.js" th:src="@{/ajax/libs/captcha/ase.min.js}"></script>
+<script src="../static/ajax/libs/captcha/verify.min.js" th:src="@{/ajax/libs/captcha/verify.min.js}"></script>
+<!-- 验证插件 -->
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>

ruoyi-admin/src/main/resources/templates/register.html

@@ -3,13 +3,14 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>注册若依系统</title>
+    <title>注册保密业务辅助管理系统</title>
     <meta name="description" content="若依后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
+    <link href="../static/ajax/libs/captcha/css/verify.min.css" th:href="@{/ajax/libs/captcha/css/verify.min.css}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
@@ -18,6 +19,8 @@
     <style type="text/css">label.error { position:inherit;  }</style>
 </head>
 <body class="signin">
+<div id="verfyImg">
+</div>
     <div class="signinpanel">
         <div class="row">
             <div class="col-sm-7">
@@ -44,33 +47,28 @@
                     <input type="text"     name="username" class="form-control uname"         placeholder="用户名"   maxlength="20" />
                     <input type="password" name="password" class="form-control pword"         placeholder="密码"     maxlength="20" />
                     <input type="password" name="confirmPassword" class="form-control pword"  placeholder="确认密码" maxlength="20" />
-					<div class="row m-t" th:if="${captchaEnabled==true}">
+                    <div class="checkbox-custom m-t">
-						<div class="col-xs-6">
-						    <input type="text" name="validateCode" class="form-control code"  placeholder="验证码"   maxlength="5" >
-						</div>
-						<div class="col-xs-6">
-							<a href="javascript:void(0);" title="点击更换验证码">
-								<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-							</a>
-						</div>
-					</div>
-                    <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
 				        <input type="checkbox" id="acceptTerm" name="acceptTerm"> <label for="acceptTerm">我已阅读并同意</label>
 				        <a href="https://gitee.com/y_project/RuoYi/blob/master/README.md" target="_blank">使用条款</a>
 				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍候...">注册</button>
+                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍后...">注册</button>
                 </form>
             </div>
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                &copy; 2024 All Rights Reserved. 中科园 <br>
+                &copy; 2018-2023 All Rights Reserved. RuoYi <br>
             </div>
         </div>
     </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+<script th:inline="javascript"> var ctx = [[@{/}]];</script>
 <!-- 全局js -->
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
+<!-- 验证码 -->
+<script src="../static/ajax/libs/captcha/crypto-js.min.js" th:src="@{/ajax/libs/captcha/crypto-js.min.js}"></script>
+<script src="../static/ajax/libs/captcha/ase.min.js" th:src="@{/ajax/libs/captcha/ase.min.js}"></script>
+<script src="../static/ajax/libs/captcha/verify.min.js" th:src="@{/ajax/libs/captcha/verify.min.js}"></script>
+<!-- 验证插件 -->
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>

ruoyi-admin/src/main/resources/templates/system/check/add.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增检查报告管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人：</label>
+                <div class="col-sm-8">
+                    <input name="user" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人单位：</label>
+                <div class="col-sm-8">
+                    <input name="depart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">检查开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">人员检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentry" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrywj" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrysb" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管理制度检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryglzd" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">泄密事件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryxmsj" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他项目检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryother" class="form-control" ></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check"
+        $("#form-check-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-check-add').serialize());
+            }
+        }
+
+        $("input[name='checkStartTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkownresulttime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/check/check.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('检查报告管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>报告人单位：</label>
+                                <input type="text" name="depart"/>
+                            </li>
+                            <li>
+                                <label>所属市州：</label>
+                                <input type="text" name="framework"/>
+                            </li>
+                            <li>
+                                <label>所属区县：</label>
+                                <input type="text" name="area"/>
+                            </li>
+                            <li>
+                                <label>检查状态：</label>
+                                <select name="checkState" th:with="type=${@dict.getType('sys_check_state')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:check:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:check:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:check:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:check:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:check:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:check:remove')}]];
+        var checkTypeDatas = [[${@dict.getType('sys_check_type')}]];
+        var checkStateDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentrywjjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentrysbjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryglzdjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryxmsjjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryxmsjotherjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var prefix = ctx + "system/check";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "检查报告管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'checkId',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'area',
+                    title: '所属区县'
+                },
+                {
+                    field: 'framework',
+                    title: '所属市州'
+                },
+                {
+                    field: 'user',
+                    title: '报告人'
+                },
+                {
+                    field: 'depart',
+                    title: '报告人单位'
+                },
+                {
+                    field: 'checkStartTime',
+                    title: '检查开始时间'
+                },
+                {
+                    field: 'checkState',
+                    title: '检查状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(checkStateDatas, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/check/checkprint.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/check/edit.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改检查报告管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
+            <input name="checkId" th:field="*{checkId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人：</label>
+                <div class="col-sm-8">
+                    <input name="user" disabled th:field="*{user}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人单位：</label>
+                <div class="col-sm-8">
+                    <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">检查开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" th:field="*{framework}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" th:field="*{area}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">人员检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentry" th:field="*{checkcontentry}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrywj" th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrysb" th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管理制度检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryglzd" th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">泄密事件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryxmsj" th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他项目检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryother" th:field="*{checkcontentryother}" class="form-control" ></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check";
+        $("#form-check-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-check-edit').serialize());
+            }
+        }
+
+        $("input[name='checkStartTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkownresulttime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/checkresult/add.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增检查报告管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人：</label>
+                <div class="col-sm-8">
+                    <input name="user" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人单位：</label>
+                <div class="col-sm-8">
+                    <input name="depart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">检查开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">人员检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentry" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrywj" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrysb" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管理制度检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryglzd" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">泄密事件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryxmsj" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他项目检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryother" class="form-control" ></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check"
+        $("#form-check-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-check-add').serialize());
+            }
+        }
+
+        $("input[name='checkStartTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkownresulttime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('检查报告管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>报告人单位：</label>
+                                <input type="text" name="depart"/>
+                            </li>
+                            <li>
+                                <label>所属市州：</label>
+                                <input type="text" name="framework"/>
+                            </li>
+                            <li>
+                                <label>所属区县：</label>
+                                <input type="text" name="area"/>
+                            </li>
+                            <li>
+                                <label>检查状态：</label>
+                                <select name="checkState" th:with="type=${@dict.getType('sys_check_state')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:check:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:check:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:check:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:check:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:check:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:check:remove')}]];
+        var checkTypeDatas = [[${@dict.getType('sys_check_type')}]];
+        var checkStateDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentrywjjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentrysbjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryglzdjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryxmsjjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var checkcontentryxmsjotherjtDatas = [[${@dict.getType('sys_check_state')}]];
+        var prefix = ctx + "system/check";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "检查报告管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'checkId',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'area',
+                    title: '所属区县'
+                },
+                {
+                    field: 'framework',
+                    title: '所属市州'
+                },
+                {
+                    field: 'user',
+                    title: '报告人'
+                },
+                {
+                    field: 'depart',
+                    title: '报告人单位'
+                },
+                {
+                    field: 'checkStartTime',
+                    title: '检查开始时间'
+                },
+                {
+                    field: 'checkState',
+                    title: '检查状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(checkStateDatas, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/checkresult/edit.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改检查报告管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
+            <input name="checkId" th:field="*{checkId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人：</label>
+                <div class="col-sm-8">
+                    <input name="user" disabled th:field="*{user}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">报告人单位：</label>
+                <div class="col-sm-8">
+                    <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">检查开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" th:field="*{framework}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" th:field="*{area}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">人员检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentry" th:field="*{checkcontentry}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrywj" th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentrysb" th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管理制度检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryglzd" th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">泄密事件检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryxmsj" th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他项目检查：</label>
+                <div class="col-sm-8">
+                    <textarea name="checkcontentryother" th:field="*{checkcontentryother}" class="form-control" ></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check";
+        $("#form-check-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-check-edit').serialize());
+            }
+        }
+
+        $("input[name='checkStartTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='checkownresulttime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html

@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增文件下发')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-fileprovide-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件编号：</label>
+                <div class="col-sm-8">
+                    <input disabled name="fileId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文份数：</label>
+                <div class="col-sm-8">
+                    <input name="provideCount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文单位：</label>
+                <div class="col-sm-8">
+                    <input name="provideDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文人员：</label>
+                <div class="col-sm-8">
+                    <input name="provideUserid" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文日期：</label>
+                <div class="col-sm-8">
+                    <input name="provideDate" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收文单位：</label>
+                <div class="col-sm-8">
+                    <input name="targetDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">紧急程度：</label>
+                <div class="col-sm-8">
+                    <select name="instancyExtent" class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">定密依据：</label>
+                <div class="col-sm-8">
+                    <input name="allianceFile" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属地区：</label>
+                <div class="col-sm-8">
+                    <input name="frameworkId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件密级：</label>
+                <div class="col-sm-8">
+                    <select name="fileSecret" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">保密期限：</label>
+                <div class="col-sm-8">
+                    <input name="releaseSecretid" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件标题：</label>
+                <div class="col-sm-8">
+                    <input name="fileName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文号：</label>
+                <div class="col-sm-8">
+                    <input name="fileNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属地区：</label>
+                <div class="col-sm-8">
+                    <input name="areaid" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/fileprovide"
+        $("#form-fileprovide-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/fileprovide/edit.html

@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改文件下发')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-fileprovide-edit" th:object="${tdFileProvide}">
+            <input name="fileId" th:field="*{fileId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件编码：</label>
+                <div class="col-sm-8">
+                    <input name="fileId" disabled th:field="*{fileId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文份数：</label>
+                <div class="col-sm-8">
+                    <input name="provideCount" th:field="*{provideCount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文单位：</label>
+                <div class="col-sm-8">
+                    <input name="provideDepart" th:field="*{provideDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文人员：</label>
+                <div class="col-sm-8">
+                    <input name="provideUserid" th:field="*{provideUserid}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发文日期：</label>
+                <div class="col-sm-8">
+                    <input name="provideDate" th:field="*{provideDate}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收文单位：</label>
+                <div class="col-sm-8">
+                    <input name="targetDepart" th:field="*{targetDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">紧急程度：</label>
+                <div class="col-sm-8">
+                    <select name="instancyExtent" class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{instancyExtent}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">定密依据：</label>
+                <div class="col-sm-8">
+                    <input name="allianceFile" th:field="*{allianceFile}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新人员：</label>
+                <div class="col-sm-8">
+                    <input name="updateUser" th:field="*{updateUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新日期：</label>
+                <div class="col-sm-8">
+                    <input name="updateDate" th:field="*{updateDate}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属地区：</label>
+                <div class="col-sm-8">
+                    <input name="frameworkId" th:field="*{frameworkId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件密级：</label>
+                <div class="col-sm-8">
+                    <select name="fileSecret" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{fileSecret}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">保密期限：</label>
+                <div class="col-sm-8">
+                    <input name="releaseSecretid" th:field="*{releaseSecretid}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件标题：</label>
+                <div class="col-sm-8">
+                    <input name="fileName" th:field="*{fileName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文号：</label>
+                <div class="col-sm-8">
+                    <input name="fileNum" th:field="*{fileNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属地区：</label>
+                <div class="col-sm-8">
+                    <input name="areaid" th:field="*{areaid}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/fileprovide";
+        $("#form-fileprovide-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-fileprovide-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('文件下发列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>发文单位：</label>
+                                <input type="text" name="provideDepart"/>
+                            </li>
+                            <li>
+                                <label>紧急程度：</label>
+                                <select name="instancyExtent" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>所属地区：</label>
+                                <input type="text" name="frameworkId"/>
+                            </li>
+                            <li>
+                                <label>文件标题：</label>
+                                <input type="text" name="fileName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:fileprovide:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:fileprovide:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:fileprovide:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:fileprovide:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:fileprovide:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:fileprovide:remove')}]];
+        var instancyExtentDatas = [[${@dict.getType('sys_file_jinjichengdu')}]];
+        var fileSecretDatas = [[${@dict.getType('sys_file_miji')}]];
+        var prefix = ctx + "system/fileprovide";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "文件下发",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'fileId',
+                    title: '文件编号'
+                },
+                {
+                    field: 'fileName',
+                    title: '文件标题'
+                },
+                {
+                    field: 'fileNum',
+                    title: '文号'
+                },
+                {
+                    field: 'provideCount',
+                    title: '发文份数'
+                },
+                {
+                    field: 'provideDepart',
+                    title: '发文单位'
+                },
+                {
+                    field: 'provideDate',
+                    title: '发文日期'
+                },
+                {
+                    field: 'instancyExtent',
+                    title: '紧急程度',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(instancyExtentDatas, value);
+                    }
+                },
+                // {
+                //     field: 'allianceFile',
+                //     title: '定密依据'
+                // },
+                // {
+                //     field: 'remark',
+                //     title: '文件备注'
+                // },
+                {
+                    field: 'frameworkId',
+                    title: '所属地区'
+                },
+                {
+                    field: 'fileSecret',
+                    title: '文件密级',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(fileSecretDatas, value);
+                    }
+                },
+
+                // {
+                //     field: 'fileSecretyj',
+                //     title: '文件'
+                // },
+                // {
+                //     field: 'filePurpose',
+                //     title: ''
+                // },
+                // {
+                //     field: 'fileCode',
+                //     title: ''
+                // },
+                // {
+                //     field: 'receiveUser',
+                //     title: ''
+                // },
+                // {
+                //     field: 'receiveCount',
+                //     title: ''
+                // },
+                // {
+                //     field: 'operateId',
+                //     title: ''
+                // },
+                // {
+                //     field: 'areaid',
+                //     title: '所属区县'
+                // },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.fileId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.fileId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/notify/add.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增检查通知')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-notify-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">通知人：</label>
+                <div class="col-sm-8">
+                    <input name="notifyUser" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <input name="notifyDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="notifyTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">内容：</label>
+                <div class="col-sm-8">
+                    <textarea name="notifyContent" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">被通知人：</label>
+                <div class="col-sm-8">
+                    <input name="notifyBeuser" class="form-control" type="text">
+                </div>
+            </div>
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">发出状态：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <select name="notifyState" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_state')}">-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/notify"
+        $("#form-notify-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-notify-add').serialize());
+            }
+        }
+
+        $("input[name='notifyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/notify/edit.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改检查通知')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-notify-edit" th:object="${tdNotify}">
+            <input name="notifyId" th:field="*{notifyId}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="framework" th:field="*{framework}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="area" th:field="*{area}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">通知人：</label>
+                <div class="col-sm-8">
+                    <input name="notifyUser" th:field="*{notifyUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <input name="notifyDepart" th:field="*{notifyDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="notifyTime" th:value="${#dates.format(tdNotify.notifyTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">内容：</label>
+                <div class="col-sm-8">
+                    <textarea name="notifyContent" class="form-control">[[*{notifyContent}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">被通知人：</label>
+                <div class="col-sm-8">
+                    <input name="notifyBeuser" th:field="*{notifyBeuser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发出状态：</label>
+                <div class="col-sm-8">
+                    <select name="notifyState" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_state')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{notifyState}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/notify";
+        $("#form-notify-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-notify-edit').serialize());
+            }
+        }
+
+        $("input[name='notifyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/notify/notify.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('检查通知列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>所属市州：</label>
+                                <input type="text" name="framework"/>
+                            </li>
+                            <li>
+                                <label>所属区县：</label>
+                                <input type="text" name="area"/>
+                            </li>
+                            <li>
+                                <label>单位：</label>
+                                <input type="text" name="notifyDepart"/>
+                            </li>
+
+                            <li>
+                                <label>发出状态：</label>
+                                <select name="notifyState" th:with="type=${@dict.getType('sys_notice_state')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:notify:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:notify:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:notify:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:notify:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:notify:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:notify:remove')}]];
+        var notifyStateDatas = [[${@dict.getType('sys_notice_state')}]];
+        var prefix = ctx + "system/notify";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "检查通知",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'notifyId',
+                    title: '通知id',
+                    visible: false
+                },
+                {
+                    field: 'framework',
+                    title: '所属市州'
+                },
+                {
+                    field: 'area',
+                    title: '所属区县'
+                },
+                {
+                    field: 'notifyUser',
+                    title: '通知人'
+                },
+                {
+                    field: 'notifyDepart',
+                    title: '单位'
+                },
+                {
+                    field: 'notifyTime',
+                    title: '时间'
+                },
+                {
+                    field: 'notifyContent',
+                    title: '内容'
+                },
+                {
+                    field: 'notifyBeuser',
+                    title: '被通知人'
+                },
+                {
+                    field: 'notifyState',
+                    title: '发出状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(notifyStateDatas, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.notifyId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.notifyId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/property/add.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增资产登记')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-property-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用部门：</label>
+                <div class="col-sm-8">
+                    <input name="useDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用人员：</label>
+                <div class="col-sm-8">
+                    <input name="userName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="useDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位名称：</label>
+                <div class="col-sm-8">
+                    <input name="frameworkId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记部门：</label>
+                <div class="col-sm-8">
+                    <input name="recoverDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记人员：</label>
+                <div class="col-sm-8">
+                    <input name="recoverName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recoverDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="part" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="areaId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产数量：</label>
+                <div class="col-sm-8">
+                    <input name="propertyNum" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/property"
+        $("#form-property-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-property-add').serialize());
+            }
+        }
+
+        $("input[name='useDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='recoverDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/property/edit.html

@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改资产登记')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}">
+            <input name="useId" th:field="*{useId}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">资产id：</label>
+                <div class="col-sm-8">
+                    <input disabled name="useId" th:field="*{useId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用部门：</label>
+                <div class="col-sm-8">
+                    <input name="useDepart" th:field="*{useDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用人员：</label>
+                <div class="col-sm-8">
+                    <input name="userName" th:field="*{userName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="useDate" th:value="${#dates.format(tdPropertyManager.useDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位名称：</label>
+                <div class="col-sm-8">
+                    <input name="frameworkId" th:field="*{frameworkId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记部门：</label>
+                <div class="col-sm-8">
+                    <input name="recoverDepart" th:field="*{recoverDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记人员：</label>
+                <div class="col-sm-8">
+                    <input name="recoverName" th:field="*{recoverName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recoverDate" th:value="${#dates.format(tdPropertyManager.recoverDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属市州：</label>
+                <div class="col-sm-8">
+                    <input name="part" th:field="*{part}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属区县：</label>
+                <div class="col-sm-8">
+                    <input name="areaId" th:field="*{areaId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产数量：</label>
+                <div class="col-sm-8">
+                    <input name="propertyNum" th:field="*{propertyNum}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/property";
+        $("#form-property-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-property-edit').serialize());
+            }
+        }
+
+        $("input[name='useDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='recoverDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/property/property.html

@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('资产登记列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>单位名称：</label>
+                                <input type="text" name="frameworkId"/>
+                            </li>
+                            <li>
+                                <label>资产编号：</label>
+                                <input type="text" name="useId"/>
+                            </li>
+                            <li>
+                                <label>所在市：</label>
+                                <input type="text" name="part"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:property:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:property:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:property:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:property:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:property:remove')}]];
+        var addPropertyinfoFlag = [[${@permission.hasPermi('system:property:addproperty')}]];
+        var prefix = ctx + "system/property";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                //addUrl:  prefix + "/propertyinfo/{useId}",
+                modalName: "资产登记",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'useId',
+                    title: '资产编号'
+                },
+                {
+                    field: 'part',
+                    title: '所属市州'
+                },
+                {
+                    field: 'areaId',
+                    title: '所属区县'
+                },
+                {
+                    field: 'useDepart',
+                    title: '使用部门'
+                },
+                {
+                    field: 'userName',
+                    title: '使用人员'
+                },
+                {
+                    field: 'recoverName',
+                    title: '登记人员'
+                },
+                {
+                    field: 'recoverDate',
+                    title: '配发日期'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.useId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + addPropertyinfoFlag + '" href= "/system/propertyinfo" "><i class="fa fa-plus"></i>添加</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.useId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/property/propertyentry/addproperty.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/propertyinfo/add.html

@@ -0,0 +1,220 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增资产管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-propertyinfo-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">资产种类：</label>
+                <div class="col-sm-8">
+                    <select name="propertyType" class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">登记编号：</label>
+                <div class="col-sm-8">
+                    <input name="id" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产编号：</label>
+                <div class="col-sm-8">
+                    <input name="useId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备品牌：</label>
+                <div class="col-sm-8">
+                    <input name="propertyBrand" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备mac：</label>
+                <div class="col-sm-8">
+                    <input name="propertyMac" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">涉密网络终端：</label>
+                <div class="col-sm-8">
+                    <select name="propertyNetstyle" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产型号：</label>
+                <div class="col-sm-8">
+                    <input name="propertyNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产名称：</label>
+                <div class="col-sm-8">
+                    <input name="propertyName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">计算机类型：</label>
+                <div class="col-sm-8">
+                    <input name="computerType" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产密级：</label>
+                <div class="col-sm-8">
+                    <select name="propertyMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备SN：</label>
+                <div class="col-sm-8">
+                    <input name="propertySn" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <textarea name="remark" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否是要害部门，部位：</label>
+                <div class="col-sm-8">
+                    <select name="isCurcial" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否安装防护软件：</label>
+                <div class="col-sm-8">
+                    <select name="isSoftware" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用人：</label>
+                <div class="col-sm-8">
+                    <input name="username" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护部门：</label>
+                <div class="col-sm-8">
+                    <input name="maintainDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护人员：</label>
+                <div class="col-sm-8">
+                    <input name="maintainUser" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="maintainDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护状态：</label>
+                <div class="col-sm-8">
+                    <input name="maintainState" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁状态：</label>
+                <div class="col-sm-8">
+                    <input name="destoryState" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁部门：</label>
+                <div class="col-sm-8">
+                    <input name="destoryDepart" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁人员：</label>
+                <div class="col-sm-8">
+                    <input name="destoryUser" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="destoryDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备描述：</label>
+                <div class="col-sm-8">
+                    <input name="propertyRefer" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护备注：</label>
+                <div class="col-sm-8">
+                    <input name="maintainRemark" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">涉密程度：</label>
+                <div class="col-sm-8">
+                    <select name="shemichengdu" class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">部门：</label>
+                <div class="col-sm-8">
+                    <input name="part" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/propertyinfo"
+        $("#form-propertyinfo-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-propertyinfo-add').serialize());
+            }
+        }
+
+        $("input[name='maintainDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='destoryDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/propertyinfo/edit.html

@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改资产管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-propertyinfo-edit" th:object="${tdPropertyInfo}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产编号：</label>
+                <div class="col-sm-8">
+                    <input name="useId" th:field="*{useId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备品牌：</label>
+                <div class="col-sm-8">
+                    <input name="propertyBrand" th:field="*{propertyBrand}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备mac：</label>
+                <div class="col-sm-8">
+                    <input name="propertyMac" th:field="*{propertyMac}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">涉密网络终端：</label>
+                <div class="col-sm-8">
+                    <select name="propertyNetstyle" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyNetstyle}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产种类：</label>
+                <div class="col-sm-8">
+                    <select name="propertyType" class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyType}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产型号：</label>
+                <div class="col-sm-8">
+                    <input name="propertyNo" th:field="*{propertyNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产名称：</label>
+                <div class="col-sm-8">
+                    <input name="propertyName" th:field="*{propertyName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">计算机类型：</label>
+                <div class="col-sm-8">
+                    <input name="computerType" th:field="*{computerType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资产密级：</label>
+                <div class="col-sm-8">
+                    <select name="propertyMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyMiji}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备SN：</label>
+                <div class="col-sm-8">
+                    <input name="propertySn" th:field="*{propertySn}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否是要害部门，部位：</label>
+                <div class="col-sm-8">
+                    <select name="isCurcial" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isCurcial}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否安装防护软件：</label>
+                <div class="col-sm-8">
+                    <select name="isSoftware" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isSoftware}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用人：</label>
+                <div class="col-sm-8">
+                    <input name="username" th:field="*{username}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护部门：</label>
+                <div class="col-sm-8">
+                    <input name="maintainDepart" th:field="*{maintainDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护人员：</label>
+                <div class="col-sm-8">
+                    <input name="maintainUser" th:field="*{maintainUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="maintainDate" th:value="${#dates.format(tdPropertyInfo.maintainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护状态：</label>
+                <div class="col-sm-8">
+                    <input name="maintainState" th:field="*{maintainState}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁状态：</label>
+                <div class="col-sm-8">
+                    <input name="destoryState" th:field="*{destoryState}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁部门：</label>
+                <div class="col-sm-8">
+                    <input name="destoryDepart" th:field="*{destoryDepart}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁人员：</label>
+                <div class="col-sm-8">
+                    <input name="destoryUser" th:field="*{destoryUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">销毁日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="destoryDate" th:value="${#dates.format(tdPropertyInfo.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备描述：</label>
+                <div class="col-sm-8">
+                    <input name="propertyRefer" th:field="*{propertyRefer}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维护备注：</label>
+                <div class="col-sm-8">
+                    <input name="maintainRemark" th:field="*{maintainRemark}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">涉密程度：</label>
+                <div class="col-sm-8">
+                    <select name="shemichengdu" class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{shemichengdu}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">部门：</label>
+                <div class="col-sm-8">
+                    <input name="part" th:field="*{part}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/propertyinfo";
+        $("#form-propertyinfo-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-propertyinfo-edit').serialize());
+            }
+        }
+
+        $("input[name='maintainDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='destoryDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/propertyinfo/propertyinfo.html

@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('资产管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>资产编号：</label>
+                                <input type="text" name="useId"/>
+                            </li>
+                            <li>
+                                <label>登记编号：</label>
+                                <input type="text" name="Id"/>
+                            </li>
+                            <li>
+                                <label>资产种类：</label>
+                                <select name="propertyType" th:with="type=${@dict.getType('sys_sm_property')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>使用人：</label>
+                                <input type="text" name="username"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:propertyinfo:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:propertyinfo:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:propertyinfo:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:propertyinfo:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+                <a class="btn btn-primary" href="/system/property">
+                    <i class="fa fa-backward"></i> 返回
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:propertyinfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:propertyinfo:remove')}]];
+        var propertyNetstyleDatas = [[${@dict.getType('sys_file_miji')}]];
+        var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]];
+        var propertyMijiDatas = [[${@dict.getType('sys_file_miji')}]];
+        var isCurcialDatas = [[${@dict.getType('sys_yes_no')}]];
+        var isSoftwareDatas = [[${@dict.getType('sys_yes_no')}]];
+        var shemichengduDatas = [[${@dict.getType('sys_user_shemi')}]];
+        var prefix = ctx + "system/propertyinfo";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "资产管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '登记编号'
+                },
+                {
+                    field: 'useId',
+                    title: '资产编号'
+                },
+                {
+                    field: 'propertyBrand',
+                    title: '设备品牌'
+                },
+                {
+                    field: 'propertyType',
+                    title: '资产种类',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(propertyTypeDatas, value);
+                    }
+                },
+                {
+                    field: 'propertyMac',
+                    title: '设备mac'
+                },
+                {
+                    field: 'propertyNo',
+                    title: '资产型号'
+                },
+                {
+                    field: 'propertySn',
+                    title: '设备SN'
+                },
+                {
+                    field: 'propertyName',
+                    title: '资产名称'
+                },
+                {
+                    field: 'part',
+                    title: '部门'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/trainnum/print.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('涉密人员培训列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>人员名称：</label>
+                            <input type="text" name="trainName"/>
+                        </li>
+                        <li>
+                            <label>所属地市：</label>
+                            <input type="text" name="AREAID"/>
+                        </li>
+                        <li>
+                            <label>培训日期：</label>
+                            <input type="text" class="time-input" placeholder="请选择培训日期" name="trainDate"/>
+                        </li>
+
+                        <li>
+                            <label>培训状态：</label>
+                            <select name="trainState" th:with="type=${@dict.getType('sys_examine_state')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:trainnum:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var detailFlag = [[${@permission.hasPermi('monitor:train:detail')}]];
+    var trainTypeDatas = [[${@dict.getType('sys_usertrain_typer')}]];
+    var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
+    var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
+    var prefix = ctx + "system/train";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            detailUrl: prefix + "/detail/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "涉密人员培训",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: 'ID',
+                    visible: false
+                },
+                {
+                    field: 'AREAID',
+                    title: '所属地市',
+                    visible: false
+
+                },
+                {
+                    field: 'trainName',
+                    title: '培训人员'
+                },
+                {
+                    field: 'FRAMEWORK',
+                    title: '所属区县',
+                    visible: false
+                },
+                {
+                    field: 'USERNAME',
+                    title: '人员名称',
+                    visible: false
+                },
+                {
+                    field: 'deptName',
+                    title: '单位名称',
+                    visible: false
+                },
+                {
+                    field: 'trainType',
+                    title: '培训类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(trainTypeDatas, value);
+                    }
+                },
+                {
+                    field: 'trainSubject',
+                    title: '培训对象',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(trainSubjectDatas, value);
+                    }
+                },
+                {
+                    field: 'trainAddress',
+                    title: '培训地点'
+                },
+                {
+                    field: 'trainDate',
+                    title: '培训开始日期'
+                },
+                {
+                    field: 'trainTimeend',
+                    title: '培训结束时间'
+                },
+                {
+                    field: 'updateDepartid',
+                    title: '更新单位',
+                    visible: false
+                },
+                {
+                    field: 'trainState',
+                    title: '培训状态',//
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(trainStateDatas, value);
+                    }
+                },
+                {
+                    field: 'PART',
+                    title: '部门',
+                    visible: false
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+    function examine(id) {
+        var url = prefix + '/examine/' + id;
+        $.modal.open("涉密人员培训审核", url);
+    }
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html

@@ -0,0 +1,226 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('用户统计列表')" />
+	<th:block th:include="include :: layout-latest-css" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<body class="gray-bg">
+	<div class="ui-layout-center">
+		<div class="container-div">
+			<div class="row">
+				<div class="col-sm-12 search-collapse">
+					<form id="user-form">
+						<input type="hidden" id="deptId" name="deptId">
+		                <input type="hidden" id="parentId" name="parentId">
+						<div class="select-list">
+							<ul>
+								<li>
+									人员名称：<input type="text" name="loginName"/>
+								</li>
+								<li>
+									用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
+										<option value="">所有</option>
+										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+									</select>
+								</li>
+								<li class="select-time">
+									<label>创建时间： </label>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+									<span>-</span>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+								</li>
+								<li>
+									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+								</li>
+							</ul>
+						</div>
+					</form>
+				</div>
+				
+		        <div class="btn-group-sm" id="toolbar" role="group">
+		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:usernum:export">
+			            <i class="fa fa-download"></i> 导出
+			        </a>
+					<a class="btn btn-warning" onclick="$.table.print()" shiro:hasPermission="system:usernum:print">
+						<i class="fa fa-download"></i> 打印
+					</a>
+		        </div>
+		        <div class="col-sm-12 select-table table-striped">
+				    <table id="bootstrap-table"></table>
+				</div>
+			</div>
+		</div>
+	</div>
+	
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: ztree-js" />
+	<script th:inline="javascript">
+		var detailFlag = [[${@permission.hasPermi('system:usernum:detail')}]];
+		var prefix = ctx + "system/usernum";
+
+		$(function() {
+		    var panehHidden = false;
+		    if ($(this).width() < 769) {
+		        panehHidden = true;
+		    }
+		    $('body').layout({ initClosed: panehHidden, west__size: 185 });
+	     	// 回到顶部绑定
+	    	if ($.fn.toTop !== undefined) {
+	    		var opt = {
+	    			win:$('.ui-layout-center'),
+	    			doc:$('.ui-layout-center')
+	    		};
+	    		$('#scroll-up').toTop(opt);
+	    	}
+		    queryUserList();
+		    queryDeptTree();
+		});
+
+		function queryUserList() {
+		    var options = {
+		        url: prefix + "/list",
+		        createUrl: prefix + "/add",
+		        detail: prefix + "/detail/{id}",
+		        removeUrl: prefix + "/remove",
+		        exportUrl: prefix + "/export",
+		        importUrl: prefix + "/importData",
+		        importTemplateUrl: prefix + "/importTemplate",
+		        sortName: "createTime",
+		        sortOrder: "desc",
+		        modalName: "用户",
+		        columns: [{
+		            checkbox: true
+		        },
+		        {
+		            field: 'userName',
+		            title: '用户名称'
+		        },
+		        {
+		            field: 'dept.deptName',
+		            title: '所在单位'
+		        },
+
+				{
+					field: 'phonenumber',
+					title: '手机'
+				},
+				{
+					field: 'shemichengdu',
+					title: '涉密程度'
+				},
+				{
+					field: 'politics',
+					title: '政治面貌'
+
+				},
+
+		        {
+		        	title: '用户状态',
+		        	align: 'center',
+		        	formatter: function (value, row, index) {
+		        		return statusTools(row);
+		        	}
+		        },
+					{
+						field: 'examine',
+						title: '审核状态'
+
+					},
+		        {
+		            field: 'startdate',
+		            title: '入职日期',
+		            sortable: true
+		        },
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		                	var actions = [];
+			                actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.userId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+		            }
+		        }]
+		    };
+		    $.table.init(options);
+		}
+		
+		function queryDeptTree()
+		{
+			var url = ctx + "system/user/deptTreeData";
+			var options = {
+		        url: url,
+		        expandLevel: 2,
+		        onClick : zOnClick
+		    };
+			$.tree.init(options);
+			
+			function zOnClick(event, treeId, treeNode) {
+				$("#deptId").val(treeNode.id);
+				$("#parentId").val(treeNode.pId);
+				$.table.search();
+			}
+		}
+		
+		$('#btnExpand').click(function() {
+			$._tree.expandAll(true);
+		    $(this).hide();
+		    $('#btnCollapse').show();
+		});
+		
+		$('#btnCollapse').click(function() {
+			$._tree.expandAll(false);
+		    $(this).hide();
+		    $('#btnExpand').show();
+		});
+		
+		$('#btnRefresh').click(function() {
+			queryDeptTree();
+		});
+		
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#user-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
+
+		/* 用户管理-部门 */
+		function dept() {
+			var url = ctx + "system/dept";
+			$.modal.openTab("部门管理", url);
+		}
+
+		
+		/* 用户状态显示 */
+		function statusTools(row) {
+		    if (row.status == 1) {
+    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
+    		} else {
+    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+    		}
+		}
+
+
+	</script>
+</body>
+<!-- 导入区域 -->
+<script id="importTpl" type="text/template">
+<form enctype="multipart/form-data" class="mt20 mb10">
+	<div class="col-xs-offset-1">
+		<input type="file" id="file" name="file"/>
+		<div class="mt10 pt5">
+			<input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
+			 &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
+		</div>
+		<font color="red" class="pull-left mt10">
+			提示：仅允许导入“xls”或“xlsx”格式文件！
+		</font>
+	</div>
+</form>
+</script>
+</html>

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

@@ -71,4 +71,9 @@ public enum BusinessType
      * 打印操作
      */
     PRINT,
+
+    /**
+     * 检查操作
+     */
+    CHECK,
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateTostring.java

@@ -0,0 +1,16 @@
+package com.ruoyi.common.utils;
+
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+public class DateTostring {
+    public static String DateTostring(){
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String formattedDateTime = now.format(formatter);
+        return formattedDateTime;
+    }
+
+}

ruoyi-framework/pom.xml

@@ -77,6 +77,15 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <!-- 滑块验证码  -->
+        <dependency>
+            <groupId>com.github.anji-plus</groupId>
+            <artifactId>captcha-spring-boot-starter</artifactId>
+            <version>1.2.7</version>
+        </dependency>
+
+
+
     </dependencies>
 
 </project>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -17,10 +17,13 @@ import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.mgt.CookieRememberMeManager;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.servlet.SimpleCookie;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import com.anji.captcha.service.CaptchaService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.security.CipherUtils;
@@ -40,7 +43,7 @@ import at.pollux.thymeleaf.shiro.dialect.ShiroDialect;
 
 /**
  * 权限配置加载
- * 
+ *
  * @author ruoyi
  */
 @Configuration
@@ -130,6 +133,10 @@ public class ShiroConfig
     @Value("${shiro.rememberMe.enabled: false}")
     private boolean rememberMe;
 
+    @Autowired
+    @Lazy
+    private CaptchaService captchaService;
+
     /**
      * 缓存管理器 使用Ehcache实现
      */
@@ -288,6 +295,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
+        filterChainDefinitionMap.put("/captcha/**", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问
@@ -341,7 +349,7 @@ public class ShiroConfig
     {
         CaptchaValidateFilter captchaValidateFilter = new CaptchaValidateFilter();
         captchaValidateFilter.setCaptchaEnabled(captchaEnabled);
-        captchaValidateFilter.setCaptchaType(captchaType);
+        captchaValidateFilter.setCaptchaService(captchaService);
         return captchaValidateFilter;
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java

@@ -4,14 +4,14 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.shiro.web.filter.AccessControlFilter;
-import com.google.code.kaptcha.Constants;
+import com.anji.captcha.model.vo.CaptchaVO;
+import com.anji.captcha.service.CaptchaService;
 import com.ruoyi.common.constant.ShiroConstants;
-import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 验证码过滤器
- * 
+ *
  * @author ruoyi
  */
 public class CaptchaValidateFilter extends AccessControlFilter
@@ -21,26 +21,17 @@ public class CaptchaValidateFilter extends AccessControlFilter
      */
     private boolean captchaEnabled = true;
 
-    /**
+    private CaptchaService captchaService;
-     * 验证码类型
-     */
-    private String captchaType = "math";
 
     public void setCaptchaEnabled(boolean captchaEnabled)
     {
         this.captchaEnabled = captchaEnabled;
     }
 
-    public void setCaptchaType(String captchaType)
-    {
-        this.captchaType = captchaType;
-    }
-
     @Override
     public boolean onPreHandle(ServletRequest request, ServletResponse response, Object mappedValue) throws Exception
     {
         request.setAttribute(ShiroConstants.CURRENT_ENABLED, captchaEnabled);
-        request.setAttribute(ShiroConstants.CURRENT_TYPE, captchaType);
         return super.onPreHandle(request, response, mappedValue);
     }
 
@@ -54,16 +45,14 @@ public class CaptchaValidateFilter extends AccessControlFilter
         {
             return true;
         }
-        return validateResponse(httpServletRequest, httpServletRequest.getParameter(ShiroConstants.CURRENT_VALIDATECODE));
+        return validateResponse(httpServletRequest, httpServletRequest.getParameter("__captchaVerification"));
     }
 
-    public boolean validateResponse(HttpServletRequest request, String validateCode)
+    public boolean validateResponse(HttpServletRequest request, String captchaVerification)
     {
-        Object obj = ShiroUtils.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
+        CaptchaVO captchaVO = new CaptchaVO();
-        String code = String.valueOf(obj != null ? obj : "");
+        captchaVO.setCaptchaVerification(captchaVerification);
-        // 验证码清除，防止多次使用。
+        if (StringUtils.isEmpty(captchaVerification) || !captchaService.verification(captchaVO).isSuccess())
-        request.getSession().removeAttribute(Constants.KAPTCHA_SESSION_KEY);
-        if (StringUtils.isEmpty(validateCode) || !validateCode.equalsIgnoreCase(code))
         {
             return false;
         }
@@ -76,4 +65,9 @@ public class CaptchaValidateFilter extends AccessControlFilter
         request.setAttribute(ShiroConstants.CURRENT_CAPTCHA, ShiroConstants.CAPTCHA_ERROR);
         return true;
     }
-}
+
+    public void setCaptchaService(CaptchaService captchaService)
+    {
+        this.captchaService = captchaService;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java

@@ -0,0 +1,672 @@
+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_check
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public class TdCheck extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long checkId;
+
+    /** 人员 */
+    @Excel(name = "人员")
+    private String user;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String depart;
+
+    /** 检查开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkStartTime;
+
+    /** 检查结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检查结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkEndTime;
+
+    /** 检查类型（0.自检 1.保密局检查） */
+    @Excel(name = "检查类型", readConverterExp = "0=.自检,1=.保密局检查")
+    private String checkType;
+
+    /** 检查内容 */
+    @Excel(name = "检查内容")
+    private String checkContent;
+
+    /** 检查结果 */
+    @Excel(name = "检查结果")
+    private String checkResult;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 部门结果 */
+    @Excel(name = "部门结果")
+    private String departreault;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    private String area;
+
+    /** 市州 */
+    @Excel(name = "市州")
+    private String framework;
+
+    /** 检查状态 */
+    @Excel(name = "检查状态")
+    private String checkState;
+
+    /** 名 */
+    @Excel(name = "名")
+    private String checkName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String checkAddress;
+
+    /** 人员检查 */
+    @Excel(name = "人员检查")
+    private String checkcontentry;
+
+    /** 人员状态 */
+    @Excel(name = "人员状态")
+    private String checkcontentryjt;
+
+    /** 文件检查 */
+    @Excel(name = "文件检查")
+    private String checkcontentrywj;
+
+    /** 文件状态 */
+    @Excel(name = "文件状态")
+    private String checkcontentrywjjt;
+
+    /** 资产检查 */
+    @Excel(name = "资产检查")
+    private String checkcontentrysb;
+
+    /** 资产状态 */
+    @Excel(name = "资产状态")
+    private String checkcontentrysbjt;
+
+    /** 管理制度检查 */
+    @Excel(name = "管理制度检查")
+    private String checkcontentryglzd;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String checkcontentryglzdjt;
+
+    /** 泄密事件检查 */
+    @Excel(name = "泄密事件检查")
+    private String checkcontentryxmsj;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String checkcontentryxmsjjt;
+
+    /** 其他内容检查 */
+    @Excel(name = "其他内容检查")
+    private String checkcontentryother;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String checkcontentryxmsjotherjt;
+
+    /** 结果1 */
+    @Excel(name = "结果1")
+    private String checkresult1;
+
+    /** 结果2 */
+    @Excel(name = "结果2")
+    private String checkresult2;
+
+    /** 结果3 */
+    @Excel(name = "结果3")
+    private String checkresult3;
+
+    /** 结果4 */
+    @Excel(name = "结果4")
+    private String checkresult4;
+
+    /** 结果5 */
+    @Excel(name = "结果5")
+    private String checkresult5;
+
+    /** 结果6 */
+    @Excel(name = "结果6")
+    private String checkresult6;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    private String remark3;
+
+    /** 备注4 */
+    @Excel(name = "备注4")
+    private String remark4;
+
+    /** 备注5 */
+    @Excel(name = "备注5")
+    private String remark5;
+
+    /** 备注6 */
+    @Excel(name = "备注6")
+    private String remark6;
+
+    /** 自检结果1 */
+    @Excel(name = "自检结果1")
+    private String checkownresult1;
+
+    /** 自检结果2 */
+    @Excel(name = "自检结果2")
+    private String checkownresult2;
+
+    /** 自检结果3 */
+    @Excel(name = "自检结果3")
+    private String checkownresult3;
+
+    /** 自检结果4 */
+    @Excel(name = "自检结果4")
+    private String checkownresult4;
+
+    /** 自检结果5 */
+    @Excel(name = "自检结果5")
+    private String checkownresult5;
+
+    /** 自检结果6 */
+    @Excel(name = "自检结果6")
+    private String checkownresult6;
+
+    /** 自检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "自检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkownresulttime;
+
+    public void setCheckId(Long checkId) 
+    {
+        this.checkId = checkId;
+    }
+
+    public Long getCheckId() 
+    {
+        return checkId;
+    }
+    public void setUser(String user) 
+    {
+        this.user = user;
+    }
+
+    public String getUser() 
+    {
+        return user;
+    }
+    public void setDepart(String depart) 
+    {
+        this.depart = depart;
+    }
+
+    public String getDepart() 
+    {
+        return depart;
+    }
+    public void setCheckStartTime(Date checkStartTime) 
+    {
+        this.checkStartTime = checkStartTime;
+    }
+
+    public Date getCheckStartTime() 
+    {
+        return checkStartTime;
+    }
+    public void setCheckEndTime(Date checkEndTime) 
+    {
+        this.checkEndTime = checkEndTime;
+    }
+
+    public Date getCheckEndTime() 
+    {
+        return checkEndTime;
+    }
+    public void setCheckType(String checkType) 
+    {
+        this.checkType = checkType;
+    }
+
+    public String getCheckType() 
+    {
+        return checkType;
+    }
+    public void setCheckContent(String checkContent) 
+    {
+        this.checkContent = checkContent;
+    }
+
+    public String getCheckContent() 
+    {
+        return checkContent;
+    }
+    public void setCheckResult(String checkResult) 
+    {
+        this.checkResult = checkResult;
+    }
+
+    public String getCheckResult() 
+    {
+        return checkResult;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setDepartreault(String departreault) 
+    {
+        this.departreault = departreault;
+    }
+
+    public String getDepartreault() 
+    {
+        return departreault;
+    }
+    public void setArea(String area) 
+    {
+        this.area = area;
+    }
+
+    public String getArea() 
+    {
+        return area;
+    }
+    public void setFramework(String framework) 
+    {
+        this.framework = framework;
+    }
+
+    public String getFramework() 
+    {
+        return framework;
+    }
+    public void setCheckState(String checkState) 
+    {
+        this.checkState = checkState;
+    }
+
+    public String getCheckState() 
+    {
+        return checkState;
+    }
+    public void setCheckName(String checkName) 
+    {
+        this.checkName = checkName;
+    }
+
+    public String getCheckName() 
+    {
+        return checkName;
+    }
+    public void setCheckAddress(String checkAddress) 
+    {
+        this.checkAddress = checkAddress;
+    }
+
+    public String getCheckAddress() 
+    {
+        return checkAddress;
+    }
+    public void setCheckcontentry(String checkcontentry) 
+    {
+        this.checkcontentry = checkcontentry;
+    }
+
+    public String getCheckcontentry() 
+    {
+        return checkcontentry;
+    }
+    public void setCheckcontentryjt(String checkcontentryjt) 
+    {
+        this.checkcontentryjt = checkcontentryjt;
+    }
+
+    public String getCheckcontentryjt() 
+    {
+        return checkcontentryjt;
+    }
+    public void setCheckcontentrywj(String checkcontentrywj) 
+    {
+        this.checkcontentrywj = checkcontentrywj;
+    }
+
+    public String getCheckcontentrywj() 
+    {
+        return checkcontentrywj;
+    }
+    public void setCheckcontentrywjjt(String checkcontentrywjjt) 
+    {
+        this.checkcontentrywjjt = checkcontentrywjjt;
+    }
+
+    public String getCheckcontentrywjjt() 
+    {
+        return checkcontentrywjjt;
+    }
+    public void setCheckcontentrysb(String checkcontentrysb) 
+    {
+        this.checkcontentrysb = checkcontentrysb;
+    }
+
+    public String getCheckcontentrysb() 
+    {
+        return checkcontentrysb;
+    }
+    public void setCheckcontentrysbjt(String checkcontentrysbjt) 
+    {
+        this.checkcontentrysbjt = checkcontentrysbjt;
+    }
+
+    public String getCheckcontentrysbjt() 
+    {
+        return checkcontentrysbjt;
+    }
+    public void setCheckcontentryglzd(String checkcontentryglzd) 
+    {
+        this.checkcontentryglzd = checkcontentryglzd;
+    }
+
+    public String getCheckcontentryglzd() 
+    {
+        return checkcontentryglzd;
+    }
+    public void setCheckcontentryglzdjt(String checkcontentryglzdjt) 
+    {
+        this.checkcontentryglzdjt = checkcontentryglzdjt;
+    }
+
+    public String getCheckcontentryglzdjt() 
+    {
+        return checkcontentryglzdjt;
+    }
+    public void setCheckcontentryxmsj(String checkcontentryxmsj) 
+    {
+        this.checkcontentryxmsj = checkcontentryxmsj;
+    }
+
+    public String getCheckcontentryxmsj() 
+    {
+        return checkcontentryxmsj;
+    }
+    public void setCheckcontentryxmsjjt(String checkcontentryxmsjjt) 
+    {
+        this.checkcontentryxmsjjt = checkcontentryxmsjjt;
+    }
+
+    public String getCheckcontentryxmsjjt() 
+    {
+        return checkcontentryxmsjjt;
+    }
+    public void setCheckcontentryother(String checkcontentryother) 
+    {
+        this.checkcontentryother = checkcontentryother;
+    }
+
+    public String getCheckcontentryother() 
+    {
+        return checkcontentryother;
+    }
+    public void setCheckcontentryxmsjotherjt(String checkcontentryxmsjotherjt) 
+    {
+        this.checkcontentryxmsjotherjt = checkcontentryxmsjotherjt;
+    }
+
+    public String getCheckcontentryxmsjotherjt() 
+    {
+        return checkcontentryxmsjotherjt;
+    }
+    public void setCheckresult1(String checkresult1) 
+    {
+        this.checkresult1 = checkresult1;
+    }
+
+    public String getCheckresult1() 
+    {
+        return checkresult1;
+    }
+    public void setCheckresult2(String checkresult2) 
+    {
+        this.checkresult2 = checkresult2;
+    }
+
+    public String getCheckresult2() 
+    {
+        return checkresult2;
+    }
+    public void setCheckresult3(String checkresult3) 
+    {
+        this.checkresult3 = checkresult3;
+    }
+
+    public String getCheckresult3() 
+    {
+        return checkresult3;
+    }
+    public void setCheckresult4(String checkresult4) 
+    {
+        this.checkresult4 = checkresult4;
+    }
+
+    public String getCheckresult4() 
+    {
+        return checkresult4;
+    }
+    public void setCheckresult5(String checkresult5) 
+    {
+        this.checkresult5 = checkresult5;
+    }
+
+    public String getCheckresult5() 
+    {
+        return checkresult5;
+    }
+    public void setCheckresult6(String checkresult6) 
+    {
+        this.checkresult6 = checkresult6;
+    }
+
+    public String getCheckresult6() 
+    {
+        return checkresult6;
+    }
+    public void setRemark1(String remark1) 
+    {
+        this.remark1 = remark1;
+    }
+
+    public String getRemark1() 
+    {
+        return remark1;
+    }
+    public void setRemark2(String remark2) 
+    {
+        this.remark2 = remark2;
+    }
+
+    public String getRemark2() 
+    {
+        return remark2;
+    }
+    public void setRemark3(String remark3) 
+    {
+        this.remark3 = remark3;
+    }
+
+    public String getRemark3() 
+    {
+        return remark3;
+    }
+    public void setRemark4(String remark4) 
+    {
+        this.remark4 = remark4;
+    }
+
+    public String getRemark4() 
+    {
+        return remark4;
+    }
+    public void setRemark5(String remark5) 
+    {
+        this.remark5 = remark5;
+    }
+
+    public String getRemark5() 
+    {
+        return remark5;
+    }
+    public void setRemark6(String remark6) 
+    {
+        this.remark6 = remark6;
+    }
+
+    public String getRemark6() 
+    {
+        return remark6;
+    }
+    public void setCheckownresult1(String checkownresult1) 
+    {
+        this.checkownresult1 = checkownresult1;
+    }
+
+    public String getCheckownresult1() 
+    {
+        return checkownresult1;
+    }
+    public void setCheckownresult2(String checkownresult2) 
+    {
+        this.checkownresult2 = checkownresult2;
+    }
+
+    public String getCheckownresult2() 
+    {
+        return checkownresult2;
+    }
+    public void setCheckownresult3(String checkownresult3) 
+    {
+        this.checkownresult3 = checkownresult3;
+    }
+
+    public String getCheckownresult3() 
+    {
+        return checkownresult3;
+    }
+    public void setCheckownresult4(String checkownresult4) 
+    {
+        this.checkownresult4 = checkownresult4;
+    }
+
+    public String getCheckownresult4() 
+    {
+        return checkownresult4;
+    }
+    public void setCheckownresult5(String checkownresult5) 
+    {
+        this.checkownresult5 = checkownresult5;
+    }
+
+    public String getCheckownresult5() 
+    {
+        return checkownresult5;
+    }
+    public void setCheckownresult6(String checkownresult6) 
+    {
+        this.checkownresult6 = checkownresult6;
+    }
+
+    public String getCheckownresult6() 
+    {
+        return checkownresult6;
+    }
+    public void setCheckownresulttime(Date checkownresulttime) 
+    {
+        this.checkownresulttime = checkownresulttime;
+    }
+
+    public Date getCheckownresulttime() 
+    {
+        return checkownresulttime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("checkId", getCheckId())
+            .append("user", getUser())
+            .append("depart", getDepart())
+            .append("checkStartTime", getCheckStartTime())
+            .append("checkEndTime", getCheckEndTime())
+            .append("checkType", getCheckType())
+            .append("checkContent", getCheckContent())
+            .append("checkResult", getCheckResult())
+            .append("address", getAddress())
+            .append("departreault", getDepartreault())
+            .append("area", getArea())
+            .append("framework", getFramework())
+            .append("checkState", getCheckState())
+            .append("checkName", getCheckName())
+            .append("checkAddress", getCheckAddress())
+            .append("checkcontentry", getCheckcontentry())
+            .append("checkcontentryjt", getCheckcontentryjt())
+            .append("checkcontentrywj", getCheckcontentrywj())
+            .append("checkcontentrywjjt", getCheckcontentrywjjt())
+            .append("checkcontentrysb", getCheckcontentrysb())
+            .append("checkcontentrysbjt", getCheckcontentrysbjt())
+            .append("checkcontentryglzd", getCheckcontentryglzd())
+            .append("checkcontentryglzdjt", getCheckcontentryglzdjt())
+            .append("checkcontentryxmsj", getCheckcontentryxmsj())
+            .append("checkcontentryxmsjjt", getCheckcontentryxmsjjt())
+            .append("checkcontentryother", getCheckcontentryother())
+            .append("checkcontentryxmsjotherjt", getCheckcontentryxmsjotherjt())
+            .append("checkresult1", getCheckresult1())
+            .append("checkresult2", getCheckresult2())
+            .append("checkresult3", getCheckresult3())
+            .append("checkresult4", getCheckresult4())
+            .append("checkresult5", getCheckresult5())
+            .append("checkresult6", getCheckresult6())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("remark4", getRemark4())
+            .append("remark5", getRemark5())
+            .append("remark6", getRemark6())
+            .append("checkownresult1", getCheckownresult1())
+            .append("checkownresult2", getCheckownresult2())
+            .append("checkownresult3", getCheckownresult3())
+            .append("checkownresult4", getCheckownresult4())
+            .append("checkownresult5", getCheckownresult5())
+            .append("checkownresult6", getCheckownresult6())
+            .append("checkownresulttime", getCheckownresulttime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileProvide.java

@@ -0,0 +1,365 @@
+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_provide
+ *
+ * @author ruoyi
+ * @date 2024-04-23
+ */
+public class TdFileProvide extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 文件id */
+    @Excel(name = "文件id")
+    private String fileId;
+
+    /** 发文份数 */
+    @Excel(name = "发文份数")
+    private Long provideCount;
+
+    /** 发文单位 */
+    @Excel(name = "发文单位")
+    private String provideDepart;
+
+    /** 发文人员 */
+    @Excel(name = "发文人员")
+    private String provideUserid;
+
+    /** 发文日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发文日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date provideDate;
+
+    /** 收文单位 */
+    @Excel(name = "收文单位")
+    private String targetDepart;
+
+    /**  */
+    @Excel(name = "")
+    private String provideLevel;
+
+    /** 紧急程度 */
+    @Excel(name = "紧急程度")
+    private String instancyExtent;
+
+    /** 定密依据 */
+    @Excel(name = "定密依据")
+    private String allianceFile;
+
+    /** 更改单位 */
+    @Excel(name = "更改单位")
+    private String updateDepart;
+
+    /** 更新人员 */
+    @Excel(name = "更新人员")
+    private String updateUser;
+
+    /** 更新日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    /** 所属地区 */
+    @Excel(name = "所属地区")
+    private String frameworkId;
+
+    /** 文件密级 */
+    @Excel(name = "文件密级")
+    private String fileSecret;
+
+    /** 保密期限 */
+    @Excel(name = "保密期限")
+    private String releaseSecretid;
+
+    /** 文件标题 */
+    @Excel(name = "文件标题")
+    private String fileName;
+
+    /** 文号 */
+    @Excel(name = "文号")
+    private String fileNum;
+
+    /** 文件 */
+    @Excel(name = "文件")
+    private String fileSecretyj;
+
+    /**  */
+    @Excel(name = "")
+    private String filePurpose;
+
+    /**  */
+    @Excel(name = "")
+    private String fileCode;
+
+    /**  */
+    @Excel(name = "")
+    private String receiveUser;
+
+    /**  */
+    @Excel(name = "")
+    private Long receiveCount;
+
+    /**  */
+    @Excel(name = "")
+    private String operateId;
+
+    /** 所属地区 */
+    @Excel(name = "所属地区")
+    private String areaid;
+
+    public void setFileId(String fileId)
+    {
+        this.fileId = fileId;
+    }
+
+    public String getFileId()
+    {
+        return fileId;
+    }
+    public void setProvideCount(Long provideCount)
+    {
+        this.provideCount = provideCount;
+    }
+
+    public Long getProvideCount()
+    {
+        return provideCount;
+    }
+    public void setProvideDepart(String provideDepart)
+    {
+        this.provideDepart = provideDepart;
+    }
+
+    public String getProvideDepart()
+    {
+        return provideDepart;
+    }
+    public void setProvideUserid(String provideUserid)
+    {
+        this.provideUserid = provideUserid;
+    }
+
+    public String getProvideUserid()
+    {
+        return provideUserid;
+    }
+    public void setProvideDate(Date provideDate)
+    {
+        this.provideDate = provideDate;
+    }
+
+    public Date getProvideDate()
+    {
+        return provideDate;
+    }
+    public void setTargetDepart(String targetDepart)
+    {
+        this.targetDepart = targetDepart;
+    }
+
+    public String getTargetDepart()
+    {
+        return targetDepart;
+    }
+    public void setProvideLevel(String provideLevel)
+    {
+        this.provideLevel = provideLevel;
+    }
+
+    public String getProvideLevel()
+    {
+        return provideLevel;
+    }
+    public void setInstancyExtent(String instancyExtent)
+    {
+        this.instancyExtent = instancyExtent;
+    }
+
+    public String getInstancyExtent()
+    {
+        return instancyExtent;
+    }
+    public void setAllianceFile(String allianceFile)
+    {
+        this.allianceFile = allianceFile;
+    }
+
+    public String getAllianceFile()
+    {
+        return allianceFile;
+    }
+    public void setUpdateDepart(String updateDepart)
+    {
+        this.updateDepart = updateDepart;
+    }
+
+    public String getUpdateDepart()
+    {
+        return updateDepart;
+    }
+    public void setUpdateUser(String updateUser)
+    {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser()
+    {
+        return updateUser;
+    }
+    public void setUpdateDate(Date updateDate)
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate()
+    {
+        return updateDate;
+    }
+    public void setFrameworkId(String frameworkId)
+    {
+        this.frameworkId = frameworkId;
+    }
+
+    public String getFrameworkId()
+    {
+        return frameworkId;
+    }
+    public void setFileSecret(String fileSecret)
+    {
+        this.fileSecret = fileSecret;
+    }
+
+    public String getFileSecret()
+    {
+        return fileSecret;
+    }
+    public void setReleaseSecretid(String releaseSecretid)
+    {
+        this.releaseSecretid = releaseSecretid;
+    }
+
+    public String getReleaseSecretid()
+    {
+        return releaseSecretid;
+    }
+    public void setFileName(String fileName)
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName()
+    {
+        return fileName;
+    }
+    public void setFileNum(String fileNum)
+    {
+        this.fileNum = fileNum;
+    }
+
+    public String getFileNum()
+    {
+        return fileNum;
+    }
+    public void setFileSecretyj(String fileSecretyj)
+    {
+        this.fileSecretyj = fileSecretyj;
+    }
+
+    public String getFileSecretyj()
+    {
+        return fileSecretyj;
+    }
+    public void setFilePurpose(String filePurpose)
+    {
+        this.filePurpose = filePurpose;
+    }
+
+    public String getFilePurpose()
+    {
+        return filePurpose;
+    }
+    public void setFileCode(String fileCode)
+    {
+        this.fileCode = fileCode;
+    }
+
+    public String getFileCode()
+    {
+        return fileCode;
+    }
+    public void setReceiveUser(String receiveUser)
+    {
+        this.receiveUser = receiveUser;
+    }
+
+    public String getReceiveUser()
+    {
+        return receiveUser;
+    }
+    public void setReceiveCount(Long receiveCount)
+    {
+        this.receiveCount = receiveCount;
+    }
+
+    public Long getReceiveCount()
+    {
+        return receiveCount;
+    }
+    public void setOperateId(String operateId)
+    {
+        this.operateId = operateId;
+    }
+
+    public String getOperateId()
+    {
+        return operateId;
+    }
+    public void setAreaid(String areaid)
+    {
+        this.areaid = areaid;
+    }
+
+    public String getAreaid()
+    {
+        return areaid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("fileId", getFileId())
+                .append("provideCount", getProvideCount())
+                .append("provideDepart", getProvideDepart())
+                .append("provideUserid", getProvideUserid())
+                .append("provideDate", getProvideDate())
+                .append("targetDepart", getTargetDepart())
+                .append("provideLevel", getProvideLevel())
+                .append("instancyExtent", getInstancyExtent())
+                .append("allianceFile", getAllianceFile())
+                .append("remark", getRemark())
+                .append("updateDepart", getUpdateDepart())
+                .append("updateUser", getUpdateUser())
+                .append("updateDate", getUpdateDate())
+                .append("frameworkId", getFrameworkId())
+                .append("fileSecret", getFileSecret())
+                .append("releaseSecretid", getReleaseSecretid())
+                .append("fileName", getFileName())
+                .append("fileNum", getFileNum())
+                .append("fileSecretyj", getFileSecretyj())
+                .append("filePurpose", getFilePurpose())
+                .append("fileCode", getFileCode())
+                .append("receiveUser", getReceiveUser())
+                .append("receiveCount", getReceiveCount())
+                .append("operateId", getOperateId())
+                .append("areaid", getAreaid())
+                .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java

@@ -29,7 +29,7 @@ public class TdLeave extends BaseEntity
     private Long id;
 
     /** 提交人 */
-    private String userId;
+    private Long userId;
 
     @Excel(name = "提交人")
     private String userName;
@@ -89,11 +89,11 @@ public class TdLeave extends BaseEntity
         this.id = id;
     }
 
-    public String getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdNotify.java

@@ -0,0 +1,152 @@
+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_notify
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public class TdNotify extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 通知id */
+    private Long notifyId;
+
+    /** 通知人 */
+    @Excel(name = "通知人")
+    private String notifyUser;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String notifyDepart;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date notifyTime;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String notifyContent;
+
+    /** 被通知人 */
+    @Excel(name = "被通知人")
+    private String notifyBeuser;
+
+    /** 发出状态（1.已发出，2.未发出） */
+    @Excel(name = "发出状态", readConverterExp = "1.已发出，2.未发出")
+    private String notifyState;
+
+    /** 市州 */
+    @Excel(name = "市州")
+    private String framework;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    private String area;
+
+    public void setNotifyId(Long notifyId) 
+    {
+        this.notifyId = notifyId;
+    }
+
+    public Long getNotifyId() 
+    {
+        return notifyId;
+    }
+    public void setNotifyUser(String notifyUser) 
+    {
+        this.notifyUser = notifyUser;
+    }
+
+    public String getNotifyUser() 
+    {
+        return notifyUser;
+    }
+    public void setNotifyDepart(String notifyDepart) 
+    {
+        this.notifyDepart = notifyDepart;
+    }
+
+    public String getNotifyDepart() 
+    {
+        return notifyDepart;
+    }
+    public void setNotifyTime(Date notifyTime) 
+    {
+        this.notifyTime = notifyTime;
+    }
+
+    public Date getNotifyTime() 
+    {
+        return notifyTime;
+    }
+    public void setNotifyContent(String notifyContent) 
+    {
+        this.notifyContent = notifyContent;
+    }
+
+    public String getNotifyContent() 
+    {
+        return notifyContent;
+    }
+    public void setNotifyBeuser(String notifyBeuser) 
+    {
+        this.notifyBeuser = notifyBeuser;
+    }
+
+    public String getNotifyBeuser() 
+    {
+        return notifyBeuser;
+    }
+    public void setNotifyState(String notifyState) 
+    {
+        this.notifyState = notifyState;
+    }
+
+    public String getNotifyState() 
+    {
+        return notifyState;
+    }
+    public void setFramework(String framework) 
+    {
+        this.framework = framework;
+    }
+
+    public String getFramework() 
+    {
+        return framework;
+    }
+    public void setArea(String area) 
+    {
+        this.area = area;
+    }
+
+    public String getArea() 
+    {
+        return area;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("notifyId", getNotifyId())
+            .append("notifyUser", getNotifyUser())
+            .append("notifyDepart", getNotifyDepart())
+            .append("notifyTime", getNotifyTime())
+            .append("notifyContent", getNotifyContent())
+            .append("notifyBeuser", getNotifyBeuser())
+            .append("notifyState", getNotifyState())
+            .append("framework", getFramework())
+            .append("area", getArea())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java

@@ -0,0 +1,406 @@
+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_property_info
+ * 
+ * @author ruoyi
+ * @date 2024-04-29
+ */
+public class TdPropertyInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 登记编号 */
+    private String id;
+
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String useId;
+
+    /** 设备品牌 */
+    @Excel(name = "设备品牌")
+    private String propertyBrand;
+
+    /** 设备mac */
+    @Excel(name = "设备mac")
+    private String propertyMac;
+
+    /** 涉密网络终端 */
+    @Excel(name = "涉密网络终端")
+    private String propertyNetstyle;
+
+    /** 资产种类 */
+    @Excel(name = "资产种类")
+    private String propertyType;
+
+    /** 资产型号 */
+    @Excel(name = "资产型号")
+    private String propertyNo;
+
+    /** 资产名称 */
+    @Excel(name = "资产名称")
+    private String propertyName;
+
+    /** 计算机类型 */
+    @Excel(name = "计算机类型")
+    private String computerType;
+
+    /** 资产密级 */
+    @Excel(name = "资产密级")
+    private String propertyMiji;
+
+    /** 设备SN */
+    @Excel(name = "设备SN")
+    private String propertySn;
+
+    /** 是否是要害部门，部位 */
+    @Excel(name = "是否是要害部门，部位")
+    private String isCurcial;
+
+    /** 是否安装防护软件 */
+    @Excel(name = "是否安装防护软件")
+    private String isSoftware;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String username;
+
+    /** 维护部门 */
+    @Excel(name = "维护部门")
+    private String maintainDepart;
+
+    /** 维护人员 */
+    @Excel(name = "维护人员")
+    private String maintainUser;
+
+    /** 维护日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "维护日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date maintainDate;
+
+    /** 维护状态 */
+    @Excel(name = "维护状态")
+    private String maintainState;
+
+    /** 销毁状态 */
+    @Excel(name = "销毁状态")
+    private String destoryState;
+
+    /** 销毁部门 */
+    @Excel(name = "销毁部门")
+    private String destoryDepart;
+
+    /** 销毁人员 */
+    @Excel(name = "销毁人员")
+    private String destoryUser;
+
+    /** 销毁日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "销毁日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date destoryDate;
+
+    /** 报废类型 */
+    @Excel(name = "报废类型")
+    private String destoryType;
+
+    /** 设备描述 */
+    @Excel(name = "设备描述")
+    private String propertyRefer;
+
+    /** 维护备注 */
+    @Excel(name = "维护备注")
+    private String maintainRemark;
+
+    /** 涉密程度 */
+    @Excel(name = "涉密程度")
+    private String shemichengdu;
+
+    /** 部门 */
+    @Excel(name = "部门")
+    private String part;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setUseId(String useId) 
+    {
+        this.useId = useId;
+    }
+
+    public String getUseId() 
+    {
+        return useId;
+    }
+    public void setPropertyBrand(String propertyBrand) 
+    {
+        this.propertyBrand = propertyBrand;
+    }
+
+    public String getPropertyBrand() 
+    {
+        return propertyBrand;
+    }
+    public void setPropertyMac(String propertyMac) 
+    {
+        this.propertyMac = propertyMac;
+    }
+
+    public String getPropertyMac() 
+    {
+        return propertyMac;
+    }
+    public void setPropertyNetstyle(String propertyNetstyle) 
+    {
+        this.propertyNetstyle = propertyNetstyle;
+    }
+
+    public String getPropertyNetstyle() 
+    {
+        return propertyNetstyle;
+    }
+    public void setPropertyType(String propertyType) 
+    {
+        this.propertyType = propertyType;
+    }
+
+    public String getPropertyType() 
+    {
+        return propertyType;
+    }
+    public void setPropertyNo(String propertyNo) 
+    {
+        this.propertyNo = propertyNo;
+    }
+
+    public String getPropertyNo() 
+    {
+        return propertyNo;
+    }
+    public void setPropertyName(String propertyName) 
+    {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() 
+    {
+        return propertyName;
+    }
+    public void setComputerType(String computerType) 
+    {
+        this.computerType = computerType;
+    }
+
+    public String getComputerType() 
+    {
+        return computerType;
+    }
+    public void setPropertyMiji(String propertyMiji) 
+    {
+        this.propertyMiji = propertyMiji;
+    }
+
+    public String getPropertyMiji() 
+    {
+        return propertyMiji;
+    }
+    public void setPropertySn(String propertySn) 
+    {
+        this.propertySn = propertySn;
+    }
+
+    public String getPropertySn() 
+    {
+        return propertySn;
+    }
+    public void setIsCurcial(String isCurcial) 
+    {
+        this.isCurcial = isCurcial;
+    }
+
+    public String getIsCurcial() 
+    {
+        return isCurcial;
+    }
+    public void setIsSoftware(String isSoftware) 
+    {
+        this.isSoftware = isSoftware;
+    }
+
+    public String getIsSoftware() 
+    {
+        return isSoftware;
+    }
+    public void setUsername(String username) 
+    {
+        this.username = username;
+    }
+
+    public String getUsername() 
+    {
+        return username;
+    }
+    public void setMaintainDepart(String maintainDepart) 
+    {
+        this.maintainDepart = maintainDepart;
+    }
+
+    public String getMaintainDepart() 
+    {
+        return maintainDepart;
+    }
+    public void setMaintainUser(String maintainUser) 
+    {
+        this.maintainUser = maintainUser;
+    }
+
+    public String getMaintainUser() 
+    {
+        return maintainUser;
+    }
+    public void setMaintainDate(Date maintainDate) 
+    {
+        this.maintainDate = maintainDate;
+    }
+
+    public Date getMaintainDate() 
+    {
+        return maintainDate;
+    }
+    public void setMaintainState(String maintainState) 
+    {
+        this.maintainState = maintainState;
+    }
+
+    public String getMaintainState() 
+    {
+        return maintainState;
+    }
+    public void setDestoryState(String destoryState) 
+    {
+        this.destoryState = destoryState;
+    }
+
+    public String getDestoryState() 
+    {
+        return destoryState;
+    }
+    public void setDestoryDepart(String destoryDepart) 
+    {
+        this.destoryDepart = destoryDepart;
+    }
+
+    public String getDestoryDepart() 
+    {
+        return destoryDepart;
+    }
+    public void setDestoryUser(String destoryUser) 
+    {
+        this.destoryUser = destoryUser;
+    }
+
+    public String getDestoryUser() 
+    {
+        return destoryUser;
+    }
+    public void setDestoryDate(Date destoryDate) 
+    {
+        this.destoryDate = destoryDate;
+    }
+
+    public Date getDestoryDate() 
+    {
+        return destoryDate;
+    }
+    public void setDestoryType(String destoryType) 
+    {
+        this.destoryType = destoryType;
+    }
+
+    public String getDestoryType() 
+    {
+        return destoryType;
+    }
+    public void setPropertyRefer(String propertyRefer) 
+    {
+        this.propertyRefer = propertyRefer;
+    }
+
+    public String getPropertyRefer() 
+    {
+        return propertyRefer;
+    }
+    public void setMaintainRemark(String maintainRemark) 
+    {
+        this.maintainRemark = maintainRemark;
+    }
+
+    public String getMaintainRemark() 
+    {
+        return maintainRemark;
+    }
+    public void setShemichengdu(String shemichengdu) 
+    {
+        this.shemichengdu = shemichengdu;
+    }
+
+    public String getShemichengdu() 
+    {
+        return shemichengdu;
+    }
+    public void setPart(String part) 
+    {
+        this.part = part;
+    }
+
+    public String getPart() 
+    {
+        return part;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("useId", getUseId())
+            .append("propertyBrand", getPropertyBrand())
+            .append("propertyMac", getPropertyMac())
+            .append("propertyNetstyle", getPropertyNetstyle())
+            .append("propertyType", getPropertyType())
+            .append("propertyNo", getPropertyNo())
+            .append("propertyName", getPropertyName())
+            .append("computerType", getComputerType())
+            .append("propertyMiji", getPropertyMiji())
+            .append("propertySn", getPropertySn())
+            .append("remark", getRemark())
+            .append("isCurcial", getIsCurcial())
+            .append("isSoftware", getIsSoftware())
+            .append("username", getUsername())
+            .append("maintainDepart", getMaintainDepart())
+            .append("maintainUser", getMaintainUser())
+            .append("maintainDate", getMaintainDate())
+            .append("maintainState", getMaintainState())
+            .append("destoryState", getDestoryState())
+            .append("destoryDepart", getDestoryDepart())
+            .append("destoryUser", getDestoryUser())
+            .append("destoryDate", getDestoryDate())
+            .append("destoryType", getDestoryType())
+            .append("propertyRefer", getPropertyRefer())
+            .append("maintainRemark", getMaintainRemark())
+            .append("shemichengdu", getShemichengdu())
+            .append("part", getPart())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java

@@ -0,0 +1,196 @@
+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_property_manager
+ *
+ * @author ruoyi
+ * @date 2024-04-28
+ */
+public class TdPropertyManager extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String useId;
+
+    /** 下属部门 */
+    @Excel(name = "下属部门")
+    private String useDepart;
+
+    /** 使用人员 */
+    @Excel(name = "使用人员")
+    private String userName;
+
+    /** 使用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "使用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date useDate;
+
+    /** 使用单位 */
+    @Excel(name = "使用单位")
+    private String frameworkId;
+
+    /** 登记部门 */
+    @Excel(name = "登记部门")
+    private String recoverDepart;
+
+    /** 登记人员 */
+    @Excel(name = "登记人员")
+    private String recoverName;
+
+    /** 登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recoverDate;
+
+    /** 密级(1：秘密，2：机密，3：绝密) */
+    @Excel(name = "密级(1：秘密，2：机密，3：绝密)")
+    private Long shemichengdu;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String part;
+
+    /** 区 */
+    @Excel(name = "区")
+    private String areaId;
+
+    /** 网络终端（数量） */
+    @Excel(name = "网络终端", readConverterExp = "数=量")
+    private Long propertyNum;
+
+    public void setUseId(String useId)
+    {
+        this.useId = useId;
+    }
+
+    public String getUseId()
+    {
+        return useId;
+    }
+    public void setUseDepart(String useDepart)
+    {
+        this.useDepart = useDepart;
+    }
+
+    public String getUseDepart()
+    {
+        return useDepart;
+    }
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+    public void setUseDate(Date useDate)
+    {
+        this.useDate = useDate;
+    }
+
+    public Date getUseDate()
+    {
+        return useDate;
+    }
+    public void setFrameworkId(String frameworkId)
+    {
+        this.frameworkId = frameworkId;
+    }
+
+    public String getFrameworkId()
+    {
+        return frameworkId;
+    }
+    public void setRecoverDepart(String recoverDepart)
+    {
+        this.recoverDepart = recoverDepart;
+    }
+
+    public String getRecoverDepart()
+    {
+        return recoverDepart;
+    }
+    public void setRecoverName(String recoverName)
+    {
+        this.recoverName = recoverName;
+    }
+
+    public String getRecoverName()
+    {
+        return recoverName;
+    }
+    public void setRecoverDate(Date recoverDate)
+    {
+        this.recoverDate = recoverDate;
+    }
+
+    public Date getRecoverDate()
+    {
+        return recoverDate;
+    }
+    public void setShemichengdu(Long shemichengdu)
+    {
+        this.shemichengdu = shemichengdu;
+    }
+
+    public Long getShemichengdu()
+    {
+        return shemichengdu;
+    }
+    public void setPart(String part)
+    {
+        this.part = part;
+    }
+
+    public String getPart()
+    {
+        return part;
+    }
+    public void setAreaId(String areaId)
+    {
+        this.areaId = areaId;
+    }
+
+    public String getAreaId()
+    {
+        return areaId;
+    }
+    public void setPropertyNum(Long propertyNum)
+    {
+        this.propertyNum = propertyNum;
+    }
+
+    public Long getPropertyNum()
+    {
+        return propertyNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("useId", getUseId())
+                .append("useDepart", getUseDepart())
+                .append("userName", getUserName())
+                .append("useDate", getUseDate())
+                .append("frameworkId", getFrameworkId())
+                .append("recoverDepart", getRecoverDepart())
+                .append("recoverName", getRecoverName())
+                .append("recoverDate", getRecoverDate())
+                .append("shemichengdu", getShemichengdu())
+                .append("part", getPart())
+                .append("areaId", getAreaId())
+                .append("propertyNum", getPropertyNum())
+                .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdCheck;
+
+/**
+ * 检查报告管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public interface TdCheckMapper 
+{
+    /**
+     * 查询检查报告管理
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 检查报告管理
+     */
+    public TdCheck selectTdCheckByCheckId(Long checkId);
+
+    /**
+     * 查询检查报告管理列表
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 检查报告管理集合
+     */
+    public List<TdCheck> selectTdCheckList(TdCheck tdCheck);
+
+    /**
+     * 新增检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    public int insertTdCheck(TdCheck tdCheck);
+
+    /**
+     * 修改检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    public int updateTdCheck(TdCheck tdCheck);
+
+    /**
+     * 删除检查报告管理
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 结果
+     */
+    public int deleteTdCheckByCheckId(Long checkId);
+
+    /**
+     * 批量删除检查报告管理
+     * 
+     * @param checkIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTdCheckByCheckIds(String[] checkIds);
+}

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

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.system.domain.TdFileProvide;
+
+/**
+ * 文件下发Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-23
+ */
+public interface TdFileProvideMapper extends BaseMapper<TdFileProvide>
+{
+    /**
+     * 查询文件下发
+     *
+     * @param fileId 文件下发主键
+     * @return 文件下发
+     */
+    public TdFileProvide selectTdFileProvideByFileId(String fileId);
+
+    /**
+     * 查询文件下发列表
+     *
+     * @param tdFileProvide 文件下发
+     * @return 文件下发集合
+     */
+    public List<TdFileProvide> selectTdFileProvideList(TdFileProvide tdFileProvide);
+
+    /**
+     * 新增文件下发
+     *
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    public int insertTdFileProvide(TdFileProvide tdFileProvide);
+
+    /**
+     * 修改文件下发
+     *
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    public int updateTdFileProvide(TdFileProvide tdFileProvide);
+
+    /**
+     * 删除文件下发
+     *
+     * @param fileId 文件下发主键
+     * @return 结果
+     */
+    public int deleteTdFileProvideByFileId(Long fileId);
+
+    /**
+     * 批量删除文件下发
+     *
+     * @param fileIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTdFileProvideByFileIds(String[] fileIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdNotify;
+
+/**
+ * 检查通知Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public interface TdNotifyMapper 
+{
+    /**
+     * 查询检查通知
+     * 
+     * @param notifyId 检查通知主键
+     * @return 检查通知
+     */
+    public TdNotify selectTdNotifyByNotifyId(Long notifyId);
+
+    /**
+     * 查询检查通知列表
+     * 
+     * @param tdNotify 检查通知
+     * @return 检查通知集合
+     */
+    public List<TdNotify> selectTdNotifyList(TdNotify tdNotify);
+
+    /**
+     * 新增检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    public int insertTdNotify(TdNotify tdNotify);
+
+    /**
+     * 修改检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    public int updateTdNotify(TdNotify tdNotify);
+
+    /**
+     * 删除检查通知
+     * 
+     * @param notifyId 检查通知主键
+     * @return 结果
+     */
+    public int deleteTdNotifyByNotifyId(Long notifyId);
+
+    /**
+     * 批量删除检查通知
+     * 
+     * @param notifyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTdNotifyByNotifyIds(String[] notifyIds);
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.TdPropertyInfo;
+
+/**
+ * 资产管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-29
+ */
+public interface TdPropertyInfoMapper extends BaseMapper<TdPropertyInfo>
+{
+    /**
+     * 查询资产管理
+     * 
+     * @param id 资产管理主键
+     * @return 资产管理
+     */
+    public TdPropertyInfo selectTdPropertyInfoById(String id);
+
+    /**
+     * 查询资产管理列表
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 资产管理集合
+     */
+    public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 新增资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 修改资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 删除资产管理
+     * 
+     * @param id 资产管理主键
+     * @return 结果
+     */
+    public int deleteTdPropertyInfoById(String id);
+
+    /**
+     * 批量删除资产管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTdPropertyInfoByIds(String[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdPropertyManager;
+
+/**
+ * 资产登记Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-26
+ */
+public interface TdPropertyManagerMapper 
+{
+    /**
+     * 查询资产登记
+     * 
+     * @param useId 资产登记主键
+     * @return 资产登记
+     */
+    public TdPropertyManager selectTdPropertyManagerByUseId(String useId);
+
+    /**
+     * 查询资产登记列表
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 资产登记集合
+     */
+    public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 新增资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    public int insertTdPropertyManager(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 修改资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    public int updateTdPropertyManager(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 删除资产登记
+     * 
+     * @param useId 资产登记主键
+     * @return 结果
+     */
+    public int deleteTdPropertyManagerByUseId(String useId);
+
+    /**
+     * 批量删除资产登记
+     * 
+     * @param useIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTdPropertyManagerByUseIds(String[] useIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdCheck;
+
+/**
+ * 检查报告管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public interface ITdCheckService 
+{
+    /**
+     * 查询检查报告管理
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 检查报告管理
+     */
+    public TdCheck selectTdCheckByCheckId(Long checkId);
+
+    /**
+     * 查询检查报告管理列表
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 检查报告管理集合
+     */
+    public List<TdCheck> selectTdCheckList(TdCheck tdCheck);
+
+    /**
+     * 新增检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    public int insertTdCheck(TdCheck tdCheck);
+
+    /**
+     * 修改检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    public int updateTdCheck(TdCheck tdCheck);
+
+    /**
+     * 批量删除检查报告管理
+     * 
+     * @param checkIds 需要删除的检查报告管理主键集合
+     * @return 结果
+     */
+    public int deleteTdCheckByCheckIds(String checkIds);
+
+    /**
+     * 删除检查报告管理信息
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 结果
+     */
+    public int deleteTdCheckByCheckId(Long checkId);
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.TdFileProvide;
+
+/**
+ * 文件下发Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-23
+ */
+public interface ITdFileProvideService extends IService<TdFileProvide>
+{
+    /**
+     * 查询文件下发
+     *
+     * @param fileId 文件下发主键
+     * @return 文件下发
+     */
+    public TdFileProvide selectTdFileProvideByFileId(String fileId);
+
+    /**
+     * 查询文件下发列表
+     *
+     * @param tdFileProvide 文件下发
+     * @return 文件下发集合
+     */
+    public List<TdFileProvide> selectTdFileProvideList(TdFileProvide tdFileProvide);
+
+    /**
+     * 新增文件下发
+     *
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    public int insertTdFileProvide(TdFileProvide tdFileProvide);
+
+    /**
+     * 修改文件下发
+     *
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    public int updateTdFileProvide(TdFileProvide tdFileProvide);
+
+    /**
+     * 批量删除文件下发
+     *
+     * @param fileIds 需要删除的文件下发主键集合
+     * @return 结果
+     */
+    public int deleteTdFileProvideByFileIds(String fileIds);
+
+    /**
+     * 删除文件下发信息
+     *
+     * @param fileId 文件下发主键
+     * @return 结果
+     */
+    public int deleteTdFileProvideByFileId(Long fileId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdNotify;
+
+/**
+ * 检查通知Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+public interface ITdNotifyService 
+{
+    /**
+     * 查询检查通知
+     * 
+     * @param notifyId 检查通知主键
+     * @return 检查通知
+     */
+    public TdNotify selectTdNotifyByNotifyId(Long notifyId);
+
+    /**
+     * 查询检查通知列表
+     * 
+     * @param tdNotify 检查通知
+     * @return 检查通知集合
+     */
+    public List<TdNotify> selectTdNotifyList(TdNotify tdNotify);
+
+    /**
+     * 新增检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    public int insertTdNotify(TdNotify tdNotify);
+
+    /**
+     * 修改检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    public int updateTdNotify(TdNotify tdNotify);
+
+    /**
+     * 批量删除检查通知
+     * 
+     * @param notifyIds 需要删除的检查通知主键集合
+     * @return 结果
+     */
+    public int deleteTdNotifyByNotifyIds(String notifyIds);
+
+    /**
+     * 删除检查通知信息
+     * 
+     * @param notifyId 检查通知主键
+     * @return 结果
+     */
+    public int deleteTdNotifyByNotifyId(Long notifyId);
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.TdPropertyInfo;
+
+/**
+ * 资产管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-29
+ */
+public interface ITdPropertyInfoService extends IService<TdPropertyInfo>
+{
+    /**
+     * 查询资产管理
+     * 
+     * @param id 资产管理主键
+     * @return 资产管理
+     */
+    public TdPropertyInfo selectTdPropertyInfoById(String id);
+
+    /**
+     * 查询资产管理列表
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 资产管理集合
+     */
+    public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 新增资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 修改资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
+
+    /**
+     * 批量删除资产管理
+     * 
+     * @param ids 需要删除的资产管理主键集合
+     * @return 结果
+     */
+    public int deleteTdPropertyInfoByIds(String ids);
+
+    /**
+     * 删除资产管理信息
+     * 
+     * @param id 资产管理主键
+     * @return 结果
+     */
+    public int deleteTdPropertyInfoById(String id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TdPropertyManager;
+
+/**
+ * 资产登记Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-26
+ */
+public interface ITdPropertyManagerService 
+{
+    /**
+     * 查询资产登记
+     * 
+     * @param useId 资产登记主键
+     * @return 资产登记
+     */
+    public TdPropertyManager selectTdPropertyManagerByUseId(String useId);
+
+    /**
+     * 查询资产登记列表
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 资产登记集合
+     */
+    public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 新增资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    public int insertTdPropertyManager(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 修改资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    public int updateTdPropertyManager(TdPropertyManager tdPropertyManager);
+
+    /**
+     * 批量删除资产登记
+     * 
+     * @param useIds 需要删除的资产登记主键集合
+     * @return 结果
+     */
+    public int deleteTdPropertyManagerByUseIds(String useIds);
+
+    /**
+     * 删除资产登记信息
+     * 
+     * @param useId 资产登记主键
+     * @return 结果
+     */
+    public int deleteTdPropertyManagerByUseId(String useId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdCheckServiceImpl.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.TdCheckMapper;
+import com.ruoyi.system.domain.TdCheck;
+import com.ruoyi.system.service.ITdCheckService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 检查报告管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+@Service
+public class TdCheckServiceImpl implements ITdCheckService 
+{
+    @Autowired
+    private TdCheckMapper tdCheckMapper;
+
+    /**
+     * 查询检查报告管理
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 检查报告管理
+     */
+    @Override
+    public TdCheck selectTdCheckByCheckId(Long checkId)
+    {
+        return tdCheckMapper.selectTdCheckByCheckId(checkId);
+    }
+
+    /**
+     * 查询检查报告管理列表
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 检查报告管理
+     */
+    @Override
+    public List<TdCheck> selectTdCheckList(TdCheck tdCheck)
+    {
+        return tdCheckMapper.selectTdCheckList(tdCheck);
+    }
+
+    /**
+     * 新增检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    @Override
+    public int insertTdCheck(TdCheck tdCheck)
+    {
+        return tdCheckMapper.insertTdCheck(tdCheck);
+    }
+
+    /**
+     * 修改检查报告管理
+     * 
+     * @param tdCheck 检查报告管理
+     * @return 结果
+     */
+    @Override
+    public int updateTdCheck(TdCheck tdCheck)
+    {
+        return tdCheckMapper.updateTdCheck(tdCheck);
+    }
+
+    /**
+     * 批量删除检查报告管理
+     * 
+     * @param checkIds 需要删除的检查报告管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdCheckByCheckIds(String checkIds)
+    {
+        return tdCheckMapper.deleteTdCheckByCheckIds(Convert.toStrArray(checkIds));
+    }
+
+    /**
+     * 删除检查报告管理信息
+     * 
+     * @param checkId 检查报告管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdCheckByCheckId(Long checkId)
+    {
+        return tdCheckMapper.deleteTdCheckByCheckId(checkId);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.text.Convert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TdFileProvideMapper;
+import com.ruoyi.system.domain.TdFileProvide;
+import com.ruoyi.system.service.ITdFileProvideService;
+
+/**
+ * 文件下发Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-04-23
+ */
+@Service
+public class TdFileProvideServiceImpl extends ServiceImpl<TdFileProvideMapper,TdFileProvide> implements ITdFileProvideService
+{
+    @Autowired
+    private TdFileProvideMapper tdFileProvideMapper;
+
+    /**
+     * 查询文件下发
+     * 
+     * @param fileId 文件下发主键
+     * @return 文件下发
+     */
+    @Override
+    public TdFileProvide selectTdFileProvideByFileId(String fileId)
+    {
+        return tdFileProvideMapper.selectTdFileProvideByFileId(fileId);
+    }
+
+    /**
+     * 查询文件下发列表
+     * 
+     * @param tdFileProvide 文件下发
+     * @return 文件下发
+     */
+    @Override
+    public List<TdFileProvide> selectTdFileProvideList(TdFileProvide tdFileProvide)
+    {
+        return tdFileProvideMapper.selectTdFileProvideList(tdFileProvide);
+    }
+
+    /**
+     * 新增文件下发
+     * 
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    @Override
+    public int insertTdFileProvide(TdFileProvide tdFileProvide)
+    {
+        return tdFileProvideMapper.insertTdFileProvide(tdFileProvide);
+    }
+
+    /**
+     * 修改文件下发
+     * 
+     * @param tdFileProvide 文件下发
+     * @return 结果
+     */
+    @Override
+    public int updateTdFileProvide(TdFileProvide tdFileProvide)
+    {
+        return tdFileProvideMapper.updateTdFileProvide(tdFileProvide);
+    }
+
+    /**
+     * 批量删除文件下发
+     * 
+     * @param fileIds 需要删除的文件下发主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdFileProvideByFileIds(String fileIds)
+    {
+        return tdFileProvideMapper.deleteTdFileProvideByFileIds(Convert.toStrArray(fileIds));
+    }
+
+    /**
+     * 删除文件下发信息
+     * 
+     * @param fileId 文件下发主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdFileProvideByFileId(Long fileId)
+    {
+        return tdFileProvideMapper.deleteTdFileProvideByFileId(fileId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdNotifyServiceImpl.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.TdNotifyMapper;
+import com.ruoyi.system.domain.TdNotify;
+import com.ruoyi.system.service.ITdNotifyService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 检查通知Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-05-06
+ */
+@Service
+public class TdNotifyServiceImpl implements ITdNotifyService 
+{
+    @Autowired
+    private TdNotifyMapper tdNotifyMapper;
+
+    /**
+     * 查询检查通知
+     * 
+     * @param notifyId 检查通知主键
+     * @return 检查通知
+     */
+    @Override
+    public TdNotify selectTdNotifyByNotifyId(Long notifyId)
+    {
+        return tdNotifyMapper.selectTdNotifyByNotifyId(notifyId);
+    }
+
+    /**
+     * 查询检查通知列表
+     * 
+     * @param tdNotify 检查通知
+     * @return 检查通知
+     */
+    @Override
+    public List<TdNotify> selectTdNotifyList(TdNotify tdNotify)
+    {
+        return tdNotifyMapper.selectTdNotifyList(tdNotify);
+    }
+
+    /**
+     * 新增检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    @Override
+    public int insertTdNotify(TdNotify tdNotify)
+    {
+        return tdNotifyMapper.insertTdNotify(tdNotify);
+    }
+
+    /**
+     * 修改检查通知
+     * 
+     * @param tdNotify 检查通知
+     * @return 结果
+     */
+    @Override
+    public int updateTdNotify(TdNotify tdNotify)
+    {
+        return tdNotifyMapper.updateTdNotify(tdNotify);
+    }
+
+    /**
+     * 批量删除检查通知
+     * 
+     * @param notifyIds 需要删除的检查通知主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdNotifyByNotifyIds(String notifyIds)
+    {
+        return tdNotifyMapper.deleteTdNotifyByNotifyIds(Convert.toStrArray(notifyIds));
+    }
+
+    /**
+     * 删除检查通知信息
+     * 
+     * @param notifyId 检查通知主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdNotifyByNotifyId(Long notifyId)
+    {
+        return tdNotifyMapper.deleteTdNotifyByNotifyId(notifyId);
+    }
+}

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

@@ -0,0 +1,96 @@
+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.TdPropertyInfoMapper;
+import com.ruoyi.system.domain.TdPropertyInfo;
+import com.ruoyi.system.service.ITdPropertyInfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 资产管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-04-29
+ */
+@Service
+public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,TdPropertyInfo> implements ITdPropertyInfoService
+{
+    @Autowired
+    private TdPropertyInfoMapper tdPropertyInfoMapper;
+
+    /**
+     * 查询资产管理
+     * 
+     * @param id 资产管理主键
+     * @return 资产管理
+     */
+    @Override
+    public TdPropertyInfo selectTdPropertyInfoById(String id)
+    {
+        return tdPropertyInfoMapper.selectTdPropertyInfoById(id);
+    }
+
+    /**
+     * 查询资产管理列表
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 资产管理
+     */
+    @Override
+    public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo)
+    {
+        return tdPropertyInfoMapper.selectTdPropertyInfoList(tdPropertyInfo);
+    }
+
+    /**
+     * 新增资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    @Override
+    public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo)
+    {
+        return tdPropertyInfoMapper.insertTdPropertyInfo(tdPropertyInfo);
+    }
+
+    /**
+     * 修改资产管理
+     * 
+     * @param tdPropertyInfo 资产管理
+     * @return 结果
+     */
+    @Override
+    public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo)
+    {
+        return tdPropertyInfoMapper.updateTdPropertyInfo(tdPropertyInfo);
+    }
+
+    /**
+     * 批量删除资产管理
+     * 
+     * @param ids 需要删除的资产管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdPropertyInfoByIds(String ids)
+    {
+        return tdPropertyInfoMapper.deleteTdPropertyInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除资产管理信息
+     * 
+     * @param id 资产管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdPropertyInfoById(String id)
+    {
+        return tdPropertyInfoMapper.deleteTdPropertyInfoById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.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.TdPropertyManagerMapper;
+import com.ruoyi.system.domain.TdPropertyManager;
+import com.ruoyi.system.service.ITdPropertyManagerService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 资产登记Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-04-26
+ */
+@Service
+public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService 
+{
+    @Autowired
+    private TdPropertyManagerMapper tdPropertyManagerMapper;
+
+    /**
+     * 查询资产登记
+     * 
+     * @param useId 资产登记主键
+     * @return 资产登记
+     */
+    @Override
+    public TdPropertyManager selectTdPropertyManagerByUseId(String useId)
+    {
+        return tdPropertyManagerMapper.selectTdPropertyManagerByUseId(useId);
+    }
+
+    /**
+     * 查询资产登记列表
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 资产登记
+     */
+    @Override
+    public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager)
+    {
+        return tdPropertyManagerMapper.selectTdPropertyManagerList(tdPropertyManager);
+    }
+
+    /**
+     * 新增资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    @Override
+    public int insertTdPropertyManager(TdPropertyManager tdPropertyManager)
+    {
+        return tdPropertyManagerMapper.insertTdPropertyManager(tdPropertyManager);
+    }
+
+    /**
+     * 修改资产登记
+     * 
+     * @param tdPropertyManager 资产登记
+     * @return 结果
+     */
+    @Override
+    public int updateTdPropertyManager(TdPropertyManager tdPropertyManager)
+    {
+        return tdPropertyManagerMapper.updateTdPropertyManager(tdPropertyManager);
+    }
+
+    /**
+     * 批量删除资产登记
+     * 
+     * @param useIds 需要删除的资产登记主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdPropertyManagerByUseIds(String useIds)
+    {
+        return tdPropertyManagerMapper.deleteTdPropertyManagerByUseIds(Convert.toStrArray(useIds));
+    }
+
+    /**
+     * 删除资产登记信息
+     * 
+     * @param useId 资产登记主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTdPropertyManagerByUseId(String useId)
+    {
+        return tdPropertyManagerMapper.deleteTdPropertyManagerByUseId(useId);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/TdCheckMapper.xml

@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TdCheckMapper">
+    
+    <resultMap type="TdCheck" id="TdCheckResult">
+        <result property="checkId"    column="check_id"    />
+        <result property="user"    column="user"    />
+        <result property="depart"    column="depart"    />
+        <result property="checkStartTime"    column="check_start_time"    />
+        <result property="checkEndTime"    column="check_end_time"    />
+        <result property="checkType"    column="check_type"    />
+        <result property="checkContent"    column="check_content"    />
+        <result property="checkResult"    column="check_result"    />
+        <result property="address"    column="address"    />
+        <result property="departreault"    column="departreault"    />
+        <result property="area"    column="area"    />
+        <result property="framework"    column="framework"    />
+        <result property="checkState"    column="check_state"    />
+        <result property="checkName"    column="check_name"    />
+        <result property="checkAddress"    column="check_address"    />
+        <result property="checkcontentry"    column="checkcontentry"    />
+        <result property="checkcontentryjt"    column="checkcontentryjt"    />
+        <result property="checkcontentrywj"    column="checkcontentrywj"    />
+        <result property="checkcontentrywjjt"    column="checkcontentrywjjt"    />
+        <result property="checkcontentrysb"    column="checkcontentrysb"    />
+        <result property="checkcontentrysbjt"    column="checkcontentrysbjt"    />
+        <result property="checkcontentryglzd"    column="checkcontentryglzd"    />
+        <result property="checkcontentryglzdjt"    column="checkcontentryglzdjt"    />
+        <result property="checkcontentryxmsj"    column="checkcontentryxmsj"    />
+        <result property="checkcontentryxmsjjt"    column="checkcontentryxmsjjt"    />
+        <result property="checkcontentryother"    column="checkcontentryother"    />
+        <result property="checkcontentryxmsjotherjt"    column="checkcontentryxmsjotherjt"    />
+        <result property="checkresult1"    column="checkresult1"    />
+        <result property="checkresult2"    column="checkresult2"    />
+        <result property="checkresult3"    column="checkresult3"    />
+        <result property="checkresult4"    column="checkresult4"    />
+        <result property="checkresult5"    column="checkresult5"    />
+        <result property="checkresult6"    column="checkresult6"    />
+        <result property="remark1"    column="remark1"    />
+        <result property="remark2"    column="remark2"    />
+        <result property="remark3"    column="remark3"    />
+        <result property="remark4"    column="remark4"    />
+        <result property="remark5"    column="remark5"    />
+        <result property="remark6"    column="remark6"    />
+        <result property="checkownresult1"    column="checkownresult1"    />
+        <result property="checkownresult2"    column="checkownresult2"    />
+        <result property="checkownresult3"    column="checkownresult3"    />
+        <result property="checkownresult4"    column="checkownresult4"    />
+        <result property="checkownresult5"    column="checkownresult5"    />
+        <result property="checkownresult6"    column="checkownresult6"    />
+        <result property="checkownresulttime"    column="checkownresulttime"    />
+    </resultMap>
+
+    <sql id="selectTdCheckVo">
+        select check_id, user, depart, check_start_time, check_end_time, check_type, check_content, check_result, address, departreault, area, framework, check_state, check_name, check_address, checkcontentry, checkcontentryjt, checkcontentrywj, checkcontentrywjjt, checkcontentrysb, checkcontentrysbjt, checkcontentryglzd, checkcontentryglzdjt, checkcontentryxmsj, checkcontentryxmsjjt, checkcontentryother, checkcontentryxmsjotherjt, checkresult1, checkresult2, checkresult3, checkresult4, checkresult5, checkresult6, remark1, remark2, remark3, remark4, remark5, remark6, checkownresult1, checkownresult2, checkownresult3, checkownresult4, checkownresult5, checkownresult6, checkownresulttime from td_check
+    </sql>
+
+    <select id="selectTdCheckList" parameterType="TdCheck" resultMap="TdCheckResult">
+        <include refid="selectTdCheckVo"/>
+        <where>  
+            <if test="user != null  and user != ''"> and user = #{user}</if>
+            <if test="depart != null  and depart != ''"> and depart = #{depart}</if>
+            <if test="checkStartTime != null "> and check_start_time = #{checkStartTime}</if>
+            <if test="checkEndTime != null "> and check_end_time = #{checkEndTime}</if>
+            <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
+            <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
+            <if test="checkResult != null  and checkResult != ''"> and check_result = #{checkResult}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="departreault != null  and departreault != ''"> and departreault = #{departreault}</if>
+            <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="framework != null  and framework != ''"> and framework = #{framework}</if>
+            <if test="checkState != null  and checkState != ''"> and check_state = #{checkState}</if>
+            <if test="checkName != null  and checkName != ''"> and check_name = #{checkName}</if>
+            <if test="checkAddress != null  and checkAddress != ''"> and check_address = #{checkAddress}</if>
+            <if test="checkcontentry != null  and checkcontentry != ''"> and checkcontentry = #{checkcontentry}</if>
+            <if test="checkcontentryjt != null  and checkcontentryjt != ''"> and checkcontentryjt = #{checkcontentryjt}</if>
+            <if test="checkcontentrywj != null  and checkcontentrywj != ''"> and checkcontentrywj = #{checkcontentrywj}</if>
+            <if test="checkcontentrywjjt != null  and checkcontentrywjjt != ''"> and checkcontentrywjjt = #{checkcontentrywjjt}</if>
+            <if test="checkcontentrysb != null  and checkcontentrysb != ''"> and checkcontentrysb = #{checkcontentrysb}</if>
+            <if test="checkcontentrysbjt != null  and checkcontentrysbjt != ''"> and checkcontentrysbjt = #{checkcontentrysbjt}</if>
+            <if test="checkcontentryglzd != null  and checkcontentryglzd != ''"> and checkcontentryglzd = #{checkcontentryglzd}</if>
+            <if test="checkcontentryglzdjt != null  and checkcontentryglzdjt != ''"> and checkcontentryglzdjt = #{checkcontentryglzdjt}</if>
+            <if test="checkcontentryxmsj != null  and checkcontentryxmsj != ''"> and checkcontentryxmsj = #{checkcontentryxmsj}</if>
+            <if test="checkcontentryxmsjjt != null  and checkcontentryxmsjjt != ''"> and checkcontentryxmsjjt = #{checkcontentryxmsjjt}</if>
+            <if test="checkcontentryother != null  and checkcontentryother != ''"> and checkcontentryother = #{checkcontentryother}</if>
+            <if test="checkcontentryxmsjotherjt != null  and checkcontentryxmsjotherjt != ''"> and checkcontentryxmsjotherjt = #{checkcontentryxmsjotherjt}</if>
+            <if test="checkresult1 != null  and checkresult1 != ''"> and checkresult1 = #{checkresult1}</if>
+            <if test="checkresult2 != null  and checkresult2 != ''"> and checkresult2 = #{checkresult2}</if>
+            <if test="checkresult3 != null  and checkresult3 != ''"> and checkresult3 = #{checkresult3}</if>
+            <if test="checkresult4 != null  and checkresult4 != ''"> and checkresult4 = #{checkresult4}</if>
+            <if test="checkresult5 != null  and checkresult5 != ''"> and checkresult5 = #{checkresult5}</if>
+            <if test="checkresult6 != null  and checkresult6 != ''"> and checkresult6 = #{checkresult6}</if>
+            <if test="remark1 != null  and remark1 != ''"> and remark1 = #{remark1}</if>
+            <if test="remark2 != null  and remark2 != ''"> and remark2 = #{remark2}</if>
+            <if test="remark3 != null  and remark3 != ''"> and remark3 = #{remark3}</if>
+            <if test="remark4 != null  and remark4 != ''"> and remark4 = #{remark4}</if>
+            <if test="remark5 != null  and remark5 != ''"> and remark5 = #{remark5}</if>
+            <if test="remark6 != null  and remark6 != ''"> and remark6 = #{remark6}</if>
+            <if test="checkownresult1 != null  and checkownresult1 != ''"> and checkownresult1 = #{checkownresult1}</if>
+            <if test="checkownresult2 != null  and checkownresult2 != ''"> and checkownresult2 = #{checkownresult2}</if>
+            <if test="checkownresult3 != null  and checkownresult3 != ''"> and checkownresult3 = #{checkownresult3}</if>
+            <if test="checkownresult4 != null  and checkownresult4 != ''"> and checkownresult4 = #{checkownresult4}</if>
+            <if test="checkownresult5 != null  and checkownresult5 != ''"> and checkownresult5 = #{checkownresult5}</if>
+            <if test="checkownresult6 != null  and checkownresult6 != ''"> and checkownresult6 = #{checkownresult6}</if>
+            <if test="checkownresulttime != null "> and checkownresulttime = #{checkownresulttime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTdCheckByCheckId" parameterType="Long" resultMap="TdCheckResult">
+        <include refid="selectTdCheckVo"/>
+        where check_id = #{checkId}
+    </select>
+        
+    <insert id="insertTdCheck" parameterType="TdCheck" useGeneratedKeys="true" keyProperty="checkId">
+        insert into td_check
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="user != null">user,</if>
+            <if test="depart != null">depart,</if>
+            <if test="checkStartTime != null">check_start_time,</if>
+            <if test="checkEndTime != null">check_end_time,</if>
+            <if test="checkType != null">check_type,</if>
+            <if test="checkContent != null">check_content,</if>
+            <if test="checkResult != null">check_result,</if>
+            <if test="address != null">address,</if>
+            <if test="departreault != null">departreault,</if>
+            <if test="area != null">area,</if>
+            <if test="framework != null">framework,</if>
+            <if test="checkState != null">check_state,</if>
+            <if test="checkName != null">check_name,</if>
+            <if test="checkAddress != null">check_address,</if>
+            <if test="checkcontentry != null">checkcontentry,</if>
+            <if test="checkcontentryjt != null">checkcontentryjt,</if>
+            <if test="checkcontentrywj != null">checkcontentrywj,</if>
+            <if test="checkcontentrywjjt != null">checkcontentrywjjt,</if>
+            <if test="checkcontentrysb != null">checkcontentrysb,</if>
+            <if test="checkcontentrysbjt != null">checkcontentrysbjt,</if>
+            <if test="checkcontentryglzd != null">checkcontentryglzd,</if>
+            <if test="checkcontentryglzdjt != null">checkcontentryglzdjt,</if>
+            <if test="checkcontentryxmsj != null">checkcontentryxmsj,</if>
+            <if test="checkcontentryxmsjjt != null">checkcontentryxmsjjt,</if>
+            <if test="checkcontentryother != null">checkcontentryother,</if>
+            <if test="checkcontentryxmsjotherjt != null">checkcontentryxmsjotherjt,</if>
+            <if test="checkresult1 != null">checkresult1,</if>
+            <if test="checkresult2 != null">checkresult2,</if>
+            <if test="checkresult3 != null">checkresult3,</if>
+            <if test="checkresult4 != null">checkresult4,</if>
+            <if test="checkresult5 != null">checkresult5,</if>
+            <if test="checkresult6 != null">checkresult6,</if>
+            <if test="remark1 != null">remark1,</if>
+            <if test="remark2 != null">remark2,</if>
+            <if test="remark3 != null">remark3,</if>
+            <if test="remark4 != null">remark4,</if>
+            <if test="remark5 != null">remark5,</if>
+            <if test="remark6 != null">remark6,</if>
+            <if test="checkownresult1 != null">checkownresult1,</if>
+            <if test="checkownresult2 != null">checkownresult2,</if>
+            <if test="checkownresult3 != null">checkownresult3,</if>
+            <if test="checkownresult4 != null">checkownresult4,</if>
+            <if test="checkownresult5 != null">checkownresult5,</if>
+            <if test="checkownresult6 != null">checkownresult6,</if>
+            <if test="checkownresulttime != null">checkownresulttime,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="user != null">#{user},</if>
+            <if test="depart != null">#{depart},</if>
+            <if test="checkStartTime != null">#{checkStartTime},</if>
+            <if test="checkEndTime != null">#{checkEndTime},</if>
+            <if test="checkType != null">#{checkType},</if>
+            <if test="checkContent != null">#{checkContent},</if>
+            <if test="checkResult != null">#{checkResult},</if>
+            <if test="address != null">#{address},</if>
+            <if test="departreault != null">#{departreault},</if>
+            <if test="area != null">#{area},</if>
+            <if test="framework != null">#{framework},</if>
+            <if test="checkState != null">#{checkState},</if>
+            <if test="checkName != null">#{checkName},</if>
+            <if test="checkAddress != null">#{checkAddress},</if>
+            <if test="checkcontentry != null">#{checkcontentry},</if>
+            <if test="checkcontentryjt != null">#{checkcontentryjt},</if>
+            <if test="checkcontentrywj != null">#{checkcontentrywj},</if>
+            <if test="checkcontentrywjjt != null">#{checkcontentrywjjt},</if>
+            <if test="checkcontentrysb != null">#{checkcontentrysb},</if>
+            <if test="checkcontentrysbjt != null">#{checkcontentrysbjt},</if>
+            <if test="checkcontentryglzd != null">#{checkcontentryglzd},</if>
+            <if test="checkcontentryglzdjt != null">#{checkcontentryglzdjt},</if>
+            <if test="checkcontentryxmsj != null">#{checkcontentryxmsj},</if>
+            <if test="checkcontentryxmsjjt != null">#{checkcontentryxmsjjt},</if>
+            <if test="checkcontentryother != null">#{checkcontentryother},</if>
+            <if test="checkcontentryxmsjotherjt != null">#{checkcontentryxmsjotherjt},</if>
+            <if test="checkresult1 != null">#{checkresult1},</if>
+            <if test="checkresult2 != null">#{checkresult2},</if>
+            <if test="checkresult3 != null">#{checkresult3},</if>
+            <if test="checkresult4 != null">#{checkresult4},</if>
+            <if test="checkresult5 != null">#{checkresult5},</if>
+            <if test="checkresult6 != null">#{checkresult6},</if>
+            <if test="remark1 != null">#{remark1},</if>
+            <if test="remark2 != null">#{remark2},</if>
+            <if test="remark3 != null">#{remark3},</if>
+            <if test="remark4 != null">#{remark4},</if>
+            <if test="remark5 != null">#{remark5},</if>
+            <if test="remark6 != null">#{remark6},</if>
+            <if test="checkownresult1 != null">#{checkownresult1},</if>
+            <if test="checkownresult2 != null">#{checkownresult2},</if>
+            <if test="checkownresult3 != null">#{checkownresult3},</if>
+            <if test="checkownresult4 != null">#{checkownresult4},</if>
+            <if test="checkownresult5 != null">#{checkownresult5},</if>
+            <if test="checkownresult6 != null">#{checkownresult6},</if>
+            <if test="checkownresulttime != null">#{checkownresulttime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTdCheck" parameterType="TdCheck">
+        update td_check
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="user != null">user = #{user},</if>
+            <if test="depart != null">depart = #{depart},</if>
+            <if test="checkStartTime != null">check_start_time = #{checkStartTime},</if>
+            <if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>
+            <if test="checkType != null">check_type = #{checkType},</if>
+            <if test="checkContent != null">check_content = #{checkContent},</if>
+            <if test="checkResult != null">check_result = #{checkResult},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="departreault != null">departreault = #{departreault},</if>
+            <if test="area != null">area = #{area},</if>
+            <if test="framework != null">framework = #{framework},</if>
+            <if test="checkState != null">check_state = #{checkState},</if>
+            <if test="checkName != null">check_name = #{checkName},</if>
+            <if test="checkAddress != null">check_address = #{checkAddress},</if>
+            <if test="checkcontentry != null">checkcontentry = #{checkcontentry},</if>
+            <if test="checkcontentryjt != null">checkcontentryjt = #{checkcontentryjt},</if>
+            <if test="checkcontentrywj != null">checkcontentrywj = #{checkcontentrywj},</if>
+            <if test="checkcontentrywjjt != null">checkcontentrywjjt = #{checkcontentrywjjt},</if>
+            <if test="checkcontentrysb != null">checkcontentrysb = #{checkcontentrysb},</if>
+            <if test="checkcontentrysbjt != null">checkcontentrysbjt = #{checkcontentrysbjt},</if>
+            <if test="checkcontentryglzd != null">checkcontentryglzd = #{checkcontentryglzd},</if>
+            <if test="checkcontentryglzdjt != null">checkcontentryglzdjt = #{checkcontentryglzdjt},</if>
+            <if test="checkcontentryxmsj != null">checkcontentryxmsj = #{checkcontentryxmsj},</if>
+            <if test="checkcontentryxmsjjt != null">checkcontentryxmsjjt = #{checkcontentryxmsjjt},</if>
+            <if test="checkcontentryother != null">checkcontentryother = #{checkcontentryother},</if>
+            <if test="checkcontentryxmsjotherjt != null">checkcontentryxmsjotherjt = #{checkcontentryxmsjotherjt},</if>
+            <if test="checkresult1 != null">checkresult1 = #{checkresult1},</if>
+            <if test="checkresult2 != null">checkresult2 = #{checkresult2},</if>
+            <if test="checkresult3 != null">checkresult3 = #{checkresult3},</if>
+            <if test="checkresult4 != null">checkresult4 = #{checkresult4},</if>
+            <if test="checkresult5 != null">checkresult5 = #{checkresult5},</if>
+            <if test="checkresult6 != null">checkresult6 = #{checkresult6},</if>
+            <if test="remark1 != null">remark1 = #{remark1},</if>
+            <if test="remark2 != null">remark2 = #{remark2},</if>
+            <if test="remark3 != null">remark3 = #{remark3},</if>
+            <if test="remark4 != null">remark4 = #{remark4},</if>
+            <if test="remark5 != null">remark5 = #{remark5},</if>
+            <if test="remark6 != null">remark6 = #{remark6},</if>
+            <if test="checkownresult1 != null">checkownresult1 = #{checkownresult1},</if>
+            <if test="checkownresult2 != null">checkownresult2 = #{checkownresult2},</if>
+            <if test="checkownresult3 != null">checkownresult3 = #{checkownresult3},</if>
+            <if test="checkownresult4 != null">checkownresult4 = #{checkownresult4},</if>
+            <if test="checkownresult5 != null">checkownresult5 = #{checkownresult5},</if>
+            <if test="checkownresult6 != null">checkownresult6 = #{checkownresult6},</if>
+            <if test="checkownresulttime != null">checkownresulttime = #{checkownresulttime},</if>
+        </trim>
+        where check_id = #{checkId}
+    </update>
+
+    <delete id="deleteTdCheckByCheckId" parameterType="Long">
+        delete from td_check where check_id = #{checkId}
+    </delete>
+
+    <delete id="deleteTdCheckByCheckIds" parameterType="String">
+        delete from td_check where check_id in 
+        <foreach item="checkId" collection="array" open="(" separator="," close=")">
+            #{checkId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TdFileProvideMapper.xml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TdFileProvideMapper">
+
+    <resultMap type="TdFileProvide" id="TdFileProvideResult">
+        <result property="fileId"    column="file_id"    />
+        <result property="provideCount"    column="provide_count"    />
+        <result property="provideDepart"    column="provide_depart"    />
+        <result property="provideUserid"    column="provide_userid"    />
+        <result property="provideDate"    column="provide_date"    />
+        <result property="targetDepart"    column="target_depart"    />
+        <result property="provideLevel"    column="provide_level"    />
+        <result property="instancyExtent"    column="instancy_extent"    />
+        <result property="allianceFile"    column="alliance_file"    />
+        <result property="remark"    column="remark"    />
+        <result property="updateDepart"    column="update_depart"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="updateDate"    column="update_date"    />
+        <result property="frameworkId"    column="frameworkId"    />
+        <result property="fileSecret"    column="file_secret"    />
+        <result property="releaseSecretid"    column="release_secretid"    />
+        <result property="fileName"    column="file_name"    />
+        <result property="fileNum"    column="file_num"    />
+        <result property="fileSecretyj"    column="file_secretyj"    />
+        <result property="filePurpose"    column="file_purpose"    />
+        <result property="fileCode"    column="file_code"    />
+        <result property="receiveUser"    column="receive_user"    />
+        <result property="receiveCount"    column="receive_count"    />
+        <result property="operateId"    column="operate_id"    />
+        <result property="areaid"    column="areaid"    />
+    </resultMap>
+
+    <sql id="selectTdFileProvideVo">
+        select file_id, provide_count, provide_depart, provide_userid, provide_date, target_depart, provide_level, instancy_extent, alliance_file, remark, update_depart, update_user, update_date, frameworkId, file_secret, release_secretid, file_name, file_num, file_secretyj, file_purpose, file_code, receive_user, receive_count, operate_id, areaid from td_file_provide
+    </sql>
+
+    <select id="selectTdFileProvideList" parameterType="TdFileProvide" resultMap="TdFileProvideResult">
+        <include refid="selectTdFileProvideVo"/>
+        <where>
+            <if test="fileId != null  and fileId != ''"> and file_id = #{fileId}</if>
+            <if test="provideCount != null "> and provide_count = #{provideCount}</if>
+            <if test="provideDepart != null  and provideDepart != ''"> and provide_depart = #{provideDepart}</if>
+            <if test="provideUserid != null  and provideUserid != ''"> and provide_userid = #{provideUserid}</if>
+            <if test="provideDate != null "> and provide_date = #{provideDate}</if>
+            <if test="targetDepart != null  and targetDepart != ''"> and target_depart = #{targetDepart}</if>
+            <if test="provideLevel != null  and provideLevel != ''"> and provide_level = #{provideLevel}</if>
+            <if test="instancyExtent != null  and instancyExtent != ''"> and instancy_extent = #{instancyExtent}</if>
+            <if test="allianceFile != null  and allianceFile != ''"> and alliance_file = #{allianceFile}</if>
+            <if test="updateDepart != null  and updateDepart != ''"> and update_depart = #{updateDepart}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+            <if test="updateDate != null "> and update_date = #{updateDate}</if>
+            <if test="frameworkId != null  and frameworkId != ''"> and frameworkId = #{frameworkId}</if>
+            <if test="fileSecret != null  and fileSecret != ''"> and file_secret = #{fileSecret}</if>
+            <if test="releaseSecretid != null  and releaseSecretid != ''"> and release_secretid = #{releaseSecretid}</if>
+            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+            <if test="fileNum != null  and fileNum != ''"> and file_num = #{fileNum}</if>
+            <if test="fileSecretyj != null  and fileSecretyj != ''"> and file_secretyj = #{fileSecretyj}</if>
+            <if test="filePurpose != null  and filePurpose != ''"> and file_purpose = #{filePurpose}</if>
+            <if test="fileCode != null  and fileCode != ''"> and file_code = #{fileCode}</if>
+            <if test="receiveUser != null  and receiveUser != ''"> and receive_user = #{receiveUser}</if>
+            <if test="receiveCount != null "> and receive_count = #{receiveCount}</if>
+            <if test="operateId != null  and operateId != ''"> and operate_id = #{operateId}</if>
+            <if test="areaid != null  and areaid != ''"> and areaid = #{areaid}</if>
+        </where>
+    </select>
+
+    <select id="selectTdFileProvideByFileId" parameterType="String" resultMap="TdFileProvideResult">
+        <include refid="selectTdFileProvideVo"/>
+        where file_id = #{fileId}
+    </select>
+
+    <insert id="insertTdFileProvide" parameterType="TdFileProvide">
+        insert into td_file_provide
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fileId != null">file_id,</if>
+            <if test="provideCount != null">provide_count,</if>
+            <if test="provideDepart != null">provide_depart,</if>
+            <if test="provideUserid != null">provide_userid,</if>
+            <if test="provideDate != null">provide_date,</if>
+            <if test="targetDepart != null">target_depart,</if>
+            <if test="provideLevel != null">provide_level,</if>
+            <if test="instancyExtent != null">instancy_extent,</if>
+            <if test="allianceFile != null">alliance_file,</if>
+            <if test="remark != null">remark,</if>
+            <if test="updateDepart != null">update_depart,</if>
+            <if test="updateUser != null">update_user,</if>
+            <if test="updateDate != null">update_date,</if>
+            <if test="frameworkId != null">frameworkId,</if>
+            <if test="fileSecret != null">file_secret,</if>
+            <if test="releaseSecretid != null">release_secretid,</if>
+            <if test="fileName != null">file_name,</if>
+            <if test="fileNum != null">file_num,</if>
+            <if test="fileSecretyj != null">file_secretyj,</if>
+            <if test="filePurpose != null">file_purpose,</if>
+            <if test="fileCode != null">file_code,</if>
+            <if test="receiveUser != null">receive_user,</if>
+            <if test="receiveCount != null">receive_count,</if>
+            <if test="operateId != null">operate_id,</if>
+            <if test="areaid != null">areaid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fileId != null">#{fileId},</if>
+            <if test="provideCount != null">#{provideCount},</if>
+            <if test="provideDepart != null">#{provideDepart},</if>
+            <if test="provideUserid != null">#{provideUserid},</if>
+            <if test="provideDate != null">#{provideDate},</if>
+            <if test="targetDepart != null">#{targetDepart},</if>
+            <if test="provideLevel != null">#{provideLevel},</if>
+            <if test="instancyExtent != null">#{instancyExtent},</if>
+            <if test="allianceFile != null">#{allianceFile},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="updateDepart != null">#{updateDepart},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateDate != null">#{updateDate},</if>
+            <if test="frameworkId != null">#{frameworkId},</if>
+            <if test="fileSecret != null">#{fileSecret},</if>
+            <if test="releaseSecretid != null">#{releaseSecretid},</if>
+            <if test="fileName != null">#{fileName},</if>
+            <if test="fileNum != null">#{fileNum},</if>
+            <if test="fileSecretyj != null">#{fileSecretyj},</if>
+            <if test="filePurpose != null">#{filePurpose},</if>
+            <if test="fileCode != null">#{fileCode},</if>
+            <if test="receiveUser != null">#{receiveUser},</if>
+            <if test="receiveCount != null">#{receiveCount},</if>
+            <if test="operateId != null">#{operateId},</if>
+            <if test="areaid != null">#{areaid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTdFileProvide" parameterType="TdFileProvide">
+        update td_file_provide
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="provideCount != null">provide_count = #{provideCount},</if>
+            <if test="provideDepart != null">provide_depart = #{provideDepart},</if>
+            <if test="provideUserid != null">provide_userid = #{provideUserid},</if>
+            <if test="provideDate != null">provide_date = #{provideDate},</if>
+            <if test="targetDepart != null">target_depart = #{targetDepart},</if>
+            <if test="provideLevel != null">provide_level = #{provideLevel},</if>
+            <if test="instancyExtent != null">instancy_extent = #{instancyExtent},</if>
+            <if test="allianceFile != null">alliance_file = #{allianceFile},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateDepart != null">update_depart = #{updateDepart},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateDate != null">update_date = #{updateDate},</if>
+            <if test="frameworkId != null">frameworkId = #{frameworkId},</if>
+            <if test="fileSecret != null">file_secret = #{fileSecret},</if>
+            <if test="releaseSecretid != null">release_secretid = #{releaseSecretid},</if>
+            <if test="fileName != null">file_name = #{fileName},</if>
+            <if test="fileNum != null">file_num = #{fileNum},</if>
+            <if test="fileSecretyj != null">file_secretyj = #{fileSecretyj},</if>
+            <if test="filePurpose != null">file_purpose = #{filePurpose},</if>
+            <if test="fileCode != null">file_code = #{fileCode},</if>
+            <if test="receiveUser != null">receive_user = #{receiveUser},</if>
+            <if test="receiveCount != null">receive_count = #{receiveCount},</if>
+            <if test="operateId != null">operate_id = #{operateId},</if>
+            <if test="areaid != null">areaid = #{areaid},</if>
+        </trim>
+        where file_id = #{fileId}
+    </update>
+
+    <delete id="deleteTdFileProvideByFileId" parameterType="String">
+        delete from td_file_provide where file_id = #{fileId}
+    </delete>
+
+    <delete id="deleteTdFileProvideByFileIds" parameterType="String">
+        delete from td_file_provide where file_id in
+        <foreach item="fileId" collection="array" open="(" separator="," close=")">
+            #{fileId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TdNotifyMapper.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TdNotifyMapper">
+    
+    <resultMap type="TdNotify" id="TdNotifyResult">
+        <result property="notifyId"    column="notify_id"    />
+        <result property="notifyUser"    column="notify_user"    />
+        <result property="notifyDepart"    column="notify_depart"    />
+        <result property="notifyTime"    column="notify_time"    />
+        <result property="notifyContent"    column="notify_content"    />
+        <result property="notifyBeuser"    column="notify_beuser"    />
+        <result property="notifyState"    column="notify_state"    />
+        <result property="framework"    column="framework"    />
+        <result property="area"    column="area"    />
+    </resultMap>
+
+    <sql id="selectTdNotifyVo">
+        select notify_id, notify_user, notify_depart, notify_time, notify_content, notify_beuser, notify_state, framework, area from td_notify
+    </sql>
+
+    <select id="selectTdNotifyList" parameterType="TdNotify" resultMap="TdNotifyResult">
+        <include refid="selectTdNotifyVo"/>
+        <where>  
+            <if test="notifyUser != null  and notifyUser != ''"> and notify_user = #{notifyUser}</if>
+            <if test="notifyDepart != null  and notifyDepart != ''"> and notify_depart = #{notifyDepart}</if>
+            <if test="notifyTime != null "> and notify_time = #{notifyTime}</if>
+            <if test="notifyContent != null  and notifyContent != ''"> and notify_content = #{notifyContent}</if>
+            <if test="notifyBeuser != null  and notifyBeuser != ''"> and notify_beuser = #{notifyBeuser}</if>
+            <if test="notifyState != null  and notifyState != ''"> and notify_state = #{notifyState}</if>
+            <if test="framework != null  and framework != ''"> and framework = #{framework}</if>
+            <if test="area != null  and area != ''"> and area = #{area}</if>
+        </where>
+    </select>
+    
+    <select id="selectTdNotifyByNotifyId" parameterType="Long" resultMap="TdNotifyResult">
+        <include refid="selectTdNotifyVo"/>
+        where notify_id = #{notifyId}
+    </select>
+        
+    <insert id="insertTdNotify" parameterType="TdNotify" useGeneratedKeys="true" keyProperty="notifyId">
+        insert into td_notify
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="notifyUser != null">notify_user,</if>
+            <if test="notifyDepart != null">notify_depart,</if>
+            <if test="notifyTime != null">notify_time,</if>
+            <if test="notifyContent != null">notify_content,</if>
+            <if test="notifyBeuser != null">notify_beuser,</if>
+            <if test="notifyState != null">notify_state,</if>
+            <if test="framework != null">framework,</if>
+            <if test="area != null">area,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="notifyUser != null">#{notifyUser},</if>
+            <if test="notifyDepart != null">#{notifyDepart},</if>
+            <if test="notifyTime != null">#{notifyTime},</if>
+            <if test="notifyContent != null">#{notifyContent},</if>
+            <if test="notifyBeuser != null">#{notifyBeuser},</if>
+            <if test="notifyState != null">#{notifyState},</if>
+            <if test="framework != null">#{framework},</if>
+            <if test="area != null">#{area},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTdNotify" parameterType="TdNotify">
+        update td_notify
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="notifyUser != null">notify_user = #{notifyUser},</if>
+            <if test="notifyDepart != null">notify_depart = #{notifyDepart},</if>
+            <if test="notifyTime != null">notify_time = #{notifyTime},</if>
+            <if test="notifyContent != null">notify_content = #{notifyContent},</if>
+            <if test="notifyBeuser != null">notify_beuser = #{notifyBeuser},</if>
+            <if test="notifyState != null">notify_state = #{notifyState},</if>
+            <if test="framework != null">framework = #{framework},</if>
+            <if test="area != null">area = #{area},</if>
+        </trim>
+        where notify_id = #{notifyId}
+    </update>
+
+    <delete id="deleteTdNotifyByNotifyId" parameterType="Long">
+        delete from td_notify where notify_id = #{notifyId}
+    </delete>
+
+    <delete id="deleteTdNotifyByNotifyIds" parameterType="String">
+        delete from td_notify where notify_id in 
+        <foreach item="notifyId" collection="array" open="(" separator="," close=")">
+            #{notifyId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TdPropertyInfoMapper">
+    
+    <resultMap type="TdPropertyInfo" id="TdPropertyInfoResult">
+        <result property="id"    column="id"    />
+        <result property="useId"    column="use_id"    />
+        <result property="propertyBrand"    column="property_brand"    />
+        <result property="propertyMac"    column="property_mac"    />
+        <result property="propertyNetstyle"    column="property_netstyle"    />
+        <result property="propertyType"    column="property_type"    />
+        <result property="propertyNo"    column="property_no"    />
+        <result property="propertyName"    column="property_name"    />
+        <result property="computerType"    column="computer_type_"    />
+        <result property="propertyMiji"    column="property_miji"    />
+        <result property="propertySn"    column="property_SN"    />
+        <result property="remark"    column="remark"    />
+        <result property="isCurcial"    column="is_curcial"    />
+        <result property="isSoftware"    column="is_software"    />
+        <result property="username"    column="username"    />
+        <result property="maintainDepart"    column="maintain_depart"    />
+        <result property="maintainUser"    column="maintain_user"    />
+        <result property="maintainDate"    column="maintain_date"    />
+        <result property="maintainState"    column="maintain_state"    />
+        <result property="destoryState"    column="destory_state"    />
+        <result property="destoryDepart"    column="destory_depart"    />
+        <result property="destoryUser"    column="destory_user"    />
+        <result property="destoryDate"    column="destory_date"    />
+        <result property="destoryType"    column="destory_type"    />
+        <result property="propertyRefer"    column="property_refer"    />
+        <result property="maintainRemark"    column="maintain_remark"    />
+        <result property="shemichengdu"    column="shemichengdu"    />
+        <result property="part"    column="part"    />
+    </resultMap>
+
+    <sql id="selectTdPropertyInfoVo">
+        select id, use_id, property_brand, property_mac, property_netstyle, property_type, property_no, property_name, computer_type_, property_miji, property_SN, remark, is_curcial, is_software, username, maintain_depart, maintain_user, maintain_date, maintain_state, destory_state, destory_depart, destory_user, destory_date, destory_type, property_refer, maintain_remark, shemichengdu, part from td_property_info
+    </sql>
+
+    <select id="selectTdPropertyInfoList" parameterType="TdPropertyInfo" resultMap="TdPropertyInfoResult">
+        <include refid="selectTdPropertyInfoVo"/>
+        <where>  
+            <if test="useId != null  and useId != ''"> and use_id = #{useId}</if>
+            <if test="propertyBrand != null  and propertyBrand != ''"> and property_brand = #{propertyBrand}</if>
+            <if test="propertyMac != null  and propertyMac != ''"> and property_mac = #{propertyMac}</if>
+            <if test="propertyNetstyle != null  and propertyNetstyle != ''"> and property_netstyle = #{propertyNetstyle}</if>
+            <if test="propertyType != null  and propertyType != ''"> and property_type = #{propertyType}</if>
+            <if test="propertyNo != null  and propertyNo != ''"> and property_no = #{propertyNo}</if>
+            <if test="propertyName != null  and propertyName != ''"> and property_name like concat('%', #{propertyName}, '%')</if>
+            <if test="computerType != null  and computerType != ''"> and computer_type_ = #{computerType}</if>
+            <if test="propertyMiji != null  and propertyMiji != ''"> and property_miji = #{propertyMiji}</if>
+            <if test="propertySn != null  and propertySn != ''"> and property_SN = #{propertySn}</if>
+            <if test="isCurcial != null  and isCurcial != ''"> and is_curcial = #{isCurcial}</if>
+            <if test="isSoftware != null  and isSoftware != ''"> and is_software = #{isSoftware}</if>
+            <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
+            <if test="maintainDepart != null  and maintainDepart != ''"> and maintain_depart = #{maintainDepart}</if>
+            <if test="maintainUser != null  and maintainUser != ''"> and maintain_user = #{maintainUser}</if>
+            <if test="maintainDate != null "> and maintain_date = #{maintainDate}</if>
+            <if test="maintainState != null  and maintainState != ''"> and maintain_state = #{maintainState}</if>
+            <if test="destoryState != null  and destoryState != ''"> and destory_state = #{destoryState}</if>
+            <if test="destoryDepart != null  and destoryDepart != ''"> and destory_depart = #{destoryDepart}</if>
+            <if test="destoryUser != null  and destoryUser != ''"> and destory_user = #{destoryUser}</if>
+            <if test="destoryDate != null "> and destory_date = #{destoryDate}</if>
+            <if test="destoryType != null  and destoryType != ''"> and destory_type = #{destoryType}</if>
+            <if test="propertyRefer != null  and propertyRefer != ''"> and property_refer = #{propertyRefer}</if>
+            <if test="maintainRemark != null  and maintainRemark != ''"> and maintain_remark = #{maintainRemark}</if>
+            <if test="shemichengdu != null  and shemichengdu != ''"> and shemichengdu = #{shemichengdu}</if>
+            <if test="part != null  and part != ''"> and part = #{part}</if>
+        </where>
+    </select>
+    
+    <select id="selectTdPropertyInfoById" parameterType="String" resultMap="TdPropertyInfoResult">
+        <include refid="selectTdPropertyInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTdPropertyInfo" parameterType="TdPropertyInfo">
+        insert into td_property_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="useId != null">use_id,</if>
+            <if test="propertyBrand != null">property_brand,</if>
+            <if test="propertyMac != null">property_mac,</if>
+            <if test="propertyNetstyle != null">property_netstyle,</if>
+            <if test="propertyType != null">property_type,</if>
+            <if test="propertyNo != null">property_no,</if>
+            <if test="propertyName != null">property_name,</if>
+            <if test="computerType != null">computer_type_,</if>
+            <if test="propertyMiji != null">property_miji,</if>
+            <if test="propertySn != null">property_SN,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isCurcial != null">is_curcial,</if>
+            <if test="isSoftware != null">is_software,</if>
+            <if test="username != null">username,</if>
+            <if test="maintainDepart != null">maintain_depart,</if>
+            <if test="maintainUser != null">maintain_user,</if>
+            <if test="maintainDate != null">maintain_date,</if>
+            <if test="maintainState != null">maintain_state,</if>
+            <if test="destoryState != null">destory_state,</if>
+            <if test="destoryDepart != null">destory_depart,</if>
+            <if test="destoryUser != null">destory_user,</if>
+            <if test="destoryDate != null">destory_date,</if>
+            <if test="destoryType != null">destory_type,</if>
+            <if test="propertyRefer != null">property_refer,</if>
+            <if test="maintainRemark != null">maintain_remark,</if>
+            <if test="shemichengdu != null">shemichengdu,</if>
+            <if test="part != null">part,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="useId != null">#{useId},</if>
+            <if test="propertyBrand != null">#{propertyBrand},</if>
+            <if test="propertyMac != null">#{propertyMac},</if>
+            <if test="propertyNetstyle != null">#{propertyNetstyle},</if>
+            <if test="propertyType != null">#{propertyType},</if>
+            <if test="propertyNo != null">#{propertyNo},</if>
+            <if test="propertyName != null">#{propertyName},</if>
+            <if test="computerType != null">#{computerType},</if>
+            <if test="propertyMiji != null">#{propertyMiji},</if>
+            <if test="propertySn != null">#{propertySn},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isCurcial != null">#{isCurcial},</if>
+            <if test="isSoftware != null">#{isSoftware},</if>
+            <if test="username != null">#{username},</if>
+            <if test="maintainDepart != null">#{maintainDepart},</if>
+            <if test="maintainUser != null">#{maintainUser},</if>
+            <if test="maintainDate != null">#{maintainDate},</if>
+            <if test="maintainState != null">#{maintainState},</if>
+            <if test="destoryState != null">#{destoryState},</if>
+            <if test="destoryDepart != null">#{destoryDepart},</if>
+            <if test="destoryUser != null">#{destoryUser},</if>
+            <if test="destoryDate != null">#{destoryDate},</if>
+            <if test="destoryType != null">#{destoryType},</if>
+            <if test="propertyRefer != null">#{propertyRefer},</if>
+            <if test="maintainRemark != null">#{maintainRemark},</if>
+            <if test="shemichengdu != null">#{shemichengdu},</if>
+            <if test="part != null">#{part},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTdPropertyInfo" parameterType="TdPropertyInfo">
+        update td_property_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="useId != null">use_id = #{useId},</if>
+            <if test="propertyBrand != null">property_brand = #{propertyBrand},</if>
+            <if test="propertyMac != null">property_mac = #{propertyMac},</if>
+            <if test="propertyNetstyle != null">property_netstyle = #{propertyNetstyle},</if>
+            <if test="propertyType != null">property_type = #{propertyType},</if>
+            <if test="propertyNo != null">property_no = #{propertyNo},</if>
+            <if test="propertyName != null">property_name = #{propertyName},</if>
+            <if test="computerType != null">computer_type_ = #{computerType},</if>
+            <if test="propertyMiji != null">property_miji = #{propertyMiji},</if>
+            <if test="propertySn != null">property_SN = #{propertySn},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isCurcial != null">is_curcial = #{isCurcial},</if>
+            <if test="isSoftware != null">is_software = #{isSoftware},</if>
+            <if test="username != null">username = #{username},</if>
+            <if test="maintainDepart != null">maintain_depart = #{maintainDepart},</if>
+            <if test="maintainUser != null">maintain_user = #{maintainUser},</if>
+            <if test="maintainDate != null">maintain_date = #{maintainDate},</if>
+            <if test="maintainState != null">maintain_state = #{maintainState},</if>
+            <if test="destoryState != null">destory_state = #{destoryState},</if>
+            <if test="destoryDepart != null">destory_depart = #{destoryDepart},</if>
+            <if test="destoryUser != null">destory_user = #{destoryUser},</if>
+            <if test="destoryDate != null">destory_date = #{destoryDate},</if>
+            <if test="destoryType != null">destory_type = #{destoryType},</if>
+            <if test="propertyRefer != null">property_refer = #{propertyRefer},</if>
+            <if test="maintainRemark != null">maintain_remark = #{maintainRemark},</if>
+            <if test="shemichengdu != null">shemichengdu = #{shemichengdu},</if>
+            <if test="part != null">part = #{part},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTdPropertyInfoById" parameterType="String">
+        delete from td_property_info where id = #{id}
+    </delete>
+
+    <delete id="deleteTdPropertyInfoByIds" parameterType="String">
+        delete from td_property_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TdPropertyManagerMapper">
+
+    <resultMap type="TdPropertyManager" id="TdPropertyManagerResult">
+        <result property="useId"    column="use_id"    />
+        <result property="useDepart"    column="use_depart"    />
+        <result property="userName"    column="user_name"    />
+        <result property="useDate"    column="use_date"    />
+        <result property="frameworkId"    column="framework_id"    />
+        <result property="recoverDepart"    column="recover_depart"    />
+        <result property="recoverName"    column="recover_name"    />
+        <result property="recoverDate"    column="recover_date"    />
+        <result property="shemichengdu"    column="shemichengdu"    />
+        <result property="part"    column="part"    />
+        <result property="areaId"    column="area_id"    />
+        <result property="propertyNum"    column="property_num"    />
+    </resultMap>
+
+    <sql id="selectTdPropertyManagerVo">
+        select use_id, use_depart, user_name, use_date, framework_id, recover_depart, recover_name, recover_date, shemichengdu, part, area_id, property_num from td_property_manager
+    </sql>
+
+    <select id="selectTdPropertyManagerList" parameterType="TdPropertyManager" resultMap="TdPropertyManagerResult">
+        <include refid="selectTdPropertyManagerVo"/>
+        <where>
+            <if test="useId != null  and useId != ''"> and use_id = #{useId}</if>
+            <if test="useDepart != null  and useDepart != ''"> and use_depart = #{useDepart}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="useDate != null "> and use_date = #{useDate}</if>
+            <if test="frameworkId != null  and frameworkId != ''"> and framework_id = #{frameworkId}</if>
+            <if test="recoverDepart != null  and recoverDepart != ''"> and recover_depart = #{recoverDepart}</if>
+            <if test="recoverName != null  and recoverName != ''"> and recover_name like concat('%', #{recoverName}, '%')</if>
+            <if test="recoverDate != null "> and recover_date = #{recoverDate}</if>
+            <if test="shemichengdu != null "> and shemichengdu = #{shemichengdu}</if>
+            <if test="part != null  and part != ''"> and part = #{part}</if>
+            <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
+            <if test="propertyNum != null "> and property_num = #{propertyNum}</if>
+        </where>
+    </select>
+
+    <select id="selectTdPropertyManagerByUseId" parameterType="String" resultMap="TdPropertyManagerResult">
+        <include refid="selectTdPropertyManagerVo"/>
+        where use_id = #{useId}
+    </select>
+
+    <insert id="insertTdPropertyManager" parameterType="TdPropertyManager">
+        insert into td_property_manager
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="useId != null">use_id,</if>
+            <if test="useDepart != null">use_depart,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="useDate != null">use_date,</if>
+            <if test="frameworkId != null">framework_id,</if>
+            <if test="recoverDepart != null">recover_depart,</if>
+            <if test="recoverName != null">recover_name,</if>
+            <if test="recoverDate != null">recover_date,</if>
+            <if test="shemichengdu != null">shemichengdu,</if>
+            <if test="part != null">part,</if>
+            <if test="areaId != null">area_id,</if>
+            <if test="propertyNum != null">property_num,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="useId != null">#{useId},</if>
+            <if test="useDepart != null">#{useDepart},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="useDate != null">#{useDate},</if>
+            <if test="frameworkId != null">#{frameworkId},</if>
+            <if test="recoverDepart != null">#{recoverDepart},</if>
+            <if test="recoverName != null">#{recoverName},</if>
+            <if test="recoverDate != null">#{recoverDate},</if>
+            <if test="shemichengdu != null">#{shemichengdu},</if>
+            <if test="part != null">#{part},</if>
+            <if test="areaId != null">#{areaId},</if>
+            <if test="propertyNum != null">#{propertyNum},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTdPropertyManager" parameterType="TdPropertyManager">
+        update td_property_manager
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="useDepart != null">use_depart = #{useDepart},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="useDate != null">use_date = #{useDate},</if>
+            <if test="frameworkId != null">framework_id = #{frameworkId},</if>
+            <if test="recoverDepart != null">recover_depart = #{recoverDepart},</if>
+            <if test="recoverName != null">recover_name = #{recoverName},</if>
+            <if test="recoverDate != null">recover_date = #{recoverDate},</if>
+            <if test="shemichengdu != null">shemichengdu = #{shemichengdu},</if>
+            <if test="part != null">part = #{part},</if>
+            <if test="areaId != null">area_id = #{areaId},</if>
+            <if test="propertyNum != null">property_num = #{propertyNum},</if>
+        </trim>
+        where use_id = #{useId}
+    </update>
+
+    <delete id="deleteTdPropertyManagerByUseId" parameterType="String">
+        delete from td_property_manager where use_id = #{useId}
+    </delete>
+
+    <delete id="deleteTdPropertyManagerByUseIds" parameterType="String">
+        delete from td_property_manager where use_id in
+        <foreach item="useId" collection="array" open="(" separator="," close=")">
+            #{useId}
+        </foreach>
+    </delete>
+
+</mapper>