Commit 176e4872 authored by wzp's avatar wzp

修改bug

parent 729e12f6
...@@ -17,7 +17,7 @@ public interface TOrganService extends IService<TOrgan> { ...@@ -17,7 +17,7 @@ public interface TOrganService extends IService<TOrgan> {
List<TOrgan> getTree(String orgCode); List<TOrgan> getTree(String orgCode);
boolean batchUpload(List excelList); boolean batchUpload(List excelList) throws Exception;
TOrgan selectById(String id); TOrgan selectById(String id);
......
...@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.rmi.server.ExportException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -59,8 +60,12 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -59,8 +60,12 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
} }
@Override @Override
public boolean batchUpload(List excelList) { public boolean batchUpload(List excelList) throws Exception{
boolean flag =false; boolean flag =false;
if (excelList.size()<1){
throw new Exception("文件没有正确数据!");
}
List<TOrgan> list1 = list(); List<TOrgan> list1 = list();
HashMap<String, TOrgan> map1 = new HashMap<>(); HashMap<String, TOrgan> map1 = new HashMap<>();
list1.stream().forEach(o-> map1.put(o.getName(),o)); list1.stream().forEach(o-> map1.put(o.getName(),o));
...@@ -69,7 +74,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -69,7 +74,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
List<Map<String, Object>> mapList = organMapper.selectArea(); List<Map<String, Object>> mapList = organMapper.selectArea();
mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString())); mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString()));
try {
for (int i = 0; i < excelList.size(); i++) { for (int i = 0; i < excelList.size(); i++) {
Map<String, String> map = null; Map<String, String> map = null;
map = (Map<String, String>) excelList.get(i); map = (Map<String, String>) excelList.get(i);
...@@ -84,12 +89,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -84,12 +89,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
ew.eq("name", organ.getName()); ew.eq("name", organ.getName());
List<TOrgan> list = list(ew); List<TOrgan> list = list(ew);
if (list != null&&list.size()>0&&list.get(0)!=null) { if (list != null&&list.size()>0&&list.get(0)!=null) {
return flag; throw new Exception("机构名称不能重复!");
} }
} }
String parent = map.get("上级机构"); String parent = map.get("上级机构");
if (map1.get(parent)==null){ if (map1.get(parent)==null){
organ.setParentId("0"); organ.setParentId("0");
...@@ -108,9 +110,13 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -108,9 +110,13 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
organ.setIsDeleted(false); organ.setIsDeleted(false);
organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
organ.setUpdateTime(LocalDateTime.now()); organ.setUpdateTime(LocalDateTime.now());
flag = save(organ); flag = save(organ);
// list.add(organ); // list.add(organ);
} }
} catch (Exception e) {
throw new Exception("文件数据错误!");
}
// flag = saveBatch(list); // flag = saveBatch(list);
return flag; return flag;
} }
......
...@@ -129,6 +129,9 @@ public class TBoxOperationController extends BaseController { ...@@ -129,6 +129,9 @@ public class TBoxOperationController extends BaseController {
tBoxOperation.setPublicKey(rsaKeys.get(0)); tBoxOperation.setPublicKey(rsaKeys.get(0));
tBoxOperation.setPrivateKey(rsaKeys.get(1)); tBoxOperation.setPrivateKey(rsaKeys.get(1));
} }
if (3==tBoxOperation.getStatus()) {
tBoxOperation.setMac("");
}
boolean flag = tBoxOperationService.updateById(tBoxOperation); boolean flag = tBoxOperationService.updateById(tBoxOperation);
UpdateWrapper<TUser> wrapper = new UpdateWrapper<>(); UpdateWrapper<TUser> wrapper = new UpdateWrapper<>();
wrapper.eq("org_id", tBoxOperation.getOrganId()); wrapper.eq("org_id", tBoxOperation.getOrganId());
......
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