增加机构大屏功能

src/main/java/com/care/bigscreen/controller/BigScreenController.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -270,35 +271,35 @@ public class BigScreenController {
             List<BigScreenAgeSexVO> bigScreenAgeSexVOList =  bigScreenService.selectOrgBigScreenAgeSexList(orgId);
             if(CollUtil.isNotEmpty(bigScreenAgeSexVOList)){
                 BigScreenAgeSexVO vo40_down = new BigScreenAgeSexVO();
-                vo40_down.setAge("40以下");
+                vo40_down.setAgeInterval("40以下");
                 BigScreenAgeSexVO vo41_50 = new BigScreenAgeSexVO();
-                vo41_50.setAge("41-50");
+                vo41_50.setAgeInterval("41-50");
                 BigScreenAgeSexVO vo51_60 = new BigScreenAgeSexVO();
-                vo51_60.setAge("51-60");
+                vo51_60.setAgeInterval("51-60");
                 BigScreenAgeSexVO vo61_70 = new BigScreenAgeSexVO();
-                vo61_70.setAge("61-70");
+                vo61_70.setAgeInterval("61-70");
                 BigScreenAgeSexVO vo71_80 = new BigScreenAgeSexVO();
-                vo71_80.setAge("71-80");
+                vo71_80.setAgeInterval("71-80");
                 BigScreenAgeSexVO vo80_up = new BigScreenAgeSexVO();
-                vo80_up.setAge("80以上");
+                vo80_up.setAgeInterval("80以上");
 
                 for (BigScreenAgeSexVO vo : bigScreenAgeSexVOList) {
-                    if((Integer)vo.getAge() <= 40){
+                    if(vo.getAge().intValue() <= 40){
                        vo40_down.setManNum(vo40_down.getManNum() + vo.getManNum());
                        vo40_down.setWomanNum(vo40_down.getWomanNum() + vo.getWomanNum());
-                    } else if((Integer)vo.getAge() >= 41 &&  (Integer)vo.getAge() <= 50){
+                    } else if(vo.getAge().intValue() >= 41 &&  vo.getAge().intValue() <= 50){
                         vo41_50.setManNum(vo41_50.getManNum() + vo.getManNum());
                         vo41_50.setWomanNum(vo41_50.getWomanNum() + vo.getWomanNum());
-                    } else if((Integer)vo.getAge() >= 51 &&  (Integer)vo.getAge() <= 60){
+                    } else if(vo.getAge().intValue() >= 51 &&  vo.getAge().intValue() <= 60){
                         vo51_60.setManNum(vo51_60.getManNum() + vo.getManNum());
                         vo51_60.setWomanNum(vo51_60.getWomanNum() + vo.getWomanNum());
-                    } else if((Integer)vo.getAge() >= 61 &&  (Integer)vo.getAge() <= 70){
+                    } else if(vo.getAge().intValue() >= 61 &&  vo.getAge().intValue() <= 70){
                         vo61_70.setManNum(vo61_70.getManNum() + vo.getManNum());
                         vo61_70.setWomanNum(vo61_70.getWomanNum() + vo.getWomanNum());
-                    } else if((Integer)vo.getAge() >= 71 &&  (Integer)vo.getAge() <= 80){
+                    } else if(vo.getAge().intValue() >= 71 &&  vo.getAge().intValue() <= 80){
                         vo71_80.setManNum(vo71_80.getManNum() + vo.getManNum());
                         vo71_80.setWomanNum(vo71_80.getWomanNum() + vo.getWomanNum());
-                    } else if( (Integer)vo.getAge() >= 80){
+                    } else if( vo.getAge().intValue() >= 80){
                         vo80_up.setManNum(vo80_up.getManNum() + vo.getManNum());
                         vo80_up.setWomanNum(vo80_up.getWomanNum() + vo.getWomanNum());
                     }

src/main/java/com/care/bigscreen/vo/BigScreenAgeSexVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -18,7 +19,10 @@ import lombok.Data;
 public class BigScreenAgeSexVO {
 
     @ApiModelProperty(value = "年龄")
-    private Object age;
+    private BigDecimal age;
+
+    @ApiModelProperty(value = "年龄")
+    private String ageInterval ;
 
     @ApiModelProperty(value = "男数量")
     private Integer manNum = 0;

src/main/java/com/care/client/service/PinanbaoService.java

@@ -94,18 +94,24 @@ public class PinanbaoService {
 
             //睡眠时间
             DeviceMonitorVO vo1 = careBedroomInbedDetailService.selectSleepTime(devId);
-            vo.setSleepTimeHour(vo1.getSleepTimeHour());
-            vo.setSleepTimeMinute(vo1.getSleepTimeMinute());
+            if(vo1 != null) {
+                vo.setSleepTimeHour(vo1.getSleepTimeHour());
+                vo.setSleepTimeMinute(vo1.getSleepTimeMinute());
+            }
 
             //卫生间进出次数
             DeviceMonitorVO vo2 = careToiletInoutDetailService.selectToiletInoutFrequency(devId);
-            vo.setToiletInoutFrequency(vo2.getToiletInoutFrequency());
+            if(vo2 != null) {
+                vo.setToiletInoutFrequency(vo2.getToiletInoutFrequency());
+            }
 
             //活动距离和时长
             DeviceMonitorVO vo3 = careWalkingDistanceDetailService.selectWalking(devId);
-            vo.setActivityDistance(vo3.getActivityDistance());
-            vo.setActivityTimeHour(vo3.getActivityTimeHour());
-            vo.setActivityTimeMinute(vo3.getActivityTimeMinute());
+            if(vo3 != null) {
+                vo.setActivityDistance(vo3.getActivityDistance());
+                vo.setActivityTimeHour(vo3.getActivityTimeHour());
+                vo.setActivityTimeMinute(vo3.getActivityTimeMinute());
+            }
         }
         return vo;
     }

src/main/resources/mybatis/BigSreenMapper.xml

@@ -181,7 +181,7 @@
          ROUND(DATEDIFF(CURDATE(), a.birthday)/365.2422) age,
         sum(case when a.gender='M'then 1 else 0 end) manNum,
         sum(case when a.gender='W'then 1 else 0 end) womanNum
-        FROM care_older a where a.org_id = #{orgId}
+        FROM care_older a where a.org_id = #{orgId} and a.birthday is not null
         group by age
     </select>
 

src/main/resources/mybatis/CareWalkingDistanceDetailMapper.xml

@@ -6,7 +6,7 @@
         sum(t.walking_distance) activityDistance,
         DATE_FORMAT (sec_to_time(sum(walking_duration)),'%H') activityTimeHour,
         DATE_FORMAT (sec_to_time(sum(walking_duration)),'%i') activityTimeMinute
-        FROM care_bedroom_inbed_detail t
+        FROM care_walking_distance_detail t
         where t.dev_id = #{devId} and DATE_FORMAT(t.create_time,'%Y%m%d') = DATE_FORMAT(now(),'%Y%m%d')
 
     </select>