From cc1c3a50e12d3cf82a899b5b7e45b95ce4966540 Mon Sep 17 00:00:00 2001 From: NiuZiYuan Date: Thu, 17 Apr 2025 13:31:16 +0800 Subject: [PATCH] dev --- .../social/SocialDirectoryService.java | 67 +++++++++++++++++-- .../clinic/server/ServerApplicationTests.java | 2 +- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index bff26f9..d3c75f6 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -6,11 +6,9 @@ import com.syjiaer.clinic.server.common.config.Config; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.*; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.social.SocialDirectory; -import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion; +import com.syjiaer.clinic.server.entity.social.*; import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView; -import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper; -import com.syjiaer.clinic.server.mapper.social.SocialDirectoryVersionMapper; +import com.syjiaer.clinic.server.mapper.social.*; import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,6 +37,12 @@ public class SocialDirectoryService extends BaseService { @Autowired private SocialDirectoryMapper socialDirectoryMapper; @Autowired + private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper; + @Autowired + private SocialDirectoryLimitMapper socialDirectoryLimitMapper; + @Autowired + private SocialDirectorySelfMapper socialDirectorySelfMapper; + @Autowired private SocialDirectoryVersionMapper socialDirectoryVersionMapper; /* @@ -194,8 +198,59 @@ public class SocialDirectoryService extends BaseService { * 搜索接口 * @param keyword 关键字 */ - public Page search(String keyword,int[] type,int pageNum,int pageSize){ - return null; + public Page search(String keyword,int type,int pageNum,int pageSize){ + QueryWrapper codeqw = new QueryWrapper<>(); + codeqw.eq("type", type); + + //模糊搜索 + if (!keyword.trim().isEmpty()) { + codeqw.like("name", keyword); + codeqw.or().like("code", keyword); + codeqw.or().like("keyword", keyword); + } + // 执行查询 + +// return success(SelectPage(queryWrapper, page, size, iSocialDirectoryService)); + codeqw.select("code"); + long count=socialDirectoryMapper.selectCount(codeqw); + + codeqw.last("LIMIT " + pageSize + " OFFSET " + (pageNum - 1) * pageSize); + List codeList = socialDirectoryMapper.selectObjs(codeqw); + + List list= new ArrayList<>(); + if(codeList.isEmpty()){ + Page empty_result = new Page<>(); + empty_result.setList(new ArrayList<>()); + empty_result.setTotal_count(0); + empty_result.setTotal_page(1); + return empty_result; + } + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("code", codeList); + //第一步 拿到字典表数据 + List socialDirectoryList=socialDirectoryMapper.selectList(queryWrapper); + List socialDirectoryUpinfoList=socialDirectoryUpinfoMapper.selectList(queryWrapper); + List socialDirectoryLimitList=socialDirectoryLimitMapper.selectList(queryWrapper); + List socialDirectorySelfList=socialDirectorySelfMapper.selectList(queryWrapper); + System.out.println(socialDirectoryList); + System.out.println(socialDirectoryUpinfoList); + System.out.println(socialDirectoryLimitList); + System.out.println(socialDirectorySelfList); + //第二部 构建新的返回List + List socialDirectoryViewList=new ArrayList<>(); + for(SocialDirectory socialDirectory:socialDirectoryList){ + SocialDirectoryView socialDirectoryView=JSONObject.parseObject(JSONObject.toJSONString(socialDirectory), SocialDirectoryView.class); + } + + + + + + Page result=new Page<>(); + result.setTotal_page((int) Math.ceil((double) count / pageSize)); + result.setTotal_count(count); + result.setList(socialDirectoryViewList); + return result; } /* * 列表接口 diff --git a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java index 5b3d4e1..f041ba0 100644 --- a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java +++ b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java @@ -16,7 +16,7 @@ class ServerApplicationTests { private SocialDirectoryService socialDirectoryService; @Test void contextLoads() { - + Page search = socialDirectoryService.search("劳拉", 1301, 1, 10); } }