设备和场地

liujun001
1 parent a8b19eef
Showing 16 changed files with 176 additions and 116 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/venue/info/LinggangVenueInfoController.java
Bsth-admin/src/main/java/com/ruoyi/domain/venue/info/dto/LinggangVenueInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/venue/info/vo/LinggangVenueInfoVO.java
Bsth-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/equipment/domain/Equipment.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/KeyBoxVoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/IUnicodeUtils.java
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
Bsth-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
Bsth-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -545,7 +545,7 @@ public class DssDriverController extends BaseController {
             if (CollectionUtils.isNotEmpty(equipmentList)) {
                 Optional<Equipment> optional = equipmentList.stream().filter(e -> Objects.equals(e.getDeviceId(), s.getDeviceId())).findFirst();
                 if (optional.isPresent()) {
-                    vo.setDeviceName(optional.get().getSiteName());
+                    vo.setDeviceName(optional.get().getName());
                 }
             }
             vo.setCheckResult(Convert.toStr(s.getStatus()));
@@ -95,7 +95,7 @@ public class DssEquipmentController extends BaseController {
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(dto.getDevice(), Constants.LOGIN_SUCCESS, MessageUtils.message("equipment.login.success")));
         //LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         LoginUser loginUser = new LoginUser();
-        loginUser.setUserId(equipment.getId());
+        loginUser.setUserId(Convert.toLong(equipment.getId()));
         loginUser.setDeptId(Convert.toLong(equipment.getDeviceId()));
         loginUser.setUser(new SysUser());
@@ -438,7 +438,7 @@ public class KeyBoxController extends BaseController {
         vo.setDevice(equipment.getDeviceId());
         vo.setDeviceType(equipment.getPromise());
         vo.setTime(workLocations.get(0).getScheduleDate());
-        vo.setYardName(equipment.getSiteName());
+        vo.setYardName(equipment.getName());
 //        vo.setKeyboxName()
         List<BasicSyncKeyboxVo> keybox = new ArrayList<>();
@@ -36,6 +36,7 @@ public class LinggangVenueInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('linggang:venue:info:list:limit:page:limit')")
     @PostMapping(value = "/list/limit/{page}/{pageLimit}")
     public IPage<LinggangVenueInfoVO> listLimit(@ModelAttribute LinggangVenueInfoQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        request.clearStrEmpty();
         LinggangVenueInfo entity = convert(request);
         IPage<LinggangVenueInfo> response = linggangVenueInfoService.pageList(new Page<LinggangVenueInfo>(page, pageLimit), entity, orderEntity);
@@ -52,7 +53,7 @@ public class LinggangVenueInfoController extends BaseController {
     @PostMapping(value = "/list/select")
     @ApiOperation("（页面选择）")
-    public com.ruoyi.common.core.domain.ResponseResult<List<LinggangVenueInfoVO>> listSelect(@RequestBody LinggangVenueInfoQueryDTO request) {
+    public com.ruoyi.common.core.domain.ResponseResult<List<LinggangVenueInfoVO>> listSelect(LinggangVenueInfoQueryDTO request) {
         LinggangVenueInfo entity = convert(request);
         List<LinggangVenueInfo> selectList = linggangVenueInfoService.listOfSelect(entity);
         return com.ruoyi.common.core.domain.ResponseResult.success(convert(selectList));
@@ -43,6 +43,19 @@ public class LinggangVenueInfoQueryDTO implements java.io.Serializable {
     private String name;
+    public void clearStrEmpty() {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.parkCode)) {
+            this.parkCode = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.parkAddr)) {
+            this.parkAddr = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.name)) {
+            this.name = null;
+        }
+    }
+
+
     @Override
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
@@ -47,6 +47,10 @@ public class LinggangVenueInfoVO implements java.io.Serializable {
     @ApiModelProperty(value = "场站名称")
     private String name;
+    public String getDeleteFlagStr(){
+        return com.ruoyi.utils.IUnicodeUtils.getDelFlagStr(delFlag);
+    }
+
     @Override
     public String toString() {
 package com.ruoyi.equipment.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.equipment.domain.EquipmentLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.equipment.service.IEquipmentService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 /**
  * 设备信息Controller
@@ -30,6 +36,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class EquipmentController extends BaseController {
     @Autowired
     private IEquipmentService equipmentService;
+    @Autowired
+    private LinggangVenueInfoService venueInfoService;
     /**
      * 查询设备信息列表
@@ -40,6 +48,21 @@ public class EquipmentController extends BaseController {
     public TableDataInfo list(Equipment equipment) {
         startPage();
         List<Equipment> list = equipmentService.selectEquipmentList(equipment);
+        if (CollectionUtils.isNotEmpty(list)) {
+            Collection<Integer> yarIds = list.stream().map(Equipment::getYardId).collect(Collectors.toSet());
+            List<LinggangVenueInfo> venueInfos = venueInfoService.listOfIds(yarIds);
+            if (CollectionUtils.isNotEmpty(venueInfos)) {
+                list = list.stream().map(eq -> {
+                    Optional<LinggangVenueInfo> optional = venueInfos.stream().filter(v -> Objects.equals(v.getId(), eq.getYardId())).findFirst();
+                    if (optional.isPresent()) {
+                        eq.setYardName(optional.get().getName());
+                    }
+
+                    return eq;
+                }).collect(Collectors.toList());
+            }
+
+        }
         return getDataTable(list);
     }
 package com.ruoyi.equipment.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
-
 /**
  * 设备信息对象 equipment
  *
@@ -19,71 +19,82 @@ import java.util.Date;
 public class Equipment extends BaseEntity {
     private static final long serialVersionUID = 1L;
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 场地名称
-     */
-    @Excel(name = "场地名称")
-    @ApiModelProperty("场地名称")
-    private String siteName;
-
-    /**
-     * 安置地址
-     */
+    /***主键*/
+    @Excel(name = "主键")
+    private java.lang.Integer id;
+
+
+    /***安置地址*/
     @Excel(name = "安置地址")
-    @ApiModelProperty("安置地址")
-    private String address;
-
-    /**
-     * 设备ip
-     */
-    @Excel(name = "设备ip")
-    @ApiModelProperty("设备ip")
-    private String ip;
-
-    /**
-     * 设备状态
-     */
-    @Excel(name = "设备状态")
-    @ApiModelProperty("设备状态")
-    private Integer status;
-
-    /**
-     * 设备权限
-     */
-    @Excel(name = "设备权限")
-    @ApiModelProperty("设备权限")
-    private String promise;
-
-    /**
-     * 设备图片
-     */
+    private java.lang.String address;
+
+
+    /***设备ip地址*/
+    @Excel(name = "设备ip地址")
+    private java.lang.String ip;
+
+
+    /***设备状态 是否异常*/
+    @Excel(name = "设备状态 是否异常")
+    private java.lang.Integer status;
+
+
+    /***权限 1 人脸 2 刷卡  3 其他 4 酒精 5为钥匙柜*/
+    @Excel(name = "权限 1 人脸 2 刷卡  3 其他 4 酒精 5为钥匙柜")
+    private java.lang.String promise;
+
+
+    /***设备图片*/
     @Excel(name = "设备图片")
-    @ApiModelProperty("设备图片")
-    private String image;
-    /**
-     * 设备号
-     */
+    private java.lang.String image;
+
+
+    /***设备号*/
+    @TableId(value = "device_id", type = IdType.AUTO)
     @Excel(name = "设备号")
-    @ApiModelProperty("设备号")
-    private String deviceId;
-    /**
-     * 设备在线状态
-     */
-    @ApiModelProperty("设备在线状态")
-    private String onlineClient;
-    @ApiModelProperty("上次心跳响应时间")
-    private Date lastHeartRes;
+    private java.lang.String deviceId;
+
+
+    /***创建时间*/
+    @Excel(name = "创建时间")
+    private java.util.Date createTime;
+
+
+    /***修改时间*/
+    @Excel(name = "修改时间")
+    private java.util.Date updateTime;
+
+
+    /***创建人 */
+    @Excel(name = "创建人 ")
+    private java.lang.String createBy;
+
+
+    /***修改人*/
+    @Excel(name = "修改人")
+    private java.lang.String updateBy;
+
+
+    /***备注*/
+    @Excel(name = "备注")
+    private java.lang.String remark;
+
+
+    /***上次检测时间*/
+    @Excel(name = "上次检测时间")
+    private java.util.Date lastHeartRes;
+
+
+    /***是否在线*/
+    @Excel(name = "是否在线")
+    private java.lang.String onlineClient;
     /***格子数*/
     @Excel(name = "格子数")
     private java.lang.Integer latticeNumber;
+
     /***钥匙柜名称*/
     @Excel(name = "钥匙柜名称")
     private java.lang.String name;
@@ -93,6 +104,13 @@ public class Equipment extends BaseEntity {
     @Excel(name = "场站ID")
     private java.lang.Integer yardId;
+    @TableField(exist = false)
+    private String yardName;
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
 }
@@ -83,7 +83,7 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
         }
         LambdaQueryWrapper<Equipment> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(Equipment::getId, ids);
-        wrapper.select(Equipment::getId, Equipment::getSiteName);
+        wrapper.select(Equipment::getId, Equipment::getName);
         return list(wrapper);
     }
@@ -180,7 +180,7 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
     @Override
     public List<String> getEquipmentSiteName() {
         List<Equipment> list = equipmentMapper.selectEquipmentList(null);
-        List<String> equipment = list.stream().map(Equipment::getSiteName).distinct().collect(Collectors.toList());
+        List<String> equipment = list.stream().map(Equipment::getName).distinct().collect(Collectors.toList());
         return equipment;
     }
@@ -463,9 +463,9 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         if (Objects.isNull(equipment)) {
             equipment = new Equipment();
         }
-        vo.setAddress(equipment.getAddress());
+//        vo.setAddress(equipment.getAddress());
         vo.setDeviceId(signIn.getDeviceId());
-        vo.setSiteName(equipment.getSiteName());
+        vo.setSiteName(equipment.getName());
         vo.setName(driver.getPersonnelName());
         vo.setPosts(driver.getPosts());
         return vo;
@@ -91,7 +91,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
         KeyBoxVo keyBoxVo = new KeyBoxVo();
         //keyBoxVo.setCabinetNo(Convert.toStr(keyInfo.getCabinetno()));
 //        keyBoxVo.setDevice("");
-        keyBoxVo.setDeviceName(equipment.getSiteName());
+        keyBoxVo.setDeviceName(equipment.getName());
 //        keyBoxVo.setYardId(Convert.toStr(keyInfo.getYardId()));
 //        keyBoxVo.setYardName(Convert.toStr(keyInfo.getS()));
         keyBoxVo.setPlateNum(lingangScheduling.getNbbm());
 package com.ruoyi.utils;
+import com.ruoyi.domain.enums.DelFlagEnum;
 import org.apache.commons.lang3.StringUtils;
+import java.util.Objects;
+
 /**
  * @author 20412
  */
@@ -21,4 +24,8 @@ public class IUnicodeUtils {
         }
         return outStr.toString();
     }
+
+    public static String getDelFlagStr(Boolean delFlag) {
+        return Objects.isNull(delFlag) ? null : delFlag ? DelFlagEnum.YES.getLabel() : DelFlagEnum.NO.getLabel();
+    }
 }
@@ -68,7 +68,7 @@
     </update>
     <select id="queryToDay" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
-        select scheduling.*,driver.fleet_name fleetName,equipment.site_name siteName from
+        select scheduling.*,driver.fleet_name fleetName,equipment.name siteName from
         scheduling left join driver on scheduling.job_code = driver.job_code
         left join sign_in on scheduling.sign_in_id = sign_in.id
         left join equipment on equipment.device_id = sign_in.device_id
@@ -90,7 +90,7 @@
     </select>
     <select id="queryByMonth" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
-        select scheduling.*, driver.fleet_name fleetName,equipment.site_name siteName
+        select scheduling.*, driver.fleet_name fleetName,equipment.name siteName
         from scheduling
                  left join driver on driver.job_code = scheduling.job_code
                  left join sign_in on scheduling.sign_in_id = sign_in.id
@@ -15,7 +15,7 @@
         <result property="remark" column="remark"/>
         <result property="exType" column="ex_type"/>
         <result property="personnelName" column="personnel_name"/>
-        <result property="siteName" column="site_name"/>
+        <result property="name" column="name"/>
         <result property="fleetName" column="fleet_name"/>
         <result property="nbbm" column="nbbm"/>
         <result property="lineName" column="line_name"/>
@@ -53,7 +53,7 @@
     <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo"
             resultMap="EquipmentExceptionResponseResult">
-        select equipment_exception.id, title, equipment.site_name ,
+        select equipment_exception.id, title, equipment.name ,
         equipment_exception.device_id,driver.personnel_name,
         driver.job_code, equipment_exception.image,
         equipment_exception.status, equipment_exception.create_time,
@@ -92,7 +92,7 @@
             resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo"
             resultMap="EquipmentExceptionResponseResult">
         select equipment_exception.id, title,
-        equipment.site_name ,
+        equipment.name ,
         equipment_exception.device_id,
         driver.personnel_name,
         driver.job_code,
@@ -4,35 +4,33 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.equipment.mapper.EquipmentMapper">
-    <resultMap type="Equipment" id="EquipmentResult">
-        <result property="id"    column="id"    />
-        <result property="siteName"    column="site_name"    />
-        <result property="address"    column="address"    />
-        <result property="ip"    column="ip"    />
-        <result property="status"    column="status"    />
-        <result property="promise"    column="promise"    />
-        <result property="image"    column="image"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="lastHeartRes"    column="last_heart_res"    />
-        <result property="onlineClient"    column="online_client"    />
+    <resultMap type="com.ruoyi.equipment.domain.Equipment" id="EquipmentResult">
+        <id column ="device_id" jdbcType="VARCHAR" property="deviceId" />
+        <result column="id" jdbcType="INTEGER" property="id" />
+        <result column="address" jdbcType="VARCHAR" property="address" />
+        <result column="ip" jdbcType="VARCHAR" property="ip" />
+        <result column="status" jdbcType="TINYINT" property="status" />
+        <result column="promise" jdbcType="VARCHAR" property="promise" />
+        <result column="image" jdbcType="VARCHAR" property="image" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="last_heart_res" jdbcType="TIMESTAMP" property="lastHeartRes" />
+        <result column="online_client" jdbcType="VARCHAR" property="onlineClient" />
         <result column="lattice_number" jdbcType="INTEGER" property="latticeNumber" />
-        <result column="name" property="name" />
-        <result column="yard_Id"  property="yardId" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="yard_Id" jdbcType="INTEGER" property="yardId" />
     </resultMap>
     <sql id="selectEquipmentVo">
-        select id, site_name, address, ip, status, promise, image, device_id, create_time, update_time, create_by, update_by, remark,last_heart_res,online_client,lattice_number from equipment
+        select id, name, address, ip, status, promise, image, device_id, create_time, update_time, create_by, update_by, remark,last_heart_res,online_client,lattice_number,yard_Id from equipment
     </sql>
-    <select id="selectEquipmentList" parameterType="Equipment" resultMap="EquipmentResult">
+    <select id="selectEquipmentList" parameterType="com.ruoyi.equipment.domain.Equipment" resultMap="EquipmentResult">
         <include refid="selectEquipmentVo"/>
-        <where>  
-            <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
+        <where>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
             <if test="status != null "> and status = #{status}</if>
@@ -40,8 +38,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="image != null  and image != ''"> and image = #{image}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <if test="onlineClient != null  and onlineClient != ''"> and online_client = #{onlineClient}</if>
-            <if test="null!=name">#{name}</if>
-            <if test="null!=yardId">#{yardId}</if>
+            <if test="null!=name">and name =#{name}</if>
+            <if test="null!=yardId">and yard_Id =#{yardId}</if>
         </where>
         order by id desc
     </select>
@@ -82,12 +80,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
     <select id="queryIdsiteNameBypromise"  resultType="com.ruoyi.equipment.domain.Equipment">
-        SELECT id,site_name,promise FROM equipment WHERE FIND_IN_SET(#{promise},promise) >0
+        SELECT id,name,promise FROM equipment WHERE FIND_IN_SET(#{promise},promise) >0
     </select>
     <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id">
         insert into equipment
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="siteName != null and siteName != ''">site_name,</if>
             <if test="address != null and address != ''">address,</if>
             <if test="ip != null and ip != ''">ip,</if>
             <if test="status != null">status,</if>
@@ -106,7 +103,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="null!=yardId">yard_Id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="siteName != null and siteName != ''">#{siteName},</if>
             <if test="address != null and address != ''">#{address},</if>
             <if test="ip != null and ip != ''">#{ip},</if>
             <if test="status != null">#{status},</if>
@@ -143,7 +139,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <update id="updateEquipment" parameterType="Equipment">
         update equipment
         <trim prefix="SET" suffixOverrides=",">
-            <if test="siteName != null and siteName != ''">site_name = #{siteName},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="ip != null and ip != ''">ip = #{ip},</if>
             <if test="status != null">status = #{status},</if>
@@ -177,7 +172,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <update id="updateEquipmentByDeviceId">
         update equipment
         <trim prefix="SET" suffixOverrides=",">
-            <if test="siteName != null and siteName != ''">site_name = #{siteName},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="ip != null and ip != ''">ip = #{ip},</if>
             <if test="status != null">status = #{status},</if>
@@ -60,7 +60,7 @@
     </sql>
     <select id="selectSignInList" parameterType="com.ruoyi.pojo.response.SignInResponseVo" resultMap="SignInResultVO">
-        select sign_in.*,driver.posts,driver.personnel_name,equipment.site_name
+        select sign_in.*,driver.posts,driver.personnel_name,equipment.name
         from sign_in,driver,equipment
         WHERE
         driver.job_code = sign_in.jobCode and equipment.device_id = sign_in.device_id
@@ -72,7 +72,7 @@
         <if test="alcoholFlag != null ">and alcohol_flag = #{alcoholFlag}</if>
         <if test="type != null ">and type = #{type}</if>
         <if test="alcoholIntake != null ">and alcohol_intake = #{alcoholIntake}</if>
-        <if test="siteName != null ">and site_name = #{siteName}</if>
+        <if test="siteName != null ">and name = #{name}</if>
         <if test="date != null ">and sign_in.create_time LIKE concat(#{date},'%')</if>
         <if test="null!=schedulingId"> scheduling_id = #{schedulingId}</if>
         order by create_time desc
@@ -141,7 +141,7 @@
         on s1.jobCode = s2.job_code and s1.create_time = s2.min_create_time
     </select>
     <select id="selectSignInByIds" parameterType="com.ruoyi.pojo.response.SignInResponseVo" resultMap="SignInResultVO">
-        select sign_in.id,equipment.site_name
+        select sign_in.id,equipment.name
         from sign_in,equipment
         where equipment.device_id = sign_in.device_id
         <if test="list != null and list.size >0">