wangqifan 3 jaren geleden
bovenliggende
commit
0f0fee114d

+ 6 - 7
src/main/java/com/izouma/nineth/service/UserDetailService.java

@@ -3,7 +3,6 @@ package com.izouma.nineth.service;
 import com.izouma.nineth.domain.UserDetail;
 import com.izouma.nineth.domain.UserDetail;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.AssetRepo;
-import com.izouma.nineth.repo.UserDetailRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
@@ -15,12 +14,12 @@ import java.util.Map;
 @AllArgsConstructor
 @AllArgsConstructor
 public class UserDetailService {
 public class UserDetailService {
 
 
-    private UserDetailRepo userDetailRepo;
-    private AssetRepo assetRepo;
-
-    public Page<UserDetail> all(PageQuery pageQuery) {
-        return userDetailRepo.findAll(JpaUtils.toSpecification(pageQuery, UserDetail.class), JpaUtils.toPageRequest(pageQuery));
-    }
+//    private UserDetailRepo userDetailRepo;
+//    private AssetRepo assetRepo;
+//
+//    public Page<UserDetail> all(PageQuery pageQuery) {
+//        return userDetailRepo.findAll(JpaUtils.toSpecification(pageQuery, UserDetail.class), JpaUtils.toPageRequest(pageQuery));
+//    }
 
 
 //    public Map<String,Long> userHoldCount(Long userId) {
 //    public Map<String,Long> userHoldCount(Long userId) {
 //        //查询绿洲元宇宙建筑
 //        //查询绿洲元宇宙建筑

+ 47 - 48
src/main/java/com/izouma/nineth/web/UserDetailController.java

@@ -5,7 +5,6 @@ import com.izouma.nineth.service.ContentAuditService;
 import com.izouma.nineth.service.UserDetailService;
 import com.izouma.nineth.service.UserDetailService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.UserDetailRepo;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
@@ -25,52 +24,52 @@ import java.util.List;
 @RequestMapping("/userDetail")
 @RequestMapping("/userDetail")
 @AllArgsConstructor
 @AllArgsConstructor
 public class UserDetailController extends BaseController {
 public class UserDetailController extends BaseController {
-    private UserDetailService userDetailService;
-    private UserDetailRepo userDetailRepo;
-    private ContentAuditService contentAuditService;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public UserDetail save(@RequestBody UserDetail record) {
-        Long currentUserId = SecurityUtils.getAuthenticatedUser().getId();
-        if (currentUserId != record.getUserId()) {
-            throw new BusinessException("当前修改用户与登录用户不一致");
-        }
-        if (StringUtils.isNotBlank(record.getAutograph())) {
-            if (!contentAuditService.auditText(record.getAutograph())) {
-                throw new BusinessException("简介包含非法内容");
-            }
-        }
-        if (record.getUserId() != null) {
-            UserDetail orig = userDetailRepo.findById(record.getUserId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return userDetailRepo.save(orig);
-        }
-        return userDetailRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<UserDetail> all(@RequestBody PageQuery pageQuery) {
-        return userDetailService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public UserDetail get(@PathVariable Long id) {
-        return userDetailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        userDetailRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<UserDetail> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
+//    private UserDetailService userDetailService;
+//    private UserDetailRepo userDetailRepo;
+//    private ContentAuditService contentAuditService;
+//
+//    //@PreAuthorize("hasRole('ADMIN')")
+//    @PostMapping("/save")
+//    public UserDetail save(@RequestBody UserDetail record) {
+//        Long currentUserId = SecurityUtils.getAuthenticatedUser().getId();
+//        if (currentUserId != record.getUserId()) {
+//            throw new BusinessException("当前修改用户与登录用户不一致");
+//        }
+//        if (StringUtils.isNotBlank(record.getAutograph())) {
+//            if (!contentAuditService.auditText(record.getAutograph())) {
+//                throw new BusinessException("简介包含非法内容");
+//            }
+//        }
+//        if (record.getUserId() != null) {
+//            UserDetail orig = userDetailRepo.findById(record.getUserId()).orElseThrow(new BusinessException("无记录"));
+//            ObjUtils.merge(orig, record);
+//            return userDetailRepo.save(orig);
+//        }
+//        return userDetailRepo.save(record);
+//    }
+//
+//
+//    //@PreAuthorize("hasRole('ADMIN')")
+//    @PostMapping("/all")
+//    public Page<UserDetail> all(@RequestBody PageQuery pageQuery) {
+//        return userDetailService.all(pageQuery);
+//    }
+//
+//    @GetMapping("/get/{id}")
+//    public UserDetail get(@PathVariable Long id) {
+//        return userDetailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+//    }
+//
+//    @PostMapping("/del/{id}")
+//    public void del(@PathVariable Long id) {
+//        userDetailRepo.softDelete(id);
+//    }
+//
+//    @GetMapping("/excel")
+//    @ResponseBody
+//    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+//        List<UserDetail> data = all(pageQuery).getContent();
+//        ExcelUtils.export(response, data);
+//    }
 }
 }