Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-eg/service-eg-biz/src/main/java/com/usky/eg/controller/web/EgDeviceController.java

@@ -3,6 +3,8 @@ package com.usky.eg.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.eg.domain.EgDevice;
 import com.usky.eg.service.EgDeviceService;
 import com.usky.eg.service.vo.EgDeviceRequestVO;
@@ -66,6 +68,7 @@ public class EgDeviceController {
     /**
      * 下发设备控制命令
      */
+    @Log(title = "门禁系统人员校验开门", businessType = BusinessType.OTHER)
     @GetMapping("/control")
     public ApiResult<Map<String,Object>> control(@RequestParam("productCode") String productCode,
                                                  @RequestParam("deviceUuid") String deviceUuid,

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/DingTalkAndMessage.java

@@ -207,7 +207,8 @@ public class DingTalkAndMessage {
         return sysUserMapper.selectOne(phoneQuery);
     }
 
-    @Async("asyncServiceExecutor")// 异步发送
+    @Async// 异步发送
+//    @Async("asyncServiceExecutor")// 异步发送
     public void sendDingTalkDailyReport(PmWorkReport workReport, List<PmWorkContent> workContents) {
         String userName = workReport.getCreateBy();
         log.info(userName + "的工作报告开始发送钉钉-----------------------------------");
@@ -302,7 +303,8 @@ public class DingTalkAndMessage {
     }
 
 
-    @Async("asyncServiceExecutor")
+    @Async
+//    @Async("asyncServiceExecutor")
     public void sendAsyncMessage(PmWorkReport newReport) {
         String username = newReport.getCreateBy();
         Long submitterId = newReport.getSubmitterId();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/ExecutorConfig.java

@@ -1,49 +1,49 @@
-package com.usky.iot.service.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ThreadPoolExecutor;
-
-@Configuration
-@EnableAsync
-@Slf4j
-public class ExecutorConfig {
-
-    /** 核心线程数(默认线程数) */
-    private int corePoolSize = 10;
-    /** 最大线程数 */
-    private int maxPoolSize = 20;
-    /** 允许线程空闲时间（单位：默认为秒） */
-    private static final int keepAliveTime = 60;
-    /** 缓冲队列大小 */
-    private int queueCapacity = 10;
-
-    @Bean(name = "asyncServiceExecutor")
-    public Executor asyncServiceExecutor(){
-        log.info("start asyncServiceExecutor++++++++++++++++++++++");
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        //配置核心线程数
-        executor.setCorePoolSize(corePoolSize);
-        //配置最大线程数
-        executor.setMaxPoolSize(maxPoolSize);
-        //配置空闲时间
-        executor.setKeepAliveSeconds(keepAliveTime);
-        //配置队列大小
-        executor.setQueueCapacity(queueCapacity);
-        //配置线程前缀名
-        executor.setThreadNamePrefix("async-service-");
-
-        // rejection-policy：当pool已经达到max size的时候，如何处理新任务
-        // CALLER_RUNS：不在新线程中执行任务，而是有调用者所在的线程来执行
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-
-        //执行初始化
-        executor.initialize();
-        return executor;
-    }
-}
+//package com.usky.iot.service.config;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//
+//import java.util.concurrent.Executor;
+//import java.util.concurrent.ThreadPoolExecutor;
+//
+//@Configuration
+//@EnableAsync
+//@Slf4j
+//public class ExecutorConfig {
+//
+//    /** 核心线程数(默认线程数) */
+//    private int corePoolSize = 10;
+//    /** 最大线程数 */
+//    private int maxPoolSize = 20;
+//    /** 允许线程空闲时间（单位：默认为秒） */
+//    private static final int keepAliveTime = 60;
+//    /** 缓冲队列大小 */
+//    private int queueCapacity = 10;
+//
+//    @Bean(name = "asyncServiceExecutor")
+//    public Executor asyncServiceExecutor(){
+//        log.info("start asyncServiceExecutor++++++++++++++++++++++");
+//        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+//        //配置核心线程数
+//        executor.setCorePoolSize(corePoolSize);
+//        //配置最大线程数
+//        executor.setMaxPoolSize(maxPoolSize);
+//        //配置空闲时间
+//        executor.setKeepAliveSeconds(keepAliveTime);
+//        //配置队列大小
+//        executor.setQueueCapacity(queueCapacity);
+//        //配置线程前缀名
+//        executor.setThreadNamePrefix("async-service-");
+//
+//        // rejection-policy：当pool已经达到max size的时候，如何处理新任务
+//        // CALLER_RUNS：不在新线程中执行任务，而是有调用者所在的线程来执行
+//        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+//
+//        //执行初始化
+//        executor.initialize();
+//        return executor;
+//    }
+//}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java

@@ -213,57 +213,57 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
         crmDeviceRepair1.setHandleTime(LocalDateTime.now());
         this.updateById(crmDeviceRepair1);
 
-        CrmDeviceRepair crmDeviceRepair = this.getById(crmDeviceRepair1.getId());
-
-        //发送短信
-        StringBuffer sendStatus = new StringBuffer();
-        StringBuffer sendContext = new StringBuffer();
-        DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
-        IAcsClient client = new DefaultAcsClient(profile);
-        SendSmsRequest request = new SendSmsRequest();
-        request.setPhoneNumbers(crmDeviceRepair.getReflectPhone());//接收短信的手机号码
-        request.setSignName("上海永天科技股份有限公司");//短信签名名称
-        request.setTemplateCode("SMS_463206001");//短信模板CODE
-
-        String custom = "#/pages/common/evaluate/index?statusBool=true&repairCode="+crmDeviceRepair.getRepairCode();
-        request.setTemplateParam("{\"name\":\""+crmDeviceRepair.getReflectName()+"\","+"\"date\":\""+crmDeviceRepair.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+"\","+"\"custom\":\""+custom+"\"}");//短信模板变量对应的实际值
-
-        try {
-            SendSmsResponse response = client.getAcsResponse(request);
-            if(response.getCode() != null){
-                if(response.getCode().equals("OK")){
-//                    sendStatus.append("1");
-//                    //查询发送短信内容
+//        CrmDeviceRepair crmDeviceRepair = this.getById(crmDeviceRepair1.getId());
+
+//        //发送短信
+//        StringBuffer sendStatus = new StringBuffer();
+//        StringBuffer sendContext = new StringBuffer();
+//        DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
+//        IAcsClient client = new DefaultAcsClient(profile);
+//        SendSmsRequest request = new SendSmsRequest();
+//        request.setPhoneNumbers(crmDeviceRepair.getReflectPhone());//接收短信的手机号码
+//        request.setSignName("上海永天科技股份有限公司");//短信签名名称
+//        request.setTemplateCode("SMS_463206001");//短信模板CODE
 //
-//                    try {
-//                        Thread.sleep(3000);
-//                    } catch (InterruptedException e) {
-//                        e.printStackTrace();
-//                    }
+//        String custom = "#/pages/common/evaluate/index?statusBool=true&repairCode="+crmDeviceRepair.getRepairCode();
+//        request.setTemplateParam("{\"name\":\""+crmDeviceRepair.getReflectName()+"\","+"\"date\":\""+crmDeviceRepair.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+"\","+"\"custom\":\""+custom+"\"}");//短信模板变量对应的实际值
 //
-//                    QuerySendDetailsRequest request1 = new QuerySendDetailsRequest();
-//                    request1.setPhoneNumber(crmDeviceRepair.getReflectPhone());
-//                    request1.setSendDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-//                    request1.setPageSize((long)10);
-//                    request1.setCurrentPage((long)1);
-//                    QuerySendDetailsResponse response1 = client.getAcsResponse(request1);
-//                    if(response1.getCode() != null){
-//                        if(response1.getCode().equals("OK")){
-//                            sendContext.append(response1.getSmsSendDetailDTOs().get(0).getContent());
-//                        }
+//        try {
+//            SendSmsResponse response = client.getAcsResponse(request);
+//            if(response.getCode() != null){
+//                if(response.getCode().equals("OK")){
+////                    sendStatus.append("1");
+////                    //查询发送短信内容
+////
+////                    try {
+////                        Thread.sleep(3000);
+////                    } catch (InterruptedException e) {
+////                        e.printStackTrace();
+////                    }
+////
+////                    QuerySendDetailsRequest request1 = new QuerySendDetailsRequest();
+////                    request1.setPhoneNumber(crmDeviceRepair.getReflectPhone());
+////                    request1.setSendDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+////                    request1.setPageSize((long)10);
+////                    request1.setCurrentPage((long)1);
+////                    QuerySendDetailsResponse response1 = client.getAcsResponse(request1);
+////                    if(response1.getCode() != null){
+////                        if(response1.getCode().equals("OK")){
+////                            sendContext.append(response1.getSmsSendDetailDTOs().get(0).getContent());
+////                        }
+////
+////                    }
 //
-//                    }
-
-                }else{
-//                    sendStatus.append("2");
-                }
-            }
-            System.out.println(new Gson().toJson(response));
-        } catch (ClientException e) {
-            System.out.println("ErrCode:" + e.getErrCode());
-            System.out.println("ErrMsg:" + e.getErrMsg());
-            System.out.println("RequestId:" + e.getRequestId());
-        }
+//                }else{
+////                    sendStatus.append("2");
+//                }
+//            }
+//            System.out.println(new Gson().toJson(response));
+//        } catch (ClientException e) {
+//            System.out.println("ErrCode:" + e.getErrCode());
+//            System.out.println("ErrMsg:" + e.getErrMsg());
+//            System.out.println("RequestId:" + e.getRequestId());
+//        }
 
     }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/server/FaceContrastServer.java

@@ -49,6 +49,7 @@ public class FaceContrastServer {
         } catch (TencentCloudSDKException e) {
             faceResult.setCode(FaceResultVO.FACE_ERROR);
             faceResult.setMsg(e.getMessage());
+            System.out.println("e.getMessage() "+e.getMessage());
         }
         return faceResult;
     }