From 4b3c59ddba61b1af35145ec8b1eda080797e9e32 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Tue, 13 May 2025 16:10:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B2=97=E4=BD=8D=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/ClassifiedPostManager.java | 69 +++++++++ .../spost/ClassifiedPostController.java | 138 ++++++++++++++++++ .../templates/system/newdev/spost/add.html | 127 ++++++++++++++++ .../system/newdev/spost/classifiedPost.html | 124 ++++++++++++++++ .../templates/system/newdev/spost/edit.html | 127 ++++++++++++++++ .../templates/system/newdev/test.html | 10 ++ .../system/domain/spost/TdClassifiedPost.java | 91 ++++++++++++ .../domain/spost/dto/TdClassifiedPostDTO.java | 89 +++++++++++ .../mapper/spost/TdClassifiedPostMapper.java | 24 +++ .../spost/TdClassifiedPostService.java | 21 +++ .../impl/TdClassifiedPostServiceImpl.java | 36 +++++ .../system/spost/TdClassifiedPostMapper.xml | 60 ++++++++ 12 files changed, 916 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ClassifiedPostManager.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/spost/ClassifiedPostController.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/newdev/spost/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/newdev/spost/classifiedPost.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/newdev/spost/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/newdev/test.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/TdClassifiedPost.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/dto/TdClassifiedPostDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/spost/TdClassifiedPostMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/spost/TdClassifiedPostService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/spost/impl/TdClassifiedPostServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/spost/TdClassifiedPostMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ClassifiedPostManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ClassifiedPostManager.java new file mode 100644 index 00000000..653cb9e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ClassifiedPostManager.java @@ -0,0 +1,69 @@ +package com.ruoyi.web.controller.manager; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.text.CharSequenceUtil; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.check.TdCheckType; +import com.ruoyi.system.domain.check.dto.TdCheckReportDTO; +import com.ruoyi.system.domain.check.dto.TdCheckTypeDTO; +import com.ruoyi.system.domain.spost.TdClassifiedPost; +import com.ruoyi.system.domain.spost.dto.TdClassifiedPostDTO; +import com.ruoyi.system.service.spost.TdClassifiedPostService; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * ClassName: ClassifiedPostmanager + * Package: com.ruoyi.web.controller.manager + * Description: + * + * @Author wangxy + * @Create 2025/5/13 11:49 + * @Version 1.0 + */ +@Component +public class ClassifiedPostManager { + + @Resource + private TdClassifiedPostService classifiedPostService; + + public List selectTdCheckReportList(TdClassifiedPostDTO classifiedPostDTO) { + return classifiedPostService.selectTdClassifiedPostList(classifiedPostDTO); + } + + + @Transactional(rollbackFor = Exception.class) + public boolean saveOrUpdate(TdClassifiedPostDTO classifiedPostDTO) { + TdClassifiedPost classifiedPost = Convert.convert(TdClassifiedPost.class, classifiedPostDTO); + if (CharSequenceUtil.isNotBlank(classifiedPost.getClassifiedId())) { + classifiedPost.setUpdateTime(new Date()); + classifiedPost.setUpdateBy(ShiroUtils.getSysUser().getUserName()); + } else { + classifiedPost.setCreateTime(new Date()); + classifiedPost.setCreateBy(ShiroUtils.getSysUser().getUserName()); + } + classifiedPost.setDeptId(ShiroUtils.getSysUser().getDeptId()); + classifiedPost.setStatus("0"); + return classifiedPostService.saveOrUpdate(classifiedPost); + } + + public TdClassifiedPostDTO getTdClassifiedPost(String id) { + return Convert.convert(TdClassifiedPostDTO.class, classifiedPostService.getById(id)); + } + + + @Transactional(rollbackFor = Exception.class) + public boolean deletedTdClassifiedPostIds(String ids) { + List list = Arrays.asList(Convert.toStrArray(ids)); + return classifiedPostService.removeByIds(list); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/spost/ClassifiedPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/spost/ClassifiedPostController.java new file mode 100644 index 00000000..07d87e8d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/spost/ClassifiedPostController.java @@ -0,0 +1,138 @@ +package com.ruoyi.web.controller.system.spost; + +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.spost.TdClassifiedPost; +import com.ruoyi.system.domain.spost.dto.TdClassifiedPostDTO; +import com.ruoyi.web.controller.manager.ClassifiedPostManager; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * ClassName: ClassifiedPostController + * Package: com.ruoyi.web.controller.system.spost + * Description: + * + * @Author wangxy + * @Create 2025/5/13 14:17 + * @Version 1.0 + */ +@Controller +@RequestMapping("/system/classifiedPost") +public class ClassifiedPostController extends BaseController { + + + private String prefix = "system/newdev/spost"; + + + @Resource + private ClassifiedPostManager classifiedPostManager; + + @RequiresPermissions("system:spost:view") + @GetMapping() + public String classifiedPost() { + return prefix + "/classifiedPost"; + } + + /** + * 岗位情况列表 + */ + @RequiresPermissions("system:spost:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdClassifiedPostDTO classifiedPostDTO) { + startPage(); + List tdClassifiedPosts = classifiedPostManager.selectTdCheckReportList( classifiedPostDTO); + return getDataTable(tdClassifiedPosts); + } + + /** + * 导出岗位管理列表 + */ + @RequiresPermissions("system:spost:export") + @Log(title = "检查报告", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TdClassifiedPostDTO classifiedPostDTO) { + List tdClassifiedPosts = classifiedPostManager.selectTdCheckReportList( classifiedPostDTO); + ExcelUtil util = new ExcelUtil<>(TdClassifiedPost.class); + return util.exportExcel(tdClassifiedPosts, "岗位情况管理数据"); + } + + /** + * 新增岗位 + */ + @GetMapping("/add") + public String add(ModelMap mmap) { + return prefix + "/add"; + } + + + /** + * 新增岗位 + */ + @RequiresPermissions("system:spost:add") + @Log(title = "岗位情况", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TdClassifiedPostDTO classifiedPostDTO) { + return toAjax(classifiedPostManager.saveOrUpdate(classifiedPostDTO)); + } + + + /** + * 修改岗位情况告 + */ + @RequiresPermissions("system:spost:edit") + @GetMapping("/edit/{classifiedId}") + public String edit(@PathVariable("classifiedId") String classifiedId, ModelMap mmap) { + TdClassifiedPostDTO classifiedPost = classifiedPostManager.getTdClassifiedPost(classifiedId); + mmap.put("classifiedPost", classifiedPost); + return prefix + "/edit"; + } + + /** + * 修改检查报告 + */ + @RequiresPermissions("system:spost:edit") + @Log(title = "岗位情况", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TdClassifiedPostDTO classifiedPostDTO) { + return toAjax(classifiedPostManager.saveOrUpdate(classifiedPostDTO)); + } + + /** + * 详情 + */ + @RequiresPermissions("system:spost:detail") + @GetMapping("/detail/{classifiedId}") + public String detail(@PathVariable("classifiedId") String classifiedId, ModelMap mmap) { + TdClassifiedPostDTO classifiedPost = classifiedPostManager.getTdClassifiedPost(classifiedId); + mmap.put("classifiedPost", classifiedPost); + return prefix + "/detail"; + } + + + /** + * 删除 + */ + @RequiresPermissions("system:spost:remove") + @Log(title = "岗位情况", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(classifiedPostManager.deletedTdClassifiedPostIds(ids)); + } + + +} diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/spost/add.html b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/add.html new file mode 100644 index 00000000..65a3d33c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/add.html @@ -0,0 +1,127 @@ + + + + + + + +
+
+

基本信息

+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+

其他信息

+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+   + +
+
+ + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/spost/classifiedPost.html b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/classifiedPost.html new file mode 100644 index 00000000..2d39f10d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/classifiedPost.html @@ -0,0 +1,124 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/spost/edit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/edit.html new file mode 100644 index 00000000..6227016b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/spost/edit.html @@ -0,0 +1,127 @@ + + + + + + + +
+
+ +

基本信息

+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+

其他信息

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+   + +
+
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/test.html b/ruoyi-admin/src/main/resources/templates/system/newdev/test.html new file mode 100644 index 00000000..566549bd --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/test.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/TdClassifiedPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/TdClassifiedPost.java new file mode 100644 index 00000000..f0211466 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/TdClassifiedPost.java @@ -0,0 +1,91 @@ +package com.ruoyi.system.domain.spost; + + +import com.baomidou.mybatisplus.annotation.TableId; + + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @author 13560 + * sm人员申请流程表 + * @TableName td_classified_post + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class TdClassifiedPost extends BaseEntity { + /** + * 主键 + */ + @TableId + private String classifiedId; + + /** + * 部门 + */ + @Excel(name = "部门") + private String deptName; + + /** + * 三定规定 + */ + @Excel(name = "三定规定") + private String rule; + + /** + * 涉密岗位名称 + */ + @Excel(name = "涉密岗位名称") + private String postName; + + /** + * 涉密等级 + */ + @Excel(name = "涉密等级") + private String classifiedLevel; + + /** + * 编号 + */ + @Excel(name = "编号") + private String classifiedRef; + + /** + * 岗位确定依据 + */ + @Excel(name = "岗位确定依据") + private String classifiedAccording; + + /** + * 保密事项范围 + */ + @Excel(name = "保密事项范围") + private String scopeMatters; + + /** + * 部门id + */ + private Long deptId; + + /** + * 秘密事项 + */ + @Excel(name = "秘密事项") + private String secretMatters; + + /** + * 岗位类别 + */ + @Excel(name = "岗位类别") + private String category; + + /** + * 帐号状态（0正常 1停用） + */ + private String status; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/dto/TdClassifiedPostDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/dto/TdClassifiedPostDTO.java new file mode 100644 index 00000000..402fc238 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/spost/dto/TdClassifiedPostDTO.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.domain.spost.dto; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @author 13560 + * sm人员申请流程表 + * @TableName td_classified_post + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class TdClassifiedPostDTO extends BaseEntity { + /** + * 主键 + */ + @TableId + private String classifiedId; + + /** + * 部门 + */ + @Excel(name = "部门") + private String deptName; + + /** + * 三定规定 + */ + @Excel(name = "三定规定") + private String rule; + + /** + * 涉密岗位名称 + */ + @Excel(name = "涉密岗位名称") + private String postName; + + /** + * 涉密等级 + */ + @Excel(name = "涉密等级") + private String classifiedLevel; + + /** + * 编号 + */ + @Excel(name = "编号") + private String classifiedRef; + + /** + * 岗位确定依据 + */ + @Excel(name = "岗位确定依据") + private String classifiedAccording; + + /** + * 保密事项范围 + */ + @Excel(name = "保密事项范围") + private String scopeMatters; + + /** + * 部门id + */ + private Long deptId; + + /** + * 秘密事项 + */ + @Excel(name = "秘密事项") + private String secretMatters; + + /** + * 岗位类别 + */ + @Excel(name = "岗位类别") + private String category; + + /** + * 帐号状态（0正常 1停用） + */ + private String status; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/spost/TdClassifiedPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/spost/TdClassifiedPostMapper.java new file mode 100644 index 00000000..f4227525 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/spost/TdClassifiedPostMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.system.mapper.spost; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.spost.TdClassifiedPost; +import com.ruoyi.system.domain.spost.dto.TdClassifiedPostDTO; + +import java.util.List; + +/** +* @author Administrator +* @description 针对表【td_classified_post(sm人员申请流程表)】的数据库操作Mapper +* @createDate 2025-05-13 11:26:22 +* @Entity generator.domain.TdClassifiedPost +*/ +public interface TdClassifiedPostMapper extends BaseMapper { + + + public List selectTdClassifiedPostList(TdClassifiedPostDTO classifiedPostDTO); + +} + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/TdClassifiedPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/TdClassifiedPostService.java new file mode 100644 index 00000000..9adad781 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/TdClassifiedPostService.java @@ -0,0 +1,21 @@ +package com.ruoyi.system.service.spost; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.check.dto.CheckReportDTO; +import com.ruoyi.system.domain.spost.TdClassifiedPost; +import com.ruoyi.system.domain.spost.dto.TdClassifiedPostDTO; + +import java.util.List; + +/** +* @author Administrator +* @description 针对表【td_classified_post(sm人员申请流程表)】的数据库操作Service +* @createDate 2025-05-13 11:26:22 +*/ +public interface TdClassifiedPostService extends IService { + + public List selectTdClassifiedPostList(TdClassifiedPostDTO classifiedPostDTO); + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/impl/TdClassifiedPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/impl/TdClassifiedPostServiceImpl.java new file mode 100644 index 00000000..28a2f028 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/spost/impl/TdClassifiedPostServiceImpl.java @@ -0,0 +1,36 @@ +package com.ruoyi.system.service.spost.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.domain.spost.TdClassifiedPost; +import com.ruoyi.system.domain.spost.dto.TdClassifiedPostDTO; +import com.ruoyi.system.mapper.check.TdCheckReportMapper; +import com.ruoyi.system.mapper.spost.TdClassifiedPostMapper; +import com.ruoyi.system.service.spost.TdClassifiedPostService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** +* @author Administrator +* @description 针对表【td_classified_post(sm人员申请流程表)】的数据库操作Service实现 +* @createDate 2025-05-13 11:26:22 +*/ +@Service +public class TdClassifiedPostServiceImpl extends ServiceImpl + implements TdClassifiedPostService { + + @Resource + private TdClassifiedPostMapper classifiedPostMapper; + + + @Override + public List selectTdClassifiedPostList(TdClassifiedPostDTO classifiedPostDTO) { + return classifiedPostMapper.selectTdClassifiedPostList(classifiedPostDTO); + } +} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/system/spost/TdClassifiedPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/spost/TdClassifiedPostMapper.xml new file mode 100644 index 00000000..3d969806 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/spost/TdClassifiedPostMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + classified_id,dept_name,rule, + post_name,classified_level,classified_ref, + classified_according,scope_matters, + create_by,create_time,update_by, + update_time,remark,dept_id, + secret_matters,category,status + + +