From a93341f427f831323649f80f2fd986b6f44d5570 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 23 May 2018 14:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/dal/IYunBookBuildingDao.java | 6 ++ .../biz/dal/impl/YunBookbuildingDaoImpl.java | 23 ++++++ .../biz/service/YunBookbuildingService.java | 14 ++++ .../com/lyms/platform/common/utils/FileUtil.java | 21 +++++ .../java/com/lyms/platform/beans/SerialIdEnum.java | 1 + .../java/com/lyms/platform/pojo/FilePathModel.java | 95 ++++++++++++++++++++++ .../web/controller/PregnantBuildController.java | 38 +++++++-- .../operate/web/facade/BookbuildingFacade.java | 68 ++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 54 ++++++++---- .../web/request/YunBookbuildingAddRequest.java | 21 +++++ .../src/main/resources/config.properties | 4 + .../resources/spring/applicationContext-mvc.xml | 12 +++ 12 files changed, 334 insertions(+), 23 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java index b6af7c8..b249345 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IYunBookBuildingDao.java @@ -1,6 +1,7 @@ package com.lyms.platform.biz.dal; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.FilePathModel; import com.lyms.platform.pojo.Patients; import java.util.List; @@ -19,4 +20,9 @@ public interface IYunBookBuildingDao { public Patients findOneById(String id); int queryPatientCount(MongoQuery query); + + void addFilePath(FilePathModel filePath); + void updateFilePath(FilePathModel obj); + + FilePathModel findFilePath(String patientId); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java index 38436c5..1c932a0 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/YunBookbuildingDaoImpl.java @@ -4,7 +4,11 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.MongoConvertHelper; +import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.pojo.FilePathModel; +import com.lyms.platform.pojo.PatientWeight; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.MapReduceCommand; @@ -13,6 +17,8 @@ import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import com.lyms.platform.biz.dal.IYunBookBuildingDao; @@ -42,6 +48,23 @@ public class YunBookbuildingDaoImpl extends BaseMongoDAOImpl implement } @Override + public void addFilePath(FilePathModel filePath) { + mongoTemplate.insert(filePath); + } + + + @Override + public void updateFilePath(FilePathModel obj) { + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(obj)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(obj.getId())), update, FilePathModel.class); + } + + @Override + public FilePathModel findFilePath(String patientId) { + return mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId)),FilePathModel.class); + } + + @Override public void updatePatient(Patients obj, String id) { update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java index fedc01a..e945a49 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.dal.IAntExChuDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.FilePathModel; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.lang.StringUtils; @@ -79,6 +80,19 @@ public class YunBookbuildingService { public List getBirthHusbands(String dateStr) { return yunBookBuildingDao.getBirthHusbands(dateStr); } + + public void addFilePath(FilePathModel filePath) { + yunBookBuildingDao.addFilePath(filePath); + } + + public void updateFilePath(FilePathModel filePath) { + yunBookBuildingDao.updateFilePath(filePath); + } + + public FilePathModel findFilePath(String patientId) { + + return yunBookBuildingDao.findFilePath(patientId); + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/FileUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/FileUtil.java index 9e5c536..6853b38 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/FileUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/FileUtil.java @@ -30,6 +30,27 @@ public class FileUtil { } } + /** + * 判断是否为允许的上传文件类型,true表示允许 + */ + public static boolean checkFile(String fileName) { + //设置允许上传文件类型 + String suffixList = "jpg,gif,png,ico,bmp,jpeg"; + // 获取文件后缀 + String suffix = getFileSuffix(fileName); + if (suffixList.contains(suffix.trim().toLowerCase())) { + return true; + } + return false; + } + + public static String getFileSuffix(String fileName) + { + // 获取文件后缀 + return fileName.substring(fileName.lastIndexOf(".") + + 1, fileName.length()); + } + public static void main(String[] args) throws IOException { getFileItem(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 8e97b00..3ca33aa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -11,6 +11,7 @@ public enum SerialIdEnum { AntExRecordModel("AntExRecordModel", 97531000030L), ArchiveData("ArchiveData", 97531000040L), AssayConfig("AssayConfig", 97531000050L), + FilePathModel("FilePathModel", 97233000050L), AwModel("AwModel", 97531000060L), BabyCheckModel("BabyCheckModel", 97531000070L), BabyModel("BabyModel", 97531000080L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java new file mode 100644 index 0000000..686c5f6 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FilePathModel.java @@ -0,0 +1,95 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.enums.TrackDownDateEnums; +import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; + +import java.util.Date; +import java.util.List; +import java.util.Objects; + + +@Document(collection="lyms_file_path") +public class FilePathModel extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.FilePathModel.getCid(); + + + private String id; + + //孕妇建档id + private String patientId; + + //身份证正面 + private String cardNoz; + //身份证反面 + private String cardNof; + + //户主信息 + private String registerHouse; + + //孕妇信息 + private String registerPatient; + + //面部信息 + private String facePatient; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getCardNoz() { + return cardNoz; + } + + public void setCardNoz(String cardNoz) { + this.cardNoz = cardNoz; + } + + public String getCardNof() { + return cardNof; + } + + public void setCardNof(String cardNof) { + this.cardNof = cardNof; + } + + public String getRegisterHouse() { + return registerHouse; + } + + public void setRegisterHouse(String registerHouse) { + this.registerHouse = registerHouse; + } + + public String getRegisterPatient() { + return registerPatient; + } + + public void setRegisterPatient(String registerPatient) { + this.registerPatient = registerPatient; + } + + public String getFacePatient() { + return facePatient; + } + + public void setFacePatient(String facePatient) { + this.facePatient = facePatient; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 23a0235..0a223c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -23,9 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -58,7 +60,7 @@ public class PregnantBuildController extends BaseController{ @RequestParam(required = true) String certNo, @RequestParam(required = true) String hospitalId, @RequestParam(required = true) Integer valueType) { - return bookbuildingFacade.getPatientBuildId(certType,certNo,hospitalId,valueType); + return bookbuildingFacade.getPatientBuildId(certType, certNo, hospitalId, valueType); } /** @@ -95,7 +97,7 @@ public class PregnantBuildController extends BaseController{ return bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest,loginState.getId()); } - BaseObjectResponse p = bookbuildingFacade.addPregnantBookbuilding(yunBookbuildingAddRequest,loginState.getId()); + BaseObjectResponse p = bookbuildingFacade.addPregnantBookbuilding(yunBookbuildingAddRequest, loginState.getId()); return p; } @@ -185,7 +187,7 @@ public class PregnantBuildController extends BaseController{ AntenatalExaminationQueryRequest antenatalExaminationQueryRequest = new AntenatalExaminationQueryRequest(); antenatalExaminationQueryRequest.setPatientId(id); LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest,loginState.getId()); + return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest, loginState.getId()); } /** @@ -197,7 +199,7 @@ public class PregnantBuildController extends BaseController{ @TokenRequired public BaseResponse queryLatePregnant(HttpServletRequest request,@RequestParam("parentId")String parentId){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return bookbuildingFacade.findPatientById(parentId,loginState.getId()); + return bookbuildingFacade.findPatientById(parentId, loginState.getId()); } @@ -221,7 +223,7 @@ public class PregnantBuildController extends BaseController{ @TokenRequired public BaseObjectResponse queryYunBuildInfo(HttpServletRequest request,@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vcCardNo){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - BaseObjectResponse objectResponse = bookbuildingFacade.queryYunBuildInfo(cardNo,vcCardNo,loginState.getId()); + BaseObjectResponse objectResponse = bookbuildingFacade.queryYunBuildInfo(cardNo, vcCardNo, loginState.getId()); return objectResponse; } @@ -532,6 +534,32 @@ public class PregnantBuildController extends BaseController{ } + /** + * 图片上次 + * @param request + * @param file + * @return + * @throws Exception + */ + @RequestMapping(value="/uploadImg",method=RequestMethod.POST) + @ResponseBody +// @TokenRequired + public BaseResponse upload(HttpServletRequest request, + @RequestParam("file") MultipartFile file) throws Exception { + + return bookbuildingFacade.uploadImg(file); + + } + +// @RequestMapping(value="/deleteImg",method=RequestMethod.GET) +// @ResponseBody +//// @TokenRequired +// public BaseResponse deleteImg(HttpServletRequest request, +// @RequestParam("filePath") String filePath) throws Exception { +// +// return bookbuildingFacade.deleteImg(filePath); +// +// } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index fa963ed..9351b49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -43,8 +43,11 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; import java.io.OutputStream; import java.util.*; @@ -57,6 +60,7 @@ public class BookbuildingFacade { private Logger logger = LoggerFactory.getLogger(BookbuildingFacade.class); public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + public static final String BASE_IMG_PATH = PropertiesUtils.getPropertyValue("img_path"); @Autowired private YunBookbuildingService yunBookbuildingService; @@ -390,6 +394,7 @@ public class BookbuildingFacade { final Patients tempP = p; + final FilePathModel filePath = yunRequest.getFilePath(); commonThreadPool.execute(new Runnable() { @Override public void run() { @@ -403,6 +408,12 @@ public class BookbuildingFacade { Date endDate = DateUtil.addDay(new Date(), 1); qhdfyFmService.syncByCardNo(DateUtil.getyyyy_MM_dd(startDate),DateUtil.getyyyy_MM_dd(endDate),tempP.getCardNo()); } + if (filePath != null && filePath.getId() == null) + { + filePath.setPatientId(tempP.getId()); + yunBookbuildingService.addFilePath(filePath); + } + } }); @@ -876,6 +887,19 @@ public class BookbuildingFacade { } Patients patients = patientsService.findOnePatientById(id); updateAntExLastMenses(patients.getLastMenses(), patients.getPid(), patients.getBookbuildingDate()); + + FilePathModel filePath = yunRequest.getFilePath(); + if (filePath != null && filePath.getId() != null) + { + yunBookbuildingService.updateFilePath(filePath); + } + + List delFiles = yunRequest.getDelFiles(); + if (CollectionUtils.isNotEmpty(delFiles)) + { + deleteImg(delFiles); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -2028,4 +2052,48 @@ public class BookbuildingFacade { } return patientId; } + + public BaseResponse uploadImg(MultipartFile file) { + //如果文件不为空，写入上传路径 + BaseObjectResponse objectResponse = new BaseObjectResponse(); + if(file.isEmpty()) { + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("没有上传数据"); + return objectResponse; + } + try { + + String imgPath = DateUtil.getYmd(new Date()); + String filename = StringUtils.uuid()+"."+FileUtil.getFileSuffix(file.getOriginalFilename()); + + File filepath = new File(BASE_IMG_PATH+File.separator+imgPath,filename); + //判断路径是否存在，如果不存在就创建一个 + if (!filepath.getParentFile().exists()) { + filepath.getParentFile().mkdirs(); + } + file.transferTo(filepath); + objectResponse.setData(imgPath + "/" + filename); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } catch (IOException e) { + ExceptionUtils.catchException(e,"上传文件发生异常"); + objectResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + objectResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return objectResponse; + } + + } + + public void deleteImg(List delFiles) { + + for (String filePath : delFiles) + { + File filepath = new File(BASE_IMG_PATH+File.separator+filePath); + if (filepath.exists()) + { + filepath.delete(); + } + } + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 0a38b8e..7c81c40 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -256,6 +256,10 @@ public class ViewFacade { /** 优惠券编号 */ map.put("couponCode", couponService.findByUsedId(id)); + FilePathModel filePath = yunBookbuildingService.findFilePath(id); + + map.put("filePath", filePath); + return map; } @@ -4362,28 +4366,42 @@ public class ViewFacade { patientMap.put("maddress",CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 + if (StringUtils.isNotEmpty(pat.getHusbandName())) + { + patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 + + patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍 + patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族 + String fbirthday = ""; + if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) && + pat.getHcertificateNum().length() == 18 && + "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) { + String cardNo = pat.getHcertificateNum().substring(6, 14); + Date date = DateUtil.parseYYYYMMDD(cardNo); + fbirthday = DateUtil.getyyyy_MM_dd(date); + } + + patientMap.put("fbirthday",fbirthday);//父亲出生日期 + patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 - patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 - patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍 - patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族 - String fbirthday = ""; - if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) && - pat.getHcertificateNum().length() == 18 && - "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) { - String cardNo = pat.getHcertificateNum().substring(6, 14); - Date date = DateUtil.parseYYYYMMDD(cardNo); - fbirthday = DateUtil.getyyyy_MM_dd(date); + patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码 + patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(), + pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(), + basicConfigService));//父亲户籍地址 + } + else + { + patientMap.put("fname","");//父亲姓名 + patientMap.put("fcountry","");//父亲国籍 + patientMap.put("fnation","");//父亲民族 + patientMap.put("fbirthday","");//父亲出生日期 + patientMap.put("fcardtype","");//父亲证件类型 + patientMap.put("fcardnum","");//父亲证件号码 + patientMap.put("faddress","");//父亲户籍地址 } - - patientMap.put("fbirthday",fbirthday);//父亲出生日期 - patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 - patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码 - patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(), - pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(), - basicConfigService));//父亲户籍地址 Organization organization = null; String fmHospital = ""; @@ -4487,7 +4505,7 @@ public class ViewFacade { if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { - organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital())); + organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); } String babyprovince = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index cf5c933..e4d1fce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.pojo.FilePathModel; import org.hibernate.validator.constraints.NotEmpty; import java.util.List; @@ -33,6 +34,26 @@ public class YunBookbuildingAddRequest { //是否发放母子保健手册 private String sendCareMan; + private FilePathModel filePath; + //删除文件路径 + private List delFiles; + + public List getDelFiles() { + return delFiles; + } + + public void setDelFiles(List delFiles) { + this.delFiles = delFiles; + } + + public FilePathModel getFilePath() { + return filePath; + } + + public void setFilePath(FilePathModel filePath) { + this.filePath = filePath; + } + public String getSendCareMan() { return sendCareMan; } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 8986eba..4804d18 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -23,3 +23,7 @@ platform.operate.api.validate.url=http://localhost:8080/ #威海虚拟叫号语音机器地址 virtual_call_url=http://localhost:8090/Voice.ashx + +#证件照上次目录D:\\vs\\images +img_path=/data/images + diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-mvc.xml b/platform-operate-api/src/main/resources/spring/applicationContext-mvc.xml index b9a073f..359cd53 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-mvc.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-mvc.xml @@ -41,4 +41,16 @@ --> + + + + + 10485760 + + + UTF-8 + + + \ No newline at end of file -- 1.8.3.1