Skip to content

Commit e91e4f0

Browse files
author
zhuoda
committed
v3.18.0 【新增】新增消息管理；【新增】完善企业demo；【新增】完善相关数据权限；【新增】菜单管理下级功能
1 parent b0addda commit e91e4f0

100 files changed

Lines changed: 1834 additions & 300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎smart-admin-api-java17-springboot3/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>net.1024lab</groupId>
5+
<groupId>net.lab1024</groupId>
66
<artifactId>sa-parent</artifactId>
77
<version>3.0.0</version>
88
<packaging>pom</packaging>

‎smart-admin-api-java17-springboot3/sa-admin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>net.1024lab</groupId>
5+
<groupId>net.lab1024</groupId>
66
<artifactId>sa-parent</artifactId>
77
<version>3.0.0</version>
88
<relativePath>../pom.xml</relativePath>
@@ -18,7 +18,7 @@
1818
<dependencies>
1919

2020
<dependency>
21-
<groupId>net.1024lab</groupId>
21+
<groupId>net.lab1024</groupId>
2222
<artifactId>sa-base</artifactId>
2323
<version>3.0.0</version>
2424
</dependency>

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ public static class System {
5151

5252
public static final String SYSTEM_POSITION = "系统-职务管理";
5353

54+
public static final String SYSTEM_MESSAGE = "系统-消息";
55+
5456
}
5557

5658

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.lab1024.sa.admin.module.business.oa.bank;
22

3+
import cn.dev33.satoken.annotation.SaCheckPermission;
34
import io.swagger.v3.oas.annotations.Operation;
45
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.annotation.Resource;
@@ -35,24 +36,28 @@ public class BankController {
3536

3637
@Operation(summary = "分页查询银行信息 @author 善逸")
3738
@PostMapping("/oa/bank/page/query")
39+
@SaCheckPermission("oa:bank:query")
3840
public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryForm) {
3941
return bankService.queryByPage(queryForm);
4042
}
4143

4244
@Operation(summary = "根据企业ID查询银行信息列表 @author 善逸")
4345
@GetMapping("/oa/bank/query/list/{enterpriseId}")
46+
@SaCheckPermission("oa:bank:query")
4447
public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
4548
return bankService.queryList(enterpriseId);
4649
}
4750

4851
@Operation(summary = "查询银行信息详情 @author 善逸")
4952
@GetMapping("/oa/bank/get/{bankId}")
53+
@SaCheckPermission("oa:bank:query")
5054
public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
5155
return bankService.getDetail(bankId);
5256
}
5357

5458
@Operation(summary = "新建银行信息 @author 善逸")
5559
@PostMapping("/oa/bank/create")
60+
@SaCheckPermission("oa:bank:add")
5661
public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
5762
RequestUser requestUser = SmartRequestUtil.getRequestUser();
5863
createVO.setCreateUserId(requestUser.getUserId());
@@ -62,12 +67,14 @@ public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createV
6267

6368
@Operation(summary = "编辑银行信息 @author 善逸")
6469
@PostMapping("/oa/bank/update")
70+
@SaCheckPermission("oa:bank:update")
6571
public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
6672
return bankService.updateBank(updateVO);
6773
}
6874

6975
@Operation(summary = "删除银行信息 @author 善逸")
7076
@GetMapping("/oa/bank/delete/{bankId}")
77+
@SaCheckPermission("oa:bank:delete")
7178
public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
7279
return bankService.deleteBank(bankId);
7380
}

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public ResponseDTO<String> deleteEnterprise(@PathVariable Long enterpriseId) {
100100

101101
@Operation(summary = "按照类型查询企业 @author 开云")
102102
@GetMapping("/oa/enterprise/query/list")
103+
@SaCheckPermission("oa:enterprise:query")
103104
public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
104105
return enterpriseService.queryList(type);
105106
}
@@ -114,12 +115,14 @@ public ResponseDTO<String> addEmployee(@RequestBody @Valid EnterpriseEmployeeFor
114115

115116
@Operation(summary = "查询企业全部员工 @author 罗伊")
116117
@PostMapping("/oa/enterprise/employee/list")
118+
@SaCheckPermission("oa:enterprise:queryEmployee")
117119
public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
118120
return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
119121
}
120122

121123
@Operation(summary = "分页查询企业员工 @author 卓大")
122124
@PostMapping("/oa/enterprise/employee/queryPage")
125+
@SaCheckPermission("oa:enterprise:queryEmployee")
123126
public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
124127
return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm));
125128
}

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.lab1024.sa.admin.module.business.oa.invoice;
22

3+
import cn.dev33.satoken.annotation.SaCheckPermission;
34
import io.swagger.v3.oas.annotations.Operation;
45
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.annotation.Resource;
@@ -38,40 +39,46 @@ public class InvoiceController {
3839

3940
@Operation(summary = "分页查询发票信息 @author 善逸")
4041
@PostMapping("/oa/invoice/page/query")
42+
@SaCheckPermission("oa:invoice:query")
4143
public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) {
4244
return invoiceService.queryByPage(queryForm);
4345
}
4446

4547
@Operation(summary = "查询发票信息详情 @author 善逸")
4648
@GetMapping("/oa/invoice/get/{invoiceId}")
49+
@SaCheckPermission("oa:invoice:query")
4750
public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
4851
return invoiceService.getDetail(invoiceId);
4952
}
5053

5154
@Operation(summary = "新建发票信息 @author 善逸")
5255
@PostMapping("/oa/invoice/create")
56+
@SaCheckPermission("oa:invoice:add")
5357
public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
5458
RequestUser requestUser = SmartRequestUtil.getRequestUser();
5559
createVO.setCreateUserId(requestUser.getUserId());
5660
createVO.setCreateUserName(requestUser.getUserName());
5761
return invoiceService.createInvoice(createVO);
5862
}
5963

64+
@OperateLog
6065
@Operation(summary = "编辑发票信息 @author 善逸")
6166
@PostMapping("/oa/invoice/update")
62-
@OperateLog
67+
@SaCheckPermission("oa:invoice:update")
6368
public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
6469
return invoiceService.updateInvoice(updateVO);
6570
}
6671

6772
@Operation(summary = "删除发票信息 @author 善逸")
6873
@GetMapping("/invoice/delete/{invoiceId}")
74+
@SaCheckPermission("oa:invoice:delete")
6975
public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
7076
return invoiceService.deleteInvoice(invoiceId);
7177
}
7278

7379
@Operation(summary = "查询列表 @author lidoudou")
7480
@GetMapping("/oa/invoice/query/list/{enterpriseId}")
81+
@SaCheckPermission("oa:invoice:query")
7582
public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
7683
return invoiceService.queryList(enterpriseId);
7784
}

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package net.lab1024.sa.admin.module.system.message;
2+
3+
import cn.dev33.satoken.annotation.SaCheckPermission;
4+
import io.swagger.v3.oas.annotations.Operation;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
6+
import jakarta.validation.Valid;
7+
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
8+
import net.lab1024.sa.base.common.domain.PageResult;
9+
import net.lab1024.sa.base.common.domain.ResponseDTO;
10+
import net.lab1024.sa.base.common.domain.ValidateList;
11+
import net.lab1024.sa.base.module.support.message.domain.MessageQueryForm;
12+
import net.lab1024.sa.base.module.support.message.domain.MessageSendForm;
13+
import net.lab1024.sa.base.module.support.message.domain.MessageVO;
14+
import net.lab1024.sa.base.module.support.message.service.MessageService;
15+
import org.springframework.beans.factory.annotation.Autowired;
16+
import org.springframework.web.bind.annotation.*;
17+
18+
19+
/**
20+
* 后管 消息路由
21+
*
22+
* @author: 卓大
23+
* @date: 2025/04/09 20:55
24+
*/
25+
@Tag(name = AdminSwaggerTagConst.System.SYSTEM_MESSAGE)
26+
@RestController
27+
public class AdminMessageController {
28+
29+
@Autowired
30+
private MessageService messageService;
31+
32+
@Operation(summary = "通知消息-新建 @author 卓大")
33+
@PostMapping("/message/sendMessages")
34+
@SaCheckPermission("system:message:send")
35+
public ResponseDTO<String> sendMessages(@RequestBody @Valid ValidateList<MessageSendForm> messageList) {
36+
messageService.sendMessage(messageList);
37+
return ResponseDTO.ok();
38+
}
39+
40+
@Operation(summary = "通知消息-分页查询 @author 卓大")
41+
@PostMapping("/message/query")
42+
@SaCheckPermission("system:message:query")
43+
public ResponseDTO<PageResult<MessageVO>> query(@RequestBody @Valid MessageQueryForm queryForm) {
44+
return ResponseDTO.ok(messageService.query(queryForm));
45+
}
46+
47+
@Operation(summary = "通知消息-删除 @author 卓大")
48+
@GetMapping("/message/delete/{messageId}")
49+
@SaCheckPermission("system:message:delete")
50+
public ResponseDTO<String> delete(@PathVariable Long messageId) {
51+
return messageService.delete(messageId);
52+
}
53+
54+
}

‎smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,86 +52,86 @@ public ResponseDTO<List<DictVO>> getAllDict() {
5252

5353
@Operation(summary = "分页查询 @author 1024创新实验室-主任-卓大")
5454
@PostMapping("/dict/queryPage")
55-
@SaCheckPermission("dict:query")
55+
@SaCheckPermission("support:dict:query")
5656
public ResponseDTO<PageResult<DictVO>> queryPage(@RequestBody @Valid DictQueryForm queryForm) {
5757
return ResponseDTO.ok(dictService.queryPage(queryForm));
5858
}
5959

6060
@Operation(summary = "添加 @author 1024创新实验室-主任-卓大")
6161
@PostMapping("/dict/add")
62-
@SaCheckPermission("dict:add")
62+
@SaCheckPermission("support:dict:add")
6363
public ResponseDTO<String> add(@RequestBody @Valid DictAddForm addForm) {
6464
return dictService.add(addForm);
6565
}
6666

6767
@Operation(summary = "更新 @author 1024创新实验室-主任-卓大")
6868
@PostMapping("/dict/update")
69-
@SaCheckPermission("dict:update")
69+
@SaCheckPermission("support:dict:update")
7070
public ResponseDTO<String> update(@RequestBody @Valid DictUpdateForm updateForm) {
7171
return dictService.update(updateForm);
7272
}
7373

74-
@Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大")
74+
@Operation(summary = "启用/禁用 @author 1024创新实验室-主任-卓大")
7575
@GetMapping("/dict/updateDisabled/{dictId}")
76-
@SaCheckPermission("dictData:updateDisabled")
76+
@SaCheckPermission("support:dict:updateDisabled")
7777
public ResponseDTO<String> updateDisabled(@PathVariable Long dictId) {
7878
return dictService.updateDisabled(dictId);
7979
}
8080

8181
@Operation(summary = "批量删除 @author 1024创新实验室-主任-卓大")
8282
@PostMapping("/dict/batchDelete")
83-
@SaCheckPermission("dict:delete")
83+
@SaCheckPermission("support:dict:delete")
8484
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
8585
return dictService.batchDelete(idList);
8686
}
8787

8888
@Operation(summary = "单个删除 @author 1024创新实验室-主任-卓大")
8989
@GetMapping("/dict/delete/{dictId}")
90-
@SaCheckPermission("dict:delete")
91-
public ResponseDTO<String> batchDelete(@PathVariable Long dictId) {
90+
@SaCheckPermission("support:dict:delete")
91+
public ResponseDTO<String> delete(@PathVariable Long dictId) {
9292
return dictService.delete(dictId);
9393
}
9494

9595
// ------------------- 字典数据 -------------------
9696

9797
@Operation(summary = "字典数据 分页查询 @author 1024创新实验室-主任-卓大")
9898
@GetMapping("/dict/dictData/queryDictData/{dictId}")
99-
@SaCheckPermission("dictData:query")
99+
@SaCheckPermission("support:dictData:query")
100100
public ResponseDTO<List<DictDataVO>> queryDictData(@PathVariable Long dictId) {
101101
return ResponseDTO.ok(dictService.queryDictData(dictId));
102102
}
103103

104104
@Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大")
105105
@GetMapping("/dict/dictData/updateDisabled/{dictDataId}")
106-
@SaCheckPermission("dictData:updateDisabled")
106+
@SaCheckPermission("support:dictData:updateDisabled")
107107
public ResponseDTO<String> updateDictDataDisabled(@PathVariable Long dictDataId) {
108108
return dictService.updateDictDataDisabled(dictDataId);
109109
}
110110

111111
@Operation(summary = "字典数据 添加 @author 1024创新实验室-主任-卓大")
112112
@PostMapping("/dict/dictData/add")
113-
@SaCheckPermission("dictData:add")
113+
@SaCheckPermission("support:dictData:add")
114114
public ResponseDTO<String> addDictData(@RequestBody @Valid DictDataAddForm addForm) {
115115
return dictService.addDictData(addForm);
116116
}
117117

118118
@Operation(summary = "字典数据 更新 @author 1024创新实验室-主任-卓大")
119119
@PostMapping("/dict/dictData/update")
120-
@SaCheckPermission("dictData:update")
120+
@SaCheckPermission("support:dictData:update")
121121
public ResponseDTO<String> updateDictData(@RequestBody @Valid DictDataUpdateForm updateForm) {
122122
return dictService.updateDictData(updateForm);
123123
}
124124

125125
@Operation(summary = "字典数据 批量删除 @author 1024创新实验室-主任-卓大")
126126
@PostMapping("/dict/dictData/batchDelete")
127-
@SaCheckPermission("dictData:delete")
127+
@SaCheckPermission("support:dictData:delete")
128128
public ResponseDTO<String> batchDeleteDictData(@RequestBody ValidateList<Long> idList) {
129129
return dictService.batchDeleteDictData(idList);
130130
}
131131

132132
@Operation(summary = "字典数据 单个删除 @author 1024创新实验室-主任-卓大")
133133
@GetMapping("/dict/dictData/delete/{dictDataId}")
134-
@SaCheckPermission("dictData:delete")
134+
@SaCheckPermission("support:dictData:delete")
135135
public ResponseDTO<String> deleteDictData(@PathVariable Long dictDataId) {
136136
return dictService.deleteDictData(dictDataId);
137137
}

‎smart-admin-api-java17-springboot3/sa-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>net.1024lab</groupId>
5+
<groupId>net.lab1024</groupId>
66
<artifactId>sa-parent</artifactId>
77
<version>3.0.0</version>
88
<relativePath>../pom.xml</relativePath>

‎smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageQueryForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class MessageQueryForm extends PageParam {
3636
@Schema(description = "查询结束时间")
3737
private LocalDate endDate;
3838

39-
@Schema(hidden = true)
39+
@Schema(description = "接收人")
4040
private Long receiverUserId;
4141

42-
@Schema(hidden = true)
42+
@Schema(description = "接收人类型")
4343
private Integer receiverUserType;
4444
}

0 commit comments

Comments
 (0)