jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiangs:7f358d9068fbc88d979b96e693d501ff4240e0e5
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:39e91492aec93553301f378647947ad9d045a7db
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "7f358d9068fbc88d979b96e693d501ff4240e0e5" and "39e91492aec93553301f378647947ad9d045a7db" have entirely different histories.
7f358d9068 ... 39e91492ae

2 changed files with 15 additions and 24 deletions
Show Stats Expand all files Collapse all files

6
lis-system/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:sqlserver://47.97.125.165:11433;DatabaseName=lisnet_test
username: lis
password: lisp@ssw0rd
url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=lisnet_ss
username: sa
password: jiangsheng
# 从库数据源
slave:
# 从数据源开关/默认关闭

33
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java
View File

@ -8,7 +8,6 @@ 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.DTO.HistoryResultDTO;
@ -20,7 +19,6 @@ 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;
@ -37,26 +35,19 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
@Override
public Result resultGraph(Date jyrq, String yq, String ybh) {
List<Map<String, String>> listOfMaps = new ArrayList<>();
List<LabGraph> 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<String,String> 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);
}
//List<LabGraph> labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh);
// List<LabGraphUnit> labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,"");
// List<LabOldGraph> labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh);
List<String> 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);
}
return new Result("0","获取数据成功！",listOfMaps);
return new Result("0","获取数据成功！",queryList);
}
@Override