From 01af9cb1c94e459184ad4d9836662094f14bac7e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 16 四月 2024 00:15:27 +0800
Subject: [PATCH] 增加标准对于产品标准的区分，修复若干其她bug
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 230 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 174 insertions(+), 56 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index b1c4eeb..85b7357 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -16,9 +16,6 @@
import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.Style;
import com.deepoove.poi.data.style.TableStyle;
-import com.deepoove.poi.render.Render;
-import com.deepoove.poi.xwpf.XWPFHighlightColor;
-import com.spire.doc.Table;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
@@ -30,14 +27,12 @@
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.GiveCode;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.poi.xwpf.usermodel.TableRowAlign;
-import org.apache.poi.xwpf.usermodel.TextAlignment;
import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,16 +40,17 @@
import javax.annotation.Resource;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -82,6 +78,9 @@
@Value("${wordUrl}")
private String wordUrl;
+
+ @Value("${twoCode}")
+ private String twoCode;
@Resource
private GiveCode giveCode;
@@ -233,113 +232,232 @@
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
+ InsReport insReport = new InsReport();
+ insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setInsOrderId(orderId);
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
- List<TableRenderData> tables = new ArrayList<>();
+ List<Map<String, Object>> tables = new ArrayList<>();
+ Set<String> standardMethod = new HashSet<>();
+ Set<String> deviceSet = new HashSet<>();
samples.forEach(a -> {
+ Set<String> templateSet = new HashSet<>();
getTemplateThing(set, map2, a);
- a.getInsProduct().forEach(b -> {
- if(b.getTemplate().size()==0){
+ a.getInsProduct().forEach(b->{
+ String[] split = b.getMethod().replaceAll("]", "").replaceAll("\\[","").replaceAll("\"","").split(",");
+ standardMethod.addAll(Arrays.asList(split));
+ if(b.getInsProductResult()!=null){
+ if(b.getInsProductResult().getEquipValue()!=null&& !Objects.equals(b.getInsProductResult().getEquipValue(), "")){
+ deviceSet.add(b.getInsProductResult().getEquipValue());
+ }
+ }
+ if (b.getTemplate().size() == 0) {
return;
}
-// System.out.println(b.getTemplate());
-// System.out.println(b.getStyle());
+ templateSet.add(JSON.toJSONString(b.getTemplate()));
+ });
+ AtomicInteger index = new AtomicInteger();
+ templateSet.forEach(tem->{
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
RowRenderData rowRenderData;
Set<String> delSet = new HashSet<>();
- for (JSONObject jo1 : b.getTemplate()) {
+ List<JSONObject> temp = JSON.parseArray(tem, JSONObject.class);
+ Map<String, InsProduct> pMap = new HashMap<>();
+ Set<String> delRSet = new HashSet<>();
+ for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- if(v.get("ps")!=null){
-// System.out.println(v);
- if("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value")+"")){
- delSet.add(jo1.get("c")+"");
+ if (v.get("ps") != null) {
+ if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ delSet.add(jo1.get("c") + "");
+ }
+ if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ int count2 = 0;
+ for (InsProduct p : a.getInsProduct()) {
+ if(v.get("v").equals(p.getInspectionItemSubclass())){
+ pMap.put(jo1.get("r")+"", p);
+ break;
+ }else{
+ count2++;
+ }
+ }
+ if(count2 == a.getInsProduct().size()){
+ delRSet.add(jo1.get("r")+"");
+ }
}
}
}
- for (int i = 0;i<b.getTemplate().size();i++) {
- JSONObject jo1 = b.getTemplate().get(i);
- if (delSet.stream().anyMatch(e->e.equals(jo1.get("c")+""))){
+ for (int i = 0; i < temp.size(); i++) {
+ JSONObject jo1 = temp.get(i);
+ if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
+ continue;
+ }
+ if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
continue;
}
TextRenderData textRenderData = new TextRenderData();
- if (set2.add(Integer.parseInt(jo1.get("r") + "")) || i == b.getTemplate().size()-1) {
- if(text.size() > 0){
+ if (set2.add(Integer.parseInt(jo1.get("r") + ""))) {
+ if (text.size() > 0) {
TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
- rowRenderData = Rows.of(text2).create();
+ rowRenderData = Rows.of(text2).center().rowAtleastHeight(1).create();
rows.add(rowRenderData);
text = new ArrayList<>();
}
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- textRenderData.setText(v.get("v")==null?"":v.get("v")+"");
+ InsProduct p = pMap.get(jo1.get("r") + "");
+ if (p!=null && v.get("ps") != null) {
+ String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ if (value.equals("瑕佹眰鍊�")) {
+ textRenderData.setText(p.getAsk());
+ } else if (value.equals("鍗曚綅")) {
+ textRenderData.setText(p.getUnit());
+ } else if (value.equals("缁撹")) {
+ switch (p.getInsResult()) {
+ case 1:
+ textRenderData.setText("鈭�");
+ break;
+ case 0:
+ textRenderData.setText("脳");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else if (value.equals("搴忓彿")) {
+ index.getAndIncrement();
+ textRenderData.setText(index + "");
+ } else if (value.equals("璁＄畻鍊�")) {
+ JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
+ textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "/" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
+ } else if (value.equals("鏈�缁堝��")) {
+ textRenderData.setText(p.getLastValue());
+ } else if (value.equals("鏍峰搧缂栧彿")) {
+ textRenderData.setText(a.getSampleCode());
+ } else if (value.equals("鏍峰搧鍨嬪彿")) {
+ textRenderData.setText(a.getModel());
+ } else if (value.equals("鏍峰搧鍚嶇О")) {
+ textRenderData.setText(a.getSample());
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else if (p==null && v.get("ps") != null) {
+ String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ p = pMap.get(pMap.keySet().iterator().next());
+ if (value.equals("鏈�缁堝��")) {
+ textRenderData.setText(p.getLastValue());
+ } else if (value.equals("缁撹")) {
+ switch (p.getInsResult()) {
+ case 1:
+ textRenderData.setText("鉁�");
+ break;
+ case 0:
+ textRenderData.setText("鉁�");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else if (value.equals("鏍峰搧缂栧彿")) {
+ textRenderData.setText(a.getSampleCode());
+ } else if (value.equals("鏍峰搧鍨嬪彿")) {
+ textRenderData.setText(a.getModel());
+ } else if (value.equals("鏍峰搧鍚嶇О")) {
+ textRenderData.setText(a.getSample());
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
Style style = new Style();
- style.setFontFamily(v.get("ff")==null?"寰蒋闆呴粦":v.get("ff")+"");
+ style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
- style.setColor(v.get("fc")==null?"000000":(v.get("fc")+"").replace("#",""));
- /*String align;
- switch (v.get("ht")+""){
- case "0":
- align = "center";
- break;
- case "2":
- align = "right";
- break;
- default:
- align = "left";
- break;
- }*/
+ style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
textRenderData.setStyle(style);
text.add(textRenderData);
+ if (i == temp.size() - 1) {
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ rows.add(rowRenderData);
+ text = new ArrayList<>();
+ }
}
- rows.forEach(System.out::println);
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
TableStyle tableStyle = new TableStyle();
- JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
+ /*JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
List<Integer> colLen = new ArrayList<>();
int colSize = rows.get(0).getCells().size();
- int colOne = Integer.parseInt(b.getTemplate().get(0).get("r")+"");
+ int colOne = Integer.parseInt(b.getTemplate().get(0).get("r") + "");
for (int i = colOne; i < colSize + colOne; i++) {
- if(styleJo.get(i + "") == null){
+ if (styleJo.get(i + "") == null) {
colLen.add(pxToCm(100));
- }else{
+ } else {
int i1 = Integer.parseInt(styleJo.get(i + "") + "");
colLen.add(pxToCm(i1));
}
- }
+ }*/
// tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
tableStyle.setAlign(TableRowAlign.CENTER);
tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
tableRenderData.setTableStyle(tableStyle);
- tables.add(tableRenderData);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table", tableRenderData);
+ table.put("report", insReport);
+ tables.add(table);
});
});
- InsReport insReport = new InsReport();
- insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
- insReport.setInsOrderId(orderId);
String url;
try {
- url = ResourceUtils.getURL("classpath:static/template-table.docx").getPath();
+ url = ResourceUtils.getURL("classpath:static/report-template.docx").getPath();
} catch (FileNotFoundException e) {
throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
}
-
- XWPFTemplate template = XWPFTemplate.compile(url).render(
+ StringBuilder standardMethod2 = new StringBuilder();
+ for (String s : standardMethod) {
+ standardMethod2.append("銆�").append(s);
+ }
+ standardMethod2.replace(0, 1,"");
+ tables.forEach(table->{
+ table.put("tableSize", tables.size() + 1);
+ });
+ List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ Map<String, String> codeStr = new HashMap<>();
+ codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
+ codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
+ codeStr.put("瑙勬牸鍨嬪彿", samples.get(0).getModel());
+ codeStr.put("鍙戞斁鏃ユ湡", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ String codePath;
+ try {
+ codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{","")
+ .replaceAll("}","").replaceAll(",","").replaceAll("\"",""), twoCode);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ ConfigureBuilder builder = Configure.builder();
+ builder.useSpringEL(true);
+ XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
put("user", user);
- put("samples", samples);
+// put("samples", samples);
put("sampleSize", samples.size() + samples.get(0).getUnit());
- put("tables", tables.get(0));
+ put("tables", tables);
+ put("tableSize", tables.size() + 1);
+ put("standardMethod", standardMethod2);
+ put("deviceList", deviceList);
+ put("twoCode", Pictures.ofLocal(codePath).create());
}});
try {
- String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd_HH_mm_ss")) + ".docx";
+ String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd&HH_mm_ss")) + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
insReportMapper.insert(insReport);
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -405,7 +523,7 @@
return 1;
}
- public int pxToCm(int px){
+ public int pxToCm(int px) {
return px / 9;
}
}
--
Gitblit v1.9.3