From 14b71104f5d0ce76f4c7dc26ec1b59a73cde6e87 Mon Sep 17 00:00:00 2001 From: tangw Date: Thu, 23 Oct 2025 16:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 6 ++-- .../impl/LisWorkPageInfoServiceImpl.java | 33 ++++++++++++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/lis-system/src/main/resources/application-druid.yml b/lis-system/src/main/resources/application-druid.yml index c64e627..f50f23c 100644 --- a/lis-system/src/main/resources/application-druid.yml +++ b/lis-system/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=lisnet_ss - username: sa - password: jiangsheng + url: jdbc:sqlserver://47.97.125.165:11433;DatabaseName=lisnet_test + username: lis + password: lisp@ssw0rd # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 13f11e7..83b5ae5 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.utils.file.FileUtils; import com.czlis.common.utils.file.ImageUtils; +import com.czlis.common.utils.uuid.UUID; import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.pojo.HistoryResult; @@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.File; +import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -34,19 +36,26 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { @Override public Result resultGraph(Date jyrq, String yq, String ybh) { - //List labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh); -// List labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,""); -// List labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh); - List queryList = new ArrayList<>(); - String[] picPath = reportUtil.getReportpic(jyrq, yq, ybh); - for (int i = 0; i < picPath.length; i++) { - String staticpath= ImageUtils.getStaticPath()+ File.separator; - String picFilePath =staticpath +"graphs"+File.separator + StrUtil.splitToArray(picPath[i], "graphs/")[1]; - File file = new File(picFilePath); - queryList.add(Base64.encode(file)); - FileUtils.deleteFile(picFilePath); + List> listOfMaps = new ArrayList<>(); + List labGraphList = commonUtil.getLabGraphAll(jyrq, yq, ybh); + if (!labGraphList.isEmpty()) { + for (LabGraph labGraph : labGraphList) { + byte[] txnr = labGraph.getTxnr(); + String picdata=Base64.encode(txnr); + String bz1=labGraph.getBz1(); + if(bz1==null)bz1="1"; + int lbidx=bz1.indexOf("."); + if(lbidx>0)bz1=bz1.substring(0,lbidx); + Map map = new HashMap<>(); + map.put("xh",bz1); + map.put("txlb",labGraph.getTxlb()); + map.put("txmc",labGraph.getTxmc()); + map.put("bz",labGraph.getBz2()); + map.put("picbase64",picdata); + listOfMaps.add(map); + } } - return new Result("0","获取数据成功！",queryList); + return new Result("0","获取数据成功！",listOfMaps); } @Override