Skip to content

A
amos-boot-biz
Commit bd164ca6 authored by litengwei's avatar litengwei
Browse files
Options

Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

parents 6a401514 adc8c407
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 47 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java
View file @ bd164ca6
......@@ -89,7 +89,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
@Value("${param.nrvideo.url}")
private String nrvideoUrl;
@Value("${param.nrflvbyvoideoid.url}")
private String nrflvByVoideoidUrl;
......@@ -459,7 +459,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
throw new RuntimeException("错误行" + rowNum + "：地址不能大于2000");
}
if (ValidationUtil.isEmpty(x.getRemark())&&x.getRemark().length()>255) {
if (!ValidationUtil.isEmpty(x.getRemark())&&x.getRemark().length()>255) {
throw new RuntimeException("错误行" + rowNum + "：备注不能大于255");
}
......@@ -643,7 +643,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
}
return url;
}
public String getFlvUrlByVideoId(String videoId) {
try {
Map<String, Object> request = new HashMap<String, Object>();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java
View file @ bd164ca6
......@@ -20,14 +20,12 @@ import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class OrganizationImpl extends BaseService<Organization,Organization, OrganizationMapper> implements OrganizationService {
public class OrganizationImpl extends BaseService<Organization, Organization, OrganizationMapper> implements OrganizationService {
@Autowired
private OrganizationMapper organizationMapper;
......@@ -35,11 +33,43 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
@Autowired
private OrganizationUserMapper organizationUserMapper;
private static String NAME="组员信息表第";
private static String NAME = "组员信息表第";
@Override
public Page<Map<String, Object>> getOrganizationInfo(Page<Map<String, Object>> page, String bizOrgCode) {
return organizationMapper.getOrganizationInfo(page, bizOrgCode);
Page<Map<String, Object>> page1 = new Page<>();
List<Map<String, Object>> list = organizationMapper.getOrganizationInfo(page, bizOrgCode).getRecords();
LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
wrapper.orderByDesc(Organization::getSort);
List<Organization> organizations = this.baseMapper.selectList(wrapper);
List<Map<String, Object>> res = new ArrayList<>();
if (0 < list.size()) {
for (Map<String, Object> map : list) {
Map<String, Object> tempMap = new HashMap<>();
if (ObjectUtils.isEmpty(map.get("value"))) {
tempMap.put("name", map.get("name") + "");
tempMap.put("value", "");
} else {
tempMap.put("name", map.get("name") + " " + map.get("value") + "人");
Organization organization = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(map.get("name"))).collect(Collectors.toList()).get(0);
String[] nameArr = organization.getGroupLeader().split(",");
List<String> nameList = Arrays.asList(nameArr);
String[] telArr = new String[nameList.size()];
if (ObjectUtils.isNotEmpty(organization.getGroupLeaderTel())) {
telArr = organization.getGroupLeaderTel().split("\n");
}
List<String> telList = Arrays.asList(telArr);
List<String> valueList = new ArrayList<>();
for (int i = 0; i < nameList.size(); i++) {
valueList.add(nameList.get(i) + "-" + telList.get(i));
}
tempMap.put("value", String.join(",", valueList));
}
res.add(tempMap);
}
}
page1.setRecords(res);
return page1;
}
@Override
......@@ -63,51 +93,50 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
public void saveOrganization(List<OrganizationExportDto> data, List<OrganizationUserExportDto> userData, String bizOrgCode) {
//由于可以单独导入组，或者单独导入人，只做都为空效验
if(data==null&&userData==null&&data.size()>0&&userData.size()>0){
if (data == null && userData == null && data.size() > 0 && userData.size() > 0) {
throw new BadRequest("请填入数据导入！");
}
//对分组数据入库
int sort1 = organizationMapper.selectMaxSort();
checkOrganizationData(data);
for (OrganizationExportDto dto : data) {
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
Organization organization = new Organization();
if (CollectionUtils.isEmpty(organizations)){
BeanUtils.copyProperties(dto, organization);
sort1 = sort1 + 1;
organization.setSort(sort1);
organization.setBizOrgCode(bizOrgCode);
organizationMapper.insert(organization);
}
int sort1 = organizationMapper.selectMaxSort();
checkOrganizationData(data);
for (OrganizationExportDto dto : data) {
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
Organization organization = new Organization();
if (CollectionUtils.isEmpty(organizations)) {
BeanUtils.copyProperties(dto, organization);
sort1 = sort1 + 1;
organization.setSort(sort1);
organization.setBizOrgCode(bizOrgCode);
organizationMapper.insert(organization);
}
}
//对人员数据入库
checkOrganizationUserData(userData);
int sort = organizationMapper.selectOrganizationUserMaxSort();
for (OrganizationUserExportDto userExportDto : userData) {
OrganizationUser organizationUser = new OrganizationUser();
BeanUtils.copyProperties(userExportDto, organizationUser);
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, userExportDto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
if (CollectionUtils.isEmpty(organizations)){
throw new BadRequest("用户组"+userExportDto.getEmergencyTeamName()+"不存在，请先导入用户组！");
}else{
organizationUser.setEmergencyTeamId(String.valueOf(organizations.get(0).getSequenceNbr()));
sort = sort + 1;
organizationUser.setSort(sort);
organizationUserMapper.insert(organizationUser);
}
checkOrganizationUserData(userData);
int sort = organizationMapper.selectOrganizationUserMaxSort();
for (OrganizationUserExportDto userExportDto : userData) {
OrganizationUser organizationUser = new OrganizationUser();
BeanUtils.copyProperties(userExportDto, organizationUser);
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, userExportDto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
if (CollectionUtils.isEmpty(organizations)) {
throw new BadRequest("用户组" + userExportDto.getEmergencyTeamName() + "不存在，请先导入用户组！");
} else {
organizationUser.setEmergencyTeamId(String.valueOf(organizations.get(0).getSequenceNbr()));
sort = sort + 1;
organizationUser.setSort(sort);
organizationUserMapper.insert(organizationUser);
}
}
}
......@@ -116,7 +145,7 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
for (int i = 0; i < data.size(); i++) {
OrganizationExportDto dto = data.get(i);
if (ObjectUtils.isEmpty(dto.getEmergencyTeamName())) {
throw new BadRequest("应急救援小组信息表第" +(i + 1) + "行, 应急救援小组名称为必填信息！");
throw new BadRequest("应急救援小组信息表第" + (i + 1) + "行, 应急救援小组名称为必填信息！");
}
if (ObjectUtils.isEmpty(dto.getGroupLeader())) {
throw new BadRequest("应急救援小组信息表第" + (i + 1) + "行, 组长为必填信息！");
......@@ -134,7 +163,7 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
throw new BadRequest(NAME + (i + 1) + "行, 组员姓名为必填信息！");
}
if (ObjectUtils.isEmpty(dto.getTelephone())) {
throw new BadRequest(NAME + (i + 1)+ "行, 组员电话为必填信息！");
throw new BadRequest(NAME + (i + 1) + "行, 组员电话为必填信息！");
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment