资料库收藏调整

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
@@ -17,6 +18,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
+import java.util.List;
 
 /**
  * @Author hgc
@@ -110,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

@@ -29,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

@@ -92,7 +92,7 @@
                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

@@ -61,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());
@@ -99,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);
     }
 
@@ -317,7 +352,9 @@ 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);
     }
     /**
      * 根据名称添加字典值