update

car-wash-admin/src/main/java/com/kym/admin/controller/FinanceController.java

@@ -1,16 +1,12 @@
 package com.kym.admin.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.queryParams.InvoiceDetailQueryParam;
 import com.kym.entity.admin.queryParams.InvoiceQueryParam;
-import com.kym.entity.common.PageBean;
-import com.kym.entity.miniapp.vo.InvoiceVo;
 import com.kym.service.admin.InvoiceDetailService;
 import com.kym.service.miniapp.InvoiceService;
 import com.kym.service.miniapp.RefundLogService;
@@ -20,20 +16,10 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**

car-wash-admin/src/main/java/com/kym/admin/controller/StationStatDayController.java

@@ -1,18 +0,0 @@
-package com.kym.admin.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 站点统计表-日 前端控制器
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@RestController
-@RequestMapping("/station-stat-day")
-public class StationStatDayController {
-
-}

car-wash-admin/src/main/java/com/kym/admin/controller/StationStatMonthController.java

@@ -1,18 +0,0 @@
-package com.kym.admin.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 站点统计表-月 前端控制器
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@RestController
-@RequestMapping("/station-stat-month")
-public class StationStatMonthController {
-
-}

car-wash-admin/src/main/java/com/kym/admin/jobs/EnPlusSaasTokenJob.java

@@ -1,41 +0,0 @@
-package com.kym.admin.jobs;
-
-import com.kym.common.utils.HttpUtil;
-import com.kym.entity.common.RedisKeys;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * @author skyline
- * @description EN+ SASS平台token刷新任务
- * @date 2023-09-30 16:15
- */
-@Component
-@Slf4j
-public class EnPlusSaasTokenJob {
-
-    private final StringRedisTemplate redisTemplate;
-    @Value("${en-plus.sass}")
-    public String sass;
-
-
-    public EnPlusSaasTokenJob(StringRedisTemplate redisTemplate) {
-        this.redisTemplate = redisTemplate;
-    }
-
-    // 每30分钟执行一次
-    @Scheduled(cron = "0 0/30 * * * ?")
-    public void execute() {
-        var res = HttpUtil.post(sass);
-        var json = HttpUtil.parseJson(res);
-        if (json.getIntValue("code") == HttpStatus.SC_OK) {
-            var token = HttpUtil.parseJson(json.getString("data")).getString("token");
-            log.info("EN+ SASS平台token刷新任务执行结果 Token：{}", token);
-            redisTemplate.opsForValue().set(RedisKeys.EN_PLUS_SASS_TOKEN, token);
-        }
-    }
-}

car-wash-admin/src/main/java/com/kym/admin/jobs/InvoiceStatusJob.java

@@ -40,7 +40,7 @@ public class InvoiceStatusJob {
     /**
      * 每天18:00执行，处理微信发票开票结果通知不到的情况，主动查询发票信息更新数据
      */
-    @Scheduled(cron = "0 0 18 * * ?")
+//    @Scheduled(cron = "0 0 18 * * ?")
     public void execute() {
         log.info("执行发票状态处理定时任务...开始");
         // 所有开票中状态的发票

car-wash-admin/src/main/java/com/kym/admin/jobs/OfflineNotifyJob.java

@@ -36,7 +36,7 @@ public class OfflineNotifyJob {
     }
 
     // 每小时的第30分钟执行一次
-    @Scheduled(cron = "0 30 0/1 * * ? ")
+//    @Scheduled(cron = "0 30 0/1 * * ? ")
     public void execute() {
         // 查询redis离线设备消息队列，存在且超过1小时的消息则发送邮件提醒
         Set<String> offlineList = redisTemplate.opsForZSet().rangeByScore(RedisKeys.OFFLINE, System.currentTimeMillis() - 60 * 60 * 1000, System.currentTimeMillis() + 60 * 60 * 1000);

car-wash-admin/src/main/java/com/kym/admin/jobs/StationStatJob.java

@@ -51,7 +51,7 @@ public class StationStatJob {
     /**
      * 日统计，每日下午14:30启动，统计上日数据
      */
-    @Scheduled(cron = "0 30 14 * * ?")
+//    @Scheduled(cron = "0 30 14 * * ?")
     // 定时每日下午14:30
     private void dayStat() {
         log.info("执行站点日统计定时任务-开始");
@@ -67,7 +67,7 @@ public class StationStatJob {
     /**
      * 月统计，每月第一天下午15:00启动，统计上月数据
      */
-    @Scheduled(cron = "0 0 15 1 * ?")
+//    @Scheduled(cron = "0 0 15 1 * ?")
     private void monthStat() {
         log.info("执行站点月统计定时任务-开始");
         var statMonth = LocalDateTime.now().minusMonths(1);

car-wash-miniapp/src/main/java/com/kym/miniapp/config/AliyunLotConfig.java → car-wash-service/src/main/java/com/kym/service/aliyun/lot/AliyunLotConfig.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.config;
+package com.kym.service.aliyun.lot;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

car-wash-service/src/main/java/com/kym/service/awoara/AwoaraService.java

@@ -4,7 +4,6 @@ import com.kym.service.awoara.entity.ApiList;
 import com.kym.service.awoara.entity.Config;
 import com.kym.service.awoara.entity.MethodHelp;
 import com.kym.service.awoara.entity.event.OrderInfo;
-import com.kym.service.awoara.entity.response.AwoaraResponse;
 import com.kym.service.awoara.entity.response.CreateOrder;
 import com.kym.service.awoara.entity.response.HardwareInfo;
 import com.kym.service.awoara.entity.response.State;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/AwoaraServiceImpl.java → car-wash-service/src/main/java/com/kym/service/awoara/AwoaraServiceImpl.java

@@ -1,10 +1,9 @@
-package com.kym.miniapp.mq;
+package com.kym.service.awoara;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
-import com.kym.service.awoara.AwoaraService;
 import com.kym.service.awoara.entity.ApiList;
 import com.kym.service.awoara.entity.Config;
 import com.kym.service.awoara.entity.MethodHelp;
@@ -13,6 +12,7 @@ import com.kym.service.awoara.entity.response.AwoaraResponse;
 import com.kym.service.awoara.entity.response.CreateOrder;
 import com.kym.service.awoara.entity.response.HardwareInfo;
 import com.kym.service.awoara.entity.response.State;
+import com.kym.service.mq.AliyunLotClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +34,7 @@ public class AwoaraServiceImpl implements AwoaraService {
     /**
      * BASE64解码器
      */
-    private static Base64.Decoder decoder = Base64.getDecoder();
+    private static final Base64.Decoder DECODER = Base64.getDecoder();
 
     static <T> T doRequest(String productKey, String deviceName, String params, TypeReference<AwoaraResponse<T>>... typeReference) {
         try {
@@ -42,9 +42,9 @@ public class AwoaraServiceImpl implements AwoaraService {
             AwoaraResponse<T> res;
             if (HTTP_OK == response.getStatusCode()) {
                 if (CommUtil.isNotEmptyAndNull(typeReference)) {
-                    res = JSONObject.parseObject(new String(decoder.decode(response.getBody().payloadBase64Byte), StandardCharsets.UTF_8), typeReference[0]);
+                    res = JSONObject.parseObject(new String(DECODER.decode(response.getBody().payloadBase64Byte), StandardCharsets.UTF_8), typeReference[0]);
                 } else {
-                    res = JSONObject.parseObject(new String(decoder.decode(response.getBody().payloadBase64Byte), StandardCharsets.UTF_8), AwoaraResponse.class);
+                    res = JSONObject.parseObject(new String(DECODER.decode(response.getBody().payloadBase64Byte), StandardCharsets.UTF_8), AwoaraResponse.class);
                 }
                 if (HTTP_OK == res.getCode()) {
                     return res.getData();
@@ -244,7 +244,7 @@ public class AwoaraServiceImpl implements AwoaraService {
                         "light_mode": 2,
                         "light_time_period.1": "00:00 - 05:30",
                         "light_time_period.2": "18:30 - 00:00",
-                        "sound_volume": 60,
+                        "sound_volume": 70,
                         "screen_type": 0,
                         "video_source": 0,
                         "video_play_delay": 20,
@@ -252,9 +252,7 @@ public class AwoaraServiceImpl implements AwoaraService {
                         "bill_delay": 60,
                         "notice_throshold_idle": 300,
                         "notice_throshold_operation": 600,
-                        "motor_mode": 0,
-                        "tts_open_by_button":"欢迎使用超级进化自助洗车机",
-                        "tts_open_by_network":"欢迎使用超级进化自助洗车机"
+                        "motor_mode": 0
                      }
                 }
                 """;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/OrderInfoObject.java

@@ -1,6 +1,5 @@
 package com.kym.service.awoara.entity.event;
 
-import com.kym.service.awoara.entity.event.OrderInfo;
 import lombok.Data;
 
 @Data

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/AliyunLotClient.java → car-wash-service/src/main/java/com/kym/service/mq/AliyunLotClient.java

@@ -1,8 +1,8 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import com.aliyun.iot20180120.models.*;
 import com.aliyun.tea.TeaModel;
-import com.kym.miniapp.config.AliyunLotConfig;
+import com.kym.service.aliyun.lot.AliyunLotConfig;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/AmqpHandler.java → car-wash-service/src/main/java/com/kym/service/mq/AmqpHandler.java

@@ -1,6 +1,6 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
-import com.kym.miniapp.config.AliyunLotConfig;
+import com.kym.service.aliyun.lot.AliyunLotConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.qpid.jms.JmsConnection;
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/ConsumerQueueForTopicDemo.java → car-wash-service/src/main/java/com/kym/service/mq/ConsumerQueueForTopicDemo.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import com.aliyun.mns.client.CloudAccount;
 import com.aliyun.mns.client.CloudQueue;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/HttpEndpointSubscription.java → car-wash-service/src/main/java/com/kym/service/mq/HttpEndpointSubscription.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/MnsHandler.java → car-wash-service/src/main/java/com/kym/service/mq/MnsHandler.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import cn.hutool.core.util.CharsetUtil;
 import com.alibaba.fastjson2.JSONObject;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/PublishMessageDemo.java → car-wash-service/src/main/java/com/kym/service/mq/PublishMessageDemo.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import com.aliyun.mns.client.CloudAccount;
 import com.aliyun.mns.client.CloudTopic;

car-wash-miniapp/src/main/java/com/kym/miniapp/mq/ReceiveMessageDemo.java → car-wash-service/src/main/java/com/kym/service/mq/ReceiveMessageDemo.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.mq;
+package com.kym.service.mq;
 
 import com.aliyun.mns.client.CloudAccount;
 import com.aliyun.mns.client.CloudQueue;