Skip to content

P
patzn-cloud-service-soil
Commit d45df8fc by wangweidong
Options

土工平台修改

parent c7157f8d
Showing with 515 additions and 35 deletions
src/main/java/com/patzn/cloud/service/lims/collect/core/CollectDataType.java
...@@ -24,6 +24,9 @@ public class CollectDataType { ...@@ -24,6 +24,9 @@ public class CollectDataType {
private String entrustCode; private String entrustCode;
private String experiment;
public Long getEquipId() { public Long getEquipId() {
return equipId; return equipId;
} }
...@@ -128,4 +131,12 @@ public class CollectDataType { ...@@ -128,4 +131,12 @@ public class CollectDataType {
public void setExpId(Long expId) { public void setExpId(Long expId) {
this.expId = expId; this.expId = expId;
} }
public String getExperiment() {
return experiment;
}
public void setExperiment(String experiment) {
this.experiment = experiment;
}
} }
src/main/java/com/patzn/cloud/service/lims/collect/handle/PngReportHandle.java
...@@ -27,6 +27,7 @@ public class PngReportHandle implements ICollectHandler { ...@@ -27,6 +27,7 @@ public class PngReportHandle implements ICollectHandler {
} }
for (SmbFile smbFile:list) { for (SmbFile smbFile:list) {
String name = StringHandleUtils.getFileNameNoEx(smbFile.getName()); String name = StringHandleUtils.getFileNameNoEx(smbFile.getName());
name = name.replace(request.getExperiment(),"");
if (!name.equals(sampleCode)){ if (!name.equals(sampleCode)){
continue; continue;
} }
......
src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java
...@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.common; ...@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.common;
import com.patzn.cloud.service.lims.collect.statics.StaticsData; import com.patzn.cloud.service.lims.collect.statics.StaticsData;
import com.patzn.cloud.service.soil.entity.SoilExperimentCollectData; import com.patzn.cloud.service.soil.entity.SoilExperimentCollectData;
import org.apache.commons.lang3.StringUtils;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
...@@ -19,43 +20,172 @@ public class CollectUtil { ...@@ -19,43 +20,172 @@ public class CollectUtil {
BufferedReader br = new BufferedReader(inputReader);//构造一个BufferedReader类来读取文件 BufferedReader br = new BufferedReader(inputReader);//构造一个BufferedReader类来读取文件
String s = null; String s = null;
List<String> titleList = new ArrayList<>();
while((s = br.readLine())!=null){//使用readLine方法，一次读一行 while((s = br.readLine())!=null){//使用readLine方法，一次读一行
String content = s; String content = s;
if (checkContent(content, StaticsData.parseTxtList)){
String njl= subString(s,"凝 聚 力","内摩擦角");
SoilExperimentCollectData njlData = new SoilExperimentCollectData();
njlData.setName("凝聚力");
njlData.setTestValue(njl);
String nmcj= subString(s,"内摩擦角","有效凝聚力"); content = content.replace("凝 聚 力","凝聚力");
SoilExperimentCollectData nmcjData = new SoilExperimentCollectData(); content = content.replace("灵 敏 度","灵敏度");
nmcjData.setName("内摩擦角"); String[] dataArray = content.split(" ");
nmcjData.setTestValue(nmcj); for (String handleS:dataArray) {
handleS=handleS.trim();
handleS =handleS.replace(":","").replace("：","");
if ("".equals(handleS)){
continue;
}
if (handleS.contains("─")){
continue;
}
if (handleS.contains("│")){
continue;
}
titleList.add(handleS);
}
// if (checkContent(content, StaticsData.parseTxtList)){
// String njl= subString(s,"凝 聚 力","内摩擦角");
// SoilExperimentCollectData njlData = new SoilExperimentCollectData();
// njlData.setName("凝聚力");
// njlData.setTestValue(njl);
//
// String nmcj= subString(s,"内摩擦角","有效凝聚力");
// SoilExperimentCollectData nmcjData = new SoilExperimentCollectData();
// nmcjData.setName("内摩擦角");
// nmcjData.setTestValue(nmcj);
//
//
// String yxnjl= subString(s,"有效凝聚力","有效摩擦角");
// SoilExperimentCollectData yxnjlData = new SoilExperimentCollectData();
// yxnjlData.setName("有效凝聚力");
// yxnjlData.setTestValue(yxnjl);
//
//
// String yxmcj= subString(s,"有效摩擦角");
//
// SoilExperimentCollectData yxmcjData = new SoilExperimentCollectData();
// yxmcjData.setName("有效摩擦角");
// yxmcjData.setTestValue(yxmcj);
//
//
//
// dataList.add(njlData);
// dataList.add(yxmcjData);
// dataList.add(nmcjData);
// dataList.add(yxnjlData);
//
// }
String yxnjl= subString(s,"有效凝聚力","有效摩擦角"); System.out.println(s);
SoilExperimentCollectData yxnjlData = new SoilExperimentCollectData(); result.append(System.lineSeparator()+s);
yxnjlData.setName("有效凝聚力"); }
yxnjlData.setTestValue(yxnjl);
int size = titleList.size();
String ningjuli = "";
String neimochajiao = "";
String yasuozhishu = "";
String xianqigujieyali = "";
String yasuoxishu100to200 = "";
String sampleCode = "";
String yasuomoliang100to200 = "";
String testMethod = "";
for (int i = 0; i < size; i++) {
String str = titleList.get(i);
if ("凝聚力".equals(str)){
ningjuli = titleList.get(i+1);
if (StringUtils.isNotBlank(ningjuli)){
SoilExperimentCollectData njlData = new SoilExperimentCollectData();
njlData.setName("凝聚力");
njlData.setTestValue(ningjuli);
if (i+2<size){
njlData.setUnit(titleList.get(i+2));
}
dataList.add(njlData);
}
}
if ("内摩擦角".equals(str)){
neimochajiao = titleList.get(i+1);
if (StringUtils.isNotBlank(neimochajiao)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("内摩擦角");
collectData.setTestValue(neimochajiao);
if (i+2<size){
collectData.setUnit(titleList.get(i+2));
}
dataList.add(collectData);
}
}
String yxmcj= subString(s,"有效摩擦角"); if ("压缩指数".equals(str)){
yasuozhishu = titleList.get(i+1);
if (StringUtils.isNotBlank(yasuozhishu)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("压缩指数");
collectData.setTestValue(yasuozhishu);
if (i+2<size){
collectData.setUnit(titleList.get(i+2));
}
dataList.add(collectData);
}
}
SoilExperimentCollectData yxmcjData = new SoilExperimentCollectData(); if ("先期固结压力".equals(str)){
yxmcjData.setName("有效摩擦角"); xianqigujieyali = titleList.get(i+1);
yxmcjData.setTestValue(yxmcj); if (StringUtils.isNotBlank(xianqigujieyali)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("先期固结压力");
collectData.setTestValue(xianqigujieyali);
if (i+2<size){
collectData.setUnit(titleList.get(i+2));
}
dataList.add(collectData);
}
}
if ("压缩系数(100-200KPa)".equals(str)){
yasuoxishu100to200 = titleList.get(i+1);
if (StringUtils.isNotBlank(yasuoxishu100to200)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("压缩系数(100-200KPa)");
collectData.setTestValue(yasuoxishu100to200);
if (i+2<size){
collectData.setUnit(titleList.get(i+2));
}
dataList.add(collectData);
}
}
if ("压缩模量(100-200KPa)".equals(str)){
yasuomoliang100to200 = titleList.get(i+1);
if (StringUtils.isNotBlank(yasuomoliang100to200)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("压缩模量(100-200KPa)");
collectData.setTestValue(yasuomoliang100to200);
if (i+2<size){
collectData.setUnit(titleList.get(i+2));
}
dataList.add(collectData);
}
}
dataList.add(njlData); if ("试验编号".equals(str)){
dataList.add(yxmcjData); sampleCode = titleList.get(i+1);
dataList.add(nmcjData); }
dataList.add(yxnjlData);
if ("试验方法".equals(str)){
testMethod = titleList.get(i+1);
if (StringUtils.isNotBlank(testMethod)){
SoilExperimentCollectData collectData = new SoilExperimentCollectData();
collectData.setName("试验方法");
collectData.setTestValue(testMethod);
dataList.add(collectData);
}
} }
System.out.println(s);
result.append(System.lineSeparator()+s);
} }
br.close(); br.close();
}catch(Exception e){ }catch(Exception e){
......
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAppendixController.java 0 → 100644
package com.patzn.cloud.service.lims.soil.controller;
import com.patzn.cloud.service.soil.entity.SoilAppendix;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* 报告附件表 前端控制器
*
* @author wwd
* @since 2020-12-24
*/
@Api(tags = "报告附件表")
@RestController
@RequestMapping("/v1/appendix")
public class SoilAppendixController extends ServiceController {
@Autowired
private ISoilAppendixService soilAppendixService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page")
public RestResult<Page<SoilAppendix>> getPage(SoilAppendix soilAppendix) {
return success(soilAppendixService.page(getPage(), soilAppendix));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<SoilAppendix> get(@PathVariable("id") Long id) {
return success(soilAppendixService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilAppendix soilAppendix) {
soilAppendix.setId(id);
return success(soilAppendixService.updateById(soilAppendix));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(SoilAppendix soilAppendix) {
return success(soilAppendixService.save(soilAppendix));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(soilAppendixService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustAnnexController.java
...@@ -20,6 +20,9 @@ import io.swagger.annotations.Api; ...@@ -20,6 +20,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
/** /**
* <p> * <p>
* 土工试验-委托附件表 前端控制器 * 土工试验-委托附件表 前端控制器
...@@ -94,4 +97,26 @@ public class SoilEntrustAnnexController extends ServiceController { ...@@ -94,4 +97,26 @@ public class SoilEntrustAnnexController extends ServiceController {
return success(soilEntrustAnnexService.remove(Condition.create().in("id", ids))); return success(soilEntrustAnnexService.remove(Condition.create().in("id", ids)));
} }
@ApiOperation(value = "附件上传", notes = "附件上传")
@PostMapping("/upload/{entrustId}")
public RestResult<Boolean> upload(@PathVariable("entrustId") Long entrustId, MultipartFile file) {
return success(soilEntrustAnnexService.upload(file, entrustId));
}
@ApiOperation(value = "附件批量上传", notes = "附件批量上传")
@PostMapping("/upload_bath/{entrustId}")
public RestResult<Boolean> uploadBath(@PathVariable("entrustId") Long entrustId, MultipartHttpServletRequest httpServletRequest) {
return success(soilEntrustAnnexService.uploadBath(httpServletRequest, entrustId,getAccount()));
}
@ApiOperation(value = "下载附件", notes = "下载指定附件")
@GetMapping("/download/{id}")
public void downloadFile(@PathVariable("id")Long id) {
soilEntrustAnnexService.downloadFile(id, response);
}
} }
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilExperimentController.java
...@@ -257,6 +257,23 @@ public class SoilExperimentController extends ServiceController { ...@@ -257,6 +257,23 @@ public class SoilExperimentController extends ServiceController {
@ApiOperation(value = "试验项目按照试验项目分配(右侧数据)分配分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
})
@PostMapping("/page_exp_allot_bath")
public RestResult<Page<SoilExperimentVO>> getPageExpAllotBath(SoilExperimentVO vo) {
vo.setStatus(SoilExpStatusEnum.ALLOT);
return success(soilExperimentService.pageExpRight(getPage(),vo));
}
@ApiOperation(value = "试验项目按照试验项目分配(右侧数据)分配历史分页列表", notes = "分页查询数据列表") @ApiOperation(value = "试验项目按照试验项目分配(右侧数据)分配历史分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
......
src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilAppendixMapper.java 0 → 100644
package com.patzn.cloud.service.lims.soil.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.soil.entity.SoilAppendix;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2020-12-24
*/
public interface SoilAppendixMapper extends BatchMapper<SoilAppendix> {
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAppendixService.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.soil.entity.SoilAppendix;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2020-12-24
*/
public interface ISoilAppendixService extends IBaseService<SoilAppendix> {
Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix);
boolean removeByIds(List<Long> ids);
int countByEntrustId(Long entrustId);
SoilAppendix getByExpId(Long expId);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilEntrustAnnexService.java
...@@ -3,8 +3,13 @@ package com.patzn.cloud.service.lims.soil.service; ...@@ -3,8 +3,13 @@ package com.patzn.cloud.service.lims.soil.service;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.IBaseService; import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.soil.entity.SoilEntrustAnnex; import com.patzn.cloud.service.soil.entity.SoilEntrustAnnex;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/** /**
* <p> * <p>
...@@ -21,4 +26,14 @@ public interface ISoilEntrustAnnexService extends IBaseService<SoilEntrustAnnex> ...@@ -21,4 +26,14 @@ public interface ISoilEntrustAnnexService extends IBaseService<SoilEntrustAnnex>
List<SoilEntrustAnnex> list(SoilEntrustAnnex soilEntrustAnnex); List<SoilEntrustAnnex> list(SoilEntrustAnnex soilEntrustAnnex);
boolean upload(MultipartFile file, Long entrustId);
void downloadFile(Long id, HttpServletResponse response);
void view(HttpServletResponse response, String objectKey);
boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
} }
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleService.java
...@@ -78,4 +78,6 @@ public interface ISoilSampleService extends IBaseService<SoilSample> { ...@@ -78,4 +78,6 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
boolean prepareCheckOk(Long[] ids, Account account); boolean prepareCheckOk(Long[] ids, Account account);
boolean prepareCheckBack(Long[] ids, String remark, Account account); boolean prepareCheckBack(Long[] ids, String remark, Account account);
SoilSample getBySampleCode(String sampleCode);
} }
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAppendixServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilAppendix;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
/**
* 服务实现类
*
* @author wwd
* @since 2020-12-24
*/
@Service
public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper, SoilAppendix> implements ISoilAppendixService {
@Override
public Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix) {
Wrapper wrapper = new EntityWrapper<>(soilAppendix);
wrapper.orderBy("ctime");
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public int countByEntrustId(Long entrustId) {
return super.count(Condition.create().eq("entrust_id",entrustId));
}
@Override
public SoilAppendix getByExpId(Long expId) {
return super.getOne(Condition.create().eq("exp_id",expId).last("LIMIT 1"));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustAnnexServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl; package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl; import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.lims.soil.mapper.SoilEntrustAnnexMapper; import com.patzn.cloud.service.lims.soil.mapper.SoilEntrustAnnexMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilEntrustAnnexService; import com.patzn.cloud.service.lims.soil.service.ISoilEntrustAnnexService;
import com.patzn.cloud.service.soil.entity.SoilEntrustAnnex; import com.patzn.cloud.service.soil.entity.SoilEntrustAnnex;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/** /**
* <p> * <p>
...@@ -23,6 +36,12 @@ import com.baomidou.mybatisplus.plugins.Page; ...@@ -23,6 +36,12 @@ import com.baomidou.mybatisplus.plugins.Page;
public class SoilEntrustAnnexServiceImpl extends BaseServiceImpl<SoilEntrustAnnexMapper, SoilEntrustAnnex> implements ISoilEntrustAnnexService { public class SoilEntrustAnnexServiceImpl extends BaseServiceImpl<SoilEntrustAnnexMapper, SoilEntrustAnnex> implements ISoilEntrustAnnexService {
@Autowired
private OssClient ossClient;
@Override @Override
public Page<SoilEntrustAnnex> page(Page<SoilEntrustAnnex> page, SoilEntrustAnnex soilEntrustAnnex) { public Page<SoilEntrustAnnex> page(Page<SoilEntrustAnnex> page, SoilEntrustAnnex soilEntrustAnnex) {
Wrapper wrapper = new EntityWrapper<>(soilEntrustAnnex); Wrapper wrapper = new EntityWrapper<>(soilEntrustAnnex);
...@@ -35,4 +54,57 @@ public class SoilEntrustAnnexServiceImpl extends BaseServiceImpl<SoilEntrustAnne ...@@ -35,4 +54,57 @@ public class SoilEntrustAnnexServiceImpl extends BaseServiceImpl<SoilEntrustAnne
public List<SoilEntrustAnnex> list(SoilEntrustAnnex soilEntrustAnnex) { public List<SoilEntrustAnnex> list(SoilEntrustAnnex soilEntrustAnnex) {
return this.list(new EntityWrapper<>(soilEntrustAnnex)); return this.list(new EntityWrapper<>(soilEntrustAnnex));
} }
@Transactional(rollbackFor = Exception.class)
@Override
public boolean upload(MultipartFile file, Long entrustId) {
RestAssert.fail(null == entrustId,"请选择试验委托单");
String fileName = file.getOriginalFilename();
RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
OssFileResult result = ossClient.upload(file);
if (null == result) {
return false;
}
SoilEntrustAnnex soilEntrustAnnex = new SoilEntrustAnnex();
soilEntrustAnnex.setBucketName(result.getBucketName());
soilEntrustAnnex.setType(result.getType());
soilEntrustAnnex.setFileName(result.getName());
soilEntrustAnnex.setObjectKey(result.getObjectKey());
soilEntrustAnnex.setVersionId(result.getVersionId());
soilEntrustAnnex.setEntrustId(entrustId);
return save(soilEntrustAnnex);
}
@Override
public void downloadFile(Long id, HttpServletResponse response) {
SoilEntrustAnnex attachment = super.getById(id);
if (null == attachment) {
RestAssert.fail("抱歉！该照片不存在");
}
ossClient.download(attachment.getObjectKey(), attachment.getFileName() + "." + attachment.getType(), response);
}
@Override
public void view(HttpServletResponse response, String objectKey) {
ossClient.download(objectKey, response);
}
@Override
public boolean uploadBath(MultipartHttpServletRequest multipartHttpServletRequest, Long entrustId, Account account) {
// 先拿到文件名称的迭代器
Iterator<String> fileNamesIt = multipartHttpServletRequest.getFileNames();
List<String> failedNameList = new ArrayList<>();
while (fileNamesIt.hasNext()) {
String fileName = fileNamesIt.next();
// 获取文件
MultipartFile multipartFile = multipartHttpServletRequest.getFile(fileName);
upload(multipartFile,entrustId);
failedNameList.add(fileName);
}
return true;
}
} }
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportTemplateConfigServiceImpl.java
...@@ -24,7 +24,7 @@ public class SoilExpReportTemplateConfigServiceImpl extends BaseServiceImpl<Soil ...@@ -24,7 +24,7 @@ public class SoilExpReportTemplateConfigServiceImpl extends BaseServiceImpl<Soil
@Override @Override
public Page<SoilExpReportTemplateConfig> page(Page<SoilExpReportTemplateConfig> page, SoilExpReportTemplateConfig soilExpReportTemplateConfig) { public Page<SoilExpReportTemplateConfig> page(Page<SoilExpReportTemplateConfig> page, SoilExpReportTemplateConfig soilExpReportTemplateConfig) {
Wrapper wrapper = new EntityWrapper<>(soilExpReportTemplateConfig); Wrapper wrapper = new EntityWrapper<>(soilExpReportTemplateConfig);
wrapper.orderBy("ctime");
return this.page(page, wrapper); return this.page(page, wrapper);
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentRelEquipServiceImpl.java
...@@ -108,7 +108,6 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper ...@@ -108,7 +108,6 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper
chain.addHandler(new PngReportHandle()); chain.addHandler(new PngReportHandle());
chain.addHandler(new GdsFileHandle()); chain.addHandler(new GdsFileHandle());
for (SoilExperimentRelEquip equip:saveRelEquipList) { for (SoilExperimentRelEquip equip:saveRelEquipList) {
SoilExperimentVO experimentVO = expMap.get(equip.getExpId()); SoilExperimentVO experimentVO = expMap.get(equip.getExpId());
CollectDataType collectDataType = new CollectDataType(); CollectDataType collectDataType = new CollectDataType();
collectDataType.setEquipId(equip.getEquipId()); collectDataType.setEquipId(equip.getEquipId());
...@@ -123,12 +122,9 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper ...@@ -123,12 +122,9 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper
collectDataType.setSampleCode(experimentVO.getSampleCode()); collectDataType.setSampleCode(experimentVO.getSampleCode());
collectDataType.setEntrustCode(experimentVO.getEntrustCode()); collectDataType.setEntrustCode(experimentVO.getEntrustCode());
collectDataType.setExpId(equip.getExpId()); collectDataType.setExpId(equip.getExpId());
collectDataType.setExperiment(experimentVO.getName());
chain.process(collectDataType,soilExperimentService); chain.process(collectDataType,soilExperimentService);
} }
return saveBatch(saveRelEquipList); return saveBatch(saveRelEquipList);
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilOriginalTemplateServiceImpl.java
...@@ -78,6 +78,11 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -78,6 +78,11 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
soilOriginalTemplate.setName(null); soilOriginalTemplate.setName(null);
} }
if (StringUtils.isNotBlank(soilOriginalTemplate.getAlias())){
wrapper.like("alias",soilOriginalTemplate.getAlias());
soilOriginalTemplate.setAlias(null);
}
if (StringUtils.isNotBlank(soilOriginalTemplate.getClassType())){ if (StringUtils.isNotBlank(soilOriginalTemplate.getClassType())){
wrapper.like("class_type",soilOriginalTemplate.getClassType()); wrapper.like("class_type",soilOriginalTemplate.getClassType());
soilOriginalTemplate.setClassType(null); soilOriginalTemplate.setClassType(null);
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java
...@@ -254,6 +254,13 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi ...@@ -254,6 +254,13 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
} }
@Override
public SoilSample getBySampleCode(String sampleCode) {
return super.getOne(Condition.create().eq("sample_code",sampleCode).last("LIMIT 1"));
}
@Override @Override
public boolean checkEntrustHaveSample(Long[] entrustIds) { public boolean checkEntrustHaveSample(Long[] entrustIds) {
if (ArrayUtils.isEmpty(entrustIds)){ if (ArrayUtils.isEmpty(entrustIds)){
......
src/main/resources/mapper/soil/SoilAppendixMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper">
</mapper>
src/main/resources/mapper/soil/SoilExperimentMapper.xml
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</select> </select>
<select id="selectTestByExp" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO"> <select id="selectTestByExp" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
SELECT t.name,t.test_basis,t.test_method FROM soil_experiment t SELECT t.name FROM soil_experiment t
JOIN soil_sample s ON t.sample_id = s.id JOIN soil_sample s ON t.sample_id = s.id
WHERE t.deleted = 0 WHERE t.deleted = 0
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<if test="vo.testerId!=null"> <if test="vo.testerId!=null">
AND t.tester_id = #{vo.testerId} AND t.tester_id = #{vo.testerId}
</if> </if>
GROUP BY t.name,t.test_basis,t.test_method GROUP BY t.name
</select> </select>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<select id="selectListVOByIds" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO"> <select id="selectListVOByIds" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
SELECT t.id,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.id AS "entrustId",e.borehole_name,t.sample_id FROM soil_experiment t SELECT t.id,t.name,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.id AS "entrustId",e.borehole_name,t.sample_id,t.test_method FROM soil_experiment t
JOIN soil_sample s ON t.sample_id = s.id JOIN soil_sample s ON t.sample_id = s.id
JOIN soil_entrust e ON s.entrust_id = e.id JOIN soil_entrust e ON s.entrust_id = e.id
......
src/test/java/com/patzn/cloud/service/lims/test/Test.java
...@@ -2,13 +2,36 @@ package com.patzn.cloud.service.lims.test; ...@@ -2,13 +2,36 @@ package com.patzn.cloud.service.lims.test;
import com.patzn.cloud.service.lims.common.OrderNumUtil; import com.patzn.cloud.service.lims.common.OrderNumUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.math.BigDecimal; import java.math.BigDecimal;
public class Test { public class Test {
public static void main(String[] args) { public static void main(String[] args) {
BigDecimal bigDecimal = new BigDecimal("12.011"); String aaa= "D:\\242398行.gds" ;
Integer i = bigDecimal.intValue(); readFileByLine(aaa);
System.out.println(i);
}
/**
* 按行读取文件
* @param strFile
*/
public static void readFileByLine(String strFile){
try {
File file = new File(strFile);
BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
String strLine = null;
int lineCount = 1;
while(null != (strLine = bufferedReader.readLine())){
System.out.println("第[" + lineCount + "]行数据:[" + strLine + "]");
lineCount++;
}
}catch(Exception e){
e.printStackTrace();
}
} }
} }
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