aikai
|
f6d9e2749a
|
feat(system): 新增线库和库区相关功能并优化机器人状态获取
- 新增线库（巷道）和库区的保存、修改和删除功能
- 实现线库和库区名称的唯一性校验
- 优化机器人状态信息获取逻辑
-修复公告板服务中的潜在空指针异常
|
2025-03-20 17:17:46 +08:00 |
|
cbs
|
7dd66f2040
|
上报车辆规划路径给前端
|
2025-03-20 09:00:33 +08:00 |
|
cbs
|
928491f16c
|
机器人移动到等待点
|
2025-03-14 14:45:23 +08:00 |
|
cbs
|
5a870cf145
|
机器人放货上报
|
2025-03-13 15:57:55 +08:00 |
|
cbs
|
00f611ce1c
|
机器人实时行为上报
|
2025-03-13 10:19:22 +08:00 |
|
cbs
|
9296aabd48
|
机器人响应式状态上报
|
2025-03-13 08:59:55 +08:00 |
|
cbs
|
df8c8b28c6
|
任务状态
|
2025-03-12 15:53:50 +08:00 |
|
cbs
|
908ac015ca
|
车辆移动指令
|
2025-03-10 16:35:33 +08:00 |
|
cbs
|
19fd048a1b
|
Merge branch 'dev' into cbs
|
2025-03-07 11:55:40 +08:00 |
|
cbs
|
a9a4244290
|
告警信息
|
2025-03-07 11:54:34 +08:00 |
|
aikai
|
267d200605
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/robot/RobotInformationMapper.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotInformationMapper.xml
|
2025-03-06 11:14:40 +08:00 |
|
aikai
|
8e8a4259d1
|
feat(system): 新增设备地图关联功能并优化机器人信息相关接口- 新增设备地图关联相关实体、控制器、服务和 mapper
- 在机器人信息中集成设备地图关联数据
- 优化机器人信息查询接口，支持按地图 ID 查询- 修复公告板中设备类型默认图片显示问题
- 更新机器人状态相关 API，简化消息处理逻辑
|
2025-03-06 11:11:08 +08:00 |
|
cbs
|
982cab4313
|
处理车机上报的异常
|
2025-03-04 16:28:02 +08:00 |
|
cbs
|
5c2a8cfe9d
|
创建订单过滤禁用点位
|
2025-03-03 09:11:21 +08:00 |
|
cbs
|
8d646c1362
|
处理PP分配的任务
|
2025-02-24 17:05:05 +08:00 |
|
cbs
|
4df47ab439
|
处理PP分配的任务
|
2025-02-22 18:00:53 +08:00 |
|
cbs
|
ccf5c1d7b5
|
PP分配任务
|
2025-02-21 11:32:31 +08:00 |
|
cbs
|
63909d1105
|
分配任务给PP
|
2025-02-21 09:05:58 +08:00 |
|
aikai
|
86f0385836
|
refactor(robot): 重构机器人信息获取逻辑
- 新增 RobotInformationVO 类用于封装机器人信息
- 实现机器人信息缓存机制，优化信息获取效率
- 修改测试接口，使用 RobotStatusDTO 作为参数
- 更新机器人状态处理逻辑，支持错误级别判断
-优化数据库查询，减少冗余操作
|
2025-02-18 16:03:08 +08:00 |
|
cbs
|
570852382f
|
Merge branch 'dev' into cbs
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java
|
2025-02-15 09:18:37 +08:00 |
|
cbs
|
ed17f85c80
|
同步点位信息给PP
|
2025-02-15 09:13:30 +08:00 |
|
aikai
|
cd52301d5e
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApiImpl.java
|
2025-02-13 15:41:07 +08:00 |
|
aikai
|
ffa26a1fa9
|
位置上报新增楼区信息
|
2025-02-13 15:38:22 +08:00 |
|
cbs
|
3b3d6a5e7f
|
下发任务校验电量
|
2025-02-10 17:28:55 +08:00 |
|
cbs
|
3665002ba1
|
参数配置
|
2025-02-08 17:31:08 +08:00 |
|
cbs
|
aebbd85dbe
|
车辆信息
|
2025-02-06 11:04:54 +08:00 |
|
cbs
|
d29261e7b8
|
机器人状态上报、下发任务过滤机器人上报的信息
|
2025-02-05 14:53:46 +08:00 |
|
cbs
|
64f0f0a32d
|
机器人状态上报
|
2025-01-24 11:18:52 +08:00 |
|
cbs
|
7ed63a7388
|
开发移库任务
|
2025-01-23 11:55:40 +08:00 |
|
cbs
|
dc88e8e574
|
Merge branch 'dev' into cbs
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/houselocation/WareHouseLocationDO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapItemDO.java
# yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/houselocation/WareHouseLocationMapper.xml
|
2025-01-18 17:16:51 +08:00 |
|
cbs
|
4c62f8b205
|
任务查询/更新、校验机器人区域
|
2025-01-18 17:11:46 +08:00 |
|
aikai
|
93999f019b
|
feat(仓储): 重构库区、连线和线库相关功能- 新增库区创建、编辑和删除功能
- 优化连线和线库的增删改查接口
- 增加地图id相关字段和查询条件
- 重构数据结构和业务逻辑，提高系统可维护性
|
2025-01-18 10:54:31 +08:00 |
|
aikai
|
7099fa02a0
|
feat(houselane): 优化线库管理功能
- 新增线库列表接口和相关页面
- 实现线库和库位的关联逻辑
- 优化线库创建、编辑和删除功能
- 添加线库相关的错误码和异常处理
|
2025-01-17 19:20:34 +08:00 |
|
aikai
|
69c1168dcc
|
refactor(ware): 重构线库功能
- 修改 NodeProcessingContext 中的策略判断逻辑
-重命名 NodeTypeEnum 中的字段名称
- 更新 PositionMapItemDO 中的字段注释
- 新增 PositionMapItemService 接口及实现类
- 重构 WareHouseLaneController，改为仅处理线库相关操作
- 更新相关 VO 类，移除巷道相关字段- 重构 WareHouseLaneService接口，新增 createOrEditOrDel 方法
- 实现 WareHouseLaneServiceImpl 中的 createOrEditOrDel 方法
|
2025-01-17 09:57:58 +08:00 |
|
aikai
|
c593611b56
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into dev
|
2025-01-15 16:38:28 +08:00 |
|
cbs
|
d9ac7b7cb6
|
任务列表/修改任务状态、优先级
|
2025-01-15 16:35:15 +08:00 |
|
cbs
|
0b517511ea
|
任务下发校验大区域
|
2025-01-14 16:25:03 +08:00 |
|
aikai
|
eb580beee0
|
前端png文件下载改base64格式
|
2025-01-13 14:54:35 +08:00 |
|
aikai
|
281522adca
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
|
2025-01-13 11:23:11 +08:00 |
|
aikai
|
f94062a262
|
地图相关
|
2025-01-13 11:19:36 +08:00 |
|
cbs
|
491250852b
|
搬运任务回传
|
2025-01-13 09:10:19 +08:00 |
|
cbs
|
89fa21411d
|
搬运任务校验
|
2025-01-09 13:59:39 +08:00 |
|
cbs
|
9fe8245ed5
|
下发搬运任务
|
2025-01-08 10:46:50 +08:00 |
|
cbs
|
84980c31f7
|
机器人任务
|
2025-01-07 10:39:14 +08:00 |
|
cbs
|
101be5a8ad
|
巷道、库区、库位、车辆、设备
|
2025-01-04 17:34:56 +08:00 |
|
cbs
|
bb03dd010f
|
wcs设备注册
|
2025-01-03 15:54:13 +08:00 |
|
YunaiV
|
6a86386f60
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyPageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/AppRewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
|
2024-10-01 14:52:28 +08:00 |
|
YunaiV
|
4249528d0f
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:51:57 +08:00 |
|
YunaiV
|
7d9785ad79
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/dto/CombinationRecordCreateReqDTO.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
|
2024-09-07 20:57:15 +08:00 |
|
YunaiV
|
975ed4ce10
|
【功能修复】框架：操作日志异步记录时，丢失 request 的问题
|
2024-09-06 21:44:17 +08:00 |
|
YunaiV
|
7255d25681
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
|
2024-08-31 13:31:44 +08:00 |
|
YunaiV
|
d39681e98c
|
【代码修复】SYSTEM：角色标识的提示不正确问题
|
2024-08-31 10:15:04 +08:00 |
|
YunaiV
|
d97e54b5cd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-08-31 09:57:59 +08:00 |
|
芋道源码
|
e893caf3ad
|
!131 bugfix
Merge pull request !131 from 尹先生/master-jdk17
|
2024-08-31 01:56:00 +00:00 |
|
YunaiV
|
4e200c57f7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
|
2024-08-24 11:16:48 +08:00 |
|
YunaiV
|
87955a9751
|
【功能修复】系统：OperateLogRespDTO 的字段读取
|
2024-08-24 11:15:52 +08:00 |
|
口口口
|
a4abdefa60
|
翻译userName，RPC报错，修复
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
翻译userName，RPC报错，修复
Signed-off-by: 口口口 <17975121@qq.com>
|
2024-08-22 08:58:46 +00:00 |
|
yinyilong
|
59fc020616
|
bugfix-增加RoleExportExcelVO，数据范围导出字段从字典表中取值；RoleSaveReqVO中code字段名改为角色标识，保持提示文案一致
|
2024-08-13 15:35:13 +08:00 |
|
YunaiV
|
bf08f746b3
|
【同步】BOOT 和 CLOUD 的功能
|
2024-08-02 09:40:21 +08:00 |
|
YunaiV
|
cce77b8add
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-08-02 08:48:59 +08:00 |
|
YunaiV
|
3ceb4d4685
|
【功能新增】微信小程序的订阅消息
|
2024-08-01 13:08:35 +08:00 |
|
YunaiV
|
be67194cfb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-20 22:36:42 +08:00 |
|
YunaiV
|
b0c2f75a3f
|
【功能优化】全局：LoginUser 新增过期时间，方便判断 token 过期
|
2024-07-20 18:42:26 +08:00 |
|
YunaiV
|
5bf8c47587
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-20 17:58:19 +08:00 |
|
YunaiV
|
b728e66282
|
【功能新增】INFRA：增加 ConfigApi，支持参数配置的读取
|
2024-07-20 17:57:31 +08:00 |
|
YunaiV
|
ec33e42f2b
|
【功能修复】全局：请求租户不存在时，记录访问日志、操作日志异常的问题
|
2024-07-19 23:04:10 +08:00 |
|
YunaiV
|
906287be21
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
|
2024-07-19 19:30:37 +08:00 |
|
YunaiV
|
398171a402
|
【功能修复】CRM：操作日志读取不正确的问题
|
2024-07-19 19:27:33 +08:00 |
|
YunaiV
|
13c20c930a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# README.md
|
2024-07-17 19:57:56 +08:00 |
|
YunaiV
|
019d70e437
|
【依赖】更新 README 中的框架版本号
|
2024-07-17 19:57:24 +08:00 |
|
YunaiV
|
97563f1457
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-16 23:52:36 +08:00 |
|
YunaiV
|
369e6a009a
|
【升级】easy-trans from 2.2.11 to 3.0.5
|
2024-07-16 23:52:27 +08:00 |
|
YunaiV
|
76a25f0283
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-16 00:16:38 +08:00 |
|
YunaiV
|
4961d26e14
|
【修复】easy-trans 的 @AutoTrans 存在冲突
|
2024-07-16 00:16:30 +08:00 |
|
YunaiV
|
d8941bc990
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-15 13:01:45 +08:00 |
|
YunaiV
|
e263468389
|
【依赖】easy-trans from 2.2.11 to 3.0.5
|
2024-07-15 13:01:35 +08:00 |
|
YunaiV
|
69562e1463
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 15:59:52 +08:00 |
|
YunaiV
|
a9d91250f5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
|
2024-07-13 12:57:43 +08:00 |
|
YunaiV
|
b8f1d01733
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:56:09 +08:00 |
|
YunaiV
|
c0b196bd07
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-07-13 12:04:48 +08:00 |
|
YunaiV
|
3b8675dc6a
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:51 +08:00 |
|
YunaiV
|
700a0996c4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
|
2024-07-13 11:28:47 +08:00 |
|
YunaiV
|
c6937cf199
|
【模块新增】AI：支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
|
2024-07-13 11:26:17 +08:00 |
|
YunaiV
|
0ee01346d0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/pom.xml
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
|
2024-06-04 21:34:48 +08:00 |
|
YunaiV
|
025857c9f2
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-06-04 19:23:20 +08:00 |
|
YunaiV
|
38df9d3911
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
|
2024-04-22 21:02:10 +08:00 |
|
YunaiV
|
feb742e084
|
【同步】与 yudao-boot 版本保持一致！
|
2024-04-22 21:01:30 +08:00 |
|
YunaiV
|
be6aaec818
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:53:25 +08:00 |
|
YunaiV
|
e2c1c7d380
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:51:24 +08:00 |
|
YunaiV
|
60d56f0834
|
bugfix：easy-trans 在 FeignClient 无法启动的情况
|
2024-04-04 18:59:35 +08:00 |
|
YunaiV
|
9de92e730b
|
bugfix：easy-trans 在 FeignClient 无法启动的情况
|
2024-04-04 18:58:13 +08:00 |
|
YunaiV
|
0c2736399f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-04-04 09:59:18 +08:00 |
|
YunaiV
|
a6db89c9e3
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:58:41 +08:00 |
|
YunaiV
|
06bfe3335e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-04-04 09:50:11 +08:00 |
|
YunaiV
|
911790ad16
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:48:29 +08:00 |
|
YunaiV
|
3192a252cd
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:38:15 +08:00 |
|
YunaiV
|
809e6961d6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:32:36 +08:00 |
|
YunaiV
|
e67f16e5bb
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:21:17 +08:00 |
|
YunaiV
|
c1b5670027
|
全局：增加 VO 数据翻译的支持
|
2024-04-02 19:57:29 +08:00 |
|
YunaiV
|
3e8e3374f9
|
Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-common/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
|
2024-04-02 19:38:29 +08:00 |
|