Merge remote-tracking branch 'origin/master'

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

@@ -22,6 +22,8 @@ public class BigScreenLiveTypeVO {
     private String liveType;
     @ApiModelProperty(value = "居住类别：1：独居 2：非独居 3：集中居住 4：其他")
     private String liveTypeName;
+    @ApiModelProperty(value = "数量")
+    private Integer num;
     @ApiModelProperty(value = "比率")
     private BigDecimal rate;
 

src/main/java/com/care/bms/controller/EventHandleController.java

@@ -148,6 +148,7 @@ public class EventHandleController {
     @ApiOperation(tags = {"事件查询"},value = "事件查询 分页")
     public PageResult<List<EventOrderVO>> list(HttpServletRequest request,
                                                @RequestParam(value = "status", required = false) String status,
+                                               @RequestParam(value = "type", required = false) String type,
                                                @RequestParam(value = "title", required = false) String title,
                                                @RequestParam(value = "olderName", required = false) String olderName,
                                                @RequestParam(value = "chambId", required = false) String chambId,
@@ -155,7 +156,7 @@ public class EventHandleController {
                                                PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent(status,title, olderName, chambId, deviceCode, loginUser ,pageReqVo);
+            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent(status, type, title, olderName, chambId, deviceCode, loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的处理事件查询-分页列表出现异常",e);

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -95,10 +95,11 @@ public class BmsEventOrderService {
      * @param pageReqVo
      * @return
      */
-    public IPage<EventOrderVO> listEvent(String orderStatus, String title, String olderName, String chambId, String deviceCode, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<EventOrderVO> listEvent(String orderStatus, String orderType, String title, String olderName, String chambId, String deviceCode, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus), CareEventOrder::getStatus, orderStatus)
+                .eq(StrUtil.isNotEmpty(orderType), CareEventOrder::getOrderType, orderType)
 //                .like(StrUtil.isNotEmpty(title), CareEventOrder::getTitle, title)
                 .like(StrUtil.isNotEmpty(olderName), CareEventOrder::getOlderName, olderName)
                 .eq(StringUtils.isNotBlank(deviceCode), CareEventOrder::getDevCode, deviceCode)

src/main/java/com/care/common/service/impl/CareEventOrderChambServiceImpl.java

@@ -103,8 +103,11 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
     @Override
     public ChambEventOrderVO getChambOrderByOrderIdAndChambId(Long orderId, Long chambId) {
         QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrderChamb::getOrderId,orderId).eq(CareEventOrderChamb::getChambId, chambId);
+        queryWrapper.lambda().eq(CareEventOrderChamb::getOrderId,orderId).eq(CareEventOrderChamb::getId, chambId);
         CareEventOrderChamb order = this.getOne(queryWrapper);
+        if (order == null) {
+            return null;
+        }
         ChambEventOrderVO vo = new ChambEventOrderVO();
         BeanUtil.copyProperties(order, vo);
         return vo;

src/main/resources/application-dev.properties

@@ -28,7 +28,7 @@ spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=5
 #################################### 以下是redis的集群标准配置 结束 ##############################
-file.savePath=/root/care/file
+file.savePath=/data/rfcare/care/file
 file.url=https://rfcare.106tec.com/care-file/
 
 #################################### 3D 页面配置 ##############################

src/main/resources/mybatis/BigSreenMapper.xml

@@ -187,7 +187,7 @@
 
     <select id="selectOrgBigScreenLiveTypeRateList" resultType="com.care.bigscreen.vo.BigScreenLiveTypeVO">
         SELECT
-        live_type liveType,
+        live_type liveType, count(1) as num,
         convert(count(1)/(select count(1) from care_older b where b.org_id = #{orgId}),decimal(20,4)) rate
         FROM care_older a where a.org_id = #{orgId}
         group by live_type