8.20合并代码

zss

2024-08-20 970e7b9336aeb7e35c2bbef18bb1d6c1be0f41f7

8.20合并代码

 system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java

@@ -20,7 +20,7 @@
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/performance-server"; // 如果为分布式填子模块名称，如果不是分布式为空即可
    public static String model_name = "/cnas-server"; // 如果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.mom"; // 包路径
    public static String tablePrefix = "device_"; // 设置过滤表前缀
    public static void main(String[] args) {

 system-run/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
# 数据库备份路径
backup:
  # 数据库备份路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++
  path: #D:\Download\log
  path: D:\Download\log
  # 数据库备份天数
  destiny: 7
  # 数据库备份工具路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++
@@ -37,7 +37,10 @@
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    url: jdbc:mysql://localhost:3306/11?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    url: jdbc:mysql://10.1.200.86:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    url: jdbc:mysql://10.16.173.59:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    url: jdbc:mysql://10.1.13.77:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: root
    password: 123456
@@ -67,7 +70,7 @@
    # redis端口（默认为6379）
    port: 6379
    # redis访问密码（默认为空）
    password:
    password: 123456
    # redis连接超时时间（单位毫秒）
    timeout: 50
    # redis连接池配置

 system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java

@@ -1,13 +1,42 @@
package com.yuanchu.mom;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.mom.exception.ErrorException;
import org.apache.el.lang.ExpressionBuilder;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.time.temporal.WeekFields;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;


@SpringBootTest
class SystemRunApplicationTest {

    @Test
    void  contextLoads() {
    void contextLoads() {
        String b=null;
        BigDecimal decimal1 = new BigDecimal("20");
        BigDecimal decimal2 = new BigDecimal(b == null ?"0":b);
        BigDecimal decimal3 = new BigDecimal("10");
        if (decimal1.compareTo(decimal2)>0 && decimal1.compareTo(decimal3)>0){
            System.out.println("√");
        }

    }


}