From a86d2feff2af246bdf09c32e6591eb590cefa672 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 09:00:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 268 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 176 insertions(+), 92 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 f751863..a8ba372 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
@@ -27,6 +27,8 @@
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 org.apache.poi.xwpf.usermodel.TableRowAlign;
@@ -44,9 +46,11 @@
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;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -75,6 +79,9 @@
@Value("${wordUrl}")
private String wordUrl;
+ @Value("${twoCode}")
+ private String twoCode;
+
@Resource
private GiveCode giveCode;
@@ -83,6 +90,9 @@
@Resource
private InsProductResultMapper insProductResultMapper;
+
+ @Resource
+ private InsProductUserMapper insProductUserMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -113,9 +123,9 @@
public Map<String, Object> doInsOrder(Integer id, String laboratory) {
InsOrder insOrder = new InsOrder();
insOrder.setId(id);
- insOrder.setInsState(1);
InsOrder order = insOrderMapper.selectById(id);
if (BeanUtil.isEmpty(order.getInsTime())) {
+ insOrder.setInsState(1);
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
}
@@ -137,7 +147,6 @@
public void saveInsContext(Map<String, Object> insContext) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
- AtomicInteger count = new AtomicInteger();
insContext.forEach((k, v) -> {
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
@@ -147,39 +156,57 @@
result = new InsProductResult();
}
result.setInsProductId(Integer.parseInt(k));
- JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
- List<Map<String, Object>> iv = new ArrayList<>();
- for (Object o : jsonArray) {
- JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
- Map<String, Object> map = new HashMap<>();
- map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
- if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
- map.put("u", userId);
- } else {
- map.put("u", insValue.get("u"));
+ if (jo.get("insValue") != null) {
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
+ List<Map<String, Object>> iv = new ArrayList<>();
+ for (Object o : jsonArray) {
+ JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
+ try {
+ if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+ map.put("u", userId + "");
+ } else {
+ map.put("u", insValue.get("u"));
+ }
+ iv.add(map);
+ } catch (Exception e) {
+ }
}
- iv.add(map);
+ result.setInsValue(JSON.toJSONString(iv));
}
- result.setInsValue(JSON.toJSONString(iv));
- JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
- List<Map<String, Object>> cv = new ArrayList<>();
- for (Object o : jsonArray2) {
- JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
- Map<String, Object> map = new HashMap<>();
- map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
- cv.add(map);
+ if (jo.get("comValue") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
+ List<Map<String, Object>> cv = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
+ cv.add(map);
+ }
+ result.setComValue(JSON.toJSONString(cv));
}
- result.setComValue(JSON.toJSONString(cv));
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
- insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
- JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
- try {
- result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
- } catch (Exception ignored) {
- result.setEquipValue(null);
+ if (resValue.get("v") != null) {
+ insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
}
- JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
- insProduct.setInsResult(Integer.parseInt(JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""));
+ if (jo.get("equipValue") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ result.setEquipValue(JSON.toJSONString(ev));
+ }
+ try {
+ JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
+ String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
+ insProduct.setInsResult(Integer.parseInt(ir));
+ } catch (Exception e) {
+ }
if (BeanUtil.isEmpty(result.getId())) {
result.setCreateUser(userId);
result.setUpdateUser(userId);
@@ -191,11 +218,17 @@
}
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
- if (count.get() == 0) {
- InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
- insSample.setInsState(1);
- count.addAndGet(1);
+ insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
+ insSample.setInsState(1);
+ Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId()));
+ Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId()).isNotNull(InsProduct::getInsResult));
+ if (l == l1) {
+ insSample.setInsState(2);
}
+ insSampleMapper.updateById(insSample);
});
return null;
}).thenAccept(res -> {
@@ -231,34 +264,61 @@
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
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);
- AtomicInteger index = new AtomicInteger();
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;
}
+ 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<>();
- String pr = null;
- 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) {
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") + "")) {
- if (v.get("v").equals(b.getInspectionItemSubclass())) {
- pr = jo1.get("r") + "";
+ 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);
+ 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;
}
@@ -272,13 +332,15 @@
}
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- if (pr.equals(jo1.get("r") + "") && v.get("ps") != null) {
- if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("瑕佹眰鍊�")) {
- textRenderData.setText(b.getAsk());
- } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鍗曚綅")) {
- textRenderData.setText(b.getUnit());
- } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("缁撹")) {
- switch (b.getInsResult()) {
+ 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;
@@ -289,22 +351,30 @@
textRenderData.setText("-");
break;
}
- } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("搴忓彿")) {
+ } else if (value.equals("搴忓彿")) {
index.getAndIncrement();
textRenderData.setText(index + "");
- } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("璁＄畻鍊�")) {
- JSONArray jsonArray = JSON.parseArray(b.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 (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鏈�缁堝��")) {
- textRenderData.setText(b.getLastValue());
+ } 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 ((!pr.equals(jo1.get("r") + "")) && v.get("ps") != null) {
- if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鏈�缁堝��")) {
- textRenderData.setText(b.getLastValue());
- } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("缁撹")) {
- switch (b.getInsResult()) {
+ } 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;
@@ -315,6 +385,12 @@
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") + "");
}
@@ -327,7 +403,7 @@
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
textRenderData.setStyle(style);
text.add(textRenderData);
- if (i == b.getTemplate().size() - 1) {
+ if (i == temp.size() - 1) {
TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
rows.add(rowRenderData);
@@ -337,7 +413,7 @@
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") + "");
@@ -348,7 +424,7 @@
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);
@@ -361,9 +437,30 @@
});
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("鎵句笉鍒版ā鏉挎枃浠�");
+ }
+ 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);
@@ -372,15 +469,21 @@
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);
+ 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);
}
@@ -402,33 +505,10 @@
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
- List<JSONObject> tableData = new ArrayList<>();
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
- int r = -1;
- if (BeanUtil.isNotEmpty(cellData)) {
- for (JSONObject o : cellData) {
- JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- if (BeanUtil.isNotEmpty(v.get("ps"))) {
- JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
- if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
- tableData.add(o);
- r = Integer.parseInt(o.get("r") + "");
- continue;
- }
- }
- if (tableData.size() > 0) {
- if ((Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) && !(o.get("v") + "").equals("{\"ht\":\"0\"}")) {
- r = Integer.parseInt(o.get("r") + "");
- tableData.add(o);
- } else {
- break;
- }
- }
- }
- }
- product.setTemplate(tableData);
+ product.setTemplate(cellData);
product.setStyle(style);
}
}
@@ -438,9 +518,13 @@
public int submitPlan(Integer orderId, String laboratory) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
- if (insProducts.size() == 0) {
- return 0;
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult));
+ if (insProducts.size() > 0) {
+ String str = "";
+ for (InsProduct product : insProducts) {
+ str += product.getInspectionItem()+product.getInspectionItemSubclass()+"锛�";
+ }
+ throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�"+str);
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
return 1;
--
Gitblit v1.9.3