From 77556842bbe4f4c55513a50fb51f8a5622018f4a Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 09 九月 2025 14:56:45 +0800
Subject: [PATCH] 新增接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 19 +++++++++
service/src/main/java/com/ruoyi/cwgl/controller/SmartLockerApplicationController.java | 17 ++++++++
service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java | 23 +++++++++++
service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java | 7 +++
service/src/main/java/com/ruoyi/cwgl/mapper/SmartLockerApplicationMapper.java | 6 +++
service/src/main/java/com/ruoyi/cwgl/service/ISmartLockerApplicationService.java | 9 ++++
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 7 +++
service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml | 12 ++++++
8 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
index 986cdb2..0967161 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
@@ -72,7 +72,12 @@
requestLog.setType(0);
logService.insertRequestLog(requestLog);
- return keyCollectionInfoService.takeReview(keyCollectionInfo);
+ AjaxResult ajaxResult = keyCollectionInfoService.takeReview(keyCollectionInfo);
+ if (!ajaxResult.get("code").equals(0)){
+ ajaxResult = keyCollectionInfoService.selectSmartLockerApplication(takeReviewDto);
+
+ }
+ return ajaxResult;
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/SmartLockerApplicationController.java b/service/src/main/java/com/ruoyi/cwgl/controller/SmartLockerApplicationController.java
index 967d141..42e5f0d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/SmartLockerApplicationController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/SmartLockerApplicationController.java
@@ -72,6 +72,17 @@
{
return AjaxResult.success(smartLockerApplicationService.selectSmartLockerApplicationById(id));
}
+ /**
+ * 浣滃簾
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:smartLockerApplication:invalid')")
+ @GetMapping(value = "invalid/{id}")
+ public AjaxResult invalid(@PathVariable("id") Integer id)
+ {
+ return toAjax(smartLockerApplicationService.invalid(id));
+ }
+
+
/**
* 鏂板鏅鸿兘鏌滅墿鍝佺敵棰嗙鐞�
@@ -84,6 +95,12 @@
return toAjax(smartLockerApplicationService.insertSmartLockerApplication(smartLockerApplication));
}
+ @GetMapping("query")
+ public AjaxResult query(String licensePlateNumber )
+ {
+ return AjaxResult.success(smartLockerApplicationService.selectCwByLicensePlateNumber(licensePlateNumber));
+ }
+
/**
* 淇敼鏅鸿兘鏌滅墿鍝佺敵棰嗙鐞�
*/
diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/SmartLockerApplicationMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/SmartLockerApplicationMapper.java
index 4f697be..9756389 100644
--- a/service/src/main/java/com/ruoyi/cwgl/mapper/SmartLockerApplicationMapper.java
+++ b/service/src/main/java/com/ruoyi/cwgl/mapper/SmartLockerApplicationMapper.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.ruoyi.cwgl.domain.SmartLockerApplication;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
/**
@@ -84,4 +85,9 @@
* @return 缁撴灉
*/
public int deleteSmartLockerApplicationByIds(Integer[] ids);
+
+ SmartLockerApplication selectSmartLockerApplication(TakeReviewDto takeReviewDto);
+
+ Integer selectCwByLicensePlateNumber(String licensePlateNumber);
+
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
index 88cf9e7..f02a71c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
@@ -113,4 +113,11 @@
*/
AjaxResult takeReview(KeyCollectionInfo keyCollectionInfo);
+ /**
+ * 鏌ヨ鑷搴撴湁娌℃湁鏁版嵁
+ * @param takeReviewDto
+ * @return
+ */
+ AjaxResult selectSmartLockerApplication(TakeReviewDto takeReviewDto);
+
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/ISmartLockerApplicationService.java b/service/src/main/java/com/ruoyi/cwgl/service/ISmartLockerApplicationService.java
index 52338b7..33412b8 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/ISmartLockerApplicationService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/ISmartLockerApplicationService.java
@@ -99,4 +99,13 @@
* @return 缁撴灉
*/
public int deleteSmartLockerApplicationById(Integer id);
+
+ /**
+ * 浣滃簾
+ * @param id
+ * @return
+ */
+ int invalid(Integer id);
+
+ Integer selectCwByLicensePlateNumber(String licensePlateNumber);
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index ea58f52..de6eddf 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -9,7 +9,9 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.cwgl.domain.RequestLog;
+import com.ruoyi.cwgl.domain.SmartLockerApplication;
import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
+import com.ruoyi.cwgl.mapper.SmartLockerApplicationMapper;
import com.ruoyi.cwgl.service.IRequestLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,8 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private KeyCollectionInfoMapper keyCollectionInfoMapper;
+ @Resource
+ private SmartLockerApplicationMapper smartLockerApplicationMapper;
@@ -220,4 +224,19 @@
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
+
+ @Override
+ public AjaxResult selectSmartLockerApplication(TakeReviewDto takeReviewDto) {
+ SmartLockerApplication smartLockerApplication =smartLockerApplicationMapper.selectSmartLockerApplication(takeReviewDto);
+ if (smartLockerApplication == null){
+ return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3);
+ }
+ smartLockerApplication.setStatus(2);
+ smartLockerApplication.setReceiveTime(new Date());
+ smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNum",smartLockerApplication.getLockerPort());
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
+ }
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
index 9c42694..b5b6821 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.cwgl.service.impl;
+import java.util.Date;
import java.util.List;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
@@ -179,4 +181,25 @@
{
return smartLockerApplicationMapper.deleteSmartLockerApplicationById(id);
}
+
+ @Override
+ public int invalid(Integer id) {
+ SmartLockerApplication smartLockerApplication = smartLockerApplicationMapper.selectSmartLockerApplicationById(id);
+ if (smartLockerApplication==null){
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ smartLockerApplication.setCancelTime(new Date());
+ smartLockerApplication.setStatus(1);
+ return smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
+ }
+
+ @Override
+ @DataSource(DataSourceType.CWSJ)
+ public Integer selectCwByLicensePlateNumber(String licensePlateNumber) {
+ Integer integer = smartLockerApplicationMapper.selectCwByLicensePlateNumber(licensePlateNumber);
+ if (integer==null){
+ throw new ServiceException("鏌ヨ涓嶅埌鏅鸿兘鏌滄牸鍙ｅ彿");
+ }
+ return integer;
+ }
}
diff --git a/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml b/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
index f1e237e..baa77ed 100644
--- a/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
@@ -65,6 +65,18 @@
</where>
order by thisTab.id desc
</select>
+ <select id="selectSmartLockerApplication" resultMap="SmartLockerApplicationResult">
+ <include refid="selectSmartLockerApplicationVo"/>
+
+ where applicant_name = #{driverName}
+ and applicant_code = #{driverCode}
+ and status = 0
+ limit 1
+ </select>
+ <select id="selectCwByLicensePlateNumber" resultType="java.lang.Integer">
+
+ SELECT `NAME` from tms_vehicle WHERE LICENSE_PLATE_NUMBER = #{licensePlateNumber} and BE_DELETE =0 order by id asc LIMIT 1
+ </select>
<!-- 鏂板 -->
<insert id="insertSmartLockerApplication" parameterType="com.ruoyi.cwgl.domain.SmartLockerApplication" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0