|
|
@@ -1,18 +1,15 @@
|
|
|
package com.gis.cms.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.core.io.FileUtil;
|
|
|
import com.gis.cms.entity.dto.ExpertPageDto;
|
|
|
import com.gis.cms.entity.dto.ExpertDto;
|
|
|
import com.gis.cms.entity.po.ExpertEntity;
|
|
|
import com.gis.cms.mapper.ExpertMapper;
|
|
|
+import com.gis.cms.mapper.MyBaseMapper;
|
|
|
import com.gis.cms.service.SensitiveService;
|
|
|
import com.gis.common.base.exception.BaseRuntimeException;
|
|
|
import com.gis.common.base.mapper.IBaseMapper;
|
|
|
import com.gis.common.base.service.impl.IBaseServiceImpl;
|
|
|
import com.gis.common.constant.MsgCode;
|
|
|
-import com.gis.common.util.FileUtils;
|
|
|
-import com.gis.common.util.RegexUtil;
|
|
|
import com.gis.common.util.Result;
|
|
|
import com.gis.cms.service.ExpertService;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
@@ -41,6 +38,19 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
|
|
|
@Autowired
|
|
|
SensitiveService sensitiveService;
|
|
|
|
|
|
+
|
|
|
+ final static HashMap<String, String> typeMap;
|
|
|
+ static {
|
|
|
+ typeMap = new HashMap<>();
|
|
|
+ typeMap.put("1", "1");
|
|
|
+ typeMap.put("2", "2");
|
|
|
+ typeMap.put("3", "3");
|
|
|
+ typeMap.put("4", "4");
|
|
|
+ typeMap.put("5", "4");
|
|
|
+ typeMap.put("loyal_1", "1");
|
|
|
+ typeMap.put("loyal_2", "2");
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public IBaseMapper<ExpertEntity, Long> getBaseMapper() {
|
|
|
return this.entityMapper;
|
|
|
@@ -73,55 +83,79 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
|
|
|
entityMapper.addVisit(id);
|
|
|
}
|
|
|
|
|
|
+// @Override
|
|
|
+// public Result<ExpertEntity> webList(String type) {
|
|
|
+// List<ExpertEntity> all = this.findAll();
|
|
|
+//
|
|
|
+// List<ExpertEntity> levle_1 = new ArrayList<>();
|
|
|
+// List<ExpertEntity> levle_2 = new ArrayList<>();
|
|
|
+// List<ExpertEntity> levle_3 = new ArrayList<>();
|
|
|
+// List<ExpertEntity> levle_4 = new ArrayList<>();
|
|
|
+// List<ExpertEntity> levle_5 = new ArrayList<>();
|
|
|
+// // 忠诚力量
|
|
|
+// List<ExpertEntity> loyal_1 = new ArrayList<>();
|
|
|
+// List<ExpertEntity> loyal_2 = new ArrayList<>();
|
|
|
+// for (ExpertEntity entity : all) {
|
|
|
+// Integer level = entity.getLevel();
|
|
|
+// String type = entity.getType();
|
|
|
+// if (level == 1) {
|
|
|
+// levle_1.add(entity);
|
|
|
+// } else if (level == 2) {
|
|
|
+// levle_2.add(entity);
|
|
|
+// } else if (level == 3) {
|
|
|
+// levle_3.add(entity);
|
|
|
+// }else if (level == 4) {
|
|
|
+// levle_4.add(entity);
|
|
|
+// }else if (level == 5) {
|
|
|
+// levle_5.add(entity);
|
|
|
+// }
|
|
|
+//
|
|
|
+// // 添加 忠诚力量
|
|
|
+// if (StringUtils.isNotBlank(type)) {
|
|
|
+// if ("1".equals(type)){
|
|
|
+// loyal_1.add(entity);
|
|
|
+// } else {
|
|
|
+// loyal_2.add(entity);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// HashMap<Object, Object> result = new HashMap<>();
|
|
|
+// result.put("level_1", levle_1);
|
|
|
+// result.put("level_2", levle_2);
|
|
|
+// result.put("level_3", levle_3);
|
|
|
+// result.put("level_4", levle_4);
|
|
|
+// result.put("level_5", levle_5);
|
|
|
+// result.put("loyal_1", loyal_1);
|
|
|
+// result.put("loyal_2", loyal_2);
|
|
|
+//
|
|
|
+// return Result.success(result);
|
|
|
+// }
|
|
|
+
|
|
|
@Override
|
|
|
- public Result<ExpertEntity> webList() {
|
|
|
- List<ExpertEntity> all = this.findAll();
|
|
|
-
|
|
|
- List<ExpertEntity> levle_1 = new ArrayList<>();
|
|
|
- List<ExpertEntity> levle_2 = new ArrayList<>();
|
|
|
- List<ExpertEntity> levle_3 = new ArrayList<>();
|
|
|
- List<ExpertEntity> levle_4 = new ArrayList<>();
|
|
|
- List<ExpertEntity> levle_5 = new ArrayList<>();
|
|
|
- // 忠诚力量
|
|
|
- List<ExpertEntity> loyal_1 = new ArrayList<>();
|
|
|
- List<ExpertEntity> loyal_2 = new ArrayList<>();
|
|
|
- for (ExpertEntity entity : all) {
|
|
|
- Integer level = entity.getLevel();
|
|
|
- String type = entity.getType();
|
|
|
- if (level == 1) {
|
|
|
- levle_1.add(entity);
|
|
|
- } else if (level == 2) {
|
|
|
- levle_2.add(entity);
|
|
|
- } else if (level == 3) {
|
|
|
- levle_3.add(entity);
|
|
|
- }else if (level == 4) {
|
|
|
- levle_4.add(entity);
|
|
|
- }else if (level == 5) {
|
|
|
- levle_5.add(entity);
|
|
|
- }
|
|
|
+ public Result<ExpertEntity> webList(String type) {
|
|
|
+ StringBuffer sql = new StringBuffer();
|
|
|
+ sql.append("select * from tb_expert where is_delete = '0' and display=1 ");
|
|
|
|
|
|
- // 添加 忠诚力量
|
|
|
- if (StringUtils.isNotBlank(type)) {
|
|
|
- if ("1".equals(type)){
|
|
|
- loyal_1.add(entity);
|
|
|
- } else {
|
|
|
- loyal_2.add(entity);
|
|
|
- }
|
|
|
- }
|
|
|
+ String [] typeCheck = {"1","2","3","4","5","loyal_1","loyal_2"};
|
|
|
+ if (!Arrays.asList(typeCheck).contains(type)) {
|
|
|
+ return Result.failure("非法类型");
|
|
|
+ }
|
|
|
+ String key = typeMap.get(type);
|
|
|
+ if (type.startsWith("loyal_")){
|
|
|
+ sql.append(" and type='").append(key).append("'");
|
|
|
+ } else {
|
|
|
+ sql.append(" and level=").append(key);
|
|
|
}
|
|
|
- HashMap<Object, Object> result = new HashMap<>();
|
|
|
- result.put("level_1", levle_1);
|
|
|
- result.put("level_2", levle_2);
|
|
|
- result.put("level_3", levle_3);
|
|
|
- result.put("level_4", levle_4);
|
|
|
- result.put("level_5", levle_5);
|
|
|
- result.put("loyal_1", loyal_1);
|
|
|
- result.put("loyal_2", loyal_2);
|
|
|
-
|
|
|
- return Result.success(result);
|
|
|
+
|
|
|
+ sql.append(" order by create_time desc");
|
|
|
+ log.info("sql: {}", sql.toString());
|
|
|
+
|
|
|
+
|
|
|
+ return Result.success(entityMapper.expertSql(sql.toString()));
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
public Result saveEntity(ExpertDto param) {
|
|
|
Long id = param.getId();
|
wuweihao