| | |
| | | */ |
| | | @Override |
| | | public Result removeById(String id) { |
| | | log.info("执行删除方法-------------------"); |
| | | if (baseMapper.deleteById(id) > 0) { |
| | | return Result.ok("删除成功"); |
| | | } |
| | |
| | | if (!CollectionUtils.isEmpty(dynamics)) { |
| | | dynamicMap = dynamics.stream().filter(vo -> vo.getRefId() != null).collect(Collectors.groupingBy(DynamicColumnVO::getRefId)); |
| | | } |
| | | //定义表头列表 |
| | | //定义固定表头列表 |
| | | LinkedHashSet<String> headers = new LinkedHashSet<>(); |
| | | headers.add(PointHeaderConstant.ID); |
| | | headers.add(PointHeaderConstant.Point_Name); |
| | |
| | | headers.add(PointHeaderConstant.Province_Tag_Face); |
| | | headers.add(PointHeaderConstant.Impotrant_Command_Image); |
| | | headers.add(PointHeaderConstant.Dept_Tag); |
| | | headers.add(PointHeaderConstant.Username); |
| | | headers.add(PointHeaderConstant.Password); |
| | | List<String> headersList = new LinkedList<>(); |
| | | if (!CollectionUtils.isEmpty(dynamicsHeaders)) { |
| | | //使用链表保证后续补充数据时获取数据顺序一致 |
| | |
| | | list.add(export.getProvinceTagFaceString()); |
| | | list.add(export.getImportantCommandImageTagString()); |
| | | list.add(export.getDeptTagString()); |
| | | list.add(export.getUsername()); |
| | | list.add(export.getPassword()); |
| | | for (String header : headersList) { |
| | | //创建一个变量记录找没找到这个header |
| | | boolean flag = false; |
| | |
| | | needUpdateUnit) throws IOException, ExecutionException, InterruptedException { |
| | | List<Map<String, String>> list = EasyExcelImportUtils.makeData(file); |
| | | List<PointExport> dataList = new ArrayList<>(); |
| | | |
| | | // Consumer<List<PointExport>> consumer = (dataList) -> { |
| | | // try { |
| | | // this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit); |
| | |
| | | pointExport.setProvinceTagFace("是".equals(map.get(PointHeaderConstant.Province_Tag_Face))); |
| | | pointExport.setImportantCommandImageTag("是".equals(map.get(PointHeaderConstant.Impotrant_Command_Image))); |
| | | pointExport.setDeptTag("是".equals(map.get(PointHeaderConstant.Dept_Tag))); |
| | | pointExport.setUsername(map.get(PointHeaderConstant.Username)); |
| | | pointExport.setPassword(map.get(PointHeaderConstant.Password)); |
| | | List<DynamicColumnVO> dynamics = new ArrayList<>(); |
| | | // 处理动态列 |
| | | for (Map.Entry<String, String> entry : map.entrySet()) { |
| | |
| | | point.setProvinceTagCar(item.getProvinceTagCar()); |
| | | point.setProvinceTagFace(item.getProvinceTagFace()); |
| | | point.setDeptTag(item.getDeptTag()); |
| | | point.setUsername(item.getUsername()); |
| | | point.setPassword(item.getPassword()); |
| | | if (needUpdateUnit) { |
| | | if (Objects.nonNull(unitId)) { |
| | | point.setUnitId(Long.valueOf(unitId)); |