bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目修改优化

This commit is contained in:
马三炮 2025-04-29 18:13:27 +08:00
parent 320c89fffd
commit 86f46787da
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
View File

@ -129,7 +129,7 @@ public class TbTowerController {
/** /**
* 杆塔管理导入 * 杆塔管理导入
* @param file * @param file
* @param tbTowerVo * @param params
* @return * @return
* @throws IOException * @throws IOException
*/ */
@ -146,6 +146,8 @@ public class TbTowerController {
} else if (fileSize > 10 * 1024 * 1024) { } else if (fileSize > 10 * 1024 * 1024) {
// 文件大小超过10M // 文件大小超过10M
return ServerResponse.createErroe("文件大小超过10M"); return ServerResponse.createErroe("文件大小超过10M");
} else if(!fileName.contains("2000国家大地坐标系导入模版") && !fileName.contains("WGS-84地心坐标系导入模版")){
return ServerResponse.createErroe("请上传正确的模板");
} }
} }
ExcelUtil<TbTowerVo> util = new ExcelUtil<TbTowerVo>(TbTowerVo.class); ExcelUtil<TbTowerVo> util = new ExcelUtil<TbTowerVo>(TbTowerVo.class);
@ -154,6 +156,12 @@ public class TbTowerController {
return ServerResponse.createErroe("文件条数超过3000"); return ServerResponse.createErroe("文件条数超过3000");
} }
TbTowerVo tbTowerVo = FastJsonHelper.jsonStrToBean(params, TbTowerVo.class); TbTowerVo tbTowerVo = FastJsonHelper.jsonStrToBean(params, TbTowerVo.class);
TbTowerVo tbTower = tbTowerVoList.get(0);
if (tbTowerVo.getUploadType().equals("1") && tbTower.getCentralMeridian()!=null){
return ServerResponse.createErroe("请上传对应模板");
}else if(tbTowerVo.getUploadType().equals("2") && tbTower.getCentralMeridian()==null){
return ServerResponse.createErroe("请上传对应模板");
}
String message = tbTowerService.tbTowerExport(tbTowerVoList, tbTowerVo); String message = tbTowerService.tbTowerExport(tbTowerVoList, tbTowerVo);
return ServerResponse.createBySuccessMsg(message); return ServerResponse.createBySuccessMsg(message);
} }

40
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
View File

@ -3,10 +3,7 @@ package com.bonus.digitalSignage.basic.service.impl;
import com.bonus.digitalSignage.basic.dao.TbTowerMapper; import com.bonus.digitalSignage.basic.dao.TbTowerMapper;
import com.bonus.digitalSignage.basic.service.TbTowerService; import com.bonus.digitalSignage.basic.service.TbTowerService;
import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo;
import com.bonus.digitalSignage.utils.CoordinateConverter; import com.bonus.digitalSignage.utils.*;
import com.bonus.digitalSignage.utils.ServerResponse;
import com.bonus.digitalSignage.utils.StrUtil;
import com.bonus.digitalSignage.utils.UserUtil;
import com.bonus.digitalSignage.webResult.StringUtils; import com.bonus.digitalSignage.webResult.StringUtils;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -176,21 +173,48 @@ public class TbTowerServiceImpl implements TbTowerService {
public String tbTowerExport(List<TbTowerVo> tbTowerVoList, TbTowerVo tbTowerVo) { public String tbTowerExport(List<TbTowerVo> tbTowerVoList, TbTowerVo tbTowerVo) {
if (tbTowerVoList.size()>0){ if (tbTowerVoList.size()>0){
int num = 1; int num = 1;
StringBuffer error = new StringBuffer();
try { try {
for (int i = 0; i < tbTowerVoList.size(); i++) { for (int i = 0; i < tbTowerVoList.size(); i++) {
TbTowerVo tbTower = tbTowerVoList.get(i);
//判断数据是否为空
if (!checkParam(tbTower,tbTowerVo.getUploadType())){
log.error("第{}条数据导入失败,数据为空",num);
error.append(","+num);
continue;
}
tbTowerVoList.get(i).setProId(tbTowerVo.getProId()); tbTowerVoList.get(i).setProId(tbTowerVo.getProId());
tbTowerVoList.get(i).setUploadType(tbTowerVo.getUploadType()); tbTowerVoList.get(i).setUploadType(tbTowerVo.getUploadType());
addTbTower(tbTowerVoList.get(i)); ServerResponse serverResponse =addTbTower(tbTowerVoList.get(i));
if(serverResponse.getStatus()!= ResponseCode.SUCCESS.getCode()){
log.error("第{}条数据导入失败,错误信息为：{}",num,serverResponse.getMsg());
error.append(","+num);
}
num++; num++;
} }
}catch (Exception e){ }catch (Exception e){
log.error("第{}条数据导入失败,错误信息为：{}",num,e.getMessage()); log.error("第{}条数据导入失败,错误信息为：{}",num,error);
} }
return "导入成功"; String msg =error.substring(1);
return "导入成功,第"+msg+"条数据有问题";
}else { }else {
return "数据不能为空"; return "数据不能为空";
} }
} }
private boolean checkParam(TbTowerVo tbTower, String uploadType) {
if (uploadType.equals("1")){
if (tbTower.getLat().isEmpty() || tbTower.getLat().isEmpty() || tbTower.getTowerName().isEmpty() || tbTower.getSort()==null){
return false;
}
} else if (uploadType.equals("1")) {
if (tbTower.getLat().isEmpty() || tbTower.getLat().isEmpty() || tbTower.getTowerName().isEmpty() || tbTower.getSort()==null || tbTower.getCentralMeridian().isEmpty()){
return false;
}
}
return true;
}
} }