曹鹏飞
|
3cd0b3d8b4
|
Merge branch 'feature/product' into test
|
2025-08-13 09:15:02 +08:00 |
|
曹鹏飞
|
fe6c3cc27a
|
Merge branch 'feature/product' into develop
|
2025-08-12 17:39:31 +08:00 |
|
曹鹏飞
|
4a3d096ac2
|
feat: bug-565 产品机型详情页面，产品资料这里展示是有顺序的，需要在后台增加排序功能
|
2025-08-12 17:39:16 +08:00 |
|
曹鹏飞
|
14ba6d095e
|
Merge branch 'feature/product' into test
|
2025-08-12 14:41:20 +08:00 |
|
曹鹏飞
|
61999f84d6
|
Merge branch 'feature/product' into develop
|
2025-08-12 11:41:02 +08:00 |
|
曹鹏飞
|
adc503652d
|
feat: bug-562 机型资料需要支持批量发布
|
2025-08-12 11:40:45 +08:00 |
|
曹鹏飞
|
29c5a1e556
|
feat: 优化视频通话逻辑
|
2025-08-08 18:29:18 +08:00 |
|
曹鹏飞
|
73ca81291c
|
feat: 优化视频通话逻辑
|
2025-08-08 18:27:18 +08:00 |
|
曹鹏飞
|
7d1d588238
|
Merge branch 'feature/bug-500' into develop
# Conflicts:
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
# nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
# nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketFavoritesService.java
|
2025-08-08 15:41:01 +08:00 |
|
曹鹏飞
|
e22e20ae10
|
feat: bug-500 管理端，新的职位添加进来，给新用户配置了职位和角色，没法配置其数据权限，无法看到全部工单数据
|
2025-08-08 15:31:42 +08:00 |
|
曹鹏飞
|
8e1b1c2f61
|
feat: bug-384 用户端需要支持管理端用户添加工单和后续操作
|
2025-08-07 17:02:34 +08:00 |
|
曹鹏飞
|
acf73b2799
|
feat: bug-242 用户端登录添加管理端用户登录的支持
优先查询用户端的用户，如果不是用户端的用户，则查询管理端用户
|
2025-08-07 16:49:51 +08:00 |
|
曹鹏飞
|
a81d362c96
|
feat: bug-528 app端添加管理功能
管理端工单详情接口返回数据添加创建人来源字段
|
2025-08-06 13:58:15 +08:00 |
|
曹鹏飞
|
5b9b277251
|
feat: bug-528 app端添加管理功能
|
2025-07-30 14:10:02 +08:00 |
|
曹鹏飞
|
ad50d8cc15
|
feat: bug-528 app端添加管理功能
|
2025-07-30 11:54:47 +08:00 |
|
曹鹏飞
|
5b74e604ab
|
feat: bug-528 app端添加管理功能
|
2025-07-29 11:05:24 +08:00 |
|
曹鹏飞
|
b0c5e4880f
|
Merge branch 'feature/bug-384' into test
|
2025-07-28 17:28:19 +08:00 |
|
曹鹏飞
|
b13c88946a
|
feat: bug-524 调整异常提示，只提示系统错误和编号，不提示具体错误描述
|
2025-07-25 10:06:43 +08:00 |
|
曹鹏飞
|
2c5aa085ac
|
fix: bug-505 管理端，部件管理里面，编辑部件时，部件描述填写完保存后，再点编辑进来这里就是空的，每次都要重新填写一遍才能 保存数据
|
2025-07-22 10:03:15 +08:00 |
|
曹鹏飞
|
77a60f754b
|
fix: 修复用户端产品类型列表里的产品主要参数排序与设置不一致的问题
|
2025-07-17 12:16:57 +08:00 |
|
曹鹏飞
|
65d8b44269
|
Merge branch 'feature/bug-20250707' into feature/product
|
2025-07-08 09:25:54 +08:00 |
|
曹鹏飞
|
71d744cebb
|
fix: 修复一些bug
|
2025-07-08 09:25:40 +08:00 |
|
曹鹏飞
|
bffd874909
|
Merge branch 'feature/bug-20250707' into feature/product
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelVideoItem.java
|
2025-07-07 12:04:43 +08:00 |
|
曹鹏飞
|
e576571238
|
fix: 修复一些bug
|
2025-07-07 12:03:41 +08:00 |
|
曹鹏飞
|
79c970e8ef
|
feat: bug-384 用户端需要支持管理端用户添加工单和后续操作
|
2025-06-26 17:52:43 +08:00 |
|
曹鹏飞
|
b16f982650
|
feat: 产品中心
|
2025-06-25 13:35:02 +08:00 |
|
曹鹏飞
|
e90fa0738f
|
Merge branch 'feature/product' into test
# Conflicts:
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductPartController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelImageAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelVideoAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeInfoAddRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeSearchRequest.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductCaseSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductHonorSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductHonorVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductImageVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductIntroSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductIntroVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelInfoVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductPartInfoVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductPartSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeSearchVO.java
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeVO.java
# nflg-mobilebroken-product/pom.xml
# nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java
# nflg-mobilebroken-product/src/main/resources/bootstrap.properties
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCase.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductHonor.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductHonorInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntro.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModel.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFile.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelImage.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelParams.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelVideo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductSeries.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductSeriesInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductType.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductTypeInfo.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductCaseInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductCaseMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductHonorInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductHonorMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductIntroInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductIntroMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelFileMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelImageMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelVideoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeInfoMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductCaseInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductCaseMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelImageMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelVideoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductPartInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductPartMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeInfoMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
# nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java
# nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/RedisConfig.java
|
2025-06-25 10:05:12 +08:00 |
|
曹鹏飞
|
0a7d7ac9fd
|
feat: 产品中心
|
2025-06-20 15:21:31 +08:00 |
|
曹鹏飞
|
91297cc2f1
|
feat: 产品中心
|
2025-06-19 14:52:13 +08:00 |
|
曹鹏飞
|
902a3937d6
|
feat: 产品中心
|
2025-06-18 17:49:20 +08:00 |
|
曹鹏飞
|
13df05f316
|
feat: 产品中心
|
2025-06-17 18:08:49 +08:00 |
|
曹鹏飞
|
4e60b1fb32
|
feat: 产品中心
|
2025-06-16 17:16:46 +08:00 |
|
曹鹏飞
|
3064174bbf
|
feat: 产品中心，调整排序逻辑
|
2025-06-15 15:15:46 +08:00 |
|
曹鹏飞
|
e40199b564
|
feat: 产品中心
|
2025-06-14 16:46:41 +08:00 |
|
曹鹏飞
|
88cfd1df74
|
feat: 产品中心
|
2025-06-11 10:45:01 +08:00 |
|
曹鹏飞
|
878c73d602
|
feat: 产品中心
|
2025-06-11 09:49:17 +08:00 |
|
曹鹏飞
|
5a82097a6d
|
feat: 产品中心
|
2025-06-10 16:44:14 +08:00 |
|
曹鹏飞
|
73d46a1eac
|
feat: 产品中心
|
2025-06-09 16:01:13 +08:00 |
|
曹鹏飞
|
55e63b36e6
|
feat: 产品中心
|
2025-06-06 17:17:52 +08:00 |
|
曹鹏飞
|
f839f2a450
|
feat: 产品中心
|
2025-06-06 15:12:05 +08:00 |
|
曹鹏飞
|
cd54719de2
|
Merge branch 'develop' into feature/product
# Conflicts:
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java
|
2025-06-05 10:24:38 +08:00 |
|
曹鹏飞
|
89379b1683
|
feat: 产品中心
|
2025-06-05 10:23:34 +08:00 |
|
曹鹏飞
|
c99ca55169
|
feat: 产品中心
|
2025-06-04 17:59:34 +08:00 |
|
曹鹏飞
|
0596db6631
|
feat: 产品中心
|
2025-06-04 14:09:36 +08:00 |
|
曹鹏飞
|
a01c75f9a5
|
feat: 产品中心
|
2025-06-03 10:50:23 +08:00 |
|
曹鹏飞
|
64079598ef
|
feat: 产品中心
|
2025-05-30 11:11:52 +08:00 |
|
曹鹏飞
|
8bf86612ae
|
feat: 产品中心
|
2025-05-29 10:10:11 +08:00 |
|
曹鹏飞
|
505a30c4d7
|
feat: 产品中心
|
2025-05-28 17:24:44 +08:00 |
|
曹鹏飞
|
233c8ae24b
|
feat: 产品中心
|
2025-05-28 16:31:54 +08:00 |
|
曹鹏飞
|
7c88be8653
|
feat: 产品中心
|
2025-05-27 17:40:36 +08:00 |
|
曹鹏飞
|
c538581345
|
feat: bug-246 添加翻译接口
使用阿里云的机器翻译接口
|
2025-05-27 09:40:27 +08:00 |
|
曹鹏飞
|
1d493b3b2f
|
feat: 产品中心
|
2025-05-27 09:27:21 +08:00 |
|
曹鹏飞
|
485ed4d8b1
|
feat: 产品中心
|
2025-05-27 09:27:08 +08:00 |
|
曹鹏飞
|
2a1266b776
|
feat: 视频通话相关功能
|
2025-05-27 09:26:21 +08:00 |
|
曹鹏飞
|
767e25a13e
|
fix: 【bug-182】提交工单时，搜索设备编号的页面，展示的设备类型字段没有翻译，需要优化改为展示设备质保状态
|
2025-05-27 09:25:52 +08:00 |
|
曹鹏飞
|
81c1bf3a3b
|
feat: bug-246 添加翻译接口
使用阿里云的机器翻译接口
|
2025-05-27 09:18:31 +08:00 |
|
曹鹏飞
|
772d0a767e
|
Merge branch 'feature/bug-243' into develop
# Conflicts:
# nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
|
2025-05-26 16:27:18 +08:00 |
|
曹鹏飞
|
3858033f03
|
Merge branch 'feature/bug-242' into develop
|
2025-05-26 16:26:00 +08:00 |
|
曹鹏飞
|
62b3f2fa30
|
feat: bug-243 管理端权限调整，添加对客户端菜单的支持
|
2025-05-26 16:25:01 +08:00 |
|
曹鹏飞
|
fef078f783
|
feat: bug-242 用户端登录添加管理端用户登录的支持
优先查询用户端的用户，如果不是用户端的用户，则查询管理端用户
|
2025-05-26 14:04:34 +08:00 |
|
曹鹏飞
|
14535f8906
|
feat: 产品中心
|
2025-05-26 11:33:10 +08:00 |
|
曹鹏飞
|
0444cf564b
|
feat: 产品中心
|
2025-05-22 14:46:23 +08:00 |
|
曹鹏飞
|
bbdffd867f
|
feat: 视频通话相关功能
|
2025-05-20 08:45:06 +08:00 |
|
曹鹏飞
|
4cfb2e5526
|
Merge branch 'hotfix/master-20250425' into develop
|
2025-05-09 17:46:04 +08:00 |
|
曹鹏飞
|
a558a0c3bb
|
fix: 【bug-182】提交工单时，搜索设备编号的页面，展示的设备类型字段没有翻译，需要优化改为展示设备质保状态
|
2025-05-09 17:44:49 +08:00 |
|
曹鹏飞
|
b4ecf2f8f0
|
feat: 优化广告列表接口
|
2025-05-09 17:08:16 +08:00 |
|
曹鹏飞
|
c4d2342ab4
|
fix: 修复一些问题
|
2025-05-08 15:50:18 +08:00 |
|
曹鹏飞
|
8e0accc6ff
|
fix: 修复一些问题
|
2025-05-08 14:32:31 +08:00 |
|
曹鹏飞
|
3038ffd349
|
feat: 工单聊天添加对语音消息的支持
|
2025-05-05 17:46:27 +08:00 |
|
曹鹏飞
|
9162905cbd
|
feat(service): 添加撤回消息功能并优化工单查询
- 新增 sendTicketMessageWithdrawToApp 方法用于发送撤回消息通知
- 修改 TicketMapper.xml 中的工单查询 SQL，优化查询结果字段顺序
- 在 TicketVO 中添加 deviceAddress 字段用于存储设备地址
- 在 TiketController 中添加对 App 端的撤回消息通知
|
2025-05-05 13:17:52 +08:00 |
|
曹鹏飞
|
afe5d8e108
|
feat(repository): 优化用户查询和工单搜索功能
- 在 AdminUserMapper 中添加用户查询排序功能，提高查询效率
- 修复 TicketChatService 中的消息撤回逻辑，使用更准确的字符串比较方法
- 在 TicketMapper 中的工单搜索查询中添加工单描述字段
- 更新 TicketVO 中添加工单描述属性，以支持新的搜索结果
|
2025-05-05 09:28:25 +08:00 |
|
曹鹏飞
|
e6b76fd135
|
fix: 一些调整优化
|
2025-05-04 18:22:28 +08:00 |
|
曹鹏飞
|
e2c49908fc
|
Merge branch 'feature/202504' into feature/202504-1
|
2025-04-30 21:56:39 +08:00 |
|
曹鹏飞
|
def8dcbfe7
|
refactor: 重构机型部件列表接口
|
2025-04-30 21:56:23 +08:00 |
|
曹鹏飞
|
c381492d9f
|
Merge branch 'feature/202504' into feature/202504-1
|
2025-04-30 14:52:32 +08:00 |
|
曹鹏飞
|
4320f75ab0
|
fix: 修复一些bug
|
2025-04-30 14:52:17 +08:00 |
|
曹鹏飞
|
a5c8b88bb8
|
Merge branch 'feature/202504' into feature/202504-1
|
2025-04-28 14:28:19 +08:00 |
|
曹鹏飞
|
49d0adbe94
|
feat: 【bug-125】结案审核时，审核人不同意了，然后CQM更正措施后，重新点击结案审核确定了，但是之前的审核人没有收到待办提醒
保存解决方案后，给所有拒绝了之前方案的审核人添加待办消息
|
2025-04-28 11:40:06 +08:00 |
|
曹鹏飞
|
02c8b8f089
|
feat(device): 添加设备二维码导出功能
- 新增设备二维码导出接口，支持单个或多个设备二维码的导出
-优化二维码生成逻辑，增加边框和文本的处理
|
2025-04-28 11:24:12 +08:00 |
|
曹鹏飞
|
651d6189bc
|
Merge branch 'hotfix/master-20250425' into feature/202504-1
|
2025-04-25 11:29:09 +08:00 |
|
曹鹏飞
|
705ba21015
|
fix: 设备部件添加多语言支持
|
2025-04-25 11:28:56 +08:00 |
|
曹鹏飞
|
489213eec8
|
Merge branch 'hotfix/master-20250425' into feature/202504-1
# Conflicts:
# nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
|
2025-04-25 11:22:44 +08:00 |
|
曹鹏飞
|
a99b0c3ca1
|
fix: 设备部件添加多语言支持
|
2025-04-25 11:20:26 +08:00 |
|
曹鹏飞
|
037c2c1847
|
Merge branch 'hotfix/master-20250425' into feature/202504-1
|
2025-04-25 11:01:04 +08:00 |
|
曹鹏飞
|
c9ed712d29
|
fix: 设备部件添加多语言支持
|
2025-04-25 11:00:06 +08:00 |
|
曹鹏飞
|
777b596836
|
feat(admin): 添加广告管理和匿名工单功能
- 新增广告管理相关接口和页面
- 新增匿名工单提交和管理功能- 优化基础部件页面,增加类别属性字段
- 修复设备信息页面,添加区域名称字段- 更新二维码生成逻辑,支持自定义内容和样式
|
2025-04-24 10:45:01 +08:00 |
|
曹鹏飞
|
5c81feeb62
|
refactor(ticket): 重构工单相关功能
- 优化了工单详情、PDF生成、Excel导出等功能中的文件处理逻辑
- 使用 FileUploadRecordService 替代直接操作附件 URL
- 移除了冗余的 FileInfo 类，简化了文件相关数据结构
-重构了文件上传和更新逻辑，提高了代码可读性和维护性
|
2025-04-14 20:41:23 +08:00 |
|
曹鹏飞
|
e8a37d2a02
|
feat(message): 增加消息艾特功能并优化消息读取逻辑
- 在 ChatMessageVO 中添加 remindUsers 和 reminded 字段，用于表示被艾特的用户列表和是否被艾特
- 修改 SsePushService 和 TicketChatService，支持消息艾特功能
- 优化 TicketController 和 TiketController 中的消息读取逻辑，增加艾特提醒功能
- 调整消息未读状态的处理方式，提高性能和准确性
|
2025-04-07 20:28:45 +08:00 |
|
曹鹏飞
|
1a1f86c5ff
|
refactor(file): 优化文件上传和下载功能
- 修改了文件上传接口，支持 InputStream 参数
- 优化了文件下载逻辑，使用临时文件和 ZipOutputStream
- 更新了相关实体类和控制器的方法- 新增了 RemindUserRequest 和 ZipDownloadRequest 类
|
2025-04-07 17:13:02 +08:00 |
|
曹鹏飞
|
cd1775a297
|
feat(device): 新增设备导入导出功能
- 新增设备导入模板下载功能
- 实现设备新增导入功能，包括数据校验和错误反馈
- 添加设备更新导入功能，支持修改现有设备信息
- 优化设备导出功能，支持导出选中的设备- 新增设备状态和质保状态的字典项
|
2025-04-06 13:43:44 +08:00 |
|
曹鹏飞
|
63a587f39e
|
feat(file): 优化文件上传功能并添加批量下载支持
- 修改文件上传接口，返回 FileUploadVO 对象包含文件信息
- 添加文件批量下载功能，支持压缩包下载
- 更新相关实体类和控制器以适应新的文件上传逻辑- 优化文件名处理，使用 UUID 生成唯一后缀
|
2025-04-03 19:47:05 +08:00 |
|
曹鹏飞
|
4fa4e8cdf5
|
refactor(mobilebroken):调整解决方案为根本原因分析并优化权限判断逻辑
- 将 TicketInfoVO 中的 solution 字段注释从"解决方案"改为"根本原因分析"
- 优化 TicketSolutionServiceImpl 中的权限判断逻辑，增加 SaTokenAdminUtil.isLogin() 判断
|
2025-04-03 11:38:05 +08:00 |
|
曹鹏飞
|
30cf997c7b
|
refactor(repository): 优化设备查询和解决方案审核相关功能
- 修改设备查询条件，使用 LIKE 模糊匹配
- 重命名 SolutionMeasuresVO 中的 audited 字段为 approved，优化审核状态表示
- 更新 TicketSolutionServiceImpl 中的审核状态判断逻辑
|
2025-04-03 10:01:08 +08:00 |
|
曹鹏飞
|
ffce8c212b
|
feat(repository): 优化设备组件查询功能并添加文件类型获取接口- 重构 DeviceComponentQuery 类，增加 componentSort 字段用于组件排序
- 更新 DeviceComponentMapper 接口和 XML 文件，实现按组件排序查询
- 在 FileUploadRecordMapper 中添加 getFileTypes 方法，获取文件类型列表
- 在 FileUploadRecordServiceImpl 和 IFileUploadRecordService 中实现 getFileTypes 方法
- 在 FileController 中添加 getFileTypes 接口，用于获取文件类型列表
|
2025-04-02 18:10:41 +08:00 |
|
曹鹏飞
|
3b70ad41ac
|
feat(ticket): 优化工单处理逻辑和消息提醒功能
- 添加工单处理人获取接口
- 优化工单查询和处理逻辑
- 增加工单解决方案措施获取接口
- 修复工单状态和权限相关问题
- 优化消息提醒功能，支持艾特提醒
|
2025-04-02 11:54:02 +08:00 |
|
曹鹏飞
|
4d1b8c784d
|
refactor(ticket): 优化工单相关代码结构和逻辑
-调整 AdminTicketReportVO 和 AdminTicketVO 结构，优化字段顺序和注解
- 修改 DeviceMapper.xml 中的 SQL 查询，增加排序和限制条件
- 优化 DeviceServiceImpl 中的 getByDeviceNo 方法，增加空值检查
-调整 TicketController 中的工单处理逻辑，移除冗余代码
- 修改 TicketSolutionServiceImpl 中的解决方案创建逻辑，增加备注字段
- 优化 TiketController 中的设备信息获取，增加空值检查
|
2025-04-01 18:49:42 +08:00 |
|
曹鹏飞
|
1c042b9f0a
|
feat(ticket): 添加工单报表导出功能并优化工单处理逻辑
- 新增 AdminTicketReportVO 类用于工单报表导出- 添加 TicketCloseEvent 事件处理工单关闭逻辑
- 更新 TicketController，增加工单报表导出功能
- 修改 TicketEventListener 和 TicketEventPublisher，支持工单关闭事件
- 更新 TicketInfoVO，增加用户是否为处理人和 CQM 的字段
- 优化 TicketSolution 和 TicketSolutionAudit 的 equals 和 hashCode 方法
- 改进 TicketSolutionServiceImpl 中的措施删除和更新逻辑
- 在 TiketController 中添加工单关闭后的消息推送和事件发布
|
2025-03-29 10:55:38 +08:00 |
|
曹鹏飞
|
c7de80b9cf
|
feat(ticket): 添加事故等级功能并优化解决方案措施
- 在 Ticket 和 AdminTicketVO 中添加事故等级字段
- 新增 TicketAccidentLevel 枚举类
- 修改 SolutionMeasures 相关的 VO 和 Request 类
- 优化 TicketController 中的解决方案措施获取和审核逻辑
- 更新 TicketServiceImpl 中的工单创建和完成逻辑
-改进 TicketSolutionAuditServiceImpl 中的审核功能
- 重构 TicketSolutionServiceImpl 中的解决方案措施获取和保存逻辑
|
2025-03-28 20:14:00 +08:00 |
|
曹鹏飞
|
7dc106237c
|
Merge branch 'develop' into feature/ticket-add-solution
|
2025-03-25 16:58:19 +08:00 |
|
曹鹏飞
|
91dbceb80f
|
fix: 修复因存储的是UTC时间导致设备信息和用户信息的时间存储不正确的问题
|
2025-03-25 16:36:44 +08:00 |