Explorar o código

Merge branch 'task-case' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/controller/ArticleController.java
#	src/main/java/com/fdkankan/ucenter/entity/Case.java
#	src/main/java/com/fdkankan/ucenter/mapper/ICaseMapper.java
#	src/main/java/com/fdkankan/ucenter/service/ICaseService.java
#	src/main/java/com/fdkankan/ucenter/service/impl/CaseServiceImpl.java
lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
17fab9e2c5

+ 2 - 7
src/main/java/com/fdkankan/ucenter/controller/ArticleController.java

@@ -13,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.PostConstruct;
-
 /**
  * <p>
  *  前端控制器
@@ -29,17 +27,15 @@ public class ArticleController extends BaseController {
 
     @Autowired
     ICaseService caseService;
-    @Autowired
-    IArticleService articleService;
     /**
      * 行业解决方案-案例展示
      */
     @PostMapping("/detail")
-    public Result detail(@RequestBody Article caseEntity) throws Exception {
+    public Result detail(@RequestBody Case caseEntity) throws Exception {
         if(ObjectUtils.isEmpty(caseEntity.getId())){
             return Result.success();
         }
-        return Result.success(articleService.getById(caseEntity.getId()));
+        return Result.success(caseService.getById(caseEntity.getId()));
     }
 
     @PostMapping("/allList")
@@ -58,6 +54,5 @@ public class ArticleController extends BaseController {
         wrapper.orderByAsc(Case::getId);
         return Result.success(caseService.list(wrapper));
     }
-
 }
 

+ 1 - 1
src/main/java/com/fdkankan/ucenter/entity/Case.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2023-08-08
+ * @since 2023-08-11
  */
 @Getter
 @Setter

+ 1 - 1
src/main/java/com/fdkankan/ucenter/mapper/ICaseMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2023-08-08
+ * @since 2023-08-11
  */
 @Mapper
 public interface ICaseMapper extends BaseMapper<Case> {

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/ICaseService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 
- * @since 2023-08-08
+ * @since 2023-08-11
  */
 public interface ICaseService extends IService<Case> {
 

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/CaseServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2023-08-08
+ * @since 2023-08-11
  */
 @Service
 public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements ICaseService {