Эх сурвалжийг харах

1.编写通用已读功能
2.编写站内信封装列表接口
3.将资源新增去除部分限制

honorfire 6 сар өмнө
parent
commit
790b803906

+ 6 - 0
snowy-plugin/snowy-plugin-dev/snowy-plugin-dev-func/src/main/java/vip/xiaonuo/dev/modular/message/controller/DevMessageController.java

@@ -33,8 +33,12 @@ import vip.xiaonuo.dev.modular.message.result.DevMessageResult;
 import vip.xiaonuo.dev.modular.message.service.DevMessageService;
 import vip.xiaonuo.dev.modular.message.service.DevMessageService;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 站内信控制器
  * 站内信控制器
@@ -79,6 +83,8 @@ public class DevMessageController {
         return CommonResult.data(devMessageService.page(devMessagePageParam));
         return CommonResult.data(devMessageService.page(devMessagePageParam));
     }
     }
 
 
+
+
     /**
     /**
      * 删除站内信
      * 删除站内信
      *
      *

+ 6 - 0
snowy-plugin/snowy-plugin-dev/snowy-plugin-dev-func/src/main/java/vip/xiaonuo/dev/modular/message/service/DevMessageService.java

@@ -23,6 +23,7 @@ import vip.xiaonuo.dev.modular.message.param.DevMessageSendParam;
 import vip.xiaonuo.dev.modular.message.result.DevMessageResult;
 import vip.xiaonuo.dev.modular.message.result.DevMessageResult;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 站内信Service接口
  * 站内信Service接口
@@ -48,6 +49,11 @@ public interface DevMessageService extends IService<DevMessage> {
      */
      */
     Page<DevMessage> page(DevMessagePageParam devMessagePageParam);
     Page<DevMessage> page(DevMessagePageParam devMessagePageParam);
 
 
+    /**
+     * 获取站内信-封装列表
+     */
+    List<DevMessage> wrapperList(Map param);
+
     /**
     /**
      * 获取站内信分页,返回JSONObject分页
      * 获取站内信分页,返回JSONObject分页
      *
      *

+ 12 - 0
snowy-plugin/snowy-plugin-dev/snowy-plugin-dev-func/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java

@@ -48,6 +48,7 @@ import vip.xiaonuo.sys.api.SysUserApi;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.Comparator;
 import java.util.Comparator;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -102,6 +103,17 @@ public class DevMessageServiceImpl extends ServiceImpl<DevMessageMapper, DevMess
         }
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
     }
+    /**
+     * 获取站内信-封装列表
+     */
+    @Override
+    public List<DevMessage> wrapperList(Map param)
+    {
+        QueryWrapper<DevMessage> queryWrapper = new QueryWrapper<>();
+
+        return this.list(queryWrapper);
+    }
+
 
 
     @Override
     @Override
     public Page<JSONObject> page(List<String> receiverIdList, String category) {
     public Page<JSONObject> page(List<String> receiverIdList, String category) {

+ 0 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseauditrecord/CourseAuditRecordAddParam.java

@@ -47,7 +47,6 @@ public class CourseAuditRecordAddParam {
 
 
     /** 所属院系ID */
     /** 所属院系ID */
     @ApiModelProperty(value = "所属院系ID", position = 7)
     @ApiModelProperty(value = "所属院系ID", position = 7)
-    @NotBlank(message = "所属院系ID不能为空")
     private String collegeId;
     private String collegeId;
 
 
     /** 所属专业ID */
     /** 所属专业ID */
@@ -70,22 +69,18 @@ public class CourseAuditRecordAddParam {
 
 
     /** 二级院系ID */
     /** 二级院系ID */
     @ApiModelProperty(value = "二级院系ID", position = 7)
     @ApiModelProperty(value = "二级院系ID", position = 7)
-    @NotBlank(message = "二级院系ID不能为空")
     private String collegeTwoId;
     private String collegeTwoId;
 
 
     /** 三级院系ID */
     /** 三级院系ID */
     @ApiModelProperty(value = "三级院系ID", position = 7)
     @ApiModelProperty(value = "三级院系ID", position = 7)
-    @NotBlank(message = "三级院系ID不能为空")
     private String collegeThreeId;
     private String collegeThreeId;
 
 
     /** 资源类型 */
     /** 资源类型 */
     @ApiModelProperty(value = "资源类型", position = 7)
     @ApiModelProperty(value = "资源类型", position = 7)
-    @NotBlank(message = "资源类型不能为空")
     private String resourceType;
     private String resourceType;
 
 
     /** 二级资源类型 */
     /** 二级资源类型 */
     @ApiModelProperty(value = "二级资源类型", position = 7)
     @ApiModelProperty(value = "二级资源类型", position = 7)
-    @NotBlank(message = "二级资源类型不能为空")
     private String resourceTwoType;
     private String resourceTwoType;
 
 
     /** 是否推荐 */
     /** 是否推荐 */