ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-16 12:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

update modules/core: mod 3 files

Browse Source
This commit is contained in:
jack ning
2025-05-03 11:20:22 +08:00
parent bc776d1bcc
commit ebf444a5bb
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/main/java/com/bytedesk/core/action/ActionRepository.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-04-25 15:40:53
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-05-30 16:10:00
* @LastEditTime: 2025-05-03 10:57:55
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -13,9 +13,12 @@
*/
package com.bytedesk.core.action;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
public interface ActionRepository extends JpaRepository<ActionEntity, Long>, JpaSpecificationExecutor<ActionEntity> {
Optional<ActionEntity> findByUid(String uid);
}

4
modules/core/src/main/java/com/bytedesk/core/action/ActionRestController.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-04-25 15:40:19
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-03 10:47:49
* @LastEditTime: 2025-05-03 10:50:55
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -77,7 +77,7 @@ public class ActionRestController extends BaseRestController<ActionRequest> {
actionRestService.delete(request);
return ResponseEntity.ok(JsonResult.success("ok"));
return ResponseEntity.ok(JsonResult.success());
}
// https://github.com/alibaba/easyexcel

22
modules/core/src/main/java/com/bytedesk/core/action/ActionRestService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-04-25 15:41:47
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-03 10:47:10
* @LastEditTime: 2025-05-03 10:56:40
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -16,6 +16,7 @@ package com.bytedesk.core.action;
import java.util.Optional;
import org.modelmapper.ModelMapper;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
@@ -61,10 +62,10 @@ public class ActionRestService extends BaseRestServiceWithExcel<ActionEntity, Ac
throw new UnsupportedOperationException("Unimplemented method 'queryByUser'");
}
@Cacheable(cacheNames = "action", key = "#request.uid", unless = "#result == null")
@Override
public Optional<ActionEntity> findByUid(String uid) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'findByUid'");
return actionRepository.findByUid(uid);
}
public ActionResponse create(ActionRequest actionRequest) {
@@ -81,7 +82,7 @@ public class ActionRestService extends BaseRestServiceWithExcel<ActionEntity, Ac
}
ActionEntity savedAction = save(action);
if (savedAction == null) {
// TODO: handle exception
throw new RuntimeException("create action failed");
}
//
return convertToResponse(savedAction);
@@ -89,8 +90,15 @@ public class ActionRestService extends BaseRestServiceWithExcel<ActionEntity, Ac
@Override
public ActionResponse update(ActionRequest request) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'update'");
Optional<ActionEntity> actionOptional = findByUid(request.getUid());
if (actionOptional.isPresent()) {
ActionEntity action = actionOptional.get();
modelMapper.map(request, action);
//
ActionEntity savedAction = save(action);
return convertToResponse(savedAction);
}
return null;
}
@Override
@@ -111,7 +119,7 @@ public class ActionRestService extends BaseRestServiceWithExcel<ActionEntity, Ac
if (actionOptional.isPresent()) {
ActionEntity action = actionOptional.get();
action.setDeleted(true);
actionRepository.save(action);
save(action);
}
}