mirror of https://github.com/jeecgboot/jeecg-boot
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas
JEECG
commit
8a4fcb0023
|
|
@ -35,9 +35,9 @@
|
||||||
<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
|
<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
<groupId>org.jeecgframework.jimureport</groupId>
|
||||||
<artifactId>jimureport-drag</artifactId>
|
<artifactId>drag-free-springboot3</artifactId>
|
||||||
<version>2.0.2</version>
|
<version>1.1.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 积木报表 mongo redis 支持包
|
<!-- 积木报表 mongo redis 支持包
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -1,102 +1,102 @@
|
||||||
//package org.jeecg.config.jimureport;
|
package org.jeecg.config.jimureport;
|
||||||
//
|
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
//import org.jeecg.common.api.dto.LogDTO;
|
import org.jeecg.common.api.dto.LogDTO;
|
||||||
//import org.jeecg.common.system.api.ISysBaseAPI;
|
import org.jeecg.common.system.api.ISysBaseAPI;
|
||||||
//import org.jeecg.common.system.vo.DictModel;
|
import org.jeecg.common.system.vo.DictModel;
|
||||||
//import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
//import org.jeecg.modules.base.service.BaseCommonService;
|
import org.jeecg.modules.base.service.BaseCommonService;
|
||||||
//import org.jeecg.modules.drag.service.IOnlDragExternalService;
|
import org.jeecg.modules.drag.service.IOnlDragExternalService;
|
||||||
//import org.jeecg.modules.drag.vo.DragDictModel;
|
import org.jeecg.modules.drag.vo.DragDictModel;
|
||||||
//import org.jeecg.modules.drag.vo.DragLogDTO;
|
import org.jeecg.modules.drag.vo.DragLogDTO;
|
||||||
//import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
//import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
//import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
//
|
|
||||||
//import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
//import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
//import java.util.List;
|
import java.util.List;
|
||||||
//import java.util.Map;
|
import java.util.Map;
|
||||||
//
|
|
||||||
///**
|
/**
|
||||||
// * @Description: 字典处理
|
* @Description: 字典处理
|
||||||
// * @Author: lsq
|
* @Author: lsq
|
||||||
// * @Date:2023-01-09
|
* @Date:2023-01-09
|
||||||
// * @Version:V1.0
|
* @Version:V1.0
|
||||||
// */
|
*/
|
||||||
//@Slf4j
|
@Slf4j
|
||||||
//@Service("onlDragExternalServiceImpl")
|
@Service("onlDragExternalServiceImpl")
|
||||||
//public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
|
public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
|
||||||
//
|
|
||||||
// @Autowired
|
@Autowired
|
||||||
// @Lazy
|
@Lazy
|
||||||
// private BaseCommonService baseCommonService;
|
private BaseCommonService baseCommonService;
|
||||||
//
|
|
||||||
// @Autowired
|
@Autowired
|
||||||
// @Lazy
|
@Lazy
|
||||||
// private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseApi;
|
||||||
// /**
|
/**
|
||||||
// * 根据多个字典code查询多个字典项
|
* 根据多个字典code查询多个字典项
|
||||||
// * @param codeList
|
* @param codeList
|
||||||
// * @return key = dictCode ； value=对应的字典项
|
* @return key = dictCode ； value=对应的字典项
|
||||||
// */
|
*/
|
||||||
// @Override
|
@Override
|
||||||
// public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
|
public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
|
||||||
// Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>();
|
Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>();
|
||||||
// Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
|
Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
|
||||||
// dictItemsMap.forEach((k,v)->{
|
dictItemsMap.forEach((k,v)->{
|
||||||
// List<DragDictModel> dictItems = new ArrayList<>();
|
List<DragDictModel> dictItems = new ArrayList<>();
|
||||||
// v.forEach(dictItem->{
|
v.forEach(dictItem->{
|
||||||
// DragDictModel dictModel = new DragDictModel();
|
DragDictModel dictModel = new DragDictModel();
|
||||||
// BeanUtils.copyProperties(dictItem,dictModel);
|
BeanUtils.copyProperties(dictItem,dictModel);
|
||||||
// dictItems.add(dictModel);
|
dictItems.add(dictModel);
|
||||||
// });
|
});
|
||||||
// manyDragDictItems.put(k,dictItems);
|
manyDragDictItems.put(k,dictItems);
|
||||||
// });
|
});
|
||||||
// return manyDragDictItems;
|
return manyDragDictItems;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// *
|
*
|
||||||
// * @param dictCode
|
* @param dictCode
|
||||||
// * @return
|
* @return
|
||||||
// */
|
*/
|
||||||
// @Override
|
@Override
|
||||||
// public List<DragDictModel> getDictItems(String dictCode) {
|
public List<DragDictModel> getDictItems(String dictCode) {
|
||||||
// List<DragDictModel> dictItems = new ArrayList<>();
|
List<DragDictModel> dictItems = new ArrayList<>();
|
||||||
// if(oConvertUtils.isNotEmpty(dictCode)){
|
if(oConvertUtils.isNotEmpty(dictCode)){
|
||||||
// List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
|
List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
|
||||||
// dictItemsList.forEach(dictItem->{
|
dictItemsList.forEach(dictItem->{
|
||||||
// DragDictModel dictModel = new DragDictModel();
|
DragDictModel dictModel = new DragDictModel();
|
||||||
// BeanUtils.copyProperties(dictItem,dictModel);
|
BeanUtils.copyProperties(dictItem,dictModel);
|
||||||
// dictItems.add(dictModel);
|
dictItems.add(dictModel);
|
||||||
// });
|
});
|
||||||
// }
|
}
|
||||||
// return dictItems;
|
return dictItems;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 添加日志
|
* 添加日志
|
||||||
// * @param dragLogDTO
|
* @param dragLogDTO
|
||||||
// */
|
*/
|
||||||
// @Override
|
@Override
|
||||||
// public void addLog(DragLogDTO dragLogDTO) {
|
public void addLog(DragLogDTO dragLogDTO) {
|
||||||
// if(oConvertUtils.isNotEmpty(dragLogDTO)){
|
if(oConvertUtils.isNotEmpty(dragLogDTO)){
|
||||||
// LogDTO dto = new LogDTO();
|
LogDTO dto = new LogDTO();
|
||||||
// BeanUtils.copyProperties(dragLogDTO,dto);
|
BeanUtils.copyProperties(dragLogDTO,dto);
|
||||||
// baseCommonService.addLog(dto);
|
baseCommonService.addLog(dto);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 保存日志
|
* 保存日志
|
||||||
// * @param logMsg
|
* @param logMsg
|
||||||
// * @param logType
|
* @param logType
|
||||||
// * @param operateType
|
* @param operateType
|
||||||
// */
|
*/
|
||||||
// @Override
|
@Override
|
||||||
// public void addLog(String logMsg, int logType, int operateType) {
|
public void addLog(String logMsg, int logType, int operateType) {
|
||||||
// baseCommonService.addLog(logMsg,logType,operateType);
|
baseCommonService.addLog(logMsg,logType,operateType);
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
|
@ -258,7 +258,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
<groupId>org.jeecgframework.boot3</groupId>
|
||||||
<artifactId>hibernate-re</artifactId>
|
<artifactId>hibernate-re</artifactId>
|
||||||
<version>3.6.1-GA</version>
|
<version>3.7.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.glassfish.jaxb</groupId>
|
<groupId>org.glassfish.jaxb</groupId>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue