Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/EventLcController.java

@@ -0,0 +1,55 @@
+package com.usky.park.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.EventLc;
+import com.usky.park.service.EventLcService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 梯控历史事件表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-10
+ */
+@RestController
+@RequestMapping("/eventLc")
+public class EventLcController {
+
+    @Autowired
+    private EventLcService eventLcService;
+
+    /**
+     * 数据中心-梯控系统人员通行列表查询
+     *
+     * @param personName 人员名称
+     * @param cardNo 卡号
+     * @param liftName 电梯名称
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param pageNum  当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("eventLcList")
+    public ApiResult<CommonPage<EventLc>> eventLcList(@RequestParam(value = "personName",required = false) String personName,
+                                                      @RequestParam(value = "cardNo",required = false) String cardNo,
+                                                      @RequestParam(value = "liftName",required = false) String liftName,
+                                                      @RequestParam(value = "startDate",required = false) String startDate,
+                                                      @RequestParam(value = "endDate",required = false) String endDate,
+                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return ApiResult.success(eventLcService.eventLcList(personName,cardNo,liftName,startDate,endDate,pageNum,pageSize));
+    }
+
+}
+

service-park/service-park-biz/src/main/java/com/usky/park/domain/EventLc.java

@@ -0,0 +1,106 @@
+package com.usky.park.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 梯控历史事件表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EventLc implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 电梯名称
+     */
+    private String liftName;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
+
+    /**
+     * 事件类型
+     */
+    private Integer eventType;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 事件产生的时间
+     */
+    private LocalDateTime eventTime;
+
+    /**
+     * 人员唯一编码
+     */
+    private String personId;
+
+    /**
+     * 卡号
+     */
+    private String cardNo;
+
+    /**
+     * 人员名称
+     */
+    private String personName;
+
+    /**
+     * 组织编码
+     */
+    private String orgId;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 平台接收事件时间
+     */
+    private LocalDateTime receiveTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-park/service-park-biz/src/main/java/com/usky/park/mapper/EventLcMapper.java

@@ -0,0 +1,16 @@
+package com.usky.park.mapper;
+
+import com.usky.park.domain.EventLc;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 梯控历史事件表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-10
+ */
+public interface EventLcMapper extends CrudMapper<EventLc> {
+
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/EventLcService.java

@@ -0,0 +1,31 @@
+package com.usky.park.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.EventLc;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 梯控历史事件表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-10
+ */
+public interface EventLcService extends CrudService<EventLc> {
+
+    /**
+     * 数据中心-梯控系统人员通行列表查询
+     *
+     * @param personName 人员名称
+     * @param cardNo 卡号
+     * @param liftName 电梯名称
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param pageNum  当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    CommonPage<EventLc> eventLcList(String personName,String cardNo,String liftName,String startDate,String endDate,Integer pageNum,Integer pageSize);
+
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DmpDeviceServiceImpl.java

@@ -57,7 +57,7 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
     public CommonPage<DmpDeviceVO> dmpDeviceList(String deviceName,String installAddress,Integer deviceType,String deviceStatus,String doorStatus,String switchStatus,String startDate,String endDate,Integer pageNum,Integer pageSize){
 
         LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DmpDevice::getDeviceId,DmpDevice::getDeviceName,DmpDevice::getDeviceType,DmpDevice::getInstallAddress,DmpDevice::getCreatedTime)
+        queryWrapper.select(DmpDevice::getDeviceId,DmpDevice::getDeviceCode,DmpDevice::getDeviceName,DmpDevice::getDeviceType,DmpDevice::getInstallAddress,DmpDevice::getCreatedTime)
                 .eq(DmpDevice::getDeviceType,deviceType)
                 .like(StringUtils.isNotBlank(deviceName),DmpDevice::getDeviceName,deviceName)
                 .like(StringUtils.isNotBlank(installAddress),DmpDevice::getInstallAddress,installAddress)
@@ -99,6 +99,7 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
 
                 DmpDeviceVO dmpDeviceVO = new DmpDeviceVO();
                 dmpDeviceVO.setDeviceId(pagelist.get(i).getDeviceId());
+                dmpDeviceVO.setDeviceCode(pagelist.get(i).getDeviceCode());
                 dmpDeviceVO.setDeviceName(pagelist.get(i).getDeviceName());
                 dmpDeviceVO.setInstallAddress(pagelist.get(i).getInstallAddress());
                 dmpDeviceVO.setCreatedTime((pagelist.get(i).getCreatedTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/EventLcServiceImpl.java

@@ -0,0 +1,45 @@
+package com.usky.park.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.EventLc;
+import com.usky.park.mapper.EventLcMapper;
+import com.usky.park.service.EventLcService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 梯控历史事件表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-10
+ */
+@Service
+public class EventLcServiceImpl extends AbstractCrudService<EventLcMapper, EventLc> implements EventLcService {
+
+    @Override
+    public CommonPage<EventLc> eventLcList(String personName,String cardNo,String liftName,String startDate,String endDate,Integer pageNum,Integer pageSize){
+        IPage<EventLc> page = new Page<>(pageNum,pageSize);
+        List<EventLc> list = new ArrayList<>();
+        LambdaQueryWrapper<EventLc> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(personName),EventLc::getPersonName,personName)
+                    .like(StringUtils.isNotBlank(cardNo),EventLc::getCardNo,cardNo)
+                    .like(StringUtils.isNotBlank(liftName),EventLc::getLiftName,liftName)
+                    .between(StringUtils.isNotBlank(startDate)&&StringUtils.isNotBlank(endDate),EventLc::getEventTime,startDate,endDate)
+                    .orderByDesc(EventLc::getId);
+        page = this.page(page,queryWrapper);
+        list = page.getRecords();
+
+        return new CommonPage<>(list,page.getTotal(),pageNum,pageSize);
+    }
+
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/vo/DmpDeviceVO.java

@@ -29,6 +29,11 @@ public class DmpDeviceVO  implements Serializable {
      */
     private String deviceId;
 
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
     /**
      * 设备名称
      */

service-park/service-park-biz/src/main/resources/mapper/park/EventLcMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.park.mapper.EventLcMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.domain.EventLc">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="lift_name" property="liftName" />
+        <result column="event_id" property="eventId" />
+        <result column="event_type" property="eventType" />
+        <result column="event_name" property="eventName" />
+        <result column="event_time" property="eventTime" />
+        <result column="person_id" property="personId" />
+        <result column="card_no" property="cardNo" />
+        <result column="person_name" property="personName" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="receive_time" property="receiveTime" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>