mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：消息增加全部已读接口。部门新增时自动生成编码，用户导入数据时使用部门编码

Browse Source
This commit is contained in:
zhangxuanming
2024-12-30 11:41:00 +08:00
parent afc92b8bf6
commit 4d645ef15a
15 changed files with 391 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java
View File

@@ -2,6 +2,8 @@ package com.ktg.web.controller.system;
import java.util.Iterator;
import java.util.List;
import com.ktg.system.strategy.AutoCodeUtil;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,6 +37,9 @@ public class SysDeptController extends BaseController
@Autowired
private ISysDeptService deptService;
@Autowired
private AutoCodeUtil autoCodeUtil;
/**
* 获取部门列表
*/
@@ -111,6 +116,8 @@ public class SysDeptController extends BaseController
{
return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
String s = autoCodeUtil.genSerialCode("DEPT_CODE", null);
dept.setDeptCode(s);
dept.setCreateBy(getUsername());
return toAjax(deptService.insertDept(dept));
}

10
ktg-admin/src/main/java/com/ktg/web/controller/system/SysMessageController.java
View File

@@ -118,4 +118,14 @@ public class SysMessageController extends BaseController
}
return AjaxResult.success();
}
/**
* 全部已读
* @return
*/
@PreAuthorize("@ss.hasPermi('system:message:READ')")
@GetMapping("/read")
public AjaxResult allRead() {
return sysMessageService.allRead();
}
}

6
ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserController.java
View File

@@ -3,6 +3,8 @@ package com.ktg.web.controller.system;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ktg.common.core.domain.vo.SysUserExcelVO;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,8 +77,8 @@ public class SysUserController extends BaseController
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
ExcelUtil<SysUserExcelVO> util = new ExcelUtil<SysUserExcelVO>(SysUserExcelVO.class);
List<SysUserExcelVO> userList = util.importExcel(file.getInputStream());
String operName = getUsername();
String message = userService.importUser(userList, updateSupport, operName);
return AjaxResult.success(message);