diff --git a/nc_wms_java/pom.xml b/nc_wms_java/pom.xml index 6bc55dc..6bb888c 100644 --- a/nc_wms_java/pom.xml +++ b/nc_wms_java/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.1024lab + net.lab1024 sa-parent 3.0.0 pom @@ -10,9 +10,9 @@ sa-parent SmartAdmin project - + sa-base - sa-admin + sa-admin @@ -22,7 +22,7 @@ 3.3.1 2.0.8 6.4.3 - 3.5.7 + 3.5.5 3.9.1 4.4.0 2.0.52 @@ -60,6 +60,8 @@ 1.18.1 3.1.0 1.9.4 + 1.9.4.1 + 1.9.4 @@ -346,6 +348,18 @@ ${jimureport-spring.version} + + org.jeecgframework.jimureport + jimureport-nosql-starter + ${jimureport-nosql.version} + + + + org.jeecgframework.jimureport + jimubi-spring-boot3-starter + ${jimubi-spring.version} + + diff --git a/nc_wms_java/sa-admin/pom.xml b/nc_wms_java/sa-admin/pom.xml index 463f949..c5ac192 100644 --- a/nc_wms_java/sa-admin/pom.xml +++ b/nc_wms_java/sa-admin/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.1024lab + net.lab1024 sa-parent 3.0.0 ../pom.xml @@ -18,7 +18,7 @@ - net.1024lab + net.lab1024 sa-base 3.0.0 diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java index cd90f23..f5e88a5 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java @@ -24,11 +24,11 @@ public class MvcConfig implements WebMvcConfigurer { private AdminInterceptor adminInterceptor; + @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(adminInterceptor) .excludePathPatterns(SwaggerConfig.SWAGGER_WHITELIST) - .excludePathPatterns("/jmreport/**", "/jimubi/**") .addPathPatterns("/**"); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java index c5319d6..fb7a630 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java @@ -51,6 +51,8 @@ public class AdminSwaggerTagConst extends SwaggerTagConst { public static final String SYSTEM_POSITION = "系统-职务管理"; + public static final String SYSTEM_MESSAGE = "系统-消息"; + } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java index f17cbd4..e165817 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.bank; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -35,24 +36,28 @@ public class BankController { @Operation(summary = "分页查询银行信息 @author 善逸") @PostMapping("/oa/bank/page/query") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryByPage(@RequestBody @Valid BankQueryForm queryForm) { return bankService.queryByPage(queryForm); } @Operation(summary = "根据企业ID查询银行信息列表 @author 善逸") @GetMapping("/oa/bank/query/list/{enterpriseId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return bankService.queryList(enterpriseId); } @Operation(summary = "查询银行信息详情 @author 善逸") @GetMapping("/oa/bank/get/{bankId}") + @SaCheckPermission("oa:bank:query") public ResponseDTO getDetail(@PathVariable Long bankId) { return bankService.getDetail(bankId); } @Operation(summary = "新建银行信息 @author 善逸") @PostMapping("/oa/bank/create") + @SaCheckPermission("oa:bank:add") public ResponseDTO createBank(@RequestBody @Valid BankCreateForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -62,12 +67,14 @@ public class BankController { @Operation(summary = "编辑银行信息 @author 善逸") @PostMapping("/oa/bank/update") + @SaCheckPermission("oa:bank:update") public ResponseDTO updateBank(@RequestBody @Valid BankUpdateForm updateVO) { return bankService.updateBank(updateVO); } @Operation(summary = "删除银行信息 @author 善逸") @GetMapping("/oa/bank/delete/{bankId}") + @SaCheckPermission("oa:bank:delete") public ResponseDTO deleteBank(@PathVariable Long bankId) { return bankService.deleteBank(bankId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java index ad90479..d919537 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java @@ -100,6 +100,7 @@ public class EnterpriseController { @Operation(summary = "按照类型查询企业 @author 开云") @GetMapping("/oa/enterprise/query/list") + @SaCheckPermission("oa:enterprise:query") public ResponseDTO> queryList(@RequestParam(value = "type", required = false) Integer type) { return enterpriseService.queryList(type); } @@ -114,12 +115,14 @@ public class EnterpriseController { @Operation(summary = "查询企业全部员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/list") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> employeeList(@RequestBody @Valid List enterpriseIdList) { return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList)); } @Operation(summary = "分页查询企业员工 @author 卓大") @PostMapping("/oa/enterprise/employee/queryPage") + @SaCheckPermission("oa:enterprise:queryEmployee") public ResponseDTO> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) { return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm)); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java index 52b5ea5..13d3b98 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.oa.invoice; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -38,18 +39,21 @@ public class InvoiceController { @Operation(summary = "分页查询发票信息 @author 善逸") @PostMapping("/oa/invoice/page/query") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) { return invoiceService.queryByPage(queryForm); } @Operation(summary = "查询发票信息详情 @author 善逸") @GetMapping("/oa/invoice/get/{invoiceId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO getDetail(@PathVariable Long invoiceId) { return invoiceService.getDetail(invoiceId); } @Operation(summary = "新建发票信息 @author 善逸") @PostMapping("/oa/invoice/create") + @SaCheckPermission("oa:invoice:add") public ResponseDTO createInvoice(@RequestBody @Valid InvoiceAddForm createVO) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -57,21 +61,24 @@ public class InvoiceController { return invoiceService.createInvoice(createVO); } + @OperateLog @Operation(summary = "编辑发票信息 @author 善逸") @PostMapping("/oa/invoice/update") - @OperateLog + @SaCheckPermission("oa:invoice:update") public ResponseDTO updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) { return invoiceService.updateInvoice(updateVO); } @Operation(summary = "删除发票信息 @author 善逸") @GetMapping("/invoice/delete/{invoiceId}") + @SaCheckPermission("oa:invoice:delete") public ResponseDTO deleteInvoice(@PathVariable Long invoiceId) { return invoiceService.deleteInvoice(invoiceId); } @Operation(summary = "查询列表 @author lidoudou") @GetMapping("/oa/invoice/query/list/{enterpriseId}") + @SaCheckPermission("oa:invoice:query") public ResponseDTO> queryList(@PathVariable Long enterpriseId) { return invoiceService.queryList(enterpriseId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java index e68efcf..f986575 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java @@ -3,7 +3,6 @@ package net.lab1024.sa.admin.module.business.wms.jimuReport; import jakarta.servlet.http.HttpServletRequest; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.stereotype.Component; - @Component public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { /** diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java new file mode 100644 index 0000000..40922e2 --- /dev/null +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java @@ -0,0 +1,54 @@ +package net.lab1024.sa.admin.module.system.message; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.base.common.domain.PageResult; +import net.lab1024.sa.base.common.domain.ResponseDTO; +import net.lab1024.sa.base.common.domain.ValidateList; +import net.lab1024.sa.base.module.support.message.domain.MessageQueryForm; +import net.lab1024.sa.base.module.support.message.domain.MessageSendForm; +import net.lab1024.sa.base.module.support.message.domain.MessageVO; +import net.lab1024.sa.base.module.support.message.service.MessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * 后管 消息路由 + * + * @author: 卓大 + * @date: 2025/04/09 20:55 + */ +@Tag(name = AdminSwaggerTagConst.System.SYSTEM_MESSAGE) +@RestController +public class AdminMessageController { + + @Autowired + private MessageService messageService; + + @Operation(summary = "通知消息-新建 @author 卓大") + @PostMapping("/message/sendMessages") + @SaCheckPermission("system:message:send") + public ResponseDTO sendMessages(@RequestBody @Valid ValidateList messageList) { + messageService.sendMessage(messageList); + return ResponseDTO.ok(); + } + + @Operation(summary = "通知消息-分页查询 @author 卓大") + @PostMapping("/message/query") + @SaCheckPermission("system:message:query") + public ResponseDTO> query(@RequestBody @Valid MessageQueryForm queryForm) { + return ResponseDTO.ok(messageService.query(queryForm)); + } + + @Operation(summary = "通知消息-删除 @author 卓大") + @GetMapping("/message/delete/{messageId}") + @SaCheckPermission("system:message:delete") + public ResponseDTO delete(@PathVariable Long messageId) { + return messageService.delete(messageId); + } + +} diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java index cb5f5f0..4c4fded 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java @@ -52,43 +52,43 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "分页查询 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/queryPage") - @SaCheckPermission("dict:query") + @SaCheckPermission("support:dict:query") public ResponseDTO> queryPage(@RequestBody @Valid DictQueryForm queryForm) { return ResponseDTO.ok(dictService.queryPage(queryForm)); } @Operation(summary = "添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/add") - @SaCheckPermission("dict:add") + @SaCheckPermission("support:dict:add") public ResponseDTO add(@RequestBody @Valid DictAddForm addForm) { return dictService.add(addForm); } @Operation(summary = "更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/update") - @SaCheckPermission("dict:update") + @SaCheckPermission("support:dict:update") public ResponseDTO update(@RequestBody @Valid DictUpdateForm updateForm) { return dictService.update(updateForm); } - @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") + @Operation(summary = "启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/updateDisabled/{dictId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dict:updateDisabled") public ResponseDTO updateDisabled(@PathVariable Long dictId) { return dictService.updateDisabled(dictId); } @Operation(summary = "批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/batchDelete") - @SaCheckPermission("dict:delete") + @SaCheckPermission("support:dict:delete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return dictService.batchDelete(idList); } @Operation(summary = "单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/delete/{dictId}") - @SaCheckPermission("dict:delete") - public ResponseDTO batchDelete(@PathVariable Long dictId) { + @SaCheckPermission("support:dict:delete") + public ResponseDTO delete(@PathVariable Long dictId) { return dictService.delete(dictId); } @@ -96,42 +96,42 @@ public class AdminDictController extends SupportBaseController { @Operation(summary = "字典数据 分页查询 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/queryDictData/{dictId}") - @SaCheckPermission("dictData:query") + @SaCheckPermission("support:dictData:query") public ResponseDTO> queryDictData(@PathVariable Long dictId) { return ResponseDTO.ok(dictService.queryDictData(dictId)); } @Operation(summary = "字典数据 启用/禁用 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/updateDisabled/{dictDataId}") - @SaCheckPermission("dictData:updateDisabled") + @SaCheckPermission("support:dictData:updateDisabled") public ResponseDTO updateDictDataDisabled(@PathVariable Long dictDataId) { return dictService.updateDictDataDisabled(dictDataId); } @Operation(summary = "字典数据 添加 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/add") - @SaCheckPermission("dictData:add") + @SaCheckPermission("support:dictData:add") public ResponseDTO addDictData(@RequestBody @Valid DictDataAddForm addForm) { return dictService.addDictData(addForm); } @Operation(summary = "字典数据 更新 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/update") - @SaCheckPermission("dictData:update") + @SaCheckPermission("support:dictData:update") public ResponseDTO updateDictData(@RequestBody @Valid DictDataUpdateForm updateForm) { return dictService.updateDictData(updateForm); } @Operation(summary = "字典数据 批量删除 @author 1024创新实验室-主任-卓大") @PostMapping("/dict/dictData/batchDelete") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO batchDeleteDictData(@RequestBody ValidateList idList) { return dictService.batchDeleteDictData(idList); } @Operation(summary = "字典数据 单个删除 @author 1024创新实验室-主任-卓大") @GetMapping("/dict/dictData/delete/{dictDataId}") - @SaCheckPermission("dictData:delete") + @SaCheckPermission("support:dictData:delete") public ResponseDTO deleteDictData(@PathVariable Long dictDataId) { return dictService.deleteDictData(dictDataId); } diff --git a/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml b/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml index 4b8fd33..a989e13 100644 --- a/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml +++ b/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml @@ -8,7 +8,7 @@ # 项目配置: 名称、日志目录 project: name: sa-admin - log-directory: /logs/smart_admin_v3/${spring.profiles.active} + log-directory: ${localPath:/home}/logs/smart_admin_v3/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: diff --git a/nc_wms_java/sa-base/pom.xml b/nc_wms_java/sa-base/pom.xml index e690191..952b172 100644 --- a/nc_wms_java/sa-base/pom.xml +++ b/nc_wms_java/sa-base/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.1024lab + net.lab1024 sa-parent 3.0.0 ../pom.xml @@ -294,6 +294,16 @@ jimureport-spring-boot3-starter-fastjson2 + + org.jeecgframework.jimureport + jimureport-nosql-starter + + + + org.jeecgframework.jimureport + jimubi-spring-boot3-starter + + diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java index d1d4d7f..c248c7d 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java @@ -66,8 +66,6 @@ public class WebServerListener implements ApplicationListener delete(Long messageId) { + if(messageId == null){ + return ResponseDTO.userErrorParam(); + } + messageDao.deleteById(messageId); + return ResponseDTO.ok(); + } } \ No newline at end of file diff --git a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml index 12199dd..752086b 100644 --- a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml +++ b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml @@ -167,23 +167,4 @@ smart: # 数据库配置检测-开关 默认开启 可选(作用是固定间隔读取数据库配置更新任务,关闭后只能重启服务或通过接口修改定时任务,建议开启) db-refresh-enabled: true # 数据库配置检测-执行间隔 默认120秒 可选 - db-refresh-interval: 60 - -jeecg : - jmreport: - #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增) - saasMode: tenant - # 平台上线安全配置(v1.6.2+ 新增) - firewall: - # 数据源安全 (开启后,不允许使用平台数据源、SQL解析不允许select * 查询、禁止测试数据源连接是否正确) - # 数据源安全下,预留角色有权限使用 select * 和测试数据源链接 - dataSourceSafe: true - # 低代码开发模式(dev:开发模式,prod:发布模式关闭报表设计,预留角色admin、lowdeveloper可设计, prodsf:发布安全模式 彻底关闭报表设计) - lowCodeMode: dev - # api数据集内网ip白名单,在发布模式下只只能向设置了白名单的内网服务器发送请求。 - apiDsIpWhite: - - 192.168.1.69 - - 192.168.1.2 - - 10.22.1.0/24 - # sql注入检查级别(all:所有, simple:简单校验, none:不校验) - sqlInjectionLevel: all \ No newline at end of file + db-refresh-interval: 60 \ No newline at end of file diff --git a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml index 9acd671..85f5495 100644 --- a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml +++ b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml @@ -39,7 +39,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: 1024lab + password: LAB1024LAB properties: mail: smtp: