WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-25 18:01:23 +08:00
parent 1a14907922 6201a3c238
commit d3d9eed559
34 changed files with 507 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java
+2
View File
@@ -24,6 +24,8 @@ public interface IOSSFileService extends IService<OSSFile> {
public List<OSSFile> getFileInfos(String id);
public List<OSSFile> getFileInfoAll(String id);
public List<OSSFile> getFileInfosByConnectId(String connectId);
boolean delete(OSSFile ossFile);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+13
View File
@@ -290,6 +290,19 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
}
return list;
}
@Override
public List<OSSFile> getFileInfoAll(String id) {
if (com.jero.modules.system.util.StringUtils.isEmpty(id)) {
return new ArrayList<>();
}
LambdaQueryWrapper<OSSFile> wrapper = new LambdaQueryWrapper<>();
wrapper.in(OSSFile::getId, id.split(","));
List<OSSFile> list = this.list(wrapper);
LambdaQueryWrapper<OSSFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(OSSFile::getConnectId, id.split(","));
list.addAll(this.list(lambdaQueryWrapper));
return list;
}
@Override
public List<OSSFile> getFileInfosByConnectId(String connectId) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+13
View File
@@ -16,6 +16,7 @@ import com.jero.modules.enums.FixedFieldEnum;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.model.TreeSelectModel;
import com.jero.modules.system.service.ISysCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -44,6 +46,7 @@ import java.util.stream.Collectors;
* @Date: 2019-05-29
* @Version: V1.0
*/
@Api(tags="标签内容-树形结构")
@RestController
@RequestMapping("/sys/category")
@Slf4j
@@ -94,6 +97,14 @@ public class SysCategoryController {
result.setResult(list);
return result;
}
@AutoLog(value = "标签内容-查询字典配置的父级名称")
@ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称")
@GetMapping(value = "/queryPid")
public Result<List<SysCategory>> queryPid() {
List<SysCategory> list = sysCategoryService.queryPid();
return Result.OK(list);
}
/**标签内容-树形结构列表
*
@@ -118,6 +129,7 @@ public class SysCategoryController {
@PostMapping(value = "/add")
public Result<SysCategory> add(@RequestBody SysCategory sysCategory) {
Result<SysCategory> result = new Result<SysCategory>();
sysCategoryService.setAddOrdderNum(sysCategory);
sysCategory.setName(sysCategory.getName().replace(" ",""));
sysCategoryService.addSysCategory(sysCategory);
result.success("添加成功！");
@@ -133,6 +145,7 @@ public class SysCategoryController {
@PutMapping(value = "/edit")
public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
Result<SysCategory> result = new Result<SysCategory>();
sysCategoryService.setEditOrderNum(sysCategory);
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
if(sysCategoryEntity==null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+1 -1
View File
@@ -436,7 +436,7 @@ public class SysDictController {
@RequiresPermissions("dict:edit")
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
sysDictService.setEditOrdderNum(sysDict);
sysDictService.setEditOrderNum(sysDict);
SysDict sysdict = sysDictService.getById(sysDict.getId());
if (sysdict == null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+2
View File
@@ -84,6 +84,7 @@ public class SysDictItemController {
@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
sysDictItemService.setAddOrdderNum(sysDictItem);
//查询同名数据
List<SysDictItem> exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId());
if(CollectionUtils.isNotEmpty(exitDictItemList)){
@@ -127,6 +128,7 @@ public class SysDictItemController {
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
sysDictItemService.setEditOrderNum(sysDictItem);
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
if (sysdict == null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+6
View File
@@ -85,4 +85,10 @@ public interface ISysCategoryService extends IService<SysCategory> {
public void updateDictDelFlag(int delFlag,String id);
List<SysCategory> queryByTreeDicCode(String dicCode);
void setAddOrdderNum(SysCategory sysCategory);
void setEditOrderNum(SysCategory sysCategory);
List<SysCategory> queryPid();
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java
+4
View File
@@ -30,4 +30,8 @@ public interface ISysDictItemService extends IService<SysDictItem> {
* @param id
*/
public void updateDictDelFlag(int delFlag,String id);
void setAddOrdderNum(SysDictItem sysDictItem);
void setEditOrderNum(SysDictItem sysDictItem);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+1 -1
View File
@@ -172,5 +172,5 @@ public interface ISysDictService extends IService<SysDict> {
void setAddOrdderNum(SysDict sysDict);
void setEditOrdderNum(SysDict sysDict);
void setEditOrderNum(SysDict sysDict);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+84
View File
@@ -309,4 +309,88 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
public List<SysCategory> queryByTreeDicCode(String dicCode) {
return sysCategoryMapper.queryByTreeDicCode(dicCode);
}
@Override
public void setAddOrdderNum(SysCategory sysCategory) {
Integer inputOrderNum = sysCategory.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper);
if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysCategory> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public void setEditOrderNum(SysCategory sysCategory) {
Integer inputOrderNum = sysCategory.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId()))
.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper);
if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysCategory> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public List<SysCategory> queryPid() {
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("pid",0);
List<SysCategory> list = list(queryWrapper);
return list;
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
+79
View File
@@ -1,6 +1,8 @@
package com.jero.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.mapper.SysDictItemMapper;
import com.jero.modules.system.service.ISysDictItemService;
@@ -8,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@@ -52,4 +55,80 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
public void updateDictDelFlag(int delFlag, String id) {
baseMapper.updateDictDelFlag(delFlag,id);
}
@Override
public void setAddOrdderNum(SysDictItem sysDictItem) {
Integer inputOrderNum = sysDictItem.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId())
.orderByAsc("order_num");
queryWrapper.eq("order_num", inputOrderNum);
Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("order_num", inputOrderNum)
.eq("dict_id",sysDictItem.getDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("order_num");
List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public void setEditOrderNum(SysDictItem sysDictItem) {
Integer inputOrderNum = sysDictItem.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId())
.orderByAsc("sort_order");
Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId()))
.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("dict_id",sysDictItem.getDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+1 -1
View File
@@ -484,7 +484,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
}
@Override
public void setEditOrdderNum(SysDict sysDict) {
public void setEditOrderNum(SysDict sysDict) {
Integer inputOrderNum = sysDict.getOrderNum();
if(inputOrderNum != null) {
//查询展示顺序相同的
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+149 -23
View File
@@ -2032,6 +2032,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
String serialNumber = (String)map.get("serial_number");
String id = (String) map.get("id");
String title = (String) map.get("title");
//通过id查询数据
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
if(dataList.size() != 0){
@@ -2040,6 +2041,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
throw new JeroBootException("编号已存在不能重复添加");
}
}
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList);
try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -2063,27 +2071,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} catch (ParseException e) {
throw new JeroBootException(e.getMessage());
}
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//标准选择字段
// List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
// .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
// if(standardOnlCgformFieldList.size() != 0){
// List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
// List<String> standardList = new ArrayList<>();
// for (Map.Entry<String, Object> entry : map.entrySet()) {
// String key = entry.getKey();
// if(collect.contains(key)){
// standardList.add(key);
// }
// }
// if(standardList.size() != 0){
// for (String standard : standardList) {
// map.put(standard, map.get(standard+"_id"));
// map.remove(standard+"_id");
// }
// }
// }
map.remove("cut");
//获取搜索中心字段
@@ -2121,8 +2110,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//树形数据字典
List<SysCategory> categoryList = sysCategoryService.list();
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
//查询所有
List<Map<String, Object>> listMap = bussDocumentLibraryEOMapper.selectMapsAll(null);
@@ -2360,6 +2347,145 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
private void homeDocumentDynamic(String cut,
Map<String, Object> map,
String serialNumber,
String id, String title,
List<Map<String, Object>> dataList,
List<OnlCgformField> fieldList,
List<SysDictItem> dictItemList) {
//文件类型字段
List<OnlCgformField> onlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
String href = "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
StringBuilder msgContentSb = new StringBuilder("标准" + serialNumber);
StringBuilder msgContentInfoSb = new StringBuilder("标准" + href);
List<String> fileIdLIstTemp = new ArrayList<>();
for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
//文件
if(fileFieldList.contains(key)&& !"null".equals(value) && StringUtils.isNotBlank(value)){
fileIdLIstTemp.addAll(Arrays.asList(value.split(",")));
}
}
List<String> fileIdLIst = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
//文件
if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){
fileIdLIst.addAll(Arrays.asList(value.split(",")));
}
}
//之前的文件
List<OSSFile> fileListTemp = new ArrayList<>();
if(fileIdLIstTemp.size() != 0){
fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,","));
}
List<String> fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//编辑的文件
List<OSSFile> fileList = new ArrayList<>();
if(fileIdLIst.size() != 0){
fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,","));
}
List<String> fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//删除的文件
List<String> deleteFileList = new ArrayList<>();
for (String fileName : fileNameListTemp) {
if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){
deleteFileList.add(fileName);
}
}
//上传的文件
List<String> upFileList = new ArrayList<>();
for (String fileName : fileNameList) {
if(!fileNameListTemp.contains(fileName)){
upFileList.add(fileName);
}
}
int count = 0;
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
//状态
if("state".equals(key) && !value.equals((String)dataList.get(0).get("state"))){
count++;
//数据字典转换 dictItemList
String finalValue = value;
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "state".equals(e.getDictCode()) && finalValue.equals(e.getItemValue()))
.collect(Collectors.toList());
if(stateDictItemList.size() != 0){
if(CutEnum.CN.getValue().equals(cut)){
value = stateDictItemList.get(0).getItemText();
}else{
value = stateDictItemList.get(0).getEnName();
}
}
msgContentSb.append("状态改为" + value + ",");
msgContentInfoSb.append("状态改为" + value + ",");
}
//适用车型 car_type
if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){
count++;
//数据字典转换 dictItemList
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "car_type".equals(e.getDictCode()))
.collect(Collectors.toList());
StringBuilder sb = new StringBuilder();
for (String s : value.split(",")) {
List<SysDictItem> collect = stateDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList());
if(collect.size() != 0){
if(CutEnum.CN.getValue().equals(cut)){
sb.append(collect.get(0).getItemText()+",");
}else{
sb.append(collect.get(0).getEnName()+",");
}
}
}
if(StringUtils.isNotBlank(sb)){
String substring = sb.substring(0, sb.length() - 1);
value = substring;
}
msgContentSb.append("适用车型改为" + value + ",");
msgContentInfoSb.append("适用车型改为" + value + ",");
}
}
if(upFileList.size() != 0){
count++;
msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
}
if(deleteFileList.size() != 0){
count++;
msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
}
if(count > 0){
String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);
String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1);
HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
homeDocumentDynamicEO.setMsgContent(msgContent);
homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo);
homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
}
}
private String updateEsInfo(Map<String, Object> map, List<OnlCgformField> searchFieldList, StringBuilder sbCn, StringBuilder sbEn, List<OSSFile> fileInfos, List<Map<String, Object>> mapListTempCn, List<Map<String, Object>> mapListTempEn, String cutCn, String cutEn) {
Map<String, Object> mapBaseDateCn = new HashMap<>();
Map<String, Object> mapBaseDateEn = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java
+1
View File
@@ -53,6 +53,7 @@ public class HomeDocumentDynamicEOController extends JeroController<HomeDocument
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HomeDocumentDynamicEO> queryWrapper = QueryGenerator.initQueryWrapper(homeDocumentDynamicEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<HomeDocumentDynamicEO> page = new Page<HomeDocumentDynamicEO>(pageNo, pageSize);
IPage<HomeDocumentDynamicEO> pageList = homeDocumentDynamicEOService.page(page, queryWrapper);
return Result.OK(pageList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java
+2 -2
View File
@@ -76,8 +76,8 @@ public class HomeFunctionModuleEOController extends JeroController<HomeFunctionM
@AutoLog(value = "功能模块-列表查询")
@ApiOperation(value="功能模块-列表查询", notes="功能模块-列表查询")
@GetMapping(value = "/list")
public Result<List<HomeFunctionModuleEO>> queryList() {
List<HomeFunctionModuleEO> list = homeFunctionModuleEOService.queryList();
public Result<List<HomeFunctionModuleEO>> queryList(String cut) {
List<HomeFunctionModuleEO> list = homeFunctionModuleEOService.queryList(cut);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java
+1 -1
View File
@@ -59,5 +59,5 @@ public interface IHomeFunctionModuleEOService extends IService<HomeFunctionModul
*
* @return
*/
List<HomeFunctionModuleEO> queryList();
List<HomeFunctionModuleEO> queryList(String cut);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+13 -2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.home.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.home.entity.HomeFunctionModuleEO;
import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper;
@@ -99,7 +100,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
* @return
*/
@Override
public List<HomeFunctionModuleEO> queryList() {
public List<HomeFunctionModuleEO> queryList(String cut) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//所有的图表(state=0)
@@ -111,9 +112,19 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
LambdaQueryWrapper<HomeFunctionModuleEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort);
List<HomeFunctionModuleEO> homeFunctionModuleEOS = this.list(wrapperTemp);
if(homeFunctionModuleEOS.size() == 0){
if(homeFunctionModuleEOList.size() == 0){
if(CutEnum.EN.getValue().equals(cut)){
for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) {
homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn());
}
}
return homeFunctionModuleEOList;
}else{
if(CutEnum.EN.getValue().equals(cut)){
for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) {
homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn());
}
}
return homeFunctionModuleEOS;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
+4 -53
View File
@@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelTarget;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
@@ -60,7 +61,8 @@ public class ProjectRelatedPersonnel implements Serializable {
@TableField(exist = false)
@Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4")
private java.lang.String certificationEngineerName;
@TableField(exist = false)
private List<String> certificationEngineerNameList;
/**备注*/
@Excel(name = "备注,Comments", width = 15,orderNum = "5")
private java.lang.String remark;
@@ -88,55 +90,4 @@ public class ProjectRelatedPersonnel implements Serializable {
/**中英切换标志*/
@TableField(exist = false)
private String cut;
}
/* *//**责任领域*//*
@Excel(name = "责任领域,Responsible Field", width = 15,orderNum = "1",dicCode = "duty_territory")
@Dict(dicCode = "duty_territory")
private java.lang.String dutyTerritory;
*//**法规工程师*//*
private java.lang.String lawEngineer;
@TableField(exist = false)
@Excel(name = "法规工程师,Regulation Engineer", width = 15,orderNum = "2")
private java.lang.String lawEngineerName;
*//**工程接口人*//*
private java.lang.String engineeringInterfacePerson;
@TableField(exist = false)
@Excel(name = "工程接口人,Engineering Interface", width = 15,orderNum = "3")
private java.lang.String engineeringInterfacePersonName;
*//**认证工程师*//*
private java.lang.String certificationEngineer;
@TableField(exist = false)
@Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4")
private java.lang.String certificationEngineerName;
*//**备注*//*
@Excel(name = "备注,Comments", width = 15,orderNum = "5")
private java.lang.String remark;
*//**创建人*//*
private java.lang.String createBy;
*//**创建日期*//*
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
*//**更新人*//*
private java.lang.String updateBy;
*//**更新日期*//*
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
*//**所属部门*//*
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
*//**中英切换标志*//*
@TableField(exist = false)
private String cut;
}*/
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+24 -60
View File
@@ -996,79 +996,43 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
return getOne(queryWrapper);
}
// //导入-更新数据
// private void updateDataById(List<ProjectRelatedPersonnel> records) {
//// List<ProjectRelatedPersonnel> records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId());
// for (ProjectRelatedPersonnel projectRelatedPersonnel : records) {
//// //法规工程师
//// String lawString = projectRelatedPersonnel.getLawEngineer();
//// //去重
//// if(StringUtils.isNotBlank(lawString)) {
//// List<String> lawList = Arrays.asList(lawString.split(","));
//// String lawDistinct = lawList.stream().distinct().collect(Collectors.joining(","));
//// projectRelatedPersonnel.setLawEngineer(lawDistinct);
//// }
////
//// //工程接口人
//// String interfaceString = projectRelatedPersonnel.getEngineeringInterfacePerson();
//// //去重
//// if(StringUtils.isNotBlank(interfaceString)) {
//// List<String> interfaceList = Arrays.asList(interfaceString.split(","));
//// String interfaceDistinct = interfaceList.stream().distinct().collect(Collectors.joining(","));
//// projectRelatedPersonnel.setEngineeringInterfacePerson(interfaceDistinct);
//// }
////
////// 工程接口人
//// String certificationString = projectRelatedPersonnel.getCertificationEngineer();
//// //去重
//// if(StringUtils.isNotBlank(certificationString)) {
//// List<String> certificationList = Arrays.asList(certificationString.split(","));
//// String certificationDistinct = certificationList.stream().distinct().collect(Collectors.joining(","));
//// projectRelatedPersonnel.setCertificationEngineer(certificationDistinct);
//// }
////
//// if (StringUtils.isBlank(data.getRemark())) {//数据库里备注是空的
//// projectRelatedPersonnel.setRemark(projectRelatedPersonnel.getRemark());
//// } else {
//// projectRelatedPersonnel.setRemark("");
//// }
//
// Date now = new Date();
// projectRelatedPersonnel.setUpdateTime(now);
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// projectRelatedPersonnel.setUpdateBy(sysUser.getUsername());
// updateById(projectRelatedPersonnel);
// }
// }
@Override
public List<ProjectRelatedPersonnel> queryCertificationEngineer(String projectId) {
//查询数据库中的数据
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id",projectId));
List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id", projectId));
List<ProjectRelatedPersonnel> certificationEngineerList = new ArrayList<>();
//查询基础表认证工程师的值
QueryWrapper<ProjectLibraryBase> baseQueryWrapper = new QueryWrapper<>();
List<ProjectLibraryBase> baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId));
String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer();
if (CollectionUtils.isNotEmpty(baseDataList)) {
String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer();
List<String> baseCertificationEngineerIdList = Arrays.asList(baseCertificationEngineer.split(","));
String certificationEngineerName;
QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
userqueryWrapper.in("id ", baseCertificationEngineerIdList);
List<SysUser> userList = sysUserMapper.selectList(userqueryWrapper);
if (CollectionUtils.isNotEmpty(userList)) {
for (String baseUserId : baseCertificationEngineerIdList) {
if(StringUtils.isNotBlank(baseCertificationEngineer)) {
for (ProjectRelatedPersonnel projectRelatedPersonnel : list) {
projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer);
if (StringUtils.isNotEmpty(baseUserId)) {
certificationEngineerName = userList.stream().filter(e -> baseUserId.equals(e.getId()))
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel();
relatedPersonnel.setCertificationEngineer(baseUserId);
relatedPersonnel.setCertificationEngineerName(certificationEngineerName);
certificationEngineerList.add(relatedPersonnel);
}
}
}
}
disposeData(list);
List<ProjectRelatedPersonnel> certificationEngineerList = new ArrayList<>();
for(ProjectRelatedPersonnel personnel : list){
ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel();
relatedPersonnel.setCertificationEngineer(personnel.getCertificationEngineer());
relatedPersonnel.setCertificationEngineerName(personnel.getCertificationEngineerName());
certificationEngineerList.add(relatedPersonnel);
}
certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList());
return certificationEngineerList;
}
}