fix ware data structure

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/WareController.java

@@ -6,7 +6,7 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.product.dto.WareDTO;
 import cn.rankin.common.utils.dto.search.SearchDTO;
-import cn.rankin.data.api.product.vo.WareVo;
+import cn.rankin.data.api.product.vo.CourseWareVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,17 +20,17 @@ public class WareController {
     private WareServiceProxy wareService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<WareVo>> search(SearchDTO searchDTO) {
+    public APIResult<Page<CourseWareVo>> search(SearchDTO searchDTO) {
         return wareService.search(searchDTO);
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<WareVo> create(@Valid @RequestBody WareDTO wareDTO) {
+    public APIResult<CourseWareVo> create(@Valid @RequestBody WareDTO wareDTO) {
         return wareService.create(wareDTO);
     }
 
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<WareVo> update(@Valid @RequestBody WareDTO wareDTO) {
+    public APIResult<CourseWareVo> update(@Valid @RequestBody WareDTO wareDTO) {
         if (wareDTO.getId() == null) {
             return APIResult.error(APICode.error("参数错误: id"));
         }
@@ -43,7 +43,7 @@ public class WareController {
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public APIResult<WareVo> getWare(@PathVariable("id") String id) {
+    public APIResult<CourseWareVo> getWare(@PathVariable("id") String id) {
         return wareService.getWare(id);
     }
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/WareService.java

@@ -3,7 +3,7 @@ package cn.rankin.cmsweb.service.product;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.product.dto.WareDTO;
-import cn.rankin.data.api.product.vo.WareVo;
+import cn.rankin.data.api.product.entity.CourseWare;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,17 +13,17 @@ import java.util.Map;
 public interface WareService {
 
     @RequestMapping(value = "/ware/list", method = RequestMethod.GET)
-    APIResult<Page<WareVo>> search(@RequestParam Map<String, Object> searchDTO);
+    APIResult<Page<CourseWare>> search(@RequestParam Map<String, Object> searchDTO);
 
     @RequestMapping(value = "/ware", method = RequestMethod.POST)
-    APIResult<WareVo> create(@RequestBody WareDTO wareDTO);
+    APIResult<CourseWare> create(@RequestBody WareDTO wareDTO);
 
     @RequestMapping(value = "/ware", method = RequestMethod.PUT)
-    APIResult<WareVo> update(@RequestBody WareDTO wareDTO);
+    APIResult<CourseWare> update(@RequestBody WareDTO wareDTO);
 
     @RequestMapping(value = "/ware/{id}", method = RequestMethod.DELETE)
     APIResult delete(@PathVariable("id") String id);
 
     @RequestMapping(value = "/ware/{id}", method = RequestMethod.GET)
-    APIResult<WareVo> getWare(@PathVariable("id") String id);
+    APIResult<CourseWare> getWare(@PathVariable("id") String id);
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/proxy/WareServiceProxy.java

@@ -7,10 +7,11 @@ import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.product.dto.WareDTO;
 import cn.rankin.common.utils.dto.search.SearchDTO;
 import cn.rankin.common.utils.util.BeanUtil;
-import cn.rankin.data.api.product.vo.WareVo;
+import cn.rankin.data.api.product.entity.CourseWare;
+import cn.rankin.data.api.product.vo.CourseWareVo;
 import cn.rankin.common.utils.vo.resource.ResourceVo;
-import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -30,46 +31,51 @@ public class WareServiceProxy {
     @Autowired
     private ResourceService resourceService;
 
-    public APIResult<Page<WareVo>> search(SearchDTO searchDTO) {
+    public APIResult<Page<CourseWareVo>> search(SearchDTO searchDTO) {
         Map<String, Object> params = BeanUtil.convertToMap(searchDTO);
-        APIResult<Page<WareVo>> result = wareService.search(params);
+        APIResult<Page<CourseWare>> result = wareService.search(params);
+        Page<CourseWare> page = result.getData();
+
+        Page<CourseWareVo> voPage = new Page(page.getTotalSize(), page.getPageNo(), page.getPageSize());
         if (result.getSuccess()) {
-            List<WareVo> wareVoList = result.getData().getList();
-            setWareUrl(wareVoList);
-            log.info(JSON.toJSONString(wareVoList));
+            List<CourseWare> courseWareList = result.getData().getList();
+            voPage.setList(setWareUrl(courseWareList));
         }
-        return result;
+        return APIResult.ok(voPage);
     }
 
-    public APIResult<WareVo> create(WareDTO wareDTO) {
-        APIResult<WareVo> result = wareService.create(wareDTO);
+    public APIResult<CourseWareVo> create(WareDTO wareDTO) {
+        CourseWareVo courseWareVo = null;
+        APIResult<CourseWare> result = wareService.create(wareDTO);
         if (result.getSuccess()) {
-            WareVo wareVo = result.getData();
-            setWareUrl(wareVo);
+            CourseWare courseWare = result.getData();
+            courseWareVo = setWareUrl(courseWare);
         }
-        return result;
+        return APIResult.ok(courseWareVo);
     }
 
-    public APIResult<WareVo> update(WareDTO wareDTO) {
-        APIResult<WareVo> result = wareService.update(wareDTO);
+    public APIResult<CourseWareVo> update(WareDTO wareDTO) {
+        CourseWareVo courseWareVo = null;
+        APIResult<CourseWare> result = wareService.update(wareDTO);
         if (result.getSuccess()) {
-            WareVo wareVo = result.getData();
-            setWareUrl(wareVo);
+            CourseWare courseWare = result.getData();
+            courseWareVo = setWareUrl(courseWare);
         }
-        return result;
+        return APIResult.ok(courseWareVo);
     }
 
     public APIResult delete(String id) {
         return wareService.delete(id);
     }
 
-    public APIResult<WareVo> getWare(String id) {
-        APIResult<WareVo> result = wareService.getWare(id);
+    public APIResult<CourseWareVo> getWare(String id) {
+        CourseWareVo courseWareVo = null;
+        APIResult<CourseWare> result = wareService.getWare(id);
         if (result.getSuccess()) {
-            WareVo wareVo = result.getData();
-            setWareUrl(wareVo);
+            CourseWare courseWare = result.getData();
+            courseWareVo = setWareUrl(courseWare);
         }
-        return result;
+        return APIResult.ok(courseWareVo);
     }
 
     public Map<String, ResourceVo> getResourceMap(List<String> idList) {
@@ -90,13 +96,14 @@ public class WareServiceProxy {
         return apiResult.getData();
     }
 
-    public void setWareUrl(List<WareVo> wareVoList) {
-        if (wareVoList == null) {
-            return;
+    public List<CourseWareVo> setWareUrl(List<CourseWare> courseWareList) {
+        List<CourseWareVo> courseWareVoList = new ArrayList<>();
+        if (CollectionUtils.isEmpty(courseWareList)) {
+            return courseWareVoList;
         }
 
         List<String> idList = new ArrayList<>();
-        wareVoList.forEach(e -> {
+        courseWareList.forEach(e -> {
             List<String> resourceIdList = e.getResourceList();
             if (!CollectionUtils.isEmpty(resourceIdList)) {
                 idList.addAll(resourceIdList);
@@ -105,9 +112,14 @@ public class WareServiceProxy {
 
         Map<String, ResourceVo> resourceVoMap = getResourceMap(idList);
 
-        for (WareVo wareVo : wareVoList) {
-            List<String> resourceIdList = wareVo.getResourceList();
-            if (CollectionUtils.isEmpty(resourceIdList)) break;
+        for (CourseWare courseWare : courseWareList) {
+            CourseWareVo courseWareVo = new CourseWareVo();
+            BeanUtils.copyProperties(courseWare, courseWareVo);
+            List<String> resourceIdList = courseWare.getResourceList();
+            if (CollectionUtils.isEmpty(resourceIdList)) {
+                courseWareVoList.add(courseWareVo);
+                continue;
+            }
 
             List<ResourceVo> resourceVoList = new ArrayList<>();
             for (String resourceId : resourceIdList) {
@@ -116,18 +128,24 @@ public class WareServiceProxy {
                     resourceVoList.add(resourceVo);
                 }
             }
-            wareVo.setResourceVoList(resourceVoList);
+            courseWareVo.setResourceList(resourceVoList);
+            courseWareVoList.add(courseWareVo);
         }
+
+        return courseWareVoList;
     }
 
-    public void setWareUrl(WareVo wareVo) {
-        if (wareVo == null || wareVo.getResourceList() == null) {
-            return;
+    public CourseWareVo setWareUrl(CourseWare courseWare) {
+        CourseWareVo courseWareVo = new CourseWareVo();
+        BeanUtils.copyProperties(courseWare, courseWareVo);
+
+        if (courseWare == null || courseWare.getResourceList() == null) {
+            return courseWareVo;
         }
 
-        List<String> resourceIdList = wareVo.getResourceList();
+        List<String> resourceIdList = courseWare.getResourceList();
         if (CollectionUtils.isEmpty(resourceIdList)) {
-            return;
+            return courseWareVo;
         }
 
         Map<String, ResourceVo> resourceVoMap = getResourceMap(resourceIdList);
@@ -135,11 +153,12 @@ public class WareServiceProxy {
         List<ResourceVo> resourceVoList = new ArrayList<>();
         for (String resourceId : resourceIdList) {
             ResourceVo resourceVo = resourceVoMap.get(resourceId);
-//            ResourceVo resourceVo = (ResourceVo) resourceVoMap.values().toArray()[0];
             if (resourceVo != null) {
                 resourceVoList.add(resourceVo);
             }
         }
-        wareVo.setResourceVoList(resourceVoList);
+        courseWareVo.setResourceList(resourceVoList);
+
+        return courseWareVo;
     }
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Courseware.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Table(name = "p_courseware", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate
-public class Courseware implements Serializable{
+public class CourseWare implements Serializable{
 
     @Id
     private String id;

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Lesson.java

@@ -47,5 +47,5 @@ public class Lesson implements Serializable {
     private Date gmtModified;
 
     @Transient
-    private List<Courseware> coursewareList;
+    private List<CourseWare> courseWareList;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/WareVo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class WareVo implements Serializable {
+public class CourseWareVo implements Serializable {
 
     private String id;
 
@@ -20,9 +20,9 @@ public class WareVo implements Serializable {
 
     private String digest;
 
-    private List<String> resourceList;
+//    private List<String> resourceList;
 
-    private List<ResourceVo> resourceVoList;
+    private List<ResourceVo> resourceList;
 
     private String cpId;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/LessonVo.java

@@ -18,6 +18,6 @@ public class LessonVo implements Serializable {
 
     private Integer sort;
 
-    private List<WareVo> wareList;
+    private List<CourseWareVo> wareList;
 
 }

rankin-product-service/src/main/java/cn/rankin/productservice/controller/LessonController.java

@@ -37,7 +37,7 @@ public class LessonController {
     private LessonWareRelationService lessonWareRelationService;
 
     @Autowired
-    private CoursewareService coursewareService;
+    private WareService wareService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public APIResult<Page<Lesson>> search(SearchDTO searchDTO) {
@@ -87,8 +87,8 @@ public class LessonController {
             }
         };
 
-        APIResult<List<Courseware>> wareList = coursewareService.findByIds(wareIdList);
-        lesson.setCoursewareList(wareList.getData());
+        APIResult<List<CourseWare>> wareList = wareService.findByIds(wareIdList);
+        lesson.setCourseWareList(wareList.getData());
 
         return result;
 
@@ -116,16 +116,16 @@ public class LessonController {
             return result;
         }
 
-        APIResult<List<Courseware>> wareResult = updateRelation(Id, wareIdList);
+        APIResult<List<CourseWare>> wareResult = updateRelation(Id, wareIdList);
         if (!wareResult.getSuccess()) {
             // 显示回滚
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return APIResult.error(new BaseCode(wareResult.getCode(), wareResult.getMessage()));
         }
 
-        List<Courseware> coursewareList = wareResult.getData();
-        if (coursewareList != null) {
-            result.getData().setCoursewareList(coursewareList);
+        List<CourseWare> courseWareList = wareResult.getData();
+        if (courseWareList != null) {
+            result.getData().setCourseWareList(courseWareList);
         }
 
         return result;
@@ -140,19 +140,19 @@ public class LessonController {
         }
 
         List<String> wareIdList = lessonDTO.getWareList();
-        List<Courseware> coursewareList = new ArrayList<>();
+        List<CourseWare> courseWareList = new ArrayList<>();
         if (wareIdList != null) {
-            APIResult<List<Courseware>> wareResult = updateRelation(Id, wareIdList);
+            APIResult<List<CourseWare>> wareResult = updateRelation(Id, wareIdList);
             if (!wareResult.getSuccess()) {
                 return APIResult.error(new BaseCode(wareResult.getCode(), wareResult.getMessage()));
             }else {
-                coursewareList = wareResult.getData();
+                courseWareList = wareResult.getData();
             }
         }
 
         APIResult<Lesson> result = lessonService.update(lessonDTO);
         if (result.getSuccess() && result.getData() != null) {
-            result.getData().setCoursewareList(coursewareList);
+            result.getData().setCourseWareList(courseWareList);
         }
 
         return result;
@@ -187,24 +187,24 @@ public class LessonController {
 
     // 更新课与课件的关系
     @Transactional
-    public APIResult<List<Courseware>> updateRelation(String lessonId, List<String> wareIdList) {
+    public APIResult<List<CourseWare>> updateRelation(String lessonId, List<String> wareIdList) {
         if (wareIdList == null) {
             return APIResult.ok();
         }
 
-        List<Courseware> coursewareList = new ArrayList<>();
+        List<CourseWare> courseWareList = new ArrayList<>();
         if (wareIdList.size() == 0) {
             lessonWareRelationService.deleteByLessonId(lessonId);
         }else {
             // 验证wareId的正确性
-            APIResult<List<Courseware>> wareResult = coursewareService.findByIds(wareIdList);
-            coursewareList = wareResult.getData();
-            if (coursewareList == null || coursewareList.size() != wareIdList.size()) {
+            APIResult<List<CourseWare>> wareResult = wareService.findByIds(wareIdList);
+            courseWareList = wareResult.getData();
+            if (courseWareList == null || courseWareList.size() != wareIdList.size()) {
                 return APIResult.error(APICode.error("存在错误的课件"));
             }
             lessonWareRelationService.update(lessonId, wareIdList);
         }
 
-        return APIResult.ok(coursewareList);
+        return APIResult.ok(courseWareList);
     }
 }

rankin-product-service/src/main/java/cn/rankin/productservice/controller/WareController.java

@@ -8,10 +8,10 @@ import cn.rankin.data.api.product.dto.WareDTO;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.data.api.product.entity.Lesson;
 import cn.rankin.data.api.product.entity.LessonWareRelation;
-import cn.rankin.data.api.product.entity.Courseware;
+import cn.rankin.data.api.product.entity.CourseWare;
 import cn.rankin.productservice.service.LessonService;
 import cn.rankin.productservice.service.LessonWareRelationService;
-import cn.rankin.productservice.service.CoursewareService;
+import cn.rankin.productservice.service.WareService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +27,7 @@ import java.util.List;
 public class WareController {
 
     @Autowired
-    private CoursewareService coursewareService;
+    private WareService wareService;
 
     @Autowired
     private LessonWareRelationService relationService;
@@ -36,43 +36,43 @@ public class WareController {
     private LessonService lessonService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<Courseware>> search(SearchDTO searchDTO) {
-        Courseware Courseware = new Courseware();
+    public APIResult<Page<CourseWare>> search(SearchDTO searchDTO) {
+        CourseWare CourseWare = new CourseWare();
 
         String code = searchDTO.getCode();
         if (!StringUtils.isEmpty(code)) {
-            Courseware.setCode("%" + code + "%");
+            CourseWare.setCode("%" + code + "%");
         }
 
         String name = searchDTO.getName();
         if (!StringUtils.isEmpty(name)) {
-            Courseware.setName("%" + name + "%");
+            CourseWare.setName("%" + name + "%");
         }
 
-        Courseware.setStatus(searchDTO.getStatus());
+        CourseWare.setStatus(searchDTO.getStatus());
 
         // sort
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap() { {
             this.put("gmtModified", BaseOrderEnum.DESC);
         }};
 
-        return coursewareService.search(Courseware, searchDTO.getPageNo(), searchDTO.getPageSize(), sort);
+        return wareService.search(CourseWare, searchDTO.getPageNo(), searchDTO.getPageSize(), sort);
     }
 
     // 创建资源
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<Courseware> create(@Valid @RequestBody WareDTO wareDTO) {
-        return coursewareService.create(wareDTO);
+    public APIResult<CourseWare> create(@Valid @RequestBody WareDTO wareDTO) {
+        return wareService.create(wareDTO);
     }
 
     // 修改资源
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<Courseware> update(@Valid @RequestBody WareDTO wareDTO) {
+    public APIResult<CourseWare> update(@Valid @RequestBody WareDTO wareDTO) {
         if (wareDTO.getId() == null) {
             return APIResult.error(APICode.error("参数错误: id"));
         }
 
-        return coursewareService.update(wareDTO);
+        return wareService.update(wareDTO);
     }
 
     // 删除资源
@@ -80,7 +80,7 @@ public class WareController {
     public APIResult delete(@NotNull @PathVariable("id") String id) {
         List<LessonWareRelation> existRel = relationService.findByWareId(id);
         if (existRel == null || existRel.size() == 0) {
-            return coursewareService.delete(id);
+            return wareService.delete(id);
         }
 
         List<String> lessonIds = new ArrayList<>();
@@ -102,8 +102,8 @@ public class WareController {
 
     // 取一个
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public APIResult<Courseware> getWare(@PathVariable("id") String id) {
-        return coursewareService.findById(id);
+    public APIResult<CourseWare> getWare(@PathVariable("id") String id) {
+        return wareService.findById(id);
     }
 
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/WareRepository.java

@@ -2,7 +2,7 @@ package cn.rankin.productservice.repository;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
-import cn.rankin.data.api.product.entity.Courseware;
+import cn.rankin.data.api.product.entity.CourseWare;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -11,17 +11,17 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface WareRepository extends BasicJpaRepository<Courseware, String> {
+public interface WareRepository extends BasicJpaRepository<CourseWare, String> {
 
     Long countByCode(String code);
 
     Long countByIdIn(List<String> Ids);
 
     @Modifying(clearAutomatically = true)
-    @Query(value = "update Courseware w set w.status = :status  where w.id = :id")
+    @Query(value = "update CourseWare w set w.status = :status  where w.id = :id")
     Integer deleteAllById(@Param("id") String id, @Param("status") BaseStatusEnum status);
 
-    @Query(value = "select w from Courseware w where w.id in (:ids) and w.status = :status")
-    List<Courseware> findByIdIn(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);
+    @Query(value = "select w from CourseWare w where w.id in (:ids) and w.status = :status")
+    List<CourseWare> findByIdIn(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);
 
 }

rankin-product-service/src/main/java/cn/rankin/productservice/service/CoursewareService.java

@@ -8,7 +8,7 @@ import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.common.utils.util.ListUtil;
-import cn.rankin.data.api.product.entity.Courseware;
+import cn.rankin.data.api.product.entity.CourseWare;
 import cn.rankin.productservice.repository.WareRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,21 +21,21 @@ import static cn.rankin.productservice.utils.DTOConverter.convert;
 
 @Slf4j
 @Service
-public class CoursewareService {
+public class WareService {
 
     @Autowired
     private WareRepository wareRepository;
 
-    public APIResult<Page<Courseware>> search(Courseware Courseware, Integer pageNo, Integer pageSize, LinkedHashMap<String, BaseOrderEnum> sort) {
-        Long count = wareRepository.count(Courseware);
-        Page<Courseware> page = new Page(count, pageNo, pageSize);
+    public APIResult<Page<CourseWare>> search(CourseWare CourseWare, Integer pageNo, Integer pageSize, LinkedHashMap<String, BaseOrderEnum> sort) {
+        Long count = wareRepository.count(CourseWare);
+        Page<CourseWare> page = new Page(count, pageNo, pageSize);
 
         if (count == 0) {
             return APIResult.ok(page);
         }
 
-        List<Courseware> coursewareList = wareRepository.find(Courseware, page.getStart(), pageSize, JpaSortUtil.sort(sort));
-        page.setList(coursewareList);
+        List<CourseWare> courseWareList = wareRepository.find(CourseWare, page.getStart(), pageSize, JpaSortUtil.sort(sort));
+        page.setList(courseWareList);
 
         return APIResult.ok(page);
     }
@@ -46,19 +46,19 @@ public class CoursewareService {
     }
 
     @Transactional
-    public APIResult<Courseware> create(WareDTO wareDTO) {
-        Courseware Courseware = convert(wareDTO);
-        if (exists(Courseware.getCode())) {
+    public APIResult<CourseWare> create(WareDTO wareDTO) {
+        CourseWare CourseWare = convert(wareDTO);
+        if (exists(CourseWare.getCode())) {
             return APIResult.error(APICode.ALREADY_EXISTS);
         }
-        Courseware result = wareRepository.save(Courseware);
+        CourseWare result = wareRepository.save(CourseWare);
         return APIResult.ok(result);
     }
 
     @Transactional
-    public APIResult<Courseware> update(WareDTO wareDTO) {
-        Courseware Courseware = convert(wareDTO);
-        Courseware result = wareRepository.update(Courseware);
+    public APIResult<CourseWare> update(WareDTO wareDTO) {
+        CourseWare CourseWare = convert(wareDTO);
+        CourseWare result = wareRepository.update(CourseWare);
 
         return APIResult.ok(result);
     }
@@ -72,30 +72,30 @@ public class CoursewareService {
         return APIResult.error(APICode.NOT_EXISTS);
     }
 
-    public APIResult<Courseware> findById(String id) {
-        Courseware Courseware = wareRepository.find(id);
-        if (Courseware == null) {
+    public APIResult<CourseWare> findById(String id) {
+        CourseWare CourseWare = wareRepository.find(id);
+        if (CourseWare == null) {
             return APIResult.error(APICode.NOT_EXISTS);
         }
-        return APIResult.ok(Courseware);
+        return APIResult.ok(CourseWare);
     }
 
-    public APIResult<List<Courseware>> findByIds(List<String> ids) {
-        List<Courseware> coursewareList = wareRepository.findByIdIn(ids, BaseStatusEnum.NORMAL);
+    public APIResult<List<CourseWare>> findByIds(List<String> ids) {
+        List<CourseWare> courseWareList = wareRepository.findByIdIn(ids, BaseStatusEnum.NORMAL);
 
-        if (coursewareList == null || coursewareList.size() == 0) {
-            return APIResult.ok(coursewareList);
+        if (courseWareList == null || courseWareList.size() == 0) {
+            return APIResult.ok(courseWareList);
         }
 
-        Map<String, Courseware> wareMap = ListUtil.convert(coursewareList, "id", Courseware.class);
-        List<Courseware> sortCoursewareList = new ArrayList<>();
+        Map<String, CourseWare> wareMap = ListUtil.convert(courseWareList, "id", CourseWare.class);
+        List<CourseWare> sortCourseWareList = new ArrayList<>();
         ids.forEach( id -> {
-            Courseware Courseware = wareMap.get(id);
-            if (Courseware != null) {
-                sortCoursewareList.add(Courseware);
+            CourseWare CourseWare = wareMap.get(id);
+            if (CourseWare != null) {
+                sortCourseWareList.add(CourseWare);
             }
         });
 
-        return APIResult.ok(sortCoursewareList);
+        return APIResult.ok(sortCourseWareList);
     }
 }

rankin-product-service/src/main/java/cn/rankin/productservice/utils/DTOConverter.java

@@ -21,10 +21,10 @@ public class DTOConverter {
     }
 
     // WareDTO to Ware
-    public static Courseware convert(WareDTO wareDTO) {
-        Courseware Courseware = new Courseware();
-        BeanUtils.copyProperties(wareDTO, Courseware);
-        return Courseware;
+    public static CourseWare convert(WareDTO wareDTO) {
+        CourseWare CourseWare = new CourseWare();
+        BeanUtils.copyProperties(wareDTO, CourseWare);
+        return CourseWare;
     }
 
     // SupportDTO to Support