From df8646d27148573510e6c0ab0230a09133df1454 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 02 三月 2026 14:37:59 +0800
Subject: [PATCH] APP电子巡逻打卡
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/controller/PhoneController.java | 4 ++++
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5106.java | 29 ++++++++++++++++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/controller/PhoneController.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/controller/PhoneController.java
index 43550e2..3780758 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/controller/PhoneController.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/controller/PhoneController.java
@@ -7,6 +7,7 @@
import com.fzzy.igds.app.v1.data.PhoneResponse;
import com.fzzy.igds.app.v1.manager.PhoneManager;
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +24,7 @@
* @Description:
* @DateTime: 2026-1-14 11:45
**/
+@Slf4j
@Controller
@RequestMapping("api/phone/v1")
public class PhoneController {
@@ -94,6 +96,7 @@
result = phoneManager.execute(req, phone35AuthUser);
} catch (Exception e) {
+ log.error("==============APP鎶ラ敊锛歿}==============", e.getMessage());
result = PhoneRespUtil.error(RespCodeEnum.CODE_1111,
"鍚庣寮傚父锛�" + e.getMessage());
}
@@ -117,6 +120,7 @@
return phoneManager.phoneUploadImg(files[0], req);
}
+
/**
* 鍊间粨涓婁紶
*
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5106.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5106.java
index 09f39f7..a3f9ab6 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5106.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5106.java
@@ -88,11 +88,24 @@
patrolRecord.setUpdateBy(authUser.getCname());
String path = fileService.getFileSavePath("PATROL") + param.getImgName();
patrolRecord.setImgName(path.replace(FrameworkConfig.getProfile(), "/profile/"));
+ QueryWrapper<PatrolConf> queryConfWrapper = new QueryWrapper<>();
+ String format = DateFormatUtils.format(new Date(), "HH:mm:ss");
+ queryConfWrapper.le("start", format);
+ queryConfWrapper.ge("end", format);
+ queryConfWrapper.eq("company_id", authUser.getCompanyId());
+// queryConfWrapper.eq("dept_id", authUser.getDeptId());
+ List<PatrolConf> confList = patrolConfMapper.selectList(queryConfWrapper);
+ if (null == confList||confList.isEmpty()) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "璇峰～鍐欑浉鍏崇殑鐝淇℃伅锛侊紒");
+ }
+ PatrolConf patrolConf = confList.get(0);
QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id", patrolRecord.getPatrolId());
+ queryWrapper.eq("user_id",authUser.getUsername());
+ queryWrapper.eq("conf_id",patrolConf.getId());
List<Patrol> patrolList = patrolMapper.selectList(queryWrapper);
- if (null == patrolList) {
+ if (null == patrolList||patrolList.isEmpty()) {
Patrol patrol = new Patrol();
patrol.setId(patrolRecord.getPatrolId());
@@ -104,22 +117,12 @@
patrol.setCreateTime(new Date());
patrol.setUpdateBy(authUser.getCname());
patrol.setUpdateTime(new Date());
-
- QueryWrapper<PatrolConf> queryConfWrapper = new QueryWrapper<>();
- queryConfWrapper.ge("start", new Date());
- queryConfWrapper.le("end", new Date());
- queryConfWrapper.eq("company_id", authUser.getCompanyId());
- queryConfWrapper.eq("dept_id", authUser.getDeptId());
- List<PatrolConf> confList = patrolConfMapper.selectList(queryConfWrapper);
- if (null == confList) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "璇峰～鍐欑浉鍏崇殑鐝淇℃伅锛侊紒");
- }
- PatrolConf patrolConf = confList.get(0);
+ patrol.setDeptId(param.getDeptId());
patrol.setConfId(patrolConf.getId());
patrol.setConfName(patrolConf.getName());
int insert = patrolMapper.insert(patrol);
- if (insert > 0) {
+ if (insert <= 0) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "淇濆瓨澶辫触锛侊紒");
}
}
--
Gitblit v1.9.3