From 2c146447912ddb09d42d2a7377f70662ab75f5bf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 7 Sep 2018 09:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 2 +- .../operate/web/controller/RemoteController.java | 6 +- .../operate/web/controller/TestController.java | 1 + .../operate/web/controller/ViewController.java | 31 ++++++++ .../operate/web/facade/BabyCheckFacade.java | 4 +- .../platform/operate/web/facade/ViewFacade.java | 90 +++++++++++++++++++++- 6 files changed, 126 insertions(+), 8 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 3fe2e16..33beafc 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1556,7 +1556,7 @@ public class DateUtil { // int weeks = daysBetween(baby, new Date()) / 7; // String weekAge = String.valueOf(weeks); - Date baby = parseDate("2018-04-07"); + Date baby = parseDate("2018-07-15"); System.out.println(baby.getTime()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 1ee78d2..bc45691 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -159,8 +159,10 @@ public class RemoteController extends BaseController { if (StringUtils.isNotEmpty(created)) { String[] arr = created.split(" - "); - query.setCreatedStart(DateUtil.parseYMD(arr[0])); - query.setCreatedEnd(DateUtil.addDay((DateUtil.parseYMD(arr[1])), 1)); + Date start = DateUtil.parseYMD(arr[0]); + Date end = new Date(DateUtil.parseYMD(arr[1]).getTime() + 24 * 60 * 60 * 1000 - 1); + query.setCreatedStart(start); + query.setCreatedEnd(end); } query.setNeed("true"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index d86655d..70d325f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -362,6 +362,7 @@ public class TestController extends BaseController { Map m = new HashMap<>(); m.put("id", String.valueOf(1)); m.put("name", "测试通过"); + list.add(m); return list; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 5df8cab..daac08f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.MatdeliverFollowFacade; @@ -12,6 +13,7 @@ import com.lyms.platform.operate.web.facade.ViewFacade; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -831,4 +833,33 @@ public class ViewController extends BaseController { } + /** + * 上传升级包 + * @param request + * @param file + * @return + */ + @RequestMapping(value="/uploadUpgradePackage",method=RequestMethod.POST) + @ResponseBody + public BaseResponse uploadUpgradePackage(HttpServletRequest request, + @RequestParam("file") MultipartFile file) { + + return viewFacade.uploadUpgradePackage(file); + + } + + + /** + * 执行升级 + * @param request + * @return + */ + @RequestMapping(value="/executeUpgrade",method=RequestMethod.GET) + @ResponseBody + public BaseResponse executeUpgrade(HttpServletRequest request) { + + return viewFacade.executeUpgrade(); + + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 4135824..da905a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1923,8 +1923,10 @@ public class BabyCheckFacade { BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setHospitalId(hospitalId); query.setYn(YnEnums.YES.getId()); + + query.setCheckDateStart(currentDay); - query.setCheckDateEnd(currentDay); + query.setCheckDateEnd(new Date(currentDay.getTime() + 24 * 60 * 60 * 1000 - 1)); BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); 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 6470bea..e0e578d 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 @@ -7,10 +7,7 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExceptionUtils; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.result.*; @@ -38,7 +35,12 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; @@ -5109,4 +5111,84 @@ public class ViewFacade { colorElement.addText(riskColor); } } + + public BaseResponse uploadUpgradePackage(MultipartFile file) { + + //如果文件不为空，写入上传路径 + BaseObjectResponse objectResponse = new BaseObjectResponse(); + if(file.isEmpty()) { + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("没有上传数据"); + return objectResponse; + } + try { + + String path = System.getProperty("catalina.home")+File.separator+"upgrade"+File.separator+DateUtil.getYmd(new Date()); + + String fileName = file.getOriginalFilename(); + + System.out.println("path = " + path + ";fileName = " + fileName); + + File filepath = new File(path+File.separator,fileName); + + //删除当天上传的文件 + if (filepath.exists()) + { + filepath.delete(); + } + + //判断路径是否存在，如果不存在就创建一个 + if (!filepath.getParentFile().exists()) { + filepath.getParentFile().mkdirs(); + } + file.transferTo(filepath); + 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 BaseObjectResponse executeUpgrade(){ + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + + String path = System.getProperty("catalina.home"); + Process process = null; + String command1 = "/bin/sh "+path+"/upgrade.sh "; + System.out.println(command1); + try { + process = Runtime.getRuntime().exec(command1); + //必须等待该进程结束，否则时间设置就无法生效 + process.waitFor(); + + + BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); + StringBuffer sb = new StringBuffer(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line).append("\n"); + } + String result = sb.toString(); + System.out.println(result); + + } catch (IOException | InterruptedException e) { + objectResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + objectResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return objectResponse; + }finally{ + if(process!=null){ + process.destroy(); + } + } + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } -- 1.8.3.1