Bladeren bron

1,add print log of DmRecognizedRecordsInnerApiController

2, 缓存数据库会议预定数据,时间1分钟
tags/B.2.6.7_20240112_base
yk 1 jaar geleden
bovenliggende
commit
b4dd96cbd5
3 gewijzigde bestanden met toevoegingen van 38 en 10 verwijderingen
  1. +6
    -0
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedMultiRecordsDto.java
  2. +26
    -10
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/DmMeetingOrdersController.java
  3. +6
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/controller/api/DmRecognizedRecordsInnerApiController.java

+ 6
- 0
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/pass/domain/dto/DmRecognizedMultiRecordsDto.java Bestand weergeven

@@ -1,5 +1,6 @@
package com.xueyi.system.api.pass.domain.dto;

import com.alibaba.fastjson2.JSON;
import lombok.Data;

import java.io.Serial;
@@ -29,4 +30,9 @@ public class DmRecognizedMultiRecordsDto {
public final static Integer TYPE_STAFF = 1;
public final static Integer TYPE_STRANGER = 2;

@Override
public String toString(){
return JSON.toJSONString(this);
}

}

+ 26
- 10
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/DmMeetingOrdersController.java Bestand weergeven

@@ -6,6 +6,8 @@ import com.xueyi.common.core.web.validate.V_A;
import com.xueyi.common.core.web.validate.V_E;
import com.xueyi.common.log.annotation.Log;
import com.xueyi.common.log.enums.BusinessType;
import com.xueyi.common.redis.service.RedisService;
import com.xueyi.common.redis.utils.RedisUtil;
import com.xueyi.common.security.annotation.RequiresPermissions;
import com.xueyi.common.web.entity.controller.BaseController;
import com.xueyi.common.web.response.MyResponse;
@@ -15,6 +17,8 @@ import com.xueyi.system.meeting.domain.model.DmMeetingOrdersConverter;
import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
import com.xueyi.system.meeting.mapper.DmMeetingOrdersMapper;
import com.xueyi.system.meeting.service.IDmMeetingOrdersService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -30,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

/**
* 会议室预约管理 业务处理
@@ -39,7 +44,9 @@ import java.util.List;
@RestController
@RequestMapping("/meeting/orders")
public class DmMeetingOrdersController extends BaseController<DmMeetingOrdersQuery, DmMeetingOrdersDto, IDmMeetingOrdersService> {
private static final Logger logger = LoggerFactory.getLogger(DmMeetingOrdersController.class);

private static final String REDIS_KEY = "meeting:orders:";
@Autowired
private DmMeetingOrdersConverter dmMeetingOrdersConverter;

@@ -49,6 +56,9 @@ public class DmMeetingOrdersController extends BaseController<DmMeetingOrdersQue
@Autowired
private IDmMeetingOrdersService dmMeetingOrdersService;

@Autowired
private RedisService redisService;

/** 定义节点名称 */
@Override
protected String getNodeName() {
@@ -113,17 +123,23 @@ public class DmMeetingOrdersController extends BaseController<DmMeetingOrdersQue
@RequiresPermissions(Auth.DM_MEETING_ORDERS_LIST)
@GetMapping("/lists")
public JSONObject lists(@RequestParam("dateStr") String dateStr, @RequestParam("spaceId") Long spaceId) {
List<DmMeetingOrdersPo> list = dmMeetingOrdersMapper.findListByDate(dateStr, spaceId);
List<DmMeetingOrdersDto> res = new ArrayList<>();
list.forEach(item -> {
DmMeetingOrdersDto dto = dmMeetingOrdersConverter.mapperDto(item);
dmMeetingOrdersService.fixColumns(dto);
res.add(dto);
});
MyResponse myResponse = new MyResponse();
MyResponse myResponse = new MyResponse(0,"");
List<DmMeetingOrdersDto> res = new ArrayList<>();
if (RedisUtil.existed(REDIS_KEY+dateStr+":"+spaceId)) {
logger.info("===lists meeting orders from redis===");
res = redisService.getCacheList(REDIS_KEY+dateStr+":"+spaceId);
} else {
logger.info("===lists meeting orders from db===");
List<DmMeetingOrdersPo> list = dmMeetingOrdersMapper.findListByDate(dateStr, spaceId);
res = list.stream().map(t->{
DmMeetingOrdersDto dto = dmMeetingOrdersConverter.mapperDto(t);
dmMeetingOrdersService.fixColumns(dto);
return dto;
}).toList();
redisService.setCacheList(REDIS_KEY+dateStr+":"+spaceId, res, 60, TimeUnit.SECONDS);
}

myResponse.setData(res);
myResponse.setErrMsg("");
myResponse.setStatus(0);
return myResponse.toJSON();
}



+ 6
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/controller/api/DmRecognizedRecordsInnerApiController.java Bestand weergeven

@@ -30,6 +30,8 @@ import com.xueyi.system.staff.mapper.DmVisitorsMapper;
import com.xueyi.system.staff.service.impl.DmStaffServiceImpl;
import com.xueyi.system.utils.common.ImageUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -50,6 +52,8 @@ import java.util.List;
@RequestMapping("/pass/inner-api")
public class DmRecognizedRecordsInnerApiController extends MyBaseApiController {

Logger logger = LoggerFactory.getLogger(FaceServiceImpl.class);

@Autowired
private DmStaffMapper dmStaffMapper;

@@ -142,6 +146,8 @@ public class DmRecognizedRecordsInnerApiController extends MyBaseApiController {
String deviceId = recognizedMultiRecordsDto.getDevId();
BigDecimal timestamp = recognizedMultiRecordsDto.getTimestamp();
String sign = recognizedMultiRecordsDto.getSign();
logger.info("recognizedMultiRecordsDto :{}",recognizedMultiRecordsDto.toString());


MyResponse myResponse = commonCheck(deviceId, timestamp.doubleValue(), sign);
if (myResponse.getStatus() != 0) {


Laden…
Annuleren
Opslaan