From 6083931b6dce1c33c6e61dda5a18f727fa7a2a84 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Tue, 12 Jan 2021 16:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E4=B8=B4=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/common/DinnerType.java | 39 +++++++ .../fantang/common/DinnerTypeUtils.java | 70 +++++++++++ .../fantang/controller/ClientController.java | 109 +++++++++++------- 3 files changed, 174 insertions(+), 44 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerType.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerType.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerType.java new file mode 100644 index 000000000..daf900680 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerType.java @@ -0,0 +1,39 @@ +package com.ruoyi.system.fantang.common; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; + +import java.util.Date; + +public enum DinnerType { + breakfast, lunch, dinner, notMatch; + + /** + * 根据当前时间判断现在的就餐类型， + * @return 返回就餐类型的枚举类 + */ + public static DinnerType GetDinnerType() { + + String today = DateUtil.today(); + Date breakfastStart = DateUtil.parse(today + " 07:30"); + Date breakfastEnd = DateUtil.parse(today + " 08:30"); + + Date lunchStart = DateUtil.parse(today + " 11:30"); + Date lunchEnd = DateUtil.parse(today + " 12:30"); + + Date dinnerStart = DateUtil.parse(today + " 17:00"); + Date dinnerEnd = DateUtil.parse(today + " 18:00"); + + DateTime now = new DateTime(DateTime.now()); + if (now.isIn(breakfastStart, breakfastEnd) == true) { + return DinnerType.breakfast; + } else if (now.isIn(lunchStart, lunchEnd) == true) { + return DinnerType.lunch; + } else if (now.isIn(dinnerStart, dinnerEnd) == true){ + return DinnerType.dinner; + }else { + return DinnerType.notMatch; + } + } + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java new file mode 100644 index 000000000..a86b1e9aa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java @@ -0,0 +1,70 @@ +package com.ruoyi.system.fantang.common; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.ruoyi.system.fantang.service.IFtConfigDaoService; +import com.ruoyi.system.fantang.service.impl.FtConfigDaoServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.Map; + +@Lazy +@Service +@Transactional +public class DinnerTypeUtils { + + public enum DinnerType { + breakfast, lunch, dinner, notMatch; + } + + + private Date breakfastStart; + private Date breakfastEnd; + + private Date lunchStart; + private Date lunchEnd; + + private Date dinnerStart; + private Date dinnerEnd; + @Autowired + IFtConfigDaoService configDaoService; + + @Autowired(required = true) + public DinnerTypeUtils() { + Map setting = configDaoService.getDinnerTimeSetting(); + String today = DateUtil.today(); + this.breakfastStart = DateUtil.parse(today + setting.get("breakfastStart")); + this.breakfastEnd = DateUtil.parse(today + setting.get("breakfastEnd")); + + this.lunchStart = DateUtil.parse(today + setting.get("lunchStart")); + this.lunchEnd = DateUtil.parse(today + setting.get("lunchEnd")); + + this.dinnerStart = DateUtil.parse(today + setting.get("dinnerStart")); + this.dinnerEnd = DateUtil.parse(today + setting.get("dinnerEnd")); + + } + + /** + * 根据当前时间判断现在的就餐类型， + * + * @return 返回就餐类型的枚举类 + */ + public DinnerType GetDinnerType() { + + DateTime now = new DateTime(DateTime.now()); + if (now.isIn(this.breakfastStart, this.breakfastEnd)) { + return DinnerType.breakfast; + } else if (now.isIn(this.lunchStart, this.lunchEnd)) { + return DinnerType.lunch; + } else if (now.isIn(this.dinnerStart, this.dinnerEnd)) { + return DinnerType.dinner; + } else { + return DinnerType.notMatch; + } + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index 48954febb..961fd8924 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -6,10 +6,13 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.common.DinnerType; +import com.ruoyi.system.fantang.common.DinnerTypeUtils; import com.ruoyi.system.fantang.domain.*; import com.ruoyi.system.fantang.mapper.FtFaceEventDaoMapper; import com.ruoyi.system.fantang.service.*; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -23,7 +26,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; - +@Slf4j @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @RequestMapping("/client_api/staff") @@ -558,55 +561,73 @@ public class ClientController extends BaseController { * @return */ @PostMapping("/heartbeat") - public String HeartbeatControl(HttpServletRequest request){ + public String faceDeviceHeartbeatEvent(@RequestBody JSONObject request){ System.out.println("face device heartbeat....."); - StringBuffer data = new StringBuffer(); - String line = null; - BufferedReader reader = null; - try { - reader = request.getReader(); - while (null != (line = reader.readLine())) { - data.append(line); - } - JSONObject jsonObject = JSONObject.parseObject(data.toString()); - System.out.println(jsonObject); - } catch (IOException e) { - } finally { - } - return data.toString(); + System.out.println(request); + return "ok"; +// StringBuffer data = new StringBuffer(); +// String line = null; +// BufferedReader reader = null; +// try { +// reader = request.getReader(); +// while (null != (line = reader.readLine())) { +// data.append(line); +// } +// JSONObject jsonObject = JSONObject.parseObject(data.toString()); +// System.out.println(jsonObject); +// } catch (IOException e) { +// } finally { +// } +// return data.toString(); } - @PostMapping("/Verify") - public String VerifyControl(HttpServletRequest request){ - System.out.println("verify....."); - StringBuffer data = new StringBuffer(); + @PostMapping("/verify") + public String faceDeviceVerifyEvent(@RequestBody JSONObject request){ - try { - BufferedReader reader = request.getReader(); - String line = null; - while (null != (line = reader.readLine())) - data.append(line); - JSONObject jsonObject = JSONObject.parseObject(data.toString()); - System.out.println(jsonObject); - - HashMap map = new HashMap<>(); - map.put("flag", 0); - List dao = faceEventService.selectByMap(map); - if (dao.size() == 0) - { - JSONObject infoObject = JSONObject.parseObject(jsonObject.getString("info")); - FtFaceEventDao eventDao = new FtFaceEventDao(); - - eventDao.setDeviceId(infoObject.getString("DeviceID")); - eventDao.setPersonId(infoObject.getString("PersonID")); -// faceEventService.insert(eventDao); - } - else { - } - } catch (IOException e) { - } finally { + // 判断是否在用餐时间，否则只写日志，不处理事件 + DinnerType dinnerType = DinnerType.GetDinnerType(); + System.out.println(request); + if (dinnerType == DinnerType.notMatch) { + log.info("data : {} " , request); + return request.toJSONString(); } + + // 从数据中获取人脸id + + // 跟进人脸id信息，查找该id对应的员工id的当餐订单 + + // 将该订餐设置为核销状态 + + +// StringBuffer data = new StringBuffer(); +// +// try { +// // 从请求头中获取数据 +// BufferedReader reader = request.getReader(); +// String line = null; +// while (null != (line = reader.readLine())) +// data.append(line); +// JSONObject jsonObject = JSONObject.parseObject(data.toString()); +// System.out.println(jsonObject); +// +// HashMap map = new HashMap<>(); +// map.put("flag", 0); +// List dao = faceEventService.selectByMap(map); +// if (dao.size() == 0) +// { +// JSONObject infoObject = JSONObject.parseObject(jsonObject.getString("info")); +// FtFaceEventDao eventDao = new FtFaceEventDao(); +// +// eventDao.setDeviceId(infoObject.getString("DeviceID")); +// eventDao.setPersonId(infoObject.getString("PersonID")); +//// faceEventService.insert(eventDao); +// } +// else { +// } +// } catch (IOException e) { +// } finally { +// } return "ok"; }