Merge pull request 'dev' (#43) from dev into test

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/43

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/meeting/feign/factory/RemoteMeetingFallbackFactory.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -69,12 +70,16 @@ public class RemoteMeetingFallbackFactory implements FallbackFactory<RemoteMeeti
 
             @Override
             public List<JSONObject> recent(Long deptId, String dateStr, Long roomId, String startTime, Long enterpriseId, String sourceName, String source) {
-                return null;
+                List js = new ArrayList<>();
+                js.add(R.fail("获取会议室可预约列表失败:" + throwable.getMessage()).toJson());
+                return js;
             }
 
             @Override
             public List<JSONObject> recent(Long deptId, Long enterpriseId, String sourceName, String source) {
-                return null;
+                List js = new ArrayList<>();
+                js.add(R.fail("获取会议室可预约列表失败:" + throwable.getMessage()).toJson());
+                return js;
             }
 
             @Override

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java

@@ -115,6 +115,10 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
     public AjaxResult conversationApi(@RequestBody DmIntentVo intent) {
         log.info("交互对象：{}", intent.toString());
         redisTemplate.opsForValue().increment("dashboard:server", 1);
+        // 获取今天日期，并格式化成yyyy-MM-dd
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String today = sdf.format(new Date());
+        redisTemplate.opsForValue().increment(("dashboard:server-chart:" + today), 1);
         R<DmManDeviceDto> manDeviceDtoR = manDeviceService.manDeviceInfoInner(intent.getDevId());
         Source source = SourceUtil.getSourceCache(manDeviceDtoR.getData().getStrategyId());
         R<JSONObject> jsonObjectR = remoteIntentService.conversationInner(intent,  manDeviceDtoR.getData().getTId(), source.getMaster(), SecurityConstants.INNER);

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingInnerApiController.java

@@ -579,12 +579,19 @@ public class DmMeetingInnerApiController extends BaseApiController {
         }
         List<JSONObject> arr = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(js1)) {
+            js1.put("orderDate", dateStr);
             arr.add(js1);
         }
         if (ObjectUtil.isNotEmpty(js2)) {
+            if (DateUtils.isAmPm().equals("am")) {
+                js2.put("orderDate", dateStr);
+            } else {
+                js2.put("orderDate", nextDateStr);
+            }
             arr.add(js2);
         }
         if (ObjectUtil.isNotEmpty(js3)) {
+            js3.put("orderDate", nextDateStr);
             arr.add(js3);
         }
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/controller/api/DmRecognizedRecordsApiController.java

@@ -12,6 +12,8 @@ import com.xueyi.system.api.pass.feign.RemoteRecognizedRecordsService;
 import com.xueyi.system.pass.mapper.DmRecognizedRecordsMapper;
 import com.xueyi.system.pass.service.impl.DmRecognizedRecordsServiceImpl;
 import com.xueyi.system.resource.controller.api.BaseApiController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,7 +32,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/pass/api")
 public class DmRecognizedRecordsApiController extends BaseApiController {
-
+    private static final Logger log = LoggerFactory.getLogger(DmRecognizedRecordsApiController.class);
     @Autowired
     private RemoteRecognizedRecordsService recognizedRecordsFeign;
 
@@ -40,15 +42,17 @@ public class DmRecognizedRecordsApiController extends BaseApiController {
     @ResponseBody
     @PostMapping(value = "/upload-pass", produces = "application/json;charset=UTF-8")
     public JSONObject upload(@RequestBody DmRecognizedRecordsDto recognizedRecordsDto){
+        log.info("upload-pass devId={}", recognizedRecordsDto.getDevId());
         DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(recognizedRecordsDto.getDevId());
 
-        recognizedRecordsService.setRedisRecognizedCount(1);
+
         return recognizedRecordsFeign.uploadPass(recognizedRecordsDto, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
     }
 
     @ResponseBody
     @PostMapping(value = "/upload-multi-pass", produces = "application/json;charset=UTF-8")
     public JSONObject uploads(@RequestBody DmRecognizedMultiRecordsDto recognizedMultiRecordsDto){
+        log.info("upload-multi-pass devId={}", recognizedMultiRecordsDto.getDevId());
         DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(recognizedMultiRecordsDto.getDevId());
         if (recognizedMultiRecordsDto.getRecords().size() > 0)
         recognizedRecordsService.setRedisRecognizedCount(recognizedMultiRecordsDto.getRecords().size());

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/controller/api/DmRecognizedRecordsInnerApiController.java

@@ -17,6 +17,7 @@ import com.xueyi.system.api.pass.domain.po.DmRecognizedRecordsPo;
 import com.xueyi.system.api.staff.domain.po.DmStaffPo;
 import com.xueyi.system.pass.domain.model.DmRecognizedRecordsConverter;
 import com.xueyi.system.pass.mapper.DmRecognizedRecordsMapper;
+import com.xueyi.system.pass.service.impl.DmRecognizedRecordsServiceImpl;
 import com.xueyi.system.resource.controller.api.BaseApiController;
 import com.xueyi.system.resource.domain.dto.DmResourcesDto;
 import com.xueyi.system.resource.service.impl.DmResourcesServiceImpl;
@@ -69,6 +70,9 @@ public class DmRecognizedRecordsInnerApiController extends BaseApiController {
     @Autowired
     private FaceServiceImpl faceService;
 
+    @Autowired
+    private DmRecognizedRecordsServiceImpl recognizedRecordsService;
+
     @InnerAuth
     @PostMapping(value = "/upload-pass")
     public JSONObject upload(@RequestBody DmRecognizedRecordsDto recognizedRecordsDto) {
@@ -111,6 +115,7 @@ public class DmRecognizedRecordsInnerApiController extends BaseApiController {
         }
 
         dmRecognizedRecordsMapper.insert(cr);
+        recognizedRecordsService.setRedisRecognizedCount(1);
 
         return outputSuccess().toJSON();
     }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/controller/api/BaseApiController.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xueyi.common.web.constant.ResponseCode;
 import com.xueyi.common.web.response.MyResponse;
-import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
 import com.xueyi.system.digitalmans.mapper.DmDigitalmanMapper;
 import com.xueyi.system.digitalmans.service.impl.DmDigitalmanServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +24,7 @@ public class BaseApiController extends com.xueyi.common.web.controller.BaseApiCo
 
     @Autowired
     private DmDigitalmanMapper dmDigitalmanMapper;
+
     public MyResponse commonCheck(String devId, Double timestamp, String sign) {
         String regexZS = "[0-9A-Za-z_-]+";
         if (!(StringUtils.isNotEmpty(devId) && devId.matches(regexZS))) {
@@ -36,8 +36,8 @@ public class BaseApiController extends com.xueyi.common.web.controller.BaseApiCo
         }
 
 //        dmDigitalmanService.selectById()
-        DmDigitalmanDto dmDigitalmanDto = dmDigitalmanMapper.selectByCode(devId);
-        System.err.println(dmDigitalmanDto);
+        /*DmDigitalmanDto dmDigitalmanDto = dmDigitalmanMapper.selectByCode(devId);
+        System.err.println(dmDigitalmanDto);*/
 
        /* Device device = deviceService.findByDevId(devId);
         if (!ObjectUtils.isNotNull(device)) {