zhanghua
2023-11-16 479b759f08218794c2fba1fee4215504634b0583
代码优化
2个文件已修改
1个文件已添加
110 ■■■■■ 已修改文件
ycl-platform/src/main/resources/application-online.yml 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/application-online.yml
New file
@@ -0,0 +1,88 @@
server:
  port: 8084
  tomcat:
    uri-encoding: UTF-8
  servlet:
    context-path: /sccg
    compression: true
fdfs:
  fileUrl: http://140.143.152.226:8410/
  groupName: sczhzf
  soTimeout: 1500
  connectTimeout: 600
  trackerList:            #TrackerList参数,支持多个
    - 140.143.152.226:22122
    -
cfg:
  res: d://resources
  media-res: 140.143.152.226/media/
  snow-flake:
    datacenterId: 1
    machineId: 1
spring:
  redis:
    database: 0
    host: 127.0.0.1
    port: 6380
    password: Q(yNR2x^%v@HV
    jedis:
      pool:
        max-active: 8
        max-idle: 8
        min-idle: 0
        timeout: 0
  datasource:
    url: jdbc:mysql://10.110.247.252:3306/sccg?characterEncoding=utf-8
    username: toor
    password: v6VGHAzXEu$zF7
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    filters: stat
    maxActive: 20
    initialSize: 1
    maxWait: 60000
    minIdle: 1
    timeBetweenEvictionRunsMillis: 60000
    minEvictableIdleTimeMillis: 300000
    validationQuery: select 'x'
    testWhileIdle: true
    testOnBorrow: false
    testOnReturn: false
    poolPreparedStatements: true
    maxOpenPreparedStatements: 20
e-mail:
  sendHost: smtp.qq.com
  username: 1723292425@qq.com
  password: qizcitupatzoeeij
SMS:
  ecName: 浙江移动信息系统集成有限公司(遂昌)
  apId: sccg
  sign: wg2AOpofE
  url: https://mas.10086.cn
videoPoint:
  url: http://172.28.194.180:7901
  port: 7901
  userName: suichang
  passWord: a12345677
  ip: 10.10.10.10
aliyun:
  oss:
    endpoint: http://oss-cn-zjls-lszwy-d01-a.ops.zjlscloud.com
    keyId: Tkf72Q1gdzETsZf6
    keySecret: tRk39S6B1kSGARRdS4DF6jxr5nBYj5
    bucketName: zhzfptoss
#专有钉钉参数
zzding :
  app-key : SC_ZHZF-IC5g2YiRDW8tug1DfAfiui
  app-secret : 39RIHFOKd8fUeeW9T7CdBcwEqA6dMKx5d3686B6P
  domain-name : openplatform.dg-work.cn
  protocal : https
  tenant-id : 50645661
ycl-platform/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: online
  main:
    allow-circular-references: true
    allow-bean-definition-overriding: true
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
@@ -17,6 +17,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -112,6 +113,19 @@
    public void setLocaleDocumentService(IOdsLocaleDocumentService localeDocumentService) {
        this.localeDocumentService = localeDocumentService;
    }
    @PostConstruct
    public void start() {
        alarmMsgTask();
        queryDataDetectorDaily2Task();
        queryTenMinData();
        listLocale();
        listAlarmRecord();
        listCurAlarm();
        listDataDetectorDailyStats();
        listDetectorDaily();
    }
    @Scheduled(cron = "0 0 1 * * ?")   // 每天零点执行
    // @Scheduled(cron = "0/1 * * * * ?")   // 每秒执行
@@ -289,7 +303,7 @@
                list.forEach(o -> {
                    try {
                        o.setCustomerString(JSON.toJSONString(o.getCustomer()));
                        localeService.save(o);
                        localeService.saveOrUpdate(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
@@ -354,7 +368,7 @@
                list.forEach(o -> {
                    try {
                        o.setAlarmRecordPicsString(JSON.toJSONString(o.getAlarmRecordPics()));
                        alarmRecordService.save(o);
                        alarmRecordService.saveOrUpdate(o);
                    } catch (Exception ex) {
                        System.out.printf(ex.getMessage());
                    }
@@ -498,7 +512,7 @@
                    String listLocaleJson = "{\"Param\":{\"id\":\"" + locale.getId() + "\"}}";
                    String listLocale = HttpUtil.HttpPostWithJson(host + "/admin/listLocale", listLocaleJson, auth);
                    String detectorDailyJson = "{\"LocaleId\":\"" + locale.getId() + "\",\"AcquitAtBegin\":" + (dates[1]- 7*86400) + ",\"AcquitAtEnd\":" + dates[1]  + "}";
                    String detectorDailyJson = "{\"LocaleId\":\"" + locale.getId() + "\",\"AcquitAtBegin\":" + (dates[1] - 7 * 86400) + ",\"AcquitAtEnd\":" + dates[1] + "}";
                    String detectorDaily = HttpUtil.HttpPostWithJson(host + "/admin/queryDataDetectorDaily", detectorDailyJson, auth);
                    String listIntimeDataJson = "{\"StartAt\":0,\"Size\":20,\"mn\":\"" + locale.getMnLast() + "\",\"typ\":2,\"at\":0}";