From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/controller/CircleInfController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/CircleInfController.java b/src/main/java/com/whyc/controller/CircleInfController.java
index 51268a0..84e2ac6 100644
--- a/src/main/java/com/whyc/controller/CircleInfController.java
+++ b/src/main/java/com/whyc/controller/CircleInfController.java
@@ -15,6 +15,8 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+
@RestController
@RequestMapping("circle")
@Api(tags = "鍔ㄧ幆绠＄悊")
@@ -39,9 +41,9 @@
int userId = ActionUtil.getUser().getUId().intValue();
Response res = new Response();
//鏍￠獙鏈烘埧绔欑偣鏄惁瀛樺湪,瀛樺湪鍒欎笉闇�瑕佹柊寤篠tationId
- StationInf sinf = sinfService.judgeStationName(circleInf.getStationName());
- if (sinf!=null) {
- circleInf.setStationId(sinf.getStationId());
+ Battinf binf = service.judgeBattStationName3(circleInf);
+ if (binf!=null) {
+ circleInf.setStationId(binf.getStationId());
}else {
//绔欑偣涓嶅瓨鍦�,闇�瑕佹柊寤虹珯鐐硅褰�
String nextStationId = binfService.getNextStationId();
@@ -63,6 +65,7 @@
if(circleInf.getSubList()!=null){
circleInf.setSubCount(circleInf.getSubList().size());
}
+ circleInf.setCircleInuseDate(new Date());
if (service.add(circleInf)>0){
//娣诲姞鏈烘埧绔欑偣鍒扮敤鎴峰搴旂殑鍖呮満缁�
binfService.insertUserBattgroupBaojigroupBattgroupSelect(circleInf.getStationId(),0,userId);
@@ -112,6 +115,18 @@
return service.getCinf(cinf,pageCurr,pageSize);
}
+ @PostMapping("getConditionCid")
+ @ApiOperation(value = "鑾峰彇鍔ㄧ幆涓嬫媺璧勪骇淇℃伅")
+ public Response getConditionCid(){
+ return service.getConditionCid();
+ }
+
+ @GetMapping("getCinfById")
+ @ApiOperation(value = "鏍规嵁id鑾峰彇鍔ㄧ幆淇℃伅")
+ public Response getCinfById(@RequestParam int deviceId){
+ return service.getCinfById(deviceId);
+ }
+
@PostMapping("getSub")
@ApiOperation(value = "鑾峰彇瀛愪欢淇℃伅")
public Response getSub(@RequestBody SubInf sub,@RequestParam int pageCurr,@RequestParam int pageSize){
--
Gitblit v1.9.1