Skip to content

A
amos-boot-biz
Commit c1adfde9 authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

parents 485b2ff8 92655c3e
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 26 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipRegistrationInfoMapper.java
View file @ c1adfde9
...@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
...@@ -31,4 +32,47 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis ...@@ -31,4 +32,47 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
"</foreach>" + "</foreach>" +
"</script>") "</script>")
List<String> getUsedCountBySeqCodes(@Param("sequenceCodes") Set<String> sequenceCodes); List<String> getUsedCountBySeqCodes(@Param("sequenceCodes") Set<String> sequenceCodes);
@DS("tzs")
@Select("<script>" +
"SELECT DISTINCT" +
" sequenceCode," +
" record," +
" unitName," +
" factoryNum," +
" cylinderVariety," +
" cylinderVarietyName," +
" unitInnerCode," +
" informationManageCode," +
" appId," +
" creditCode," +
" regionCode " +
"FROM" +
" (" +
" SELECT" +
" CONCAT ( fi.\"PRODUCE_UNIT_CREDIT_CODE\", '-', fi.\"FACTORY_NUM\" ) AS sequenceCode," +
" fi.\"RECORD\" AS record," +
" ui.\"ESTATE_UNIT_NAME\" AS unitName," +
" fi.\"FACTORY_NUM\" AS factoryNum," +
" ri.\"EQU_DEFINE\" AS cylinderVariety," +
" ( SELECT NAME FROM tz_equipment_category WHERE code = ri.\"EQU_DEFINE\" ) AS cylinderVarietyName," +
" ui.\"USE_INNER_CODE\" AS unitInnerCode," +
" oi.\"INFORMATION_MANAGE_CODE\" AS informationManageCode," +
" ( SELECT app_id FROM tz_base_enterprise_info WHERE use_code = ( SELECT \"USE_UNIT_CREDIT_CODE\" FROM idx_biz_jg_use_info WHERE \"RECORD\" = fi.\"RECORD\" ) ) AS appId," +
" ui.\"USE_UNIT_CREDIT_CODE\" AS creditCode," +
" ( SELECT ui.\"PROVINCE\" || '#' || ui.\"CITY\" || '#' || ui.\"COUNTY\" ) AS regionCode " +
" FROM" +
" idx_biz_jg_factory_info fi" +
" JOIN idx_biz_jg_other_info oi ON oi.\"RECORD\" = fi.\"RECORD\"" +
" JOIN idx_biz_jg_use_info ui ON ui.\"RECORD\" = fi.\"RECORD\"" +
" JOIN idx_biz_jg_register_info ri ON ri.\"RECORD\" = fi.\"RECORD\" " +
" WHERE" +
" oi.\"CLAIM_STATUS\" = '已认领' " +
" AND fi.\"PRODUCE_UNIT_CREDIT_CODE\" IS NOT NULL " +
" AND fi.\"FACTORY_NUM\" IS NOT NULL " +
" ) subquery " +
"WHERE sequenceCode = #{sequenceCode} " +
"LIMIT 1" +
"</script>")
Map<String, Object> getCylUseInfoBySeqCode(@Param("sequenceCode") String sequenceCode);
} }
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SyncCylinderDataService.java
View file @ c1adfde9
...@@ -6,7 +6,9 @@ import com.google.common.collect.Lists; ...@@ -6,7 +6,9 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.api.openapi.face.model.*; import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderFillingRecordRepository; import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderFillingRecordRepository;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderInfoRepository; import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderInfoRepository;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipRegistrationInfoMapper;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto; import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto; import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.enums.CylDictEnum; import com.yeejoin.amos.boot.module.cylinder.api.enums.CylDictEnum;
...@@ -26,8 +28,8 @@ import org.typroject.tyboot.core.foundation.utils.Bean; ...@@ -26,8 +28,8 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@Component @Component
...@@ -84,6 +86,12 @@ public class SyncCylinderDataService { ...@@ -84,6 +86,12 @@ public class SyncCylinderDataService {
@Autowired @Autowired
CylinderOffloadingMapper cylinderOffloadingMapper; CylinderOffloadingMapper cylinderOffloadingMapper;
@Autowired
MidEquipRegistrationInfoMapper registrationInfoMapper;
@Autowired
private SnowflakeIdUtil sequence;
@Value("${cylinder.filling.insert.topic:cylinder/filling/insert/topic}") @Value("${cylinder.filling.insert.topic:cylinder/filling/insert/topic}")
private String insertTopic; private String insertTopic;
...@@ -173,37 +181,71 @@ public class SyncCylinderDataService { ...@@ -173,37 +181,71 @@ public class SyncCylinderDataService {
@DS("tzs") @DS("tzs")
public void createCylinderFillingRecord(List<ESCylinderFillingRecordDto> cylinderFillingRecord) { public void createCylinderFillingRecord(List<ESCylinderFillingRecordDto> cylinderFillingRecord) {
if (!ObjectUtils.isEmpty(cylinderFillingRecord)) { if (!ObjectUtils.isEmpty(cylinderFillingRecord)) {
List<String> appIds = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getAppId).collect(Collectors.toList()); // List<String> appIds = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getAppId).collect(Collectors.toList());
List<String> sequenceCodeS = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getSequenceCode).collect(Collectors.toList()); // List<String> sequenceCodeS = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getSequenceCode).collect(Collectors.toList());
List<ESCylinderFillingRecordDto> cylinderFillingRecordInfo = cylinderFillingRecordMapper.getCylinderFillingRecordInfo(appIds, sequenceCodeS); // List<ESCylinderFillingRecordDto> cylinderFillingRecordInfo = cylinderFillingRecordMapper.getCylinderFillingRecordInfo(appIds, sequenceCodeS);
cylinderFillingRecord.stream().map(item -> { // cylinderFillingRecord.stream().map(item -> {
List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> item.getAppIdAndSequenceCode().equals(e.getAppIdAndSequenceCode())).collect(Collectors.toList()); // List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> item.getAppIdAndSequenceCode().equals(e.getAppIdAndSequenceCode())).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) { // if (!ObjectUtils.isEmpty(collect)) {
item.setSequenceNbr(collect.get(0).getSequenceNbr()); // item.setSequenceNbr(collect.get(0).getSequenceNbr());
item.setUnitName(collect.get(0).getUnitName()); // item.setUnitName(collect.get(0).getUnitName());
item.setFactoryNum(collect.get(0).getFactoryNum()); // item.setFactoryNum(collect.get(0).getFactoryNum());
item.setCylinderVariety(collect.get(0).getCylinderVariety()); // item.setCylinderVariety(collect.get(0).getCylinderVariety());
item.setCylinderVarietyName(collect.get(0).getCylinderVarietyName()); // item.setCylinderVarietyName(collect.get(0).getCylinderVarietyName());
item.setUnitInnerCode(collect.get(0).getUnitInnerCode()); // item.setUnitInnerCode(collect.get(0).getUnitInnerCode());
item.setSequenceCode(collect.get(0).getSequenceCode()); // item.setSequenceCode(collect.get(0).getSequenceCode());
item.setQrCode(collect.get(0).getQrCode()); // item.setQrCode(collect.get(0).getQrCode());
item.setElectronicLabelCode(collect.get(0).getElectronicLabelCode()); // item.setElectronicLabelCode(collect.get(0).getElectronicLabelCode());
item.setAppId(collect.get(0).getAppId()); // item.setAppId(collect.get(0).getAppId());
item.setCreditCode(collect.get(0).getCreditCode()); // item.setCreditCode(collect.get(0).getCreditCode());
item.setRegionCode(collect.get(0).getRegionCode()); // item.setRegionCode(collect.get(0).getRegionCode());
try { // try {
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime()); // item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime()); // item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
} catch (ParseException e) { // } catch (ParseException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
// }
// return item;
// });
cylinderFillingRecord.forEach(item -> {
String sequenceCode = item.getSequenceCode();
System.out.println("Processing sequenceCode: " + sequenceCode);
Map<String, Object> cylUseInfo = registrationInfoMapper.getCylUseInfoBySeqCode(sequenceCode);
if (ObjectUtils.isEmpty(cylUseInfo)) {
return;
}
item.setSequenceNbr(sequence.nextId());
item.setUnitName((String) cylUseInfo.get("unitName"));
item.setFactoryNum((String) cylUseInfo.get("factoryNum"));
item.setCylinderVariety(Integer.valueOf((String) cylUseInfo.get("cylinderVariety")));
item.setCylinderVarietyName((String) cylUseInfo.get("cylinderVarietyName"));
item.setUnitInnerCode((String) cylUseInfo.get("unitInnerCode"));
item.setSequenceCode((String) cylUseInfo.get("sequenceCode"));
item.setQrCode((String) cylUseInfo.get("informationManageCode"));
item.setElectronicLabelCode((String) cylUseInfo.get("informationManageCode"));
item.setAppId((String) cylUseInfo.get("appId"));
item.setCreditCode((String) cylUseInfo.get("creditCode"));
item.setRegionCode((String) cylUseInfo.get("regionCode"));
try {
item.setInspectionDateMs(parseDateOrDefault(item.getFillingStartTime()));
item.setInspectionDateAfterMS(parseDateOrDefault(item.getFillingEndTime()));
} catch (ParseException e) {
item.setInspectionDateMs(0L);
item.setInspectionDateAfterMS(0L);
} }
return item;
}); });
saveCylinderFillingRecord2ES(cylinderFillingRecord); saveCylinderFillingRecord2ES(cylinderFillingRecord);
} }
} }
private long parseDateOrDefault(String date) throws ParseException {
return ObjectUtils.isEmpty(date) ? 0L : DateUtils.dateParseWithPattern(date).getTime();
}
public void saveCylinderFillingRecord2ES(List<ESCylinderFillingRecordDto> records) { public void saveCylinderFillingRecord2ES(List<ESCylinderFillingRecordDto> records) {
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
for (ESCylinderFillingRecordDto record : records) { for (ESCylinderFillingRecordDto record : records) {
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/FileController.java 0 → 100644
View file @ c1adfde9
package com.yeejoin.amos.boot.module.tcm.biz.controller;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ooxml.POIXMLDocumentPart;
import org.apache.poi.ss.extractor.EmbeddedData;
import org.apache.poi.ss.extractor.EmbeddedExtractor;
import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.PictureData;
import org.apache.poi.ss.usermodel.Shape;
import org.apache.poi.xssf.usermodel.*;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@RestController
@RequestMapping(value = "/file")
@Slf4j
public class FileController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/upload")
public ResponseModel<Boolean> importData07(@RequestBody MultipartFile file, boolean updateSupport) throws Exception {
// 获取文件流
InputStream inputStream = file.getInputStream();
// 创建一个工作薄对象
XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
// 获取第一个工作表对象
String sheetName = workbook.getSheetName(0);
XSSFSheet sheet = workbook.getSheet(sheetName);
getPicturesXSS1(sheet);
getPicturesXSS2(sheet);
workbook.close();
return ResponseHelper.buildResponse(Boolean.TRUE);
}
private void getPicturesXSS1(XSSFSheet sheet) {
XSSFDrawing patriarch = sheet.createDrawingPatriarch();
// 获取excel所有的图片对象
List<XSSFShape> shapes = patriarch.getShapes();
for (Shape shape : shapes) {
if (shape instanceof XSSFPicture) {
XSSFPicture picture = (XSSFPicture) shape;
ClientAnchor anchor2 = picture.getClientAnchor();
int row1 = anchor2.getRow1();
short col1 = anchor2.getCol1();
// 获取图片单元格坐标。例R3、A4等
// String cellRef = new CellReference(row1, col1).formatAsString();
// 根据图片位置获取对应的第一行标题单元格
// Row row = sheet.getRow(row1 - row1);
// Cell cell3 = row.getCell(col1);
// 获取标题单元格文本内容
// String stringCellValue = cell3.getStringCellValue();
// System.out.println("图片所在的单元格标题: " + stringCellValue);
// 获取图片数据
XSSFPictureData pictureData = picture.getPictureData();
byte[] bytes = pictureData.getData();
// 图片保存至本地
FileOutputStream out = null;
try (FileOutputStream fos = new FileOutputStream("D:\\temp\\" + UUID.randomUUID() + "." + pictureData.suggestFileExtension())) {
// 图片保存至本地
fos.write(bytes);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
}
private Map<String, PictureData> getPicturesXSS2(XSSFSheet sheet) {
Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
for (POIXMLDocumentPart dr : sheet.getRelations()) {
if (dr instanceof XSSFDrawing) {
XSSFDrawing drawing = (XSSFDrawing)dr;
for(XSSFShape shape :drawing.getShapes()) {
if(shape instanceof XSSFPicture) {
XSSFPicture picture = (XSSFPicture)shape;
XSSFPictureData pictureData = picture.getPictureData();
byte[] bytes = pictureData.getData();
try (FileOutputStream fos = new FileOutputStream("D:\\temp\\" + UUID.randomUUID() + "." + pictureData.suggestFileExtension())) {
// 图片保存至本地
fos.write(bytes);
} catch (IOException e) {
log.error(e.getMessage());
}
}
}
}
}
return sheetIndexPicMap;
}
/**
* 镶入的附件解析
*
* @param file
* @return
* @throws Exception
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/extractor")
public ResponseModel<Boolean> importData3(@RequestBody MultipartFile file) throws Exception {
// 获取文件流
InputStream inputStream = file.getInputStream();
// 创建一个工作薄对象
XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
// 获取第一个工作表对象
XSSFSheet sheet = workbook.getSheetAt(0);
EmbeddedExtractor extractor = new EmbeddedExtractor();
for (EmbeddedData embeddedData : extractor.extractAll(sheet)) {
Shape shape = embeddedData.getShape();
System.out.println(shape);
String filename = embeddedData.getFilename();
System.out.println(filename);
byte[] data = embeddedData.getEmbeddedData(); //data now contains the embedded data
try (FileOutputStream dataOut = new FileOutputStream("D:\\temp\\" + UUID.randomUUID() + filename)) {
dataOut.write(data);
}
}
workbook.close();
return ResponseHelper.buildResponse(Boolean.TRUE);
}
//xlsx版本表格的图片信息
public static PictureData getSheetPictrues07(int sheetNum,
XSSFSheet sheet) {
Map<Integer, PictureData> sheetIndexPicMap = new HashMap<Integer, PictureData>();
for (POIXMLDocumentPart dr : sheet.getRelations()) {
if (dr instanceof XSSFDrawing) {
XSSFDrawing drawing = (XSSFDrawing) dr;
List<XSSFShape> shapes = drawing.getShapes();
for (XSSFShape shape : shapes) {
XSSFPicture pic = (XSSFPicture) shape;
XSSFClientAnchor anchor = pic.getPreferredSize();
CTMarker ctMarker = anchor.getFrom();
Integer picIndex = ctMarker.getRow();
sheetIndexPicMap.put(picIndex, pic.getPictureData());
}
}
}
return sheetIndexPicMap.get(sheetNum);
}
}
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