jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 37c54b84fafe2f929d0823fbf2582085746839e6

Authored by jiangjiazhi
2 parents aefc5e4dff a6c7ef7cb1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 37c54b8
... ... @@ -1404,7 +1404,22 @@
1404 1404 return restList;
1405 1405 }
1406 1406  
  1407 + /**
  1408 + * 获取近xx天的时间
  1409 + */
  1410 + public static List<String> getBetweenDay(Date startDate, int size) {
  1411 + List<String> restList = new ArrayList<>();
  1412 + Calendar calendar = Calendar.getInstance();
  1413 + calendar.setTime(startDate);
  1414 + restList.add(getyyyy_MM_dd(calendar.getTime()));
  1415 + for (int i = 1; i < size; i++) {
  1416 + calendar.add(Calendar.DAY_OF_MONTH, -1);
  1417 + restList.add(getyyyy_MM_dd(calendar.getTime()));
  1418 + }
  1419 + return restList;
  1420 + }
1407 1421  
  1422 +
1408 1423 /**
1409 1424 * 获取昨天五点的时间
1410 1425 * @return
... ... @@ -1425,7 +1440,7 @@
1425 1440  
1426 1441 Date yesterday = DateUtil.getYesterday();
1427 1442 System.out.println(yesterday.toLocaleString());
1428   - System.out.println(getBetweenDay(7));
  1443 + System.out.println(getBetweenDay(parseDate("2017-12-19"), 7));
1429 1444  
1430 1445 Date date = parseDate("2017-11-30");
1431 1446 System.out.println(getYesterday().toLocaleString());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ 37c54b8
... ... @@ -14,6 +14,7 @@
14 14 import org.springframework.web.bind.annotation.ResponseBody;
15 15  
16 16 import javax.servlet.http.HttpServletRequest;
  17 +import java.util.Date;
17 18  
18 19 /**
19 20 * 血压
20 21  
... ... @@ -46,10 +47,10 @@
46 47 }
47 48  
48 49 @ResponseBody
49   - @RequestMapping(value = "/{id}", method = RequestMethod.GET)
  50 + @RequestMapping(value = "/{id}/{startDate}", method = RequestMethod.GET)
50 51 @TokenRequired
51   - public BaseResponse info(@PathVariable String id) {
52   - return bloodPressureService.info(id);
  52 + public BaseResponse info(@PathVariable String id, @PathVariable Date startDate) {
  53 + return bloodPressureService.info(id, startDate);
53 54 }
54 55  
55 56 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java View file @ 37c54b8
... ... @@ -13,6 +13,7 @@
13 13 import org.springframework.web.bind.annotation.ResponseBody;
14 14  
15 15 import javax.servlet.http.HttpServletRequest;
  16 +import java.util.Date;
16 17  
17 18 /**
18 19 * 血糖
19 20  
... ... @@ -51,10 +52,10 @@
51 52 }
52 53  
53 54 @ResponseBody
54   - @RequestMapping(value = "/{parentId}/{type}", method = RequestMethod.GET)
  55 + @RequestMapping(value = "/{parentId}/{type}/{time}", method = RequestMethod.GET)
55 56 @TokenRequired
56   - public BaseResponse info(@PathVariable String parentId, @PathVariable Integer type) {
57   - return bloodSugarService.info(parentId, type);
  57 + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer type, @PathVariable Date time) {
  58 + return bloodSugarService.info(parentId, type, time);
58 59 }
59 60  
60 61  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ 37c54b8
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.result.BaseResponse;
4 4 import com.lyms.platform.pojo.BloodPressure;
5 5  
  6 +import java.util.Date;
6 7 import java.util.List;
7 8 import java.util.Map;
8 9  
... ... @@ -12,7 +13,7 @@
12 13  
13 14 BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
14 15  
15   - BaseResponse info(String id);
  16 + BaseResponse info(String id, Date startDate);
16 17  
17 18 List<Map<String, Object>> getAppInfo(String parentId);
18 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java View file @ 37c54b8
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.result.BaseResponse;
4 4 import com.lyms.platform.pojo.BloodSugar;
5 5  
  6 +import java.util.Date;
6 7 import java.util.Map;
7 8  
8 9 public interface IBloodSugarService extends IBaseService {
... ... @@ -11,7 +12,7 @@
11 12  
12 13 BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
13 14  
14   - BaseResponse info(String parentId, Integer type);
  15 + BaseResponse info(String parentId, Integer type, Date time);
15 16  
16 17 BaseResponse getAppInfo(String parentId);
17 18  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 37c54b8
... ... @@ -151,10 +151,9 @@
151 151 }
152 152  
153 153 @Override
154   - public BaseResponse info(String id) {
  154 + public BaseResponse info(String id, Date startDate) {
155 155 BloodPressure bloodPressure = mongoTemplate.findById(id, BloodPressure.class);
156 156 List<Map<String, Object>> xyInfos = new ArrayList<>();
157   - List<Map<String, List<Object>>> lines = new ArrayList<>();
158 157 List<Integer> szyMin = Arrays.asList( 60, 60, 60, 60, 60, 60, 60);
159 158 List<Integer> ssyMax = Arrays.asList(140, 140, 140, 140, 140, 140, 140);
160 159 List<Object> ssy = new ArrayList<>();
... ... @@ -162,7 +161,7 @@
162 161 List<Object> pulse = new ArrayList<>();
163 162 List<String> xAxis = new ArrayList<>();
164 163 if(bloodPressure != null) {
165   - List<String> betweenDay = DateUtil.getBetweenDay(7);
  164 + List<String> betweenDay = DateUtil.getBetweenDay(startDate,7);
166 165 CollectionUtils.reverse(betweenDay);
167 166 Map<String, Map<String, Object>> infos = bloodPressure.getInfos();
168 167 for (String date : betweenDay) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 37c54b8
... ... @@ -115,9 +115,9 @@
115 115 }
116 116  
117 117 @Override
118   - public BaseResponse info(String parentId, Integer type) {
  118 + public BaseResponse info(String parentId, Integer type, Date time) {
119 119 List<Map<Object, Object>> tabList = new ArrayList<>();
120   - List<String> betweenDay = DateUtil.getBetweenDay(7);
  120 + List<String> betweenDay = DateUtil.getBetweenDay(time, 7);
121 121 Object[] xAxis = betweenDay.toArray();
122 122 CollectionUtils.reverseArray(xAxis);
123 123 List<Double> minAxis;