getPageWarningLog(@Param("dto") DeliverListDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientLogMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientLogMapper.java
new file mode 100644
index 0000000..d7321cf
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientLogMapper.java
@@ -0,0 +1,23 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.JbqClientLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 智能耳标日志表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface JbqClientLogMapper extends BaseMapper {
+
+ List jbqLogList(@Param("deliveryId") Integer deliveryId,@Param("createTime") Date createTime,@Param("checkTime") Date checkTime);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientMapper.java
new file mode 100644
index 0000000..b0be4b7
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqClientMapper.java
@@ -0,0 +1,29 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.entity.JbqClient;
+import com.aiotagro.cattletrade.business.vo.JbqClientVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 智能耳标表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface JbqClientMapper extends BaseMapper {
+
+ List JbqList(@Param("item") DeviceDto dto);
+
+ /**
+ * 查询未分配的智能耳标列表
+ */
+ List selectUnassignedJbqList(@Param("item") DeviceDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerLogMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerLogMapper.java
new file mode 100644
index 0000000..00bb266
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerLogMapper.java
@@ -0,0 +1,24 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.JbqServerLog;
+import com.aiotagro.cattletrade.business.vo.ServerLocationVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 智能主机日志表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface JbqServerLogMapper extends BaseMapper {
+
+ List selectServerLocationByTime(@Param("deviceId") String serverDeviceId,@Param("deliverTime") Date deliverTime,@Param("checkTime") Date checkTime);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerMapper.java
new file mode 100644
index 0000000..58c4d3f
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/JbqServerMapper.java
@@ -0,0 +1,24 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.entity.JbqServer;
+import com.aiotagro.cattletrade.business.vo.ServerClientVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 智能主机表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface JbqServerMapper extends BaseMapper {
+
+ List serverList(@Param("item") DeviceDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberDriverMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberDriverMapper.java
new file mode 100644
index 0000000..1d3e634
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberDriverMapper.java
@@ -0,0 +1,138 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Member Driver Mapper
+ *
+ * @author System
+ * @date 2025-01-16
+ */
+@Mapper
+public interface MemberDriverMapper extends BaseMapper> {
+
+ /**
+ * 查询司机列表（关联member表获取手机号）
+ */
+ @Select("SELECT md.id, md.member_id, md.username, md.car_number, " +
+ "md.driving_license, md.driver_license, md.record_code, " +
+ "md.car_img, md.id_card, md.remark, md.create_time, m.mobile, m.status " +
+ "FROM member_driver md " +
+ "LEFT JOIN member m ON md.member_id = m.id " +
+ "ORDER BY md.id DESC")
+ List> selectDriverList();
+
+ /**
+ * 根据用户名搜索司机列表（关联member表获取手机号）
+ */
+ @Select("")
+ List> selectDriverListByUsername(@Param("username") String username);
+
+ /**
+ * 根据用户名和手机号搜索司机列表（支持精确查询）
+ */
+ @Select("SELECT md.id, md.member_id, md.username, md.car_number, " +
+ "md.driving_license, md.driver_license, md.record_code, " +
+ "md.car_img, md.id_card, md.remark, md.create_time, m.mobile, m.status " +
+ "FROM member_driver md " +
+ "LEFT JOIN member m ON md.member_id = m.id " +
+ "WHERE m.mobile = #{mobile} " +
+ "ORDER BY md.id DESC")
+ List> selectDriverListByMobile(@Param("mobile") String mobile);
+
+ /**
+ * 根据用户名和手机号搜索司机列表（支持精确查询）
+ */
+ @Select("")
+ List> selectDriverListBySearch(@Param("username") String username,
+ @Param("mobile") String mobile,
+ @Param("mobileExact") Boolean mobileExact);
+
+ /**
+ * 根据司机ID查询司机信息（关联member表获取手机号）
+ */
+ @Select("SELECT md.id, md.member_id, md.username, md.car_number, " +
+ "md.driving_license, md.driver_license, md.record_code, " +
+ "md.car_img, md.id_card, md.remark, md.create_time, m.mobile, m.status " +
+ "FROM member_driver md " +
+ "LEFT JOIN member m ON md.member_id = m.id " +
+ "WHERE md.id = #{driverId}")
+ Map selectDriverById(@Param("driverId") Integer driverId);
+
+ /**
+ * 根据车牌号查询司机信息
+ */
+ @Select("SELECT md.id, md.member_id, md.username, md.car_number, " +
+ "md.driving_license, md.driver_license, md.record_code, " +
+ "md.car_img, md.id_card, md.remark, md.create_time, m.mobile, m.status " +
+ "FROM member_driver md " +
+ "LEFT JOIN member m ON md.member_id = m.id " +
+ "WHERE md.car_number = #{licensePlate} " +
+ "ORDER BY md.create_time DESC LIMIT 1")
+ Map selectDriverByPlate(@Param("licensePlate") String licensePlate);
+
+ /**
+ * 新增司机信息
+ */
+ @org.apache.ibatis.annotations.Insert("INSERT INTO member_driver (member_id, username, car_number, " +
+ "driver_license, driving_license, car_img, record_code, id_card, remark, create_time) " +
+ "VALUES (#{memberId}, #{username}, #{carNumber}, #{driverLicense}, #{drivingLicense}, " +
+ "#{carImg}, #{recordCode}, #{idCard}, #{remark}, NOW())")
+ int insertDriver(@Param("memberId") Integer memberId, @Param("username") String username,
+ @Param("carNumber") String carNumber, @Param("driverLicense") String driverLicense,
+ @Param("drivingLicense") String drivingLicense, @Param("carImg") String carImg,
+ @Param("recordCode") String recordCode, @Param("idCard") String idCard, @Param("remark") String remark);
+
+ /**
+ * 更新司机信息
+ */
+ @org.apache.ibatis.annotations.Update("UPDATE member_driver SET username = #{username}, car_number = #{carNumber}, " +
+ "driver_license = #{driverLicense}, driving_license = #{drivingLicense}, car_img = #{carImg}, " +
+ "record_code = #{recordCode}, id_card = #{idCard}, remark = #{remark} WHERE id = #{id}")
+ int updateDriver(@Param("id") Integer id, @Param("username") String username, @Param("carNumber") String carNumber,
+ @Param("driverLicense") String driverLicense, @Param("drivingLicense") String drivingLicense,
+ @Param("carImg") String carImg, @Param("recordCode") String recordCode, @Param("idCard") String idCard, @Param("remark") String remark);
+
+ /**
+ * 根据司机姓名和车牌号查询司机信息（包含车身照片）
+ */
+ @Select("SELECT md.id, md.member_id, md.username, md.car_number, " +
+ "md.driving_license, md.driver_license, md.record_code, " +
+ "md.car_img, md.id_card, md.remark, md.create_time, m.mobile " +
+ "FROM member_driver md " +
+ "LEFT JOIN member m ON md.member_id = m.id " +
+ "WHERE md.username = #{driverName} AND md.car_number = #{licensePlate}")
+ Map selectDriverByNameAndPlate(@Param("driverName") String driverName,
+ @Param("licensePlate") String licensePlate);
+}
+
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberMapper.java
new file mode 100644
index 0000000..8e3ec7c
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/MemberMapper.java
@@ -0,0 +1,209 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.Member;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Options;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Member Mapper
+ *
+ * @author System
+ * @date 2025-01-16
+ */
+@Mapper
+public interface MemberMapper extends BaseMapper {
+
+ /**
+ * 查询用户列表（关联member_user表获取用户名）
+ */
+ @Select("SELECT m.id, m.mobile, COALESCE(mu.username, m.mobile) as name, m.type " +
+ "FROM member m " +
+ "LEFT JOIN member_user mu ON m.id = mu.member_id " +
+ "WHERE CAST(m.status AS UNSIGNED) = 1 " +
+ "ORDER BY m.id ASC")
+ List> selectMemberUserList();
+
+ /**
+ * 根据类型查询会员列表（分页，用于装车订单下拉框）
+ */
+ @Select("")
+ List> selectMemberListByType(@Param("type") Integer type,
+ @Param("username") String username,
+ @Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize);
+
+ /**
+ * 根据类型查询会员总数
+ */
+ @Select("")
+ Long countMemberListByType(@Param("type") Integer type, @Param("username") String username);
+
+ /**
+ * 查询用户列表（分页，用于用户管理页面）
+ * 只查询member_user表中存在的用户
+ */
+ @Select("")
+ List> selectUserListForManagement(@Param("username") String username,
+ @Param("mobile") String mobile,
+ @Param("type") Integer type,
+ @Param("usernameExact") Boolean usernameExact,
+ @Param("mobileExact") Boolean mobileExact,
+ @Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize);
+
+ /**
+ * 查询用户总数（用于用户管理页面）
+ * 只计算member_user表中存在的用户
+ */
+ @Select("")
+ Long countUserListForManagement(@Param("username") String username,
+ @Param("mobile") String mobile,
+ @Param("type") Integer type,
+ @Param("usernameExact") Boolean usernameExact,
+ @Param("mobileExact") Boolean mobileExact);
+
+ /**
+ * 更新用户信息
+ * 同时更新member表和member_user表
+ */
+ @org.apache.ibatis.annotations.Update("")
+ int updateUserInfo(@Param("id") Integer id,
+ @Param("mobile") String mobile,
+ @Param("type") Integer type,
+ @Param("status") Integer status,
+ @Param("username") String username,
+ @Param("cbkAccount") String cbkAccount,
+ @Param("remark") String remark);
+
+ /**
+ * 根据手机号查询member记录（用于获取新插入的member ID）
+ */
+ @Select("SELECT id FROM member WHERE mobile = #{mobile} ORDER BY id DESC LIMIT 1")
+ Integer selectMemberIdByMobile(@Param("mobile") String mobile);
+
+ /**
+ * 新增用户基础信息（插入member表）
+ */
+ @Insert("INSERT INTO member (mobile, type, status, create_time, create_by) " +
+ "VALUES (#{mobile}, #{type}, #{status}, NOW(), 1)")
+ int insertMember(@Param("mobile") String mobile,
+ @Param("type") Integer type,
+ @Param("status") Integer status);
+
+ /**
+ * 新增用户详细信息（插入member_user表）
+ */
+ @Insert("INSERT INTO member_user (member_id, username, cbk_account, remark, create_time) " +
+ "VALUES (#{memberId}, #{username}, #{cbkAccount}, #{remark}, NOW())")
+ int insertMemberUser(@Param("memberId") Integer memberId,
+ @Param("username") String username,
+ @Param("cbkAccount") String cbkAccount,
+ @Param("remark") String remark);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysMenuMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysMenuMapper.java
new file mode 100644
index 0000000..880c725
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysMenuMapper.java
@@ -0,0 +1,45 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.SysMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 系统菜单表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper {
+
+ /**
+ * 查询用户菜单
+ *
+ * @param userId
+ * @return
+ */
+ List queryMenusByUserId(@Param("userId") Integer userId);
+
+ /**
+ * 根据岗位/角色查询菜单
+ *
+ * @param id
+ * @return
+ */
+ List queryListByRoleId(@Param("roleId") Integer id);
+
+ /**
+ * 根据角色ID查询菜单列表（包含权限信息）
+ *
+ * @param roleId 角色ID
+ * @return 菜单列表
+ */
+ List selectMenusByRoleId(@Param("roleId") Integer roleId);
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMapper.java
new file mode 100644
index 0000000..911d619
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMapper.java
@@ -0,0 +1,18 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * 岗位管理表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-07
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMenuMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMenuMapper.java
new file mode 100644
index 0000000..2d024a7
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysRoleMenuMapper.java
@@ -0,0 +1,18 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.SysRoleMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * 岗位菜单表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface SysRoleMenuMapper extends BaseMapper {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysTenantMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysTenantMapper.java
new file mode 100644
index 0000000..795cd0e
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysTenantMapper.java
@@ -0,0 +1,16 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.SysTenant;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 租户Mapper接口
+ *
+ * @author System
+ * @date 2025-01-16
+ */
+@Mapper
+public interface SysTenantMapper extends BaseMapper {
+}
+
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysUserMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysUserMapper.java
new file mode 100644
index 0000000..b05054b
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/SysUserMapper.java
@@ -0,0 +1,44 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.dto.SysUserDto;
+import com.aiotagro.cattletrade.business.entity.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 员工管理表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper {
+
+ /**
+ * 查询用户
+ *
+ * @param dto
+ * @return
+ */
+ List queryList(@Param("item") SysUserDto dto);
+
+ /**
+ * 获取用户信息
+ *
+ * @param currentUserId
+ * @return
+ */
+ SysUser getUserInfoById(@Param("id") Integer currentUserId);
+
+ /**
+ * 查询所有用户列表（用于权限分配）
+ *
+ * @return 用户列表
+ */
+ List selectUserListForPermission();
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/WarningLogMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/WarningLogMapper.java
new file mode 100644
index 0000000..8fe7c03
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/WarningLogMapper.java
@@ -0,0 +1,24 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.dto.DeliveryQueryDto;
+import com.aiotagro.cattletrade.business.entity.WarningLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 预警记录表 Mapper 接口
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Mapper
+public interface WarningLogMapper extends BaseMapper {
+
+ public List getNewWarningLog(@Param("dto") DeliveryQueryDto dto);
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/XqClientMapper.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/XqClientMapper.java
new file mode 100644
index 0000000..1106b5d
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/mapper/XqClientMapper.java
@@ -0,0 +1,74 @@
+package com.aiotagro.cattletrade.business.mapper;
+
+import com.aiotagro.cattletrade.business.entity.XqClient;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项圈客户端Mapper接口
+ *
+ * @author System
+ * @date 2025-01-16
+ */
+@Mapper
+public interface XqClientMapper extends BaseMapper {
+
+ /**
+ * 查询项圈列表（带关联信息）
+ */
+ @Select("SELECT xc.id, xc.org_id, xc.uid, xc.sn AS deviceId, xc.sn, xc.state, " +
+ " xc.longitude, xc.latitude, xc.altitude, xc.gps_state, " +
+ " xc.nsat, xc.rsrp, xc.battery, xc.temperature, xc.steps, " +
+ " xc.acc_x, xc.acc_y, xc.acc_z, xc.bandge_status, xc.ver, " +
+ " xc.time, xc.uptime, xc.y_steps, xc.is_wear, xc.is_temperature, " +
+ " xc.source_id, xc.loctime, xc.subType, xc.frequency, " +
+ " xc.vehicle_id, xc.evening_frequency, xc.tenant_id, " +
+ " COALESCE(dd.delivery_id, 0) AS delivery_id, " +
+ " COALESCE(d.delivery_number, '未分配') AS delivery_number, " +
+ " COALESCE(d.license_plate, md.car_number, '未分配') AS license_plate " +
+ "FROM xq_client xc " +
+ "LEFT JOIN ( " +
+ " SELECT device_id, delivery_id, ROW_NUMBER() OVER (PARTITION BY device_id ORDER BY id DESC) AS rn " +
+ " FROM delivery_device WHERE device_type = 3 " +
+ ") dd ON CONCAT(xc.sn, '') = dd.device_id AND dd.rn = 1 " +
+ "LEFT JOIN delivery d ON dd.delivery_id = d.id " +
+ "LEFT JOIN member_driver md ON xc.vehicle_id = md.id " +
+ "WHERE (#{sn} IS NULL OR #{sn} = '' OR xc.sn LIKE CONCAT('%', #{sn}, '%')) " +
+ " AND (#{startNo} IS NULL OR #{startNo} = '' OR xc.sn >= #{startNo}) " +
+ " AND (#{endNo} IS NULL OR #{endNo} = '' OR xc.sn <= #{endNo}) " +
+ "ORDER BY xc.id DESC")
+ List> selectXqClientListWithRelations(@Param("sn") String sn,
+ @Param("startNo") String startNo,
+ @Param("endNo") String endNo);
+
+ /**
+ * 查询未分配的智能项圈列表
+ */
+ @Select("SELECT xc.id, xc.org_id, xc.uid, xc.sn AS deviceId, xc.sn, xc.state, " +
+ " xc.longitude, xc.latitude, xc.altitude, xc.gps_state, " +
+ " xc.nsat, xc.rsrp, xc.battery, xc.temperature, xc.steps, " +
+ " xc.acc_x, xc.acc_y, xc.acc_z, xc.bandge_status, xc.ver, " +
+ " xc.time, xc.uptime, xc.y_steps, xc.is_wear, xc.is_temperature, " +
+ " xc.source_id, xc.loctime, xc.subType, xc.frequency, " +
+ " xc.vehicle_id, xc.evening_frequency, xc.tenant_id, " +
+ " 0 AS delivery_id, '未分配' AS delivery_number, '未分配' AS license_plate " +
+ "FROM xq_client xc " +
+ "WHERE xc.deviceId NOT IN (" +
+ " SELECT DISTINCT device_id " +
+ " FROM delivery_device " +
+ " WHERE device_type = 3" +
+ ") " +
+ "AND (#{sn} IS NULL OR #{sn} = '' OR xc.sn LIKE CONCAT('%', #{sn}, '%')) " +
+ "AND (#{startNo} IS NULL OR #{startNo} = '' OR xc.sn >= #{startNo}) " +
+ "AND (#{endNo} IS NULL OR #{endNo} = '' OR xc.sn <= #{endNo}) " +
+ "ORDER BY xc.id DESC")
+ List> selectUnassignedXqClientList(@Param("sn") String sn,
+ @Param("startNo") String startNo,
+ @Param("endNo") String endNo);
+}
+
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryDeviceService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryDeviceService.java
new file mode 100644
index 0000000..ecd31cf
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryDeviceService.java
@@ -0,0 +1,16 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.entity.DeliveryDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 运单设备表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IDeliveryDeviceService extends IService {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryService.java
new file mode 100644
index 0000000..525229e
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IDeliveryService.java
@@ -0,0 +1,51 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.DeliverListDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryAddDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryCreateDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryEditDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryQueryDto;
+import com.aiotagro.cattletrade.business.entity.Delivery;
+import com.aiotagro.cattletrade.business.vo.DeliveryLogVo;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 运送清单表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IDeliveryService extends IService {
+
+ AjaxResult addDelivery(DeliveryAddDto dto);
+
+ /**
+ * 创建运送清单（PC端）
+ *
+ * @param dto 运送清单创建DTO
+ * @return AjaxResult
+ */
+ AjaxResult createDelivery(DeliveryCreateDto dto);
+
+ /**
+ * 编辑运送清单
+ *
+ * @param dto 运送清单编辑DTO
+ * @return AjaxResult
+ */
+ AjaxResult updateDeliveryInfo(DeliveryEditDto dto);
+
+ PageResultResponse pageQuery(DeliveryQueryDto dto);
+
+ AjaxResult viewDelivery(Integer id);
+
+ PageResultResponse pageQueryList(DeliverListDto dto);
+
+ AjaxResult detail(Integer id);
+
+ PageResultResponse pageQueryListLog(DeliverListDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientLogService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientLogService.java
new file mode 100644
index 0000000..9d1e76c
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientLogService.java
@@ -0,0 +1,19 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.JbqLogDto;
+import com.aiotagro.cattletrade.business.entity.JbqClientLog;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 智能耳标日志表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IJbqClientLogService extends IService {
+
+ PageResultResponse jbqLogList(JbqLogDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientService.java
new file mode 100644
index 0000000..88b0def
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqClientService.java
@@ -0,0 +1,29 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.entity.JbqClient;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 智能耳标表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IJbqClientService extends IService {
+
+ PageResultResponse jbqList(DeviceDto dto);
+
+ /**
+ * 根据运送清单ID查询设备列表
+ *
+ * @param deliveryId 运送清单ID
+ * @param deviceType 设备类型
+ * @return AjaxResult
+ */
+ AjaxResult getDevicesByDeliveryId(Integer deliveryId, Integer deviceType);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerLogService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerLogService.java
new file mode 100644
index 0000000..36e9414
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerLogService.java
@@ -0,0 +1,16 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.entity.JbqServerLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 智能主机日志表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IJbqServerLogService extends IService {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerService.java
new file mode 100644
index 0000000..22a6bd3
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IJbqServerService.java
@@ -0,0 +1,25 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.dto.ServerLocationDto;
+import com.aiotagro.cattletrade.business.entity.JbqServer;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 智能主机表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IJbqServerService extends IService {
+
+ PageResultResponse serverList(DeviceDto dto);
+
+ AjaxResult serverLocation(ServerLocationDto dto);
+
+ AjaxResult serverTrack(ServerLocationDto dto);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysRoleService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysRoleService.java
new file mode 100644
index 0000000..4c03609
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysRoleService.java
@@ -0,0 +1,50 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.SysRoleDto;
+import com.aiotagro.cattletrade.business.entity.SysRole;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 岗位管理表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface ISysRoleService extends IService {
+
+ /**
+ * 查询分页列表
+ *
+ * @param dto
+ * @return
+ */
+ PageResultResponse queryList(SysRoleDto dto);
+
+ /**
+ * 新增、编辑
+ *
+ * @param role
+ * @return
+ */
+ AjaxResult saveRole(SysRole role);
+
+ /**
+ * 删除
+ *
+ * @param id
+ * @return
+ */
+ AjaxResult delete(Integer id);
+
+ /**
+ * 查询菜单
+ *
+ * @return
+ */
+ AjaxResult getMenus(Integer id);
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysUserService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysUserService.java
new file mode 100644
index 0000000..8af0177
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/ISysUserService.java
@@ -0,0 +1,43 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.SysUserDto;
+import com.aiotagro.cattletrade.business.entity.SysUser;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 员工管理表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface ISysUserService extends IService {
+
+ /**
+ * 查询分页列表
+ *
+ * @param dto
+ * @return
+ */
+ PageResultResponse queryList(SysUserDto dto);
+
+ /**
+ * 新增、编辑
+ *
+ * @param user
+ * @return
+ */
+ AjaxResult saveUser(SysUser user);
+
+ /**
+ * 删除
+ *
+ * @param id
+ * @return
+ */
+ AjaxResult delete(Integer id);
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IWarningLogService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IWarningLogService.java
new file mode 100644
index 0000000..9754723
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IWarningLogService.java
@@ -0,0 +1,40 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.DeliveryQueryDto;
+import com.aiotagro.cattletrade.business.dto.DeliverListDto;
+import com.aiotagro.cattletrade.business.entity.WarningLog;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.cattletrade.business.vo.DeliveryLogVo;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 预警记录表 服务类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+public interface IWarningLogService extends IService {
+
+ /**
+ * 供远程调用-保存预警日志
+ *
+ * @param deviceId
+ * @return
+ */
+ AjaxResult savaWarn(String deviceId);
+
+ AjaxResult warningCount();
+
+ PageResultResponse queryList(DeliveryQueryDto dto);
+
+ /**
+ * 预警详情查看
+ * @param id
+ * @return
+ */
+ AjaxResult warningDetail(Integer id);
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IXqClientService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IXqClientService.java
new file mode 100644
index 0000000..a5dca45
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/IXqClientService.java
@@ -0,0 +1,43 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.entity.XqClient;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * 项圈客户端服务接口
+ *
+ * @author System
+ * @date 2025-01-16
+ */
+public interface IXqClientService extends IService {
+
+ /**
+ * 分页查询项圈列表
+ */
+ PageResultResponse xqList(Map params);
+
+ /**
+ * 根据运送清单ID查询设备列表
+ */
+ AjaxResult getDevicesByDeliveryId(Integer deliveryId, Integer deviceType);
+
+ /**
+ * 查询项圈位置信息
+ */
+ AjaxResult getCollarLocation(String deliveryId, String xqDeviceId);
+
+ /**
+ * 查询项圈轨迹
+ */
+ AjaxResult getCollarTrack(String deliveryId, String xqDeviceId, String trackTime, String trackEndTime);
+
+ /**
+ * 查询设备轨迹
+ */
+ AjaxResult getCollarDeviceTrack(String deliveryId, String xqDeviceId, String trackTime, String trackEndTime);
+}
+
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/LoginService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/LoginService.java
new file mode 100644
index 0000000..6563d4c
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/LoginService.java
@@ -0,0 +1,37 @@
+package com.aiotagro.cattletrade.business.service;
+
+import com.aiotagro.cattletrade.business.dto.LoginDto;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+
+public interface LoginService {
+
+ /**
+ * 发送验证码
+ *
+ * @param mobile
+ * @return
+ */
+ AjaxResult sendLoginSmsCode(String mobile);
+
+ /**
+ * 用户登录
+ *
+ * @param dto
+ * @return
+ */
+ AjaxResult login(LoginDto dto);
+
+ /**
+ * 查询菜单
+ *
+ * @return
+ */
+ AjaxResult getUserMenus();
+
+ /**
+ * rfid获取用户信息
+ *
+ * @return
+ */
+ AjaxResult getUserInfo();
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/TencentSmsCodeService.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/TencentSmsCodeService.java
new file mode 100644
index 0000000..fc44de1
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/TencentSmsCodeService.java
@@ -0,0 +1,6 @@
+package com.aiotagro.cattletrade.business.service;
+
+public interface TencentSmsCodeService {
+
+ String sendSmsCode(String mobile, String code);
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryDeviceServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryDeviceServiceImpl.java
new file mode 100644
index 0000000..634e7f6
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryDeviceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.entity.DeliveryDevice;
+import com.aiotagro.cattletrade.business.mapper.DeliveryDeviceMapper;
+import com.aiotagro.cattletrade.business.service.IDeliveryDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 运单设备表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class DeliveryDeviceServiceImpl extends ServiceImpl implements IDeliveryDeviceService {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryServiceImpl.java
new file mode 100644
index 0000000..945c2d5
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/DeliveryServiceImpl.java
@@ -0,0 +1,1284 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.dto.DeliverListDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryAddDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryCreateDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryEditDto;
+import com.aiotagro.cattletrade.business.dto.DeliveryQueryDto;
+import com.aiotagro.cattletrade.business.entity.*;
+import com.aiotagro.cattletrade.business.mapper.*;
+import com.aiotagro.cattletrade.business.service.IDeliveryService;
+import com.aiotagro.cattletrade.business.service.IDeliveryDeviceService;
+import com.aiotagro.cattletrade.business.service.IXqClientService;
+import com.aiotagro.cattletrade.business.vo.DeliveryLogVo;
+import com.aiotagro.cattletrade.constant.WarningStatusAdminEnum;
+import com.aiotagro.common.core.utils.DateUtils;
+import com.aiotagro.common.core.utils.EnumUtil;
+import com.aiotagro.common.core.utils.SecurityUtil;
+import com.aiotagro.common.core.utils.StringUtils;
+import com.aiotagro.common.core.constant.RoleConstants;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 运送清单表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class DeliveryServiceImpl extends ServiceImpl implements IDeliveryService {
+
+ @Autowired
+ private DeliveryDeviceMapper deliveryDeviceMapper;
+ @Autowired
+ private WarningLogMapper warningLogMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private JbqClientMapper jbqClientMapper;
+ @Autowired
+ private JbqServerMapper jbqServerMapper;
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private MemberDriverMapper memberDriverMapper;
+ @Autowired
+ private IDeliveryDeviceService deliveryDeviceService;
+ @Autowired
+ private IXqClientService xqClientService;
+
+
+ /**
+ * 列表查询
+ * @param dto
+ * @return
+ */
+ @Override
+ public PageResultResponse pageQuery(DeliveryQueryDto dto) {
+ //获取当前登录人id和手机号
+ Integer userId = SecurityUtil.getCurrentUserId();
+ String currentUserMobile = SecurityUtil.getUserMobile();
+ System.out.println("=== 运送清单列表查询 - 当前登录用户手机号: " + currentUserMobile);
+
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+
+ // 运输单号模糊查询
+ if(StringUtils.isNotEmpty(dto.getDeliveryNumber())){
+ wrapper.like(Delivery::getDeliveryNumber, dto.getDeliveryNumber());
+ }
+
+ wrapper.orderByDesc(Delivery::getId);
+ List list = this.list(wrapper);
+
+ if(CollectionUtils.isNotEmpty(list)){
+ list.forEach(delivery -> {
+ if(userId.equals(delivery.getCheckBy())){
+ //判断是否需要核验，1：需要核验，2：不需要核验
+ delivery.setIfCheck(1);
+ }
+
+ // 查询四个角色的手机号（供应商、资金方、采购商、司机）
+ try {
+ // 1. 查询供应商手机号（supplierId是逗号分隔的字符串）
+ if (StringUtils.isNotEmpty(delivery.getSupplierId())) {
+ String[] supplierIds = delivery.getSupplierId().split(",");
+ List supplierMobiles = new ArrayList<>();
+ for (String supplierId : supplierIds) {
+ if (StringUtils.isNotEmpty(supplierId.trim())) {
+ try {
+ Integer sid = Integer.parseInt(supplierId.trim());
+ Member supplier = memberMapper.selectById(sid);
+ if (supplier != null && StringUtils.isNotEmpty(supplier.getMobile())) {
+ supplierMobiles.add(supplier.getMobile());
+ }
+ } catch (NumberFormatException e) {
+ System.out.println("供应商ID格式错误: " + supplierId);
+ }
+ }
+ }
+ if (!supplierMobiles.isEmpty()) {
+ delivery.setSupplierMobile(String.join(",", supplierMobiles));
+ }
+ }
+
+ // 2. 查询资金方手机号
+ if (delivery.getFundId() != null) {
+ Member fund = memberMapper.selectById(delivery.getFundId());
+ if (fund != null && StringUtils.isNotEmpty(fund.getMobile())) {
+ delivery.setFundMobile(fund.getMobile());
+ }
+ }
+
+ // 3. 查询采购商手机号
+ if (delivery.getBuyerId() != null) {
+ Member buyer = memberMapper.selectById(delivery.getBuyerId());
+ if (buyer != null && StringUtils.isNotEmpty(buyer.getMobile())) {
+ delivery.setBuyerMobile(buyer.getMobile());
+ }
+ }
+
+ // 4. 查询司机手机号（如果有司机ID）
+ if (delivery.getDriverId() != null) {
+ try {
+ Map driverInfo = memberDriverMapper.selectDriverById(delivery.getDriverId());
+ if (driverInfo != null) {
+ String driverName = (String) driverInfo.get("username");
+ String driverMobile = (String) driverInfo.get("mobile");
+ String carImg = (String) driverInfo.get("car_img");
+
+ if (StringUtils.isNotEmpty(driverMobile)) {
+ delivery.setDriverMobile(driverMobile);
+ }
+ if (StringUtils.isNotEmpty(driverName)) {
+ delivery.setDriverName(driverName);
+ }
+
+ // 处理车身照片分割
+ if (carImg != null && !carImg.isEmpty()) {
+ // 按逗号分割car_img字段，分别映射到车头和车尾照片
+ String[] carImgUrls = carImg.split(",");
+
+ if (carImgUrls.length >= 2) {
+ // 逗号前面的URL作为车尾照片
+ String carBehindPhoto = carImgUrls[0].trim();
+ // 逗号后面的URL作为车头照片
+ String carFrontPhoto = carImgUrls[1].trim();
+
+ delivery.setCarBehindPhoto(carBehindPhoto);
+ delivery.setCarFrontPhoto(carFrontPhoto);
+
+ System.out.println("运送清单-分割车身照片:");
+ System.out.println(" 车尾照片: " + carBehindPhoto);
+ System.out.println(" 车头照片: " + carFrontPhoto);
+ } else if (carImgUrls.length == 1) {
+ // 只有一个URL时，同时设置为车头和车尾照片
+ String singlePhoto = carImgUrls[0].trim();
+ delivery.setCarFrontPhoto(singlePhoto);
+ delivery.setCarBehindPhoto(singlePhoto);
+
+ System.out.println("运送清单-单张车身照片: " + singlePhoto);
+ } else {
+ // 没有有效URL
+ delivery.setCarFrontPhoto("");
+ delivery.setCarBehindPhoto("");
+ System.out.println("运送清单-无有效车身照片URL");
+ }
+ } else {
+ // 如果司机信息中没有照片，清空delivery表中的照片
+ delivery.setCarFrontPhoto("");
+ delivery.setCarBehindPhoto("");
+ System.out.println("运送清单-司机信息中无照片，清空车身照片");
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("查询司机信息异常: " + e.getMessage());
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("查询角色手机号异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+
+ // 统计登记设备数量（耳标+项圈）
+ Integer currentDeliveryId = delivery.getId();
+ if (currentDeliveryId != null) {
+ try {
+ // 统计耳标设备数量
+ LambdaQueryWrapper earTagWrapper = new LambdaQueryWrapper<>();
+ earTagWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 2);
+ long earTagCount = deliveryDeviceService.count(earTagWrapper);
+
+ // 统计项圈设备数量
+ LambdaQueryWrapper collarWrapper = new LambdaQueryWrapper<>();
+ collarWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 3);
+ long collarCount = deliveryDeviceService.count(collarWrapper);
+
+ // 设置总设备数量和耳标数量
+ int totalDeviceCount = (int) (earTagCount + collarCount);
+ delivery.setRegisteredJbqCount(totalDeviceCount);
+ delivery.setEarTagCount((int) earTagCount);
+
+ // 设置已分配设备数量，与登记设备数量保持一致
+ delivery.setBindJbqCount(totalDeviceCount);
+
+ // 统计已佩戴设备数量（bandge_status = 1）
+ int wornDeviceCount = 0;
+ try {
+ // 统计已佩戴的耳标设备数量（通过delivery_device表关联）
+ LambdaQueryWrapper wornEarTagWrapper = new LambdaQueryWrapper<>();
+ wornEarTagWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 2)
+ .eq(DeliveryDevice::getIsWare, 1); // 1表示已佩戴
+ long wornEarTagCount = deliveryDeviceService.count(wornEarTagWrapper);
+
+ // 统计已佩戴的项圈设备数量（通过delivery_device表关联xq_client表）
+ LambdaQueryWrapper wornCollarWrapper = new LambdaQueryWrapper<>();
+ wornCollarWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 3);
+ List collarDevices = deliveryDeviceService.list(wornCollarWrapper);
+
+ int wornCollarCount = 0;
+ for (DeliveryDevice device : collarDevices) {
+ // 查询xq_client表中的bandge_status
+ LambdaQueryWrapper xqWrapper = new LambdaQueryWrapper<>();
+ xqWrapper.eq(XqClient::getSn, device.getDeviceId());
+ XqClient xqClient = xqClientService.getOne(xqWrapper);
+ if (xqClient != null && xqClient.getBandgeStatus() != null && xqClient.getBandgeStatus() == 1) {
+ wornCollarCount++;
+ }
+ }
+
+ wornDeviceCount = (int) (wornEarTagCount + wornCollarCount);
+ delivery.setWareCount(wornDeviceCount);
+
+ System.out.println("运送清单-运单ID " + currentDeliveryId + " 已佩戴设备统计: 耳标=" + wornEarTagCount + ", 项圈=" + wornCollarCount + ", 总计=" + wornDeviceCount);
+ } catch (Exception e) {
+ System.out.println("运送清单-统计已佩戴设备数量失败: " + e.getMessage());
+ delivery.setWareCount(0);
+ }
+
+ System.out.println("运送清单-运单ID " + currentDeliveryId + " 设备统计: 耳标=" + earTagCount + ", 项圈=" + collarCount + ", 总计=" + totalDeviceCount + ", 已佩戴=" + wornDeviceCount);
+ } catch (Exception e) {
+ System.out.println("运送清单-统计设备数量失败: " + e.getMessage());
+ delivery.setRegisteredJbqCount(0);
+ delivery.setBindJbqCount(0);
+ delivery.setWareCount(0);
+ }
+ }
+ });
+
+ // 数据权限过滤：非超级管理员只能看到与自己手机号相关的订单
+ if (!SecurityUtil.isSuperAdmin() && StringUtils.isNotEmpty(currentUserMobile)) {
+ System.out.println("=== 非超级管理员，执行数据权限过滤 ===");
+ System.out.println("当前用户手机号: " + currentUserMobile);
+
+ list = list.stream().filter(delivery -> {
+ boolean hasPermission = false;
+
+ // 检查是否是司机
+ if (StringUtils.isNotEmpty(delivery.getDriverMobile()) &&
+ currentUserMobile.equals(delivery.getDriverMobile())) {
+ hasPermission = true;
+ System.out.println("运单 " + delivery.getDeliveryNumber() + " - 匹配司机手机号");
+ }
+
+ // 检查是否是供应商（可能有多个供应商）
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getSupplierMobile())) {
+ String[] supplierMobiles = delivery.getSupplierMobile().split(",");
+ for (String mobile : supplierMobiles) {
+ if (currentUserMobile.equals(mobile.trim())) {
+ hasPermission = true;
+ System.out.println("运单 " + delivery.getDeliveryNumber() + " - 匹配供应商手机号");
+ break;
+ }
+ }
+ }
+
+ // 检查是否是资金方
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getFundMobile()) &&
+ currentUserMobile.equals(delivery.getFundMobile())) {
+ hasPermission = true;
+ System.out.println("运单 " + delivery.getDeliveryNumber() + " - 匹配资金方手机号");
+ }
+
+ // 检查是否是采购商
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getBuyerMobile()) &&
+ currentUserMobile.equals(delivery.getBuyerMobile())) {
+ hasPermission = true;
+ System.out.println("运单 " + delivery.getDeliveryNumber() + " - 匹配采购商手机号");
+ }
+
+ if (!hasPermission) {
+ System.out.println("运单 " + delivery.getDeliveryNumber() + " - 无权限，过滤掉");
+ }
+
+ return hasPermission;
+ }).collect(Collectors.toList());
+
+ System.out.println("过滤后的运单数量: " + list.size());
+ } else if (SecurityUtil.isSuperAdmin()) {
+ System.out.println("=== 超级管理员，不执行数据权限过滤 ===");
+ } else {
+ System.out.println("=== 非超级管理员，但未获取到当前用户手机号，跳过数据过滤 ===");
+ }
+ }
+
+ // 更新分页信息
+ long filteredTotal = list.size();
+ return new PageResultResponse(filteredTotal, list);
+ }
+
+ /**
+ * 我要装车
+ * @param dto
+ * @return
+ */
+ @Transactional
+ @Override
+ public AjaxResult addDelivery(DeliveryAddDto dto) {
+ //获取当前登录信息
+ Integer userId = SecurityUtil.getCurrentUserId();
+ LocalDateTime now = LocalDateTime.now();
+ String deliverNo = now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+ Delivery delivery = new Delivery();
+ BeanUtils.copyProperties(dto, delivery);
+ delivery.setStatus(1);
+ delivery.setDeliveryNumber(deliverNo);
+ delivery.setCreatedBy(userId);
+ delivery.setCreateTime(new Date());
+ List jbqDeviceSn = dto.getJbqDeviceSn();
+ if(CollectionUtils.isNotEmpty(jbqDeviceSn)){
+ //校验设备是否已注册
+ List deliveryDevices = jbqClientMapper.selectList(new LambdaQueryWrapper().in(JbqClient::getDeviceId, jbqDeviceSn));
+ if(CollectionUtils.isNotEmpty(deliveryDevices)){
+ List collect = deliveryDevices.stream().map(JbqClient::getDeviceId).collect(Collectors.toList());
+ jbqDeviceSn = collect;
+ }else{
+ return AjaxResult.error("设备数据有误！");
+ }
+ delivery.setRegisteredJbqCount(jbqDeviceSn.size());
+ }else{
+ delivery.setRegisteredJbqCount(0);
+ }
+ boolean save = this.save(delivery);
+ if(save){
+ Integer deliveryId = delivery.getId();
+ //新增设备
+ if(CollectionUtils.isNotEmpty(jbqDeviceSn)){
+ jbqDeviceSn.forEach(deviceSn -> {
+ DeliveryDevice deliveryDevice = new DeliveryDevice();
+ deliveryDevice.setDeliveryId(deliveryId);
+ deliveryDevice.setDeviceType(2);
+ deliveryDevice.setDeviceId(deviceSn);
+ deliveryDeviceMapper.insert(deliveryDevice);
+ });
+ }
+ //校验主机是否在系统中存在
+ Long serverCount = jbqServerMapper.selectCount(new LambdaQueryWrapper().eq(JbqServer::getDeviceId, dto.getServerDeviceSn()));
+ if(serverCount.intValue() == 1){
+ DeliveryDevice deliveryDevice = new DeliveryDevice();
+ deliveryDevice.setDeliveryId(deliveryId);
+ deliveryDevice.setDeviceType(1);
+ deliveryDevice.setDeviceId(dto.getServerDeviceSn());
+ deliveryDeviceMapper.insert(deliveryDevice);
+ }else{
+ throw new IllegalArgumentException("主机未注册！");
+ }
+ }
+ return AjaxResult.success("装车成功！");
+ }
+
+ /**
+ * 创建运送清单（PC端）
+ *
+ * @param dto 运送清单创建DTO
+ * @return AjaxResult
+ */
+ @Transactional
+ @Override
+ public AjaxResult createDelivery(DeliveryCreateDto dto) {
+ // 校验时间逻辑
+ if (dto.getEstimatedArrivalTime().before(dto.getEstimatedDepartureTime())) {
+ return AjaxResult.error("预计到达时间必须晚于出发时间");
+ }
+
+ // 获取当前登录用户
+ Integer userId = SecurityUtil.getCurrentUserId();
+ String userName = SecurityUtil.getUserName();
+
+ // 生成运输单号
+ LocalDateTime now = LocalDateTime.now();
+ String deliveryNumber = "YS" + now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+
+ // 创建运送清单
+ Delivery delivery = new Delivery();
+ delivery.setDeliveryNumber(deliveryNumber);
+ delivery.setStartLocation(dto.getStartLocation());
+ delivery.setEndLocation(dto.getEndLocation());
+ delivery.setStatus(1); // 待装车
+ delivery.setCreatedBy(userId);
+ delivery.setCreateByName(userName);
+ delivery.setCreateTime(new Date());
+
+ // 保存运送清单
+ boolean saved = this.save(delivery);
+ if (!saved) {
+ return AjaxResult.error("创建失败");
+ }
+
+ // 如果选择了设备，保存设备关联
+ Integer deliveryId = delivery.getId();
+
+ // 保存主机设备
+ if (dto.getServerId() != null) {
+ Long serverCount = jbqServerMapper.selectCount(
+ new LambdaQueryWrapper().eq(JbqServer::getId, dto.getServerId())
+ );
+ if (serverCount > 0) {
+ DeliveryDevice serverDevice = new DeliveryDevice();
+ serverDevice.setDeliveryId(deliveryId);
+ serverDevice.setDeviceType(1);
+ serverDevice.setDeviceId(dto.getServerId().toString());
+ deliveryDeviceMapper.insert(serverDevice);
+ }
+ }
+
+ // 保存耳标设备
+ if (CollectionUtils.isNotEmpty(dto.getEartagIds())) {
+ for (Integer eartagId : dto.getEartagIds()) {
+ DeliveryDevice eartagDevice = new DeliveryDevice();
+ eartagDevice.setDeliveryId(deliveryId);
+ eartagDevice.setDeviceType(2);
+ eartagDevice.setDeviceId(eartagId.toString());
+ deliveryDeviceMapper.insert(eartagDevice);
+ }
+ }
+
+ // 保存项圈设备
+ if (CollectionUtils.isNotEmpty(dto.getCollarIds())) {
+ for (Integer collarId : dto.getCollarIds()) {
+ DeliveryDevice collarDevice = new DeliveryDevice();
+ collarDevice.setDeliveryId(deliveryId);
+ collarDevice.setDeviceType(3);
+ collarDevice.setDeviceId(collarId.toString());
+ deliveryDeviceMapper.insert(collarDevice);
+ }
+ }
+
+ return AjaxResult.success("创建成功", delivery);
+ }
+
+ @Override
+ public AjaxResult viewDelivery(Integer id) {
+ //获取当前登录人id
+ Integer userId = SecurityUtil.getCurrentUserId();
+ Delivery delivery = this.getById(id);
+ if(delivery != null){
+ List deliveryDevices = deliveryDeviceMapper.selectList(new LambdaQueryWrapper().eq(DeliveryDevice::getDeliveryId, id));
+ //耳标设备集合
+ List deviceIds = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(deliveryDevices)){
+ deliveryDevices.forEach(deliveryDevice -> {
+ if(deliveryDevice.getDeviceType() == 1){
+ delivery.setServerDeviceId(deliveryDevice.getDeviceId());
+ }else if(deliveryDevice.getDeviceType() == 2){
+ deviceIds.add(deliveryDevice.getDeviceId());
+ }
+ });
+ }
+ delivery.setDeviceIds(deviceIds);
+ if(userId == delivery.getCheckBy()){
+ //判断是否需要核验，1：需要核验，2：不需要核验
+ delivery.setIfCheck(1);
+ }
+ }
+ return AjaxResult.success(delivery);
+ }
+
+ /**
+ * 编辑运送清单
+ *
+ * @param dto 运送清单编辑DTO
+ * @return AjaxResult
+ */
+ @Transactional
+ @Override
+ public AjaxResult updateDeliveryInfo(DeliveryEditDto dto) {
+ // 获取当前登录用户
+ Integer userId = SecurityUtil.getCurrentUserId();
+
+ // 查询运送清单是否存在
+ Delivery delivery = this.getById(dto.getDeliveryId());
+ if (delivery == null) {
+ return AjaxResult.error("运送清单不存在");
+ }
+
+ // 检查权限：只有创建者或超级管理员可以编辑
+ if (!SecurityUtil.isSuperAdmin() && !userId.equals(delivery.getCreatedBy())) {
+ return AjaxResult.error("无权限编辑此运送清单");
+ }
+
+ // 更新运送清单信息
+ if (dto.getDeliveryTitle() != null) {
+ delivery.setDeliveryTitle(dto.getDeliveryTitle());
+ }
+ if (dto.getRatedQuantity() != null) {
+ delivery.setRatedQuantity(dto.getRatedQuantity());
+ }
+ if (dto.getStartLocation() != null) {
+ delivery.setStartLocation(dto.getStartLocation());
+ }
+ if (dto.getStartLat() != null) {
+ delivery.setStartLat(dto.getStartLat());
+ }
+ if (dto.getStartLon() != null) {
+ delivery.setStartLon(dto.getStartLon());
+ }
+ if (dto.getEndLocation() != null) {
+ delivery.setEndLocation(dto.getEndLocation());
+ }
+ if (dto.getEndLat() != null) {
+ delivery.setEndLat(dto.getEndLat());
+ }
+ if (dto.getEndLon() != null) {
+ delivery.setEndLon(dto.getEndLon());
+ }
+
+ // 更新其他业务字段
+ if (dto.getSupplierId() != null) {
+ delivery.setSupplierId(dto.getSupplierId());
+ }
+ if (dto.getFundId() != null) {
+ delivery.setFundId(dto.getFundId());
+ }
+ if (dto.getDriverId() != null) {
+ delivery.setDriverId(dto.getDriverId());
+ }
+ if (dto.getDriverMobile() != null) {
+ delivery.setDriverMobile(dto.getDriverMobile());
+ }
+ if (dto.getBuyerId() != null) {
+ delivery.setBuyerId(dto.getBuyerId());
+ }
+ if (dto.getBuyerPrice() != null) {
+ delivery.setBuyerPrice(dto.getBuyerPrice());
+ }
+ if (dto.getSalePrice() != null) {
+ delivery.setSalePrice(dto.getSalePrice());
+ }
+ if (dto.getFirmPrice() != null) {
+ delivery.setFirmPrice(dto.getFirmPrice());
+ }
+
+ // 保存更新
+ boolean updated = this.updateById(delivery);
+ if (updated) {
+ return AjaxResult.success("编辑成功");
+ } else {
+ return AjaxResult.error("编辑失败");
+ }
+ }
+
+
+ /**
+ * 转换前端时间格式为标准格式
+ * 将 "Oct 01, 2025" 转换为 "2025-10-01"
+ */
+ private String convertDateFormat(String dateStr) {
+ if (StringUtils.isEmpty(dateStr)) {
+ return null;
+ }
+
+ try {
+ // 处理 "Oct 01, 2025" 格式
+ if (dateStr.contains(",")) {
+ String[] parts = dateStr.split(",");
+ if (parts.length == 2) {
+ String monthDay = parts[0].trim(); // "Oct 01"
+ String year = parts[1].trim(); // "2025"
+
+ String[] monthDayParts = monthDay.split(" ");
+ if (monthDayParts.length == 2) {
+ String month = monthDayParts[0]; // "Oct"
+ String day = monthDayParts[1]; // "01"
+
+ // 月份名称映射
+ String[] monthNames = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+ int monthNum = 1;
+ for (int i = 0; i < monthNames.length; i++) {
+ if (monthNames[i].equals(month)) {
+ monthNum = i + 1;
+ break;
+ }
+ }
+
+ return year + "-" + String.format("%02d", monthNum) + "-" + day;
+ }
+ }
+ }
+
+ // 如果已经是标准格式，直接返回
+ return dateStr;
+ } catch (Exception e) {
+ System.out.println("时间格式转换异常: " + e.getMessage());
+ return dateStr; // 转换失败时返回原字符串
+ }
+ }
+
+ @Override
+ public PageResultResponse pageQueryListLog(DeliverListDto dto) {
+ //获取当前登录人的信息
+ String currentUserMobile = SecurityUtil.getUserMobile();
+ System.out.println("=== 装车订单列表查询 - 当前登录用户手机号: " + currentUserMobile);
+
+ // 调试：打印接收到的所有参数
+ System.out.println("=== 后端接收到的搜索参数 ===");
+ System.out.println("deliveryNumber: " + dto.getDeliveryNumber());
+ System.out.println("licensePlate: " + dto.getLicensePlate());
+ System.out.println("deliveryTitle: " + dto.getDeliveryTitle());
+ System.out.println("endLocation: " + dto.getEndLocation());
+ System.out.println("status: " + dto.getStatus());
+ System.out.println("startTime: " + dto.getStartTime());
+ System.out.println("endTime: " + dto.getEndTime());
+
+ // 调试：查询数据库中的所有车牌号
+ if(StringUtils.isNotEmpty(dto.getLicensePlate())) {
+ System.out.println("=== 查询数据库中的车牌号 ===");
+ List allDeliveries = this.list();
+ System.out.println("数据库中的车牌号列表:");
+ allDeliveries.forEach(delivery -> {
+ System.out.println("ID: " + delivery.getId() + ", 车牌号: " + delivery.getLicensePlate());
+ });
+ }
+
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+ LambdaQueryWrapper deliveryLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+ // 运单号精确匹配
+ if(StringUtils.isNotEmpty(dto.getDeliveryNumber())){
+ System.out.println("=== 添加运单号搜索条件（精确匹配）: " + dto.getDeliveryNumber() + " ===");
+ deliveryLambdaQueryWrapper.eq(Delivery::getDeliveryNumber, dto.getDeliveryNumber());
+ }
+ // 车牌号搜索：暂时不在后端过滤，改为前端精确搜索
+ if(StringUtils.isNotEmpty(dto.getLicensePlate())){
+ System.out.println("=== 车牌号搜索参数: " + dto.getLicensePlate() + "（前端精确搜索）===");
+ // 暂时不添加后端搜索条件，让前端进行精确搜索
+ }
+ // 创建时间范围查询
+ if(StringUtils.isNotEmpty(dto.getStartTime())){
+ System.out.println("=== 添加创建时间开始条件 ===");
+ System.out.println("原始startTime参数: " + dto.getStartTime());
+ try {
+ // 将前端发送的时间格式转换为标准格式
+ String startTimeStr = convertDateFormat(dto.getStartTime()) + " 00:00:00";
+ System.out.println("转换后的startTime: " + startTimeStr);
+ Date startDate = DateUtils.parseDate(startTimeStr);
+ System.out.println("解析后的startDate: " + startDate);
+ deliveryLambdaQueryWrapper.ge(Delivery::getCreateTime, startDate);
+ } catch (Exception e) {
+ System.out.println("时间解析异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ if(StringUtils.isNotEmpty(dto.getEndTime())){
+ System.out.println("=== 添加创建时间结束条件 ===");
+ System.out.println("原始endTime参数: " + dto.getEndTime());
+ try {
+ // 将前端发送的时间格式转换为标准格式
+ String endTimeStr = convertDateFormat(dto.getEndTime()) + " 23:59:59";
+ System.out.println("转换后的endTime: " + endTimeStr);
+ Date endDate = DateUtils.parseDate(endTimeStr);
+ System.out.println("解析后的endDate: " + endDate);
+ deliveryLambdaQueryWrapper.le(Delivery::getCreateTime, endDate);
+ } catch (Exception e) {
+ System.out.println("时间解析异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ // 核验状态精确匹配
+ if(null != dto.getStatus()){
+ System.out.println("=== 添加核验状态搜索条件（精确匹配）: " + dto.getStatus() + " ===");
+ deliveryLambdaQueryWrapper.eq(Delivery::getStatus, dto.getStatus());
+ }
+ // 添加订单标题搜索条件（精确匹配）
+ if(StringUtils.isNotEmpty(dto.getDeliveryTitle())){
+ System.out.println("=== 添加订单标题搜索条件（精确匹配）: " + dto.getDeliveryTitle() + " ===");
+ deliveryLambdaQueryWrapper.eq(Delivery::getDeliveryTitle, dto.getDeliveryTitle());
+ }
+ // 添加目的地搜索条件（精确匹配）
+ if(StringUtils.isNotEmpty(dto.getEndLocation())){
+ System.out.println("=== 添加目的地搜索条件（精确匹配）: " + dto.getEndLocation() + " ===");
+ deliveryLambdaQueryWrapper.eq(Delivery::getEndLocation, dto.getEndLocation());
+ }
+ deliveryLambdaQueryWrapper.orderByDesc(Delivery::getCreateTime);
+ List resList = list(deliveryLambdaQueryWrapper);
+ System.out.println("=== 数据库查询结果 ===");
+ System.out.println("查询到的记录数: " + (resList != null ? resList.size() : 0));
+ if(CollectionUtils.isNotEmpty(resList)){
+ System.out.println("第一条记录的车牌号: " + resList.get(0).getLicensePlate());
+ System.out.println("第一条记录的运单号: " + resList.get(0).getDeliveryNumber());
+ //获取当前的运单Id
+ List deliveryIds = resList.stream().map(delivery -> delivery.getId()).collect(Collectors.toList());
+ //根据当前运单查询最新的一次数量预警记录
+ List warningCountLogs = warningLogMapper.selectList(new LambdaQueryWrapper().in(WarningLog::getDeliveryId, deliveryIds).last(" and id in(select max(id) from warning_log where warning_type in ('0','2') group by delivery_id)"));
+ List warningRangeLogs = warningLogMapper.selectList(new LambdaQueryWrapper().in(WarningLog::getDeliveryId, deliveryIds).last(" and id in(select max(id) from warning_log where warning_type in ('1','3') group by delivery_id)"));
+ //获取当前登录人的Id
+ List createByIds = resList.stream().map(delivery -> delivery.getCreatedBy()).collect(Collectors.toList());
+ List sysUsers = sysUserMapper.selectBatchIds(createByIds);
+ Map userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getName));
+ resList.forEach(deliveryLogVo -> {
+ Integer deliveryId = deliveryLogVo.getId();
+ List warningTypes = new ArrayList<>();
+ //数量预警解析
+ warningCountLogs.forEach(warningLog -> {
+ Integer deliveryLogId = warningLog.getDeliveryId();
+ String warningType = warningLog.getWarningType();
+ if(deliveryId == deliveryLogId){
+ warningTypes.add(EnumUtil.getEnumConstant(WarningStatusAdminEnum.class , Integer.parseInt(warningType)).getDescription());
+ deliveryLogVo.setInventoryJbqCount(warningLog.getInventoryJbqCount());
+ }
+ });
+ //距离预警解析
+ warningRangeLogs.forEach(warningLog -> {
+ Integer deliveryLogId = warningLog.getDeliveryId();
+ String warningType = warningLog.getWarningType();
+ if(deliveryId == deliveryLogId){
+ warningTypes.add(EnumUtil.getEnumConstant(WarningStatusAdminEnum.class , Integer.parseInt(warningType)).getDescription());
+ }
+ });
+ deliveryLogVo.setWarningTypeList(warningTypes);
+ deliveryLogVo.setCreateByName(userMap.get(deliveryLogVo.getCreatedBy()));
+
+ // 添加司机信息关联查询逻辑
+ if (deliveryLogVo.getDriverId() != null) {
+ try {
+ System.out.println("=== 列表查询-开始查询司机信息 ===");
+ System.out.println("driverId: " + deliveryLogVo.getDriverId());
+ System.out.println("运单号: " + deliveryLogVo.getDeliveryNumber());
+ System.out.println("车牌号: " + deliveryLogVo.getLicensePlate());
+
+ Map driverInfo = memberDriverMapper.selectDriverById(deliveryLogVo.getDriverId());
+ System.out.println("司机信息查询结果: " + driverInfo);
+
+ // 额外调试：检查是否有多个司机记录
+ if (driverInfo != null) {
+ String driverName = (String) driverInfo.get("username");
+ String licensePlate = (String) driverInfo.get("car_number");
+ System.out.println("查询到的司机姓名: " + driverName);
+ System.out.println("查询到的车牌号: " + licensePlate);
+ System.out.println("运单中的车牌号: " + deliveryLogVo.getLicensePlate());
+
+ // 如果车牌号不匹配，尝试根据车牌号查询
+ if (licensePlate != null && !licensePlate.equals(deliveryLogVo.getLicensePlate())) {
+ System.out.println("*** 车牌号不匹配，尝试根据车牌号重新查询 ***");
+ Map correctDriver = memberDriverMapper.selectDriverByPlate(deliveryLogVo.getLicensePlate());
+ if (correctDriver != null) {
+ System.out.println("根据车牌号查询到的司机信息: " + correctDriver);
+ driverInfo = correctDriver; // 使用正确的司机信息
+ }
+ }
+ }
+
+ if (driverInfo != null) {
+ String driverName = (String) driverInfo.get("username");
+ String licensePlate = (String) driverInfo.get("car_number");
+ String carImg = (String) driverInfo.get("car_img");
+
+ System.out.println("司机姓名: " + driverName + ", 车牌号: " + licensePlate);
+ System.out.println("原始car_img字段: " + carImg);
+
+ // 设置司机信息
+ deliveryLogVo.setDriverName(driverName);
+ deliveryLogVo.setLicensePlate(licensePlate);
+
+ // 强制从司机信息中获取最新的车身照片，确保数据一致性
+ if (carImg != null && !carImg.isEmpty()) {
+ // 按逗号分割car_img字段，分别映射到车头和车尾照片
+ String[] carImgUrls = carImg.split(",");
+
+ if (carImgUrls.length >= 2) {
+ // 逗号前面的URL作为车尾照片
+ String carBehindPhoto = carImgUrls[0].trim();
+ // 逗号后面的URL作为车头照片
+ String carFrontPhoto = carImgUrls[1].trim();
+
+ deliveryLogVo.setCarBehindPhoto(carBehindPhoto);
+ deliveryLogVo.setCarFrontPhoto(carFrontPhoto);
+
+ System.out.println("列表查询-分割车身照片:");
+ System.out.println(" 车尾照片: " + carBehindPhoto);
+ System.out.println(" 车头照片: " + carFrontPhoto);
+ } else if (carImgUrls.length == 1) {
+ // 只有一个URL时，同时设置为车头和车尾照片
+ String singlePhoto = carImgUrls[0].trim();
+ deliveryLogVo.setCarFrontPhoto(singlePhoto);
+ deliveryLogVo.setCarBehindPhoto(singlePhoto);
+
+ System.out.println("列表查询-单张车身照片: " + singlePhoto);
+ } else {
+ // 没有有效URL
+ deliveryLogVo.setCarFrontPhoto("");
+ deliveryLogVo.setCarBehindPhoto("");
+ System.out.println("列表查询-无有效车身照片URL");
+ }
+ } else {
+ // 如果司机信息中没有照片，清空delivery表中的照片
+ deliveryLogVo.setCarFrontPhoto("");
+ deliveryLogVo.setCarBehindPhoto("");
+ System.out.println("列表查询-司机信息中无照片，清空车身照片");
+ }
+
+ // 如果车身照片仍然为空，尝试根据司机姓名和车牌号查询其他相关记录
+ if ((deliveryLogVo.getCarFrontPhoto() == null || deliveryLogVo.getCarFrontPhoto().isEmpty()) &&
+ (deliveryLogVo.getCarBehindPhoto() == null || deliveryLogVo.getCarBehindPhoto().isEmpty()) &&
+ driverName != null && licensePlate != null) {
+ try {
+ System.out.println("列表查询-尝试根据司机姓名和车牌号查询相关记录");
+ Map relatedDriver = memberDriverMapper.selectDriverByNameAndPlate(
+ driverName, licensePlate);
+ if (relatedDriver != null) {
+ String relatedCarImg = (String) relatedDriver.get("car_img");
+ if (relatedCarImg != null && !relatedCarImg.isEmpty()) {
+ deliveryLogVo.setCarFrontPhoto(relatedCarImg);
+ deliveryLogVo.setCarBehindPhoto(relatedCarImg);
+ System.out.println("列表查询-从相关记录设置车身照片: " + relatedCarImg);
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("列表查询-查询相关司机记录失败: " + e.getMessage());
+ }
+ }
+ } else {
+ System.out.println("列表查询-未找到司机信息，driverId: " + deliveryLogVo.getDriverId());
+ }
+ } catch (Exception e) {
+ System.out.println("列表查询-查询司机信息异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+ } else {
+ System.out.println("列表查询-driverId为空，跳过司机信息查询");
+ }
+
+ // 添加核验状态中文映射
+ Integer status = deliveryLogVo.getStatus();
+ System.out.println("列表查询-处理状态映射，status: " + status);
+ if (status != null) {
+ String statusDesc = getStatusDescription(status);
+ System.out.println("列表查询-状态描述: " + statusDesc);
+ deliveryLogVo.setStatusDesc(statusDesc);
+ System.out.println("列表查询-设置后的statusDesc: " + deliveryLogVo.getStatusDesc());
+ } else {
+ System.out.println("列表查询-status为空，跳过状态映射");
+ }
+
+ // 统计登记设备数量（耳标+项圈）
+ Integer currentDeliveryId = deliveryLogVo.getId();
+ if (currentDeliveryId != null) {
+ try {
+ // 统计耳标设备数量
+ LambdaQueryWrapper earTagWrapper = new LambdaQueryWrapper<>();
+ earTagWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 2);
+ long earTagCount = deliveryDeviceService.count(earTagWrapper);
+
+ // 统计项圈设备数量
+ LambdaQueryWrapper collarWrapper = new LambdaQueryWrapper<>();
+ collarWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 3);
+ long collarCount = deliveryDeviceService.count(collarWrapper);
+
+ // 设置总设备数量和耳标数量
+ int totalDeviceCount = (int) (earTagCount + collarCount);
+ deliveryLogVo.setRegisteredJbqCount(totalDeviceCount);
+ deliveryLogVo.setEarTagCount((int) earTagCount);
+
+ // 设置已分配设备数量，与登记设备数量保持一致
+ deliveryLogVo.setBindJbqCount(totalDeviceCount);
+
+ // 统计已佩戴设备数量（bandge_status = 1）
+ int wornDeviceCount = 0;
+ try {
+ // 统计已佩戴的耳标设备数量（通过delivery_device表关联）
+ LambdaQueryWrapper wornEarTagWrapper = new LambdaQueryWrapper<>();
+ wornEarTagWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 2)
+ .eq(DeliveryDevice::getIsWare, 1); // 1表示已佩戴
+ long wornEarTagCount = deliveryDeviceService.count(wornEarTagWrapper);
+
+ // 统计已佩戴的项圈设备数量（通过delivery_device表关联xq_client表）
+ LambdaQueryWrapper wornCollarWrapper = new LambdaQueryWrapper<>();
+ wornCollarWrapper.eq(DeliveryDevice::getDeliveryId, currentDeliveryId)
+ .eq(DeliveryDevice::getDeviceType, 3);
+ List collarDevices = deliveryDeviceService.list(wornCollarWrapper);
+
+ int wornCollarCount = 0;
+ for (DeliveryDevice device : collarDevices) {
+ // 查询xq_client表中的bandge_status
+ LambdaQueryWrapper xqWrapper = new LambdaQueryWrapper<>();
+ xqWrapper.eq(XqClient::getSn, device.getDeviceId());
+ XqClient xqClient = xqClientService.getOne(xqWrapper);
+ if (xqClient != null && xqClient.getBandgeStatus() != null && xqClient.getBandgeStatus() == 1) {
+ wornCollarCount++;
+ }
+ }
+
+ wornDeviceCount = (int) (wornEarTagCount + wornCollarCount);
+ deliveryLogVo.setWareCount(wornDeviceCount);
+
+ System.out.println("运单ID " + currentDeliveryId + " 已佩戴设备统计: 耳标=" + wornEarTagCount + ", 项圈=" + wornCollarCount + ", 总计=" + wornDeviceCount);
+ } catch (Exception e) {
+ System.out.println("统计已佩戴设备数量失败: " + e.getMessage());
+ deliveryLogVo.setWareCount(0);
+ }
+
+ System.out.println("运单ID " + currentDeliveryId + " 设备统计: 耳标=" + earTagCount + ", 项圈=" + collarCount + ", 总计=" + totalDeviceCount + ", 已佩戴=" + wornDeviceCount);
+ } catch (Exception e) {
+ System.out.println("统计设备数量失败: " + e.getMessage());
+ deliveryLogVo.setRegisteredJbqCount(0);
+ deliveryLogVo.setBindJbqCount(0);
+ deliveryLogVo.setWareCount(0);
+ }
+ }
+
+ // 查询四个角色的手机号（供应商、资金方、采购商）
+ try {
+ // 1. 查询供应商手机号（supplierId是逗号分隔的字符串）
+ if (StringUtils.isNotEmpty(deliveryLogVo.getSupplierId())) {
+ String[] supplierIds = deliveryLogVo.getSupplierId().split(",");
+ List supplierMobiles = new ArrayList<>();
+ for (String supplierId : supplierIds) {
+ if (StringUtils.isNotEmpty(supplierId.trim())) {
+ try {
+ Integer sid = Integer.parseInt(supplierId.trim());
+ Member supplier = memberMapper.selectById(sid);
+ if (supplier != null && StringUtils.isNotEmpty(supplier.getMobile())) {
+ supplierMobiles.add(supplier.getMobile());
+ }
+ } catch (NumberFormatException e) {
+ System.out.println("供应商ID格式错误: " + supplierId);
+ }
+ }
+ }
+ if (!supplierMobiles.isEmpty()) {
+ deliveryLogVo.setSupplierMobile(String.join(",", supplierMobiles));
+ }
+ }
+
+ // 2. 查询资金方手机号
+ if (deliveryLogVo.getFundId() != null) {
+ Member fund = memberMapper.selectById(deliveryLogVo.getFundId());
+ if (fund != null && StringUtils.isNotEmpty(fund.getMobile())) {
+ deliveryLogVo.setFundMobile(fund.getMobile());
+ }
+ }
+
+ // 3. 查询采购商手机号
+ if (deliveryLogVo.getBuyerId() != null) {
+ Member buyer = memberMapper.selectById(deliveryLogVo.getBuyerId());
+ if (buyer != null && StringUtils.isNotEmpty(buyer.getMobile())) {
+ deliveryLogVo.setBuyerMobile(buyer.getMobile());
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("查询角色手机号异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+ });
+
+ // 数据权限过滤：非超级管理员只能看到与自己手机号相关的订单
+ System.out.println("=== 超级管理员判断调试 ===");
+ System.out.println("SecurityUtil.isSuperAdmin(): " + SecurityUtil.isSuperAdmin());
+ System.out.println("当前用户角色ID: " + SecurityUtil.getRoleId());
+ System.out.println("超级管理员角色ID常量: " + RoleConstants.SUPER_ADMIN_ROLE_ID);
+
+ if (!SecurityUtil.isSuperAdmin() && StringUtils.isNotEmpty(currentUserMobile)) {
+ System.out.println("=== 非超级管理员，执行数据权限过滤 ===");
+ System.out.println("当前用户手机号: " + currentUserMobile);
+ System.out.println("过滤前的订单数量: " + resList.size());
+
+ resList = resList.stream().filter(delivery -> {
+ boolean hasPermission = false;
+
+ System.out.println("=== 检查订单权限: " + delivery.getDeliveryNumber() + " ===");
+ System.out.println("司机手机号: " + delivery.getDriverMobile());
+ System.out.println("供应商手机号: " + delivery.getSupplierMobile());
+ System.out.println("资金方手机号: " + delivery.getFundMobile());
+ System.out.println("采购商手机号: " + delivery.getBuyerMobile());
+
+ // 检查是否是司机
+ if (StringUtils.isNotEmpty(delivery.getDriverMobile()) &&
+ currentUserMobile.equals(delivery.getDriverMobile())) {
+ hasPermission = true;
+ System.out.println("订单 " + delivery.getDeliveryNumber() + " - 匹配司机手机号");
+ }
+
+ // 检查是否是供应商（可能有多个供应商）
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getSupplierMobile())) {
+ String[] supplierMobiles = delivery.getSupplierMobile().split(",");
+ for (String mobile : supplierMobiles) {
+ if (currentUserMobile.equals(mobile.trim())) {
+ hasPermission = true;
+ System.out.println("订单 " + delivery.getDeliveryNumber() + " - 匹配供应商手机号");
+ break;
+ }
+ }
+ }
+
+ // 检查是否是资金方
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getFundMobile()) &&
+ currentUserMobile.equals(delivery.getFundMobile())) {
+ hasPermission = true;
+ System.out.println("订单 " + delivery.getDeliveryNumber() + " - 匹配资金方手机号");
+ }
+
+ // 检查是否是采购商
+ if (!hasPermission && StringUtils.isNotEmpty(delivery.getBuyerMobile()) &&
+ currentUserMobile.equals(delivery.getBuyerMobile())) {
+ hasPermission = true;
+ System.out.println("订单 " + delivery.getDeliveryNumber() + " - 匹配采购商手机号");
+ }
+
+ if (!hasPermission) {
+ System.out.println("订单 " + delivery.getDeliveryNumber() + " - 无权限，过滤掉");
+ }
+
+ return hasPermission;
+ }).collect(Collectors.toList());
+
+ System.out.println("过滤后的订单数量: " + resList.size());
+ } else if (SecurityUtil.isSuperAdmin()) {
+ System.out.println("=== 超级管理员，不执行数据权限过滤 ===");
+ } else {
+ System.out.println("=== 非超级管理员，但未获取到当前用户手机号，跳过数据过滤 ===");
+ }
+ }
+
+ // 更新分页信息
+ long filteredTotal = resList.size();
+ return new PageResultResponse(filteredTotal, resList);
+ }
+
+ @Override
+ public PageResultResponse pageQueryList(DeliverListDto dto) {
+ //获取当前登录人的信息
+// Integer currentUserId = SecurityUtil.getCurrentUserId();
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+// dto.setCurrentUserId(currentUserId);
+ if(StringUtils.isNotEmpty(dto.getStartTime())){
+ String startTime = dto.getStartTime() + " 00:00:00";
+ dto.setStartTime(startTime);
+ }
+ if(StringUtils.isNotEmpty(dto.getEndTime())){
+ String endTime = dto.getEndTime() + " 23:59:59";
+ dto.setEndTime(endTime);
+ }
+ List resList = this.baseMapper.getPageWarningLog(dto);
+ resList.forEach(deliveryLogVo -> {
+ String warningType = deliveryLogVo.getWarningType();
+ if(StringUtils.isNotEmpty(warningType)){
+ deliveryLogVo.setWarningTypeDesc(EnumUtil.getEnumConstant(WarningStatusAdminEnum.class , Integer.parseInt(warningType)).getDescription());
+ }
+ });
+ return new PageResultResponse(result.getTotal(), resList);
+ }
+
+ @Override
+ public AjaxResult detail(Integer id) {
+ Map resMap = new HashMap<>();
+ //查询运单信息
+ Delivery delivery = this.getById(id);
+
+ // 查询供应商名称
+ if (delivery.getSupplierId() != null && !delivery.getSupplierId().isEmpty()) {
+ try {
+ Member supplier = memberMapper.selectById(delivery.getSupplierId());
+ if (supplier != null) {
+ delivery.setSupplierName(supplier.getMobile()); // 使用手机号作为显示名称
+ }
+ } catch (Exception e) {
+ // 忽略查询错误，继续处理
+ }
+ }
+
+ // 查询资金方名称
+ if (delivery.getFundId() != null) {
+ try {
+ Member funder = memberMapper.selectById(delivery.getFundId());
+ if (funder != null) {
+ delivery.setFundName(funder.getMobile()); // 使用手机号作为显示名称
+ }
+ } catch (Exception e) {
+ // 忽略查询错误，继续处理
+ }
+ }
+
+ // 查询采购商名称
+ if (delivery.getBuyerId() != null) {
+ try {
+ Member buyer = memberMapper.selectById(delivery.getBuyerId());
+ if (buyer != null) {
+ delivery.setBuyerName(buyer.getMobile()); // 使用手机号作为显示名称
+ }
+ } catch (Exception e) {
+ // 忽略查询错误，继续处理
+ }
+ }
+
+ // 查询司机信息
+ if (delivery.getDriverId() != null) {
+ try {
+ System.out.println("开始查询司机信息，driverId: " + delivery.getDriverId());
+ // 根据司机ID直接查询司机信息
+ Map driverInfo = memberDriverMapper.selectDriverById(delivery.getDriverId());
+ System.out.println("司机信息查询结果: " + driverInfo);
+
+ if (driverInfo != null) {
+ String driverName = (String) driverInfo.get("username");
+ String licensePlate = (String) driverInfo.get("car_number");
+ String carImg = (String) driverInfo.get("car_img");
+ String driverMobile = (String) driverInfo.get("mobile");
+
+ System.out.println("司机姓名: " + driverName + ", 车牌号: " + licensePlate + ", 车辆照片: " + carImg + ", 司机手机: " + driverMobile);
+
+ // 设置司机信息
+ delivery.setDriverName(driverName);
+ delivery.setLicensePlate(licensePlate);
+ delivery.setDriverMobile(driverMobile);
+
+ // 强制从司机信息中获取最新的车身照片，确保数据一致性
+ if (carImg != null && !carImg.isEmpty()) {
+ // 按逗号分割car_img字段，分别映射到车头和车尾照片
+ String[] carImgUrls = carImg.split(",");
+
+ if (carImgUrls.length >= 2) {
+ // 逗号前面的URL作为车尾照片
+ String carBehindPhoto = carImgUrls[0].trim();
+ // 逗号后面的URL作为车头照片
+ String carFrontPhoto = carImgUrls[1].trim();
+
+ delivery.setCarBehindPhoto(carBehindPhoto);
+ delivery.setCarFrontPhoto(carFrontPhoto);
+
+ System.out.println("详情查询-分割车身照片:");
+ System.out.println(" 车尾照片: " + carBehindPhoto);
+ System.out.println(" 车头照片: " + carFrontPhoto);
+ } else if (carImgUrls.length == 1) {
+ // 只有一个URL时，同时设置为车头和车尾照片
+ String singlePhoto = carImgUrls[0].trim();
+ delivery.setCarFrontPhoto(singlePhoto);
+ delivery.setCarBehindPhoto(singlePhoto);
+
+ System.out.println("详情查询-单张车身照片: " + singlePhoto);
+ } else {
+ // 没有有效URL
+ delivery.setCarFrontPhoto("");
+ delivery.setCarBehindPhoto("");
+ System.out.println("详情查询-无有效车身照片URL");
+ }
+ } else {
+ // 如果司机信息中没有照片，清空delivery表中的照片
+ delivery.setCarFrontPhoto("");
+ delivery.setCarBehindPhoto("");
+ System.out.println("详情查询-司机信息中无照片，清空车身照片");
+ }
+
+ // 如果车身照片仍然为空，尝试根据司机姓名和车牌号查询其他相关记录
+ if ((delivery.getCarFrontPhoto() == null || delivery.getCarFrontPhoto().isEmpty()) &&
+ (delivery.getCarBehindPhoto() == null || delivery.getCarBehindPhoto().isEmpty()) &&
+ driverName != null && licensePlate != null) {
+ try {
+ System.out.println("尝试根据司机姓名和车牌号查询相关记录");
+ Map relatedDriver = memberDriverMapper.selectDriverByNameAndPlate(
+ driverName, licensePlate);
+ if (relatedDriver != null) {
+ String relatedCarImg = (String) relatedDriver.get("car_img");
+ String relatedDriverMobile = (String) relatedDriver.get("mobile");
+
+ if (relatedCarImg != null && !relatedCarImg.isEmpty()) {
+ delivery.setCarFrontPhoto(relatedCarImg);
+ delivery.setCarBehindPhoto(relatedCarImg); // 使用同一张照片作为前后照片
+ System.out.println("从相关记录设置车身照片: " + relatedCarImg);
+ }
+
+ // 如果当前司机手机号为空，使用相关记录的手机号
+ if ((delivery.getDriverMobile() == null || delivery.getDriverMobile().isEmpty()) &&
+ relatedDriverMobile != null && !relatedDriverMobile.isEmpty()) {
+ delivery.setDriverMobile(relatedDriverMobile);
+ System.out.println("从相关记录设置司机手机号: " + relatedDriverMobile);
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("查询相关司机记录失败: " + e.getMessage());
+ }
+ }
+ } else {
+ System.out.println("未找到司机信息，driverId: " + delivery.getDriverId());
+ }
+ } catch (Exception e) {
+ // 忽略查询错误，继续处理
+ System.out.println("查询司机信息异常: " + e.getMessage());
+ e.printStackTrace();
+ }
+ } else {
+ System.out.println("driverId为空，跳过司机信息查询");
+ }
+
+ //根据运单信息，查询最新的预警信息
+ List warningLogs = warningLogMapper.selectList(
+ new LambdaQueryWrapper().eq(WarningLog::getDeliveryId, id).notIn(WarningLog::getWarningType, "0","1").orderByDesc(WarningLog::getWarningTime));
+ if(CollectionUtils.isNotEmpty(warningLogs)){
+ warningLogs.forEach(warningLog -> {
+ String warningType = warningLog.getWarningType();
+ if(StringUtils.isNotEmpty(warningType)){
+ warningLog.setWarningTypeDesc(EnumUtil.getEnumConstant(WarningStatusAdminEnum.class , Integer.parseInt(warningType)).getDescription());
+ }
+ });
+ }
+ //查询核验人名称
+ SysUser sysUser = sysUserMapper.selectById(delivery.getCheckBy());
+ if(null != sysUser){
+ String checkByName = sysUser.getName();
+ delivery.setCheckByName(checkByName);
+ }
+ resMap.put("delivery", delivery);
+ resMap.put("warningLog", warningLogs);
+ //查询主机信息
+ DeliveryDevice deliveryDevices = deliveryDeviceMapper.selectOne(new LambdaQueryWrapper().eq(DeliveryDevice::getDeliveryId, id).eq(DeliveryDevice::getDeviceType, 1).last("limit 1"));
+ if(null != deliveryDevices){
+ resMap.put("serverIds", deliveryDevices.getDeviceId());
+ }else{
+ resMap.put("serverIds", "");
+ }
+ return AjaxResult.success(resMap);
+ }
+
+ /**
+ * 获取核验状态的中文描述
+ * @param status 状态码
+ * @return 中文描述
+ */
+ private String getStatusDescription(Integer status) {
+ if (status == null) {
+ return "未知状态";
+ }
+
+ switch (status) {
+ case 1:
+ return "待装车";
+ case 2:
+ return "已装车/待资金方付款";
+ case 3:
+ return "待核验/资金方已付款";
+ case 4:
+ return "已核验/待买家付款";
+ case 5:
+ return "买家已付款";
+ default:
+ return "未知状态";
+ }
+ }
+
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientLogServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientLogServiceImpl.java
new file mode 100644
index 0000000..c994008
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientLogServiceImpl.java
@@ -0,0 +1,53 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.dto.JbqLogDto;
+import com.aiotagro.cattletrade.business.entity.Delivery;
+import com.aiotagro.cattletrade.business.entity.JbqClientLog;
+import com.aiotagro.cattletrade.business.mapper.DeliveryMapper;
+import com.aiotagro.cattletrade.business.mapper.JbqClientLogMapper;
+import com.aiotagro.cattletrade.business.service.IJbqClientLogService;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 智能耳标日志表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class JbqClientLogServiceImpl extends ServiceImpl implements IJbqClientLogService {
+
+ @Autowired
+ private JbqClientLogMapper jbqServerMapper;
+ @Autowired
+ private DeliveryMapper deliveryMapper;
+ @Override
+ public PageResultResponse jbqLogList(JbqLogDto dto) {
+ if (dto.getDeliveryId() == null) {
+ return new PageResultResponse(500, "运单id不能为空");
+ }
+ Delivery delivery = deliveryMapper.selectById(dto.getDeliveryId());
+ if (delivery == null) {
+ return new PageResultResponse(500, "运单不存在");
+ }
+ Integer deliveryId = dto.getDeliveryId();
+ Date createTime = delivery.getCreateTime();
+ Date checkTime = delivery.getCheckTime();
+ if (checkTime == null) {
+ checkTime = new Date();
+ }
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+ List list = jbqServerMapper.jbqLogList(deliveryId,createTime,checkTime);
+ return new PageResultResponse(result.getTotal(), list);
+ }
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientServiceImpl.java
new file mode 100644
index 0000000..5896888
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqClientServiceImpl.java
@@ -0,0 +1,125 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.entity.DeliveryDevice;
+import com.aiotagro.cattletrade.business.entity.JbqClient;
+import com.aiotagro.cattletrade.business.mapper.DeliveryDeviceMapper;
+import com.aiotagro.cattletrade.business.mapper.JbqClientMapper;
+import com.aiotagro.cattletrade.business.service.IJbqClientService;
+import com.aiotagro.cattletrade.business.vo.JbqClientVo;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 智能耳标表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class JbqClientServiceImpl extends ServiceImpl implements IJbqClientService {
+
+ @Autowired
+ private JbqClientMapper jbqClientMapper;
+
+ @Autowired
+ private DeliveryDeviceMapper deliveryDeviceMapper;
+
+ @Override
+ public PageResultResponse jbqList(DeviceDto dto) {
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+
+ try {
+ // 如果指定了只查询未分配的设备
+ if (dto.getUnassignedOnly() != null && dto.getUnassignedOnly()) {
+ System.out.println("查询未分配的智能耳标，参数: " + dto);
+ List list = jbqClientMapper.selectUnassignedJbqList(dto);
+ System.out.println("未分配智能耳标查询结果数量: " + (list != null ? list.size() : 0));
+ return new PageResultResponse(result.getTotal(), list);
+ } else {
+ System.out.println("查询所有智能耳标，参数: " + dto);
+ List list = jbqClientMapper.JbqList(dto);
+ System.out.println("所有智能耳标查询结果数量: " + (list != null ? list.size() : 0));
+ return new PageResultResponse(result.getTotal(), list);
+ }
+ } catch (Exception e) {
+ System.out.println("查询智能耳标失败: " + e.getMessage());
+ e.printStackTrace();
+ return new PageResultResponse(0L, new ArrayList<>());
+ }
+ }
+
+ @Override
+ public AjaxResult getDevicesByDeliveryId(Integer deliveryId, Integer deviceType) {
+ System.out.println("=== 查询耳标设备，deliveryId: " + deliveryId + ", deviceType: " + deviceType);
+
+ if (deliveryId == null) {
+ return AjaxResult.error("运送清单ID不能为空");
+ }
+
+ // 查询运送清单关联的设备
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(DeliveryDevice::getDeliveryId, deliveryId);
+ wrapper.eq(DeliveryDevice::getDeviceType, deviceType);
+ List deliveryDevices = deliveryDeviceMapper.selectList(wrapper);
+
+ System.out.println("=== 查询到delivery_device记录数: " + deliveryDevices.size());
+ if (!deliveryDevices.isEmpty()) {
+ System.out.println("=== delivery_device记录详情: " + deliveryDevices);
+ }
+
+ if (deliveryDevices.isEmpty()) {
+ return AjaxResult.success(new ArrayList<>());
+ }
+
+ // 获取设备ID列表
+ List deviceIds = deliveryDevices.stream()
+ .map(DeliveryDevice::getDeviceId)
+ .collect(Collectors.toList());
+
+ // 查询设备详细信息 - 只查询基础字段，避免查询不存在的扩展字段
+ LambdaQueryWrapper deviceWrapper = new LambdaQueryWrapper<>();
+ deviceWrapper.in(JbqClient::getDeviceId, deviceIds)
+ .select(JbqClient::getId,
+ JbqClient::getDeviceId,
+ JbqClient::getDeviceVoltage,
+ JbqClient::getDeviceTemp,
+ JbqClient::getServerDeviceId,
+ JbqClient::getLatitude,
+ JbqClient::getLongitude,
+ JbqClient::getWalkSteps,
+ JbqClient::getYWalkSteps,
+ JbqClient::getCreateTime,
+ JbqClient::getCreateBy,
+ JbqClient::getUpdateTime,
+ JbqClient::getUpdateBy,
+ JbqClient::getSourceId);
+ List devices = jbqClientMapper.selectList(deviceWrapper);
+
+ System.out.println("=== 查询到的耳标设备数量: " + devices.size());
+ for (JbqClient device : devices) {
+ System.out.println("=== 耳标设备: " + device);
+ }
+
+ // 返回分页格式数据
+ Map result = new HashMap<>();
+ result.put("rows", devices);
+ result.put("total", devices.size());
+
+ return AjaxResult.success(result);
+ }
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerLogServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerLogServiceImpl.java
new file mode 100644
index 0000000..343aa8f
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.entity.JbqServerLog;
+import com.aiotagro.cattletrade.business.mapper.JbqServerLogMapper;
+import com.aiotagro.cattletrade.business.service.IJbqServerLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 智能主机日志表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class JbqServerLogServiceImpl extends ServiceImpl implements IJbqServerLogService {
+
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerServiceImpl.java
new file mode 100644
index 0000000..8572612
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/JbqServerServiceImpl.java
@@ -0,0 +1,142 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import com.aiotagro.cattletrade.business.dto.DeviceDto;
+import com.aiotagro.cattletrade.business.dto.ServerLocationDto;
+import com.aiotagro.cattletrade.business.entity.Delivery;
+import com.aiotagro.cattletrade.business.entity.JbqServer;
+import com.aiotagro.cattletrade.business.mapper.DeliveryMapper;
+import com.aiotagro.cattletrade.business.mapper.JbqServerLogMapper;
+import com.aiotagro.cattletrade.business.mapper.JbqServerMapper;
+import com.aiotagro.cattletrade.business.service.IJbqServerService;
+import com.aiotagro.cattletrade.business.vo.ServerClientVo;
+import com.aiotagro.cattletrade.business.vo.ServerLocationVo;
+import com.aiotagro.common.core.utils.DateUtils;
+import com.aiotagro.common.core.utils.LngLonUtil;
+import com.aiotagro.common.core.utils.StringUtils;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.core.web.domain.PageResultResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 智能主机表 服务实现类
+ *
+ *
+ * @author admin
+ * @since 2024-12-26
+ */
+@Service
+public class JbqServerServiceImpl extends ServiceImpl implements IJbqServerService {
+
+ @Autowired
+ private JbqServerMapper jbqServerMapper;
+ @Autowired
+ private JbqServerLogMapper jbqServerLogMapper;
+ @Autowired
+ private DeliveryMapper deliveryMapper;
+ @Override
+ public PageResultResponse serverList(DeviceDto dto) {
+ Page result = PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+ List list = jbqServerMapper.serverList(dto);
+ return new PageResultResponse(result.getTotal(), list);
+ }
+
+ @Override
+ public AjaxResult serverLocation(ServerLocationDto dto) {
+ if (!StringUtils.hasText(dto.getServerDeviceId())){
+ return AjaxResult.error("主机编号不能为空");
+ }
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(JbqServer::getDeviceId, dto.getServerDeviceId());
+ //查询主机数据
+ JbqServer server = jbqServerMapper.selectOne(wrapper);
+ if (server == null) {
+ return AjaxResult.error("未找到对应的设备信息");
+ }
+ // 获取设备的经纬度
+ String latitude = server.getLatitude();
+ String longitude = server.getLongitude();
+
+ // 判断经纬度是否为空或为0
+ if (isInvalidLocation(latitude, longitude)) {
+ return AjaxResult.error("暂无定位信息");
+ }
+
+ // 转换为百度经纬度
+ double lat = Double.parseDouble(latitude);
+ double lon = Double.parseDouble(longitude);
+ double[] baiduLocation = LngLonUtil.gps84_To_bd09(lat, lon);
+
+ ServerLocationVo serverLocationVo = new ServerLocationVo();
+ serverLocationVo.setDeviceId(dto.getServerDeviceId());
+ serverLocationVo.setLatitude(String.valueOf(baiduLocation[0]));
+ serverLocationVo.setLongitude(String.valueOf(baiduLocation[1]));
+ serverLocationVo.setUpdateTime(server.getUpdateTime());
+ return AjaxResult.success(serverLocationVo);
+ }
+
+ @Override
+ public AjaxResult serverTrack(ServerLocationDto dto) {
+ if (dto.getDeliveryId() == null) {
+ return AjaxResult.error("id不能为空");
+ }
+ if (!StringUtils.hasText(dto.getServerDeviceId())){
+ return AjaxResult.error("主机编号不能为空");
+ }
+ //启运时间
+ Delivery delivery = deliveryMapper.selectById(dto.getDeliveryId());
+ if (delivery == null) {
+ return AjaxResult.error("未找到相关运单信息");
+ }
+
+ Date deliverTime = delivery.getCreateTime();
+ Date checkTime = (delivery.getCheckTime() != null) ? delivery.getCheckTime() :
+ DateUtils.stringToDate(DateUtils.getTime(), DateUtils.YYYY_MM_DD_HH_MM_SS);
+
+ if (deliverTime == null) {
+ return AjaxResult.error("启运时间为空");
+ }
+ // 轨迹
+ List serverLocations = jbqServerLogMapper.selectServerLocationByTime(dto.getServerDeviceId(), deliverTime, checkTime);
+
+ if (serverLocations != null && !serverLocations.isEmpty()) {
+ // 过滤掉经纬度/坐标转换
+ serverLocations = serverLocations.stream()
+ .filter(location -> {
+ return StringUtils.hasText(location.getLatitude())
+ && StringUtils.hasText(location.getLongitude())
+ && !"0".equals(location.getLatitude())
+ && !"0".equals(location.getLongitude());
+ })
+ .peek(location -> {
+ double latitude = Double.parseDouble(location.getLatitude());
+ double longitude = Double.parseDouble(location.getLongitude());
+ double[] bd09 = LngLonUtil.gps84_To_bd09(latitude, longitude);
+
+ location.setLatitude(String.valueOf(bd09[0]));
+ location.setLongitude(String.valueOf(bd09[1]));
+ })
+ .collect(Collectors.toList());
+ return AjaxResult.success(serverLocations);
+ } else {
+ return AjaxResult.error("没有找到符合条件的设备位置信息");
+ }
+
+ }
+
+
+
+ public boolean isInvalidLocation(String latitude, String longitude) {
+ return latitude == null || latitude.isEmpty() || "0".equals(latitude) ||
+ longitude == null || longitude.isEmpty() || "0".equals(longitude);
+ }
+}
diff --git a/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/LoginServiceImpl.java b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/LoginServiceImpl.java
new file mode 100644
index 0000000..4ae6de0
--- /dev/null
+++ b/tradeCattle/aiotagro-cattle-trade/src/main/java/com/aiotagro/cattletrade/business/service/impl/LoginServiceImpl.java
@@ -0,0 +1,180 @@
+package com.aiotagro.cattletrade.business.service.impl;
+
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.stp.SaLoginConfig;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import com.aiotagro.cattletrade.business.dto.LoginDto;
+import com.aiotagro.cattletrade.business.entity.SysMenu;
+import com.aiotagro.cattletrade.business.entity.SysRole;
+import com.aiotagro.cattletrade.business.entity.SysUser;
+import com.aiotagro.cattletrade.business.mapper.SysMenuMapper;
+import com.aiotagro.cattletrade.business.mapper.SysRoleMapper;
+import com.aiotagro.cattletrade.business.mapper.SysUserMapper;
+import com.aiotagro.cattletrade.business.service.LoginService;
+import com.aiotagro.cattletrade.business.service.TencentSmsCodeService;
+import com.aiotagro.common.core.constant.Constants;
+import com.aiotagro.common.core.constant.RoleConstants;
+import com.aiotagro.common.core.exception.ServiceException;
+import com.aiotagro.common.core.utils.SecurityUtil;
+import com.aiotagro.common.core.web.domain.AjaxResult;
+import com.aiotagro.common.redis.service.RedisService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import com.aiotagro.common.core.utils.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class LoginServiceImpl implements LoginService {
+
+ @Resource
+ private RedisService redisService;
+
+ @Resource
+ SysUserMapper userMapper;
+
+ @Resource
+ TencentSmsCodeService tencentSmsCodeService;
+
+ @Resource
+ SysMenuMapper menuMapper;
+
+ @Resource
+ SysRoleMapper roleMapper;
+
+
+ @Override
+ public AjaxResult sendLoginSmsCode(String mobile) {
+ // 临时跳过Redis验证码存储，直接返回成功
+ SysUser user = userMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getMobile, mobile).eq(SysUser::getIsDelete, 0));
+ if (null == user || user.getIsDelete() == 1) {
+ return AjaxResult.error("手机号不存在!");
+ }
+ if (user.getStatus() == 0) {
+ return AjaxResult.error("手机号已被禁用!");
+ }
+
+ log.warn("短信验证码发送暂时跳过Redis存储，直接返回成功");
+ return AjaxResult.success("验证码发送成功");
+ }
+
+ @Override
+ public AjaxResult login(LoginDto dto) {
+ log.info(dto.toString());
+ SysUser user = userMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getMobile, dto.getMobile()).eq(SysUser::getIsDelete, 0));
+ if (dto.getLoginType() == 0) {
+ // 判断用户存不存在
+ if (null == user || user.getIsDelete() == 1) {
+ return AjaxResult.error("员工不存在!");
+ }
+ if (user.getStatus() == 0) {
+ return AjaxResult.error("此账号已禁用!");
+ }
+ // 密码校验
+ String passwordMd5 = DigestUtil.md5Hex(Constants.USER_PASSWORD_PREFIX + dto.getPassword());
+ if (!passwordMd5.equals(user.getPassword())) {
+ throw new ServiceException("密码错误!");
+ }
+ } else if (dto.getLoginType() == 1) {
+ // 短信验证码校验 - 临时跳过Redis验证
+ log.warn("短信验证码登录暂时跳过Redis验证，直接允许登录");
+ }
+
+ // 更新登录时间
+ user.setLastLoginTime(new Date());
+ userMapper.updateById(user);
+
+ log.info(user.toString());
+ // 登录成功，写入缓存数据并返回token值
+ StpUtil.login(user.getId(), SaLoginConfig
+ .setExtra("username", user.getName())
+ .setExtra("userId", user.getId())
+ .setExtra("mobile", user.getMobile())
+ .setExtra("roleId", user.getRoleId())
+ );
+
+ // 存储角色ID到session
+ StpUtil.getTokenSession().set("roleId", user.getRoleId());
+ // 存储用户名与手机号到session，便于业务侧读取
+ StpUtil.getTokenSession().set("username", user.getName());
+ StpUtil.getTokenSession().set("mobile", user.getMobile());
+
+ // 调试日志：验证TokenSession写入
+ log.info("=== TokenSession 写入调试 ===");
+ log.info("写入 username: {}", user.getName());
+ log.info("写入 mobile: {}", user.getMobile());
+ log.info("写入 roleId: {}", user.getRoleId());
+
+ // 立即验证读取
+ Object sessionUsername = StpUtil.getTokenSession().get("username");
+ Object sessionMobile = StpUtil.getTokenSession().get("mobile");
+ Object sessionRoleId = StpUtil.getTokenSession().get("roleId");
+ log.info("验证读取 username: {}", sessionUsername);
+ log.info("验证读取 mobile: {}", sessionMobile);
+ log.info("验证读取 roleId: {}", sessionRoleId);
+
+ // 查询用户权限列表
+ List permissions = queryUserPermissions(user.getRoleId());
+ StpUtil.getTokenSession().set("permissions", permissions);
+
+ // 查询用户角色信息
+ SysRole role = roleMapper.selectById(user.getRoleId());
+ String roleCode = role != null ? role.getName() : "";
+ StpUtil.getTokenSession().set("roleCode", roleCode);
+
+ Map