教育培训代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/SysLearningMaterialsUpdateDto.java

@@ -0,0 +1,42 @@
+package com.xunmei.common.core.domain.edu.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/3 16:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "学习资料新增对象", description = "学习资料")
+public class SysLearningMaterialsUpdateDto {
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+    @ApiModelProperty(value = "资料标题")
+    private String title;
+
+    @ApiModelProperty(value = "资料内容")
+    private String content;
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    @ApiModelProperty(value = "资料类型(知识库标签)")
+    private Long knowledgeId;
+
+    @ApiModelProperty(value = "所属机构")
+    private Long orgId;
+
+    @ApiModelProperty(value = "附件")
+    private List<String> fileList;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/SysLearningMaterialsController.java

@@ -3,6 +3,7 @@ package com.xunmei.core.edu.controller;
 import com.xunmei.common.core.domain.edu.domain.SysLearningMaterials;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsInsertDto;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsPageDto;
+import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsUpdateDto;
 import com.xunmei.core.edu.service.ISysLearningMaterialsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -77,7 +78,7 @@ public class SysLearningMaterialsController extends BaseController {
     @RequiresPermissions("core:materials:edit")
     @Log(title = "学习资料", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysLearningMaterials sysLearningMaterials) {
+    public AjaxResult edit(@RequestBody SysLearningMaterialsUpdateDto sysLearningMaterials) {
         return toAjax(sysLearningMaterialsService.updateSysLearningMaterials(sysLearningMaterials));
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ISysLearningMaterialsService.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsInsertDto;
+import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsUpdateDto;
 import com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsDetailVo;
 import com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsFileListVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -50,7 +51,7 @@ public interface ISysLearningMaterialsService extends IService<SysLearningMateri
      * @param sysLearningMaterials 学习资料
      * @return 结果
      */
-    public int updateSysLearningMaterials(SysLearningMaterials sysLearningMaterials);
+    public int updateSysLearningMaterials(SysLearningMaterialsUpdateDto sysLearningMaterials);
 
     /**
      * 批量删除学习资料

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -13,6 +13,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.edu.domain.SysLearningMaterials;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsInsertDto;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsPageDto;
+import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsUpdateDto;
 import com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsDetailVo;
 import com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsFileListVo;
 import com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsPageVo;
@@ -159,10 +160,13 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
      * @return 结果
      */
     @Override
-    public int updateSysLearningMaterials(SysLearningMaterials sysLearningMaterials) {
-        sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
-        sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
-        return sysLearningMaterialsMapper.updateById(sysLearningMaterials);
+    public int updateSysLearningMaterials(SysLearningMaterialsUpdateDto request) {
+        final SysLearningMaterials materials = getById(request.getId());
+        BeanUtils.copyProperties(request, materials);
+        materials.setFileList(ObjectUtil.isNotEmpty(request.getFileList())?JSON.toJSONString(request.getFileList()):null);
+        materials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+        materials.setUpdateTime(DateUtils.getNowDate());
+        return sysLearningMaterialsMapper.updateById(materials);
     }
 
     /**