Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssFileController.java

@@ -698,6 +698,4 @@ public class OssFileController {
         return filePath;
     }
 
-
-
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/controller/WorkCollectAccessoryController.java

@@ -1,26 +1,24 @@
 package com.jeeplus.pubmodules.workCollectAccessory.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.pubmodules.meetingRoom.domain.MeetingRoom;
-import com.jeeplus.pubmodules.meetingRoom.service.MeetingRoomService;
-import com.jeeplus.pubmodules.meetingRoom.service.dto.MeetingRoomDTO;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.pubmodules.workCollectAccessory.domain.WorkCollectAccessory;
 import com.jeeplus.pubmodules.workCollectAccessory.service.WorkCollectAccessoryService;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValue;
 import com.jeeplus.pubmodules.workCollectAccessory.service.dto.WorkCollectAccessoryDTO;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
+import java.util.List;
 
 /**
  * @Author hgc
@@ -54,8 +52,8 @@ public class WorkCollectAccessoryController {
     @PostMapping(value = "/collection")
     public ResponseEntity collectionAttachment(@RequestBody WorkCollectAccessoryDTO workCollectAccessoryDTO) throws ParseException {
         String attachmentId = workCollectAccessoryDTO.getAttachmentId();
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
-        workCollectAccessoryService.collectionAttachment(userDto.getId(),attachmentId);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        workCollectAccessoryService.collectionAttachment(userDTO.getId(),attachmentId);
         return ResponseEntity.ok("操作成功");
     }
 
@@ -68,8 +66,8 @@ public class WorkCollectAccessoryController {
         String attachmentId = workCollectAccessoryDTO.getAttachmentId();
         String shareType = workCollectAccessoryDTO.getShareType();
         String componyId = workCollectAccessoryDTO.getCompanyId();
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
-        workCollectAccessoryService.shareAttachment(userDto.getId(),attachmentId,shareType,componyId);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        workCollectAccessoryService.shareAttachment(userDTO.getId(),attachmentId,shareType,componyId);
         return ResponseEntity.ok("操作成功");
     }
 
@@ -114,4 +112,14 @@ public class WorkCollectAccessoryController {
         workCollectAccessoryService.delAttachment(workCollectAccessoryDTO.getAttachmentId());
         return ResponseEntity.ok("操作成功");
     }
+
+    /**
+     * 根据字典值类型获取字典列表
+     */
+    @ApiOperation(value = "根据字典值类型获取字典列表")
+    @GetMapping(value = "/queryDictListByName")
+    public ResponseEntity queryDictListByName( @RequestParam("dictName")String dictName) throws ParseException {
+        List<DictValue> dictList = workCollectAccessoryService.getDictValueByName(dictName);
+        return ResponseEntity.ok(dictList);
+    }
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/mapper/WorkCollectAccessoryMapper.java

@@ -6,16 +6,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.pubmodules.meetingRoom.domain.MeetingRoom;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import com.jeeplus.pubmodules.workCollectAccessory.domain.WorkCollectAccessory;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictType;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValue;
 import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValueDTO;
-import com.jeeplus.sys.domain.DictType;
-import com.jeeplus.sys.domain.DictValue;
-import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -32,6 +29,6 @@ public interface WorkCollectAccessoryMapper extends BaseMapper<WorkCollectAccess
 
     List<WorkAttachmentInfo> listWorkAttachment(@Param("attachmentId")String id);
 
-    List<DictValue> getDictValueByName(@Param("dictName") String dictName);
+    List<DictValue> getDictValueByName(@Param("dictName") String dictName,@Param("userId") String userId);
 
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/mapper/xml/WorkCollectAccessoryMapper.xml

@@ -35,7 +35,7 @@
     </select>
 
 
-    <select id="getDictByName" resultType="com.jeeplus.sys.domain.DictType">
+    <select id="getDictByName" resultType="com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictType">
         select
             a.id,
             a.type
@@ -47,7 +47,7 @@
     </select>
 
 
-    <select id="listWorkAttachment" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
+    <select id="listWorkAttachment" resultType="com.jeeplus.pubmodules.workCollectAccessory.service.dto.WorkAttachmentInfo">
         SELECT
             id,
             url,
@@ -86,13 +86,13 @@
         </where>
     </delete>
 
-    <select id="getDictValueByName" resultType="com.jeeplus.sys.domain.DictValue">
+    <select id="getDictValueByName" resultType="com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValue">
         SELECT v.label,
                v.value,
                v.sort
         FROM `sys_dict_value` v
         LEFT JOIN `sys_dict_type` t ON v.dict_type_id = t.id
-        WHERE t.type = #{dictName}
+        WHERE t.type = #{dictName} and v.create_by_id = #{userId}
         AND t.del_flag = 0
         AND v.del_flag = 0
     </select>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/WorkCollectAccessoryService.java

@@ -1,25 +1,19 @@
 package com.jeeplus.pubmodules.workCollectAccessory.service;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
-import com.jeeplus.pubmodules.meetingRoom.domain.MeetingRoom;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import com.jeeplus.pubmodules.workCollectAccessory.domain.WorkCollectAccessory;
 import com.jeeplus.pubmodules.workCollectAccessory.mapper.WorkCollectAccessoryMapper;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictType;
+import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValue;
 import com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValueDTO;
 import com.jeeplus.pubmodules.workCollectAccessory.service.dto.WorkCollectAccessoryDTO;
-import com.jeeplus.sys.domain.DictType;
-import com.jeeplus.sys.domain.DictValue;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
@@ -32,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigInteger;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Author hgc
@@ -68,6 +61,12 @@ public class WorkCollectAccessoryService {
                     .like("b.name", workCollectAccessory.getUserName()); // 使用 b.name 作为条件
         }
 
+        // 收藏分类
+        if (StringUtils.isNotBlank(workCollectAccessory.getClassification())) {
+            workCollectAccessoryMapperQueryWrapper
+                    .eq("a.classification", workCollectAccessory.getClassification()); // 使用 b.name 作为条件
+        }
+
         // 公司
         if (StringUtils.isNotBlank(workCollectAccessory.getCompanyId())) {
             workCollectAccessoryMapperQueryWrapper.eq("a.company_id", workCollectAccessory.getCompanyId());
@@ -106,6 +105,35 @@ public class WorkCollectAccessoryService {
         workCollectAccessory.setOfficeId(null);
         workCollectAccessory.setCollectType("1");
         workCollectAccessory.setCollectUserId(userId);
+        workCollectAccessory.setCreateTime(new Date());
+        String classification = workCollectAccessory.getClassification();
+        if(StringUtils.isNotEmpty(classification)){
+            List<DictValue> dictList = getDictValueByName("classification");
+            boolean containsValue = false;
+            for (DictValue dictValue : dictList) {
+                if (dictValue.getValue().equals(workCollectAccessory.getClassification())) {
+                    containsValue = true;
+                    break; // 一旦找到匹配值，退出循环
+                }
+            }
+            if(!containsValue){
+                DictType dictType = getDictByName("classification");
+                DictValueDTO dictValue = new DictValueDTO();
+                dictValue.setDictTypeId(dictType.getId());
+                dictValue.setValue(classification);
+                dictValue.setLabel(classification);
+                dictValue.setSort(generateRandomString());
+                dictValue.setId(generateId());
+                dictValue.setCreateById(userId);
+                dictValue.setCreateTime(new Date());
+                dictValue.setUpdateById(userId);
+                dictValue.setUpdateTime(new Date());
+                dictValue.setDelFlag(0);
+                dictValue.setTenantId("10000");
+                workCollectAccessoryMapper.insertDictValue(dictValue);
+            }
+        }
+
         workCollectAccessoryMapper.insert(workCollectAccessory);
     }
 
@@ -324,15 +352,15 @@ public class WorkCollectAccessoryService {
       return  workCollectAccessoryMapper.getDictByName(dictName);
     }
     public List<DictValue> getDictValueByName(String dictName){
-        return workCollectAccessoryMapper.getDictValueByName(dictName);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        String userId = userDTO.getId();
+        return workCollectAccessoryMapper.getDictValueByName(dictName,userId);
     }
     /**
      * 根据名称添加字典值
      */
     public WorkCollectAccessory queryById(String id) {
         WorkCollectAccessory workCollectAccessory = workCollectAccessoryMapper.selectById(id);
-//        List<WorkAttachmentInfo> workAttachmentInfos = workCollectAccessoryMapper.listWorkAttachment(id);
-//        workCollectAccessory.setWorkAttachments(workAttachmentInfos);
         return workCollectAccessory;
     }
 

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/dto/DictType.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.pubmodules.workCollectAccessory.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.query.Query;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 数据字典Entity
+ *
+ * @author lgf
+ * @version 2021-01-16
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictType extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类型
+     */
+    @Query
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/dto/DictValue.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.pubmodules.workCollectAccessory.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 数据字典Entity
+ *
+ * @author lgf
+ * @version 2021-01-16
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictValue extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签名
+     */
+    private String label;
+
+    /**
+     * 键值
+     */
+    private String value;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+    /**
+     * 类型
+     */
+    private String dictTypeId;
+
+
+}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/dto/WorkAttachmentInfo.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.pubmodules.workCollectAccessory.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.sys.service.dto.UserDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户Entity
+ *
+ * @author jeeplus
+ * @version 2021-12-05
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkAttachmentInfo extends BaseEntity {
+
+    private String by;
+
+    private UserDTO createBy;
+
+    private String name;
+
+    private String size;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 附件地址
+     */
+    private String url;
+
+    /**
+     * 文件类型（文件后缀名）
+     */
+    private String type;
+
+    /**
+     * 附件对应父节点id(记录是谁的id)
+     */
+    private String attachmentId;
+
+    /**
+     * 文件名
+     */
+    private String attachmentName;
+
+    /**
+     * 文件所属业务模块（数据字典配置）
+     */
+    private String attachmentFlag;
+
+    /**
+     * 所属模块子模块
+     */
+    private String moduleType;
+
+    /**
+     * 附件类型
+     */
+    private String attachmentType;
+
+    /**
+     * 附件大小
+     */
+    private String fileSize;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 文件描述
+     */
+    private String description;
+
+    /**
+     * 附件临时地址
+     *该属性不是实体字段
+     */
+    @TableField(exist = false)
+    private String temporaryUrl;
+}