guzijian / bsth-alcohol-sign · Commits

Commit 2282d6bbf8a1541704c47f59ac72b29a38089ccc

Authored by guzijian
1 parent 1566d251

fix: 新增签到返回签到地址

Inline Side-by-side
Showing 5 changed files with 31 additions and 7 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @2282d6b
@@ -91,11 +91,6 @@ public class DriverServiceImpl implements IDriverService { @@ -91,11 +91,6 @@ public class DriverServiceImpl implements IDriverService {
91 */ 91 */
92 @Override 92 @Override
93 public int insertDriver(Driver driver) { 93 public int insertDriver(Driver driver) {
94 - // 判断是否存在相同的工号数据 存在既更新  
95 -// Driver driverById = driverMapper.selectDriverById(driver.getId());  
96 -// if (driverById == null){  
97 -//  
98 -// }  
99 return driverMapper.insertDriver(driver); 94 return driverMapper.insertDriver(driver);
100 } 95 }
101 96
ruoyi-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
  View file @2282d6b
@@ -2,6 +2,7 @@ package com.ruoyi.equipment.mapper; @@ -2,6 +2,7 @@ package com.ruoyi.equipment.mapper;
2 2
3 import java.util.List; 3 import java.util.List;
4 import com.ruoyi.equipment.domain.Equipment; 4 import com.ruoyi.equipment.domain.Equipment;
  5 +import org.apache.ibatis.annotations.Param;
5 6
6 /** 7 /**
7 * 设备信息Mapper接口 8 * 设备信息Mapper接口
@@ -59,4 +60,5 @@ public interface EquipmentMapper @@ -59,4 +60,5 @@ public interface EquipmentMapper
59 */ 60 */
60 public int deleteEquipmentByIds(Long[] ids); 61 public int deleteEquipmentByIds(Long[] ids);
61 62
  63 + Equipment selectEquipmentByDeviceId(@Param("deviceId") String deviceId);
62 } 64 }
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
  View file @2282d6b
@@ -21,7 +21,10 @@ import com.ruoyi.common.utils.ip.IpUtils; @@ -21,7 +21,10 @@ import com.ruoyi.common.utils.ip.IpUtils;
21 import com.ruoyi.common.utils.uuid.Seq; 21 import com.ruoyi.common.utils.uuid.Seq;
22 import com.ruoyi.common.utils.uuid.UUID; 22 import com.ruoyi.common.utils.uuid.UUID;
23 import com.ruoyi.driver.domain.Driver; 23 import com.ruoyi.driver.domain.Driver;
  24 +import com.ruoyi.equipment.domain.Equipment;
  25 +import com.ruoyi.equipment.mapper.EquipmentMapper;
24 import com.ruoyi.pojo.response.ResponseScheduling; 26 import com.ruoyi.pojo.response.ResponseScheduling;
  27 +import com.ruoyi.pojo.response.SignInResponseVo;
25 import com.ruoyi.service.ThreadJobService; 28 import com.ruoyi.service.ThreadJobService;
26 import com.ruoyi.utils.ConstDateUtil; 29 import com.ruoyi.utils.ConstDateUtil;
27 import org.apache.commons.io.FilenameUtils; 30 import org.apache.commons.io.FilenameUtils;
@@ -49,6 +52,9 @@ public class SignInServiceImpl implements ISignInService { @@ -49,6 +52,9 @@ public class SignInServiceImpl implements ISignInService {
49 private SignInMapper signInMapper; 52 private SignInMapper signInMapper;
50 53
51 @Autowired 54 @Autowired
  55 + private EquipmentMapper equipmentMapper;
  56 +
  57 + @Autowired
52 private RedisCache redisCache; 58 private RedisCache redisCache;
53 59
54 @Resource 60 @Resource
@@ -153,8 +159,12 @@ public class SignInServiceImpl implements ISignInService { @@ -153,8 +159,12 @@ public class SignInServiceImpl implements ISignInService {
153 } 159 }
154 } 160 }
155 161
156 -  
157 - return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark()); 162 + // 查询地址
  163 + Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
  164 + SignInResponseVo vo = new SignInResponseVo();
  165 + vo.setAddress(equipment.getAddress());
  166 + vo.setDeviceId(signIn.getDeviceId());
  167 + return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING,vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(),vo);
158 } 168 }
159 169
160 private void checkSignIn(SignIn signIn) { 170 private void checkSignIn(SignIn signIn) {
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java 0 → 100644
  View file @2282d6b
  1 +package com.ruoyi.pojo.response;
  2 +
  3 +import lombok.Data;
  4 +
  5 +/**
  6 + * 签到vo
  7 + * @author 20412
  8 + */
  9 +@Data
  10 +public class SignInResponseVo {
  11 + String address;
  12 + String deviceId;
  13 +}
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
  View file @2282d6b
@@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
42 <include refid="selectEquipmentVo"/> 42 <include refid="selectEquipmentVo"/>
43 where id = #{id} 43 where id = #{id}
44 </select> 44 </select>
  45 + <select id="selectEquipmentByDeviceId" resultType="com.ruoyi.equipment.domain.Equipment">
  46 + <include refid="selectEquipmentVo"></include>
  47 + where device_id = #{deviceId}
  48 + </select>
45 49
46 50
47 <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id"> 51 <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id">