diff --git a/pom.xml b/pom.xml
index 2e75b7e..7979afd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@
poi-ooxml
5.2.3
+
+ com.mysql
+ mysql-connector-j
+ runtime
+
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 e9a255c..6eda53f 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
@@ -13,6 +13,7 @@ import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
import com.syjiaer.clinic.server.mapper.social.*;
import com.syjiaer.clinic.server.service.BaseService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
/*
* 医保目录
*/
+@Slf4j
@Service
public class SocialDirectoryService extends BaseService {
@Autowired
@@ -61,7 +63,6 @@ public class SocialDirectoryService extends BaseService {
@Autowired
private GoodsMapper goodsMapper;
- private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName());
/*
* 下载接口
@@ -71,7 +72,7 @@ public class SocialDirectoryService extends BaseService {
@Transactional(rollbackFor = Exception.class)
public String download(String version_name, int type) {
List tab_list = httpUtil.download(version_name, type);
- if (tab_list.isEmpty()){
+ if (tab_list.isEmpty()) {
return null;
}
//清楚原有的code
@@ -94,9 +95,9 @@ public class SocialDirectoryService extends BaseService {
Map title_map = dictoryUtil.getTitleMap(String.valueOf(type));
List list = new ArrayList<>();
HashMap tmp_map = new HashMap<>();
- String next_version_name="";
- for (int i=0;i list){
- for(SocialDirectory socialDirectory:list){
+ private void saveListToMongoDb(List list) {
+ for (SocialDirectory socialDirectory : list) {
saveToMongoDb(socialDirectory);
}
}
- private void initMongoDb(){
+ private void initMongoDb() {
if (!mongoTemplate.collectionExists("social_directory")) {
System.out.println("创建了social_directory集合");
mongoTemplate.createCollection("social_directory");
@@ -232,9 +233,6 @@ public class SocialDirectoryService extends BaseService {
//mongodb分页
-
-
-
QueryWrapper codeqw = new QueryWrapper<>();
if (typeList.size() == 1) {
codeqw.eq("type", typeList.get(0));
@@ -244,8 +242,8 @@ public class SocialDirectoryService extends BaseService {
//模糊搜索
if (keyword != null && !keyword.trim().isEmpty()) {
- codeqw.and(wrapper->
- wrapper.like("name", keyword).or().like("code", keyword).or().like("keyword", keyword)
+ codeqw.and(wrapper ->
+ wrapper.like("name", keyword).or().like("code", keyword).or().like("keyword", keyword)
);
}
// 执行查询
@@ -323,7 +321,7 @@ public class SocialDirectoryService extends BaseService {
* @param type 类型
*/
public List