Explorar el Código

服务站大屏

suntianwu hace 3 años
padre
commit
d1b864bad8

+ 25 - 0
src/main/java/com/care/bigscreen/controller/BigScreenController.java

@@ -279,4 +279,29 @@ public class BigScreenController {
             return PageResult.error("系统错误,服务站大屏的已完成安全事件列表分页查询失败");
         }
     }
+
+    /**
+     * 服务站大屏的用户卡片列表分页查询
+     */
+    @ApiOperation(value = "服务站大屏的用户卡片列表分页查询", notes = "服务站大屏的用户卡片列表分页查询")
+    @GetMapping("/selectBigScreenOlderCardListByPage")
+    @ApiImplicitParams(
+            {
+                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true),
+                    @ApiImplicitParam(name = "olderName", value = "被监护人姓名", dataTypeClass = String.class,required = false)
+            }
+    )
+    public PageResult<List<BigScreenOlderDetailVO>> selectBigScreenOlderCardListByPage(Long stationId,String olderName, PageResVO page) {
+        try {
+            PageUtil<BigScreenOlderDetailVO> bigScreenOlderDetailVOList =  bigScreenService.selectBigScreenOlderCardListByPage(stationId,olderName,page);
+            return  PageResult.success(
+                    "查询成功",bigScreenOlderDetailVOList.getListT(),
+                    bigScreenOlderDetailVOList.getCurrent(),
+                    bigScreenOlderDetailVOList.getPageSize(),
+                    bigScreenOlderDetailVOList.getTotal());
+        } catch (Exception e) {
+            log.error("服务站大屏的用户卡片列表分页查询出现异常",e);
+            return PageResult.error("系统错误,服务站大屏的用户卡片列表分页查询失败");
+        }
+    }
 }

+ 10 - 0
src/main/java/com/care/bigscreen/mapper/BigSreenMapper.java

@@ -76,4 +76,14 @@ public interface BigSreenMapper extends BaseMapper<StStation> {
      */
     List<BigScreenEventVO> selectBigScreenHisEventListByPage(@Param("stationId") Long stationId, @Param("pageUtil") PageUtil<BigScreenEventVO> pageUtil);
 
+    /**
+     * 服务站大屏的已完成安全事件总记录数
+     */
+    Integer selectBigScreenOlderCardListByCount(@Param("stationId") Long stationId, @Param("olderName") String olderName);
+    /**
+     * 服务站大屏的已完成安全事件列表分页查询
+     */
+    List<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(@Param("stationId") Long stationId,@Param("olderName") String olderName, @Param("pageUtil") PageUtil<BigScreenOlderDetailVO> pageUtil);
+
+
 }

+ 5 - 0
src/main/java/com/care/bigscreen/service/BigScreenService.java

@@ -68,4 +68,9 @@ public interface BigScreenService {
      */
     PageUtil<BigScreenEventVO> selectBigScreenHisEventListByPage(Long stationId, PageResVO page);
 
+    /**
+     * 服务站大屏的已完成安全事件列表分页查询
+     */
+    PageUtil<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(Long stationId, String olderName, PageResVO page);
+
 }

+ 19 - 0
src/main/java/com/care/bigscreen/service/impl/BigScreenServiceImpl.java

@@ -118,4 +118,23 @@ public class BigScreenServiceImpl implements BigScreenService {
         return pageUtil;
 
     }
+
+
+    /**
+     * 服务站大屏的已完成安全事件列表分页查询
+     */
+    @Override
+    public PageUtil<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(Long stationId, String olderName, PageResVO page) {
+        //1、创建一个分页工具对象(然后对分页数据进行整理)
+        PageUtil<BigScreenOlderDetailVO> pageUtil = new PageUtil<>();
+        //2、更新当前页面大小
+        pageUtil.setPageSize(page.getPageSize());
+        //3、获取多条件查询总记录数
+        pageUtil.setTotal(bigSreenMapper.selectBigScreenOlderCardListByCount(stationId,olderName));
+        //4、更新当前页码(此时页码将不会再发生越界问题)
+        pageUtil.setCurrent(page.getCurrent());
+        List<BigScreenOlderDetailVO> bigScreenOlderDetailVOList = bigSreenMapper.selectBigScreenOlderCardListByPage(stationId,olderName, pageUtil);
+        pageUtil.setListT(bigScreenOlderDetailVOList);
+        return pageUtil;
+    }
 }

+ 5 - 5
src/main/java/com/care/bigscreen/vo/BigScreenAlarmOlderVO.java

@@ -25,12 +25,12 @@ public class BigScreenAlarmOlderVO {
     @ApiModelProperty("被监护人ID")
     private Long olderId;
 
-    @ApiModelProperty("姓名-事件类型")
-    private String nameType;
+    @ApiModelProperty("姓名-被监护人状态")
+    private String nameOlderStatus;
 
-    @ApiModelProperty("事件状态")
-    private String status;
+    @ApiModelProperty("事件状态,0未处理,1处理中")
+    private String eventStatus;
 
     @ApiModelProperty("事件状态名称")
-    private String statusName;
+    private String eventStatusName;
 }

+ 3 - 0
src/main/java/com/care/bigscreen/vo/BigScreenOlderDetailVO.java

@@ -58,6 +58,9 @@ public class BigScreenOlderDetailVO {
     @ApiModelProperty("是否有户外设备,Y:有,N:没有")
     private String hasOurDoorDevice;
 
+    @ApiModelProperty("被监护人状态")
+    private String olderStatus;
+
     @ApiModelProperty("紧急联系人列表")
     private List<BigSreenOlderContactVO>  olderContactList;
 

+ 41 - 3
src/main/resources/mybatis/BigSreenMapper.xml

@@ -143,9 +143,9 @@
 
     <select id="selectBigScreenAlarmOlderList" resultType="com.care.bigscreen.vo.BigScreenAlarmOlderVO">
       SELECT a.older_id olderId,
-         CONCAT((select b.name from care_older b where b.id = a.older_id),'--', (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.order_type and sdc.type_code='event_order_order_type')) nameType,
-         a.status,
-        (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='event_order_status') statusName
+         CONCAT((select b.name from care_older b where b.id = a.older_id),'--', (select sdc.name from sys_dim_code sdc where sdc.dim_code = (select b.status from care_older b where b.id = a.older_id) and sdc.type_code='older_status')) nameOlderStatus,
+         a.status eventStatus,
+        (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='event_order_status') eventStatusName
          FROM care_event_order a
         where a.station_id = #{stationId} and a.status in ('0','1')
         <if test="olderName != null and olderName != ''">
@@ -195,6 +195,7 @@
           a.addr,
           a.phone,
           (case when (select count(1) from care_device b where b.dev_type='2' and b.id in (select c.dev_id from care_older_device_rel c where c.older_id = a.id)) > 0 then 'Y' else 'N' end)  has_our_door_device,
+          (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='older_status') olderStatus,
            d.id contact_id,
           d.name contact_name,
           d.phone contact_phone,
@@ -233,4 +234,41 @@
         order by a.create_time desc
         LIMIT #{pageUtil.start}, #{pageUtil.pageSize}
     </select>
+
+    <select id="selectBigScreenOlderCardListByCount" resultType="int" >
+        SELECT
+        count(1)
+        FROM care_older a
+        where a.station_id = #{stationId}
+        <if test="olderName != null and olderName != ''">
+        AND a.name like CONCAT('%',#{olderName},'%')
+        </if>
+    </select>
+
+    <select id="selectBigScreenOlderCardListByPage" resultType="com.care.bigscreen.vo.BigScreenOlderDetailVO">
+        SELECT
+        a.id older_id,
+        a.name,
+        (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.gender and sdc.type_code='gender') gender,
+        ROUND(DATEDIFF(CURDATE(), a.birthday)/365.2422) age,
+        (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.live_type and sdc.type_code='older_live_type') live_type,
+        a.bed_number,
+        a.safe_level,
+        a.Key_escrow_type,
+        a.breath_rate,
+        a.heart_rate,
+        a.addr,
+        a.phone,
+        (case when (select count(1) from care_device b where b.dev_type='2' and b.id in (select c.dev_id from care_older_device_rel c where c.older_id = a.id)) > 0 then 'Y' else 'N' end)  has_our_door_device,
+        (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='older_status') olderStatus
+        FROM care_older a
+        where a.station_id = #{stationId}
+        <if test="olderName != null and olderName != ''">
+            AND a.name like CONCAT('%',#{olderName},'%')
+        </if>
+        order by (case when a.status in ('1','2') then 2 else 1 end), a.modify_time desc
+        LIMIT #{pageUtil.start}, #{pageUtil.pageSize}
+    </select>
+
+
 </mapper>