指标字典功能
This commit is contained in:
@@ -16,12 +16,17 @@ import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import jdk.nashorn.internal.ir.annotations.Ignore;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -45,6 +50,7 @@ public class EleEpdPqdController extends BaseController {
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("根据模板录入字典数据")
|
||||
@ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
|
||||
@ApiIgnore
|
||||
public HttpResult<String> addByModel(@RequestBody @Validated List<EleEpdPqdParam> eleEpdPqdParam){
|
||||
log.info("根据模板录入字典数据");
|
||||
String methodDescribe = getMethodDescribe("addByModel");
|
||||
@@ -55,7 +61,7 @@ public class EleEpdPqdController extends BaseController {
|
||||
|
||||
@PostMapping("/add")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("录入字典数据")
|
||||
@ApiOperation("新增字典数据")
|
||||
@ApiImplicitParam(name = "eleEpdPqdParam", value = "字典数据", required = true)
|
||||
public HttpResult<String> add(@RequestBody @Validated EleEpdPqdParam eleEpdPqdParam){
|
||||
log.info("录入字典数据");
|
||||
@@ -100,6 +106,29 @@ public class EleEpdPqdController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
|
||||
@PostMapping("/dictMarkByDataType")
|
||||
@ApiOperation("字典数据组装唯一标识")
|
||||
@ApiImplicitParam(name = "dataType", value = "数据模型", required = true)
|
||||
@ApiIgnore
|
||||
public HttpResult<List<EleEpdPqd>> dictMarkByDataType(@RequestParam("dataType") @Validated String dataType) {
|
||||
String methodDescribe = getMethodDescribe("dictMark");
|
||||
List<EleEpdPqd> list = eleEpdPqdService.dictMarkByDataType(dataType);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
|
||||
}
|
||||
|
||||
@PostMapping("/addEvt")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@ApiOperation("事件录入字典数据")
|
||||
@ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
|
||||
@ApiIgnore
|
||||
public HttpResult<Map<String,String>> addEvt(@RequestBody @Validated List<EleEpdPqdParam> eleEpdPqdParam){
|
||||
log.info("根据模板录入字典数据");
|
||||
String methodDescribe = getMethodDescribe("addEvt");
|
||||
LogUtil.njcnDebug(log, "{},模板当前解析字典数据为:", methodDescribe);
|
||||
Map<String,String> map = eleEpdPqdService.saveEvt(eleEpdPqdParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,12 @@ package com.njcn.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.system.pojo.param.EleEpdPqdParam;
|
||||
import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
import com.njcn.system.pojo.vo.EleEpdPqdVO;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -47,4 +50,15 @@ public interface IEleEpdPqdService {
|
||||
*/
|
||||
Page<EleEpdPqdVO> eleEpdPqdList(EleEpdPqdParam.EleEpdPqdQueryParam queryParam);
|
||||
|
||||
/**
|
||||
* 查询所有字典数据组成唯一标识,用于验证字典是否重复
|
||||
* @return
|
||||
*/
|
||||
List<EleEpdPqd> dictMarkByDataType(String dataType);
|
||||
|
||||
/**
|
||||
* 存储事件的字典数据
|
||||
* @param eleEpdPqdParam
|
||||
*/
|
||||
Map<String,String> saveEvt(List<EleEpdPqdParam> eleEpdPqdParam);
|
||||
}
|
||||
|
||||
@@ -15,10 +15,11 @@ import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
import com.njcn.system.pojo.vo.EleEpdPqdVO;
|
||||
import com.njcn.system.service.IEleEpdPqdService;
|
||||
import com.njcn.web.factory.PageFactory;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -37,9 +38,12 @@ public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpd
|
||||
List<EleEpdPqd> list = eleEpdPqdParam.stream().map(item->{
|
||||
EleEpdPqd eleEpdPqd = new EleEpdPqd();
|
||||
BeanUtils.copyProperties(item,eleEpdPqd);
|
||||
if (StringUtils.isBlank(item.getType())){
|
||||
eleEpdPqd.setType("");
|
||||
}
|
||||
return eleEpdPqd;
|
||||
}).collect(Collectors.toList());
|
||||
this.saveOrUpdateBatchByMultiId(list,1000);
|
||||
this.saveBatch(list,1000);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -86,6 +90,35 @@ public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpd
|
||||
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EleEpdPqd> dictMarkByDataType(String dataType) {
|
||||
LambdaQueryWrapper<EleEpdPqd> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaQueryWrapper.eq(EleEpdPqd::getDataType,dataType);
|
||||
return this.baseMapper.selectList(lambdaQueryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> saveEvt(List<EleEpdPqdParam> eleEpdPqdParam) {
|
||||
List<EleEpdPqd> list = eleEpdPqdParam.stream().map(item->{
|
||||
EleEpdPqd eleEpdPqd = new EleEpdPqd();
|
||||
BeanUtils.copyProperties(item,eleEpdPqd);
|
||||
if (StringUtils.isBlank(item.getType())){
|
||||
eleEpdPqd.setType("");
|
||||
}
|
||||
return eleEpdPqd;
|
||||
}).collect(Collectors.toList());
|
||||
this.saveBatch(list,1000);
|
||||
List<String> nameList = eleEpdPqdParam.stream().map(EleEpdPqdParam::getName).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<EleEpdPqd> lambdaQueryWrapper = new LambdaQueryWrapper<EleEpdPqd>();
|
||||
lambdaQueryWrapper.in(EleEpdPqd::getName,nameList);
|
||||
List<EleEpdPqd> list1 = this.baseMapper.selectList(lambdaQueryWrapper);
|
||||
Map<String,String> map = new HashMap<>();
|
||||
list1.forEach(item->{
|
||||
map.put(item.getName(),item.getId());
|
||||
});
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验参数,
|
||||
* 1.检查是否存在相同名称的菜单
|
||||
|
||||
Reference in New Issue
Block a user