docker-compose.yml.example

@@ -4,7 +4,7 @@
    image: zd-after-app
    container_name: zd-after # å®¹å™¨åç§°
    ports:
      - 7016:7016 # æŒ‡å®šå®¿ä¸»æœºç«¯å£ä¸Žå®¹å™¨ç«¯å£æ˜ å°„关系，宿主机：容器
      - 8088:8088 # æŒ‡å®šå®¿ä¸»æœºç«¯å£ä¸Žå®¹å™¨ç«¯å£æ˜ å°„关系，宿主机：容器
    restart: always # å®¹å™¨å¼€æœºè‡ªå¯
    privileged: true # èŽ·å–宿主机root权限


 main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java

@@ -2,15 +2,13 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.entity.CarbonCubes;
import com.ruoyi.business.service.CarbonCubesService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
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.*;

@RestController
@AllArgsConstructor
@@ -31,4 +29,9 @@
         return carbonCubesService.remove(new QueryWrapper<CarbonCubes>()
                 .lambda().eq(CarbonCubes::getBillNumber,carbonCubes.getBillNumber()))? R.ok() : R.fail();
    }

    @GetMapping("/page")
    public R page(CarbonCubes carbonCubes, Page<CarbonCubes> page) {
        return R.ok(carbonCubesService.pageCarbonCubes(page, carbonCubes));
    }
}

 main-business/src/main/java/com/ruoyi/business/entity/CarbonCubes.java

@@ -1,6 +1,7 @@
package com.ruoyi.business.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -42,5 +43,9 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate createTime;

    
    //运费
    private BigDecimal freightPrice;


}

 main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java

@@ -1,9 +1,13 @@
package com.ruoyi.business.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.entity.CarbonCubes;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@Mapper
public interface CarbonCubesMapper extends BaseMapper<CarbonCubes> {
    IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, @Param("ew") CarbonCubes carbonCubes);
}

 main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java

@@ -1,9 +1,13 @@
package com.ruoyi.business.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.business.entity.CarbonCubes;
import com.ruoyi.common.core.domain.R;

public interface CarbonCubesService extends IService<CarbonCubes> {
    R addCarbonCubes(CarbonCubes carbonCubes);

    IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, CarbonCubes carbonCubes);
}

 main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java

@@ -1,7 +1,9 @@
package com.ruoyi.business.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.mapper.CoalInfoMapper;
@@ -22,7 +24,8 @@
public class CarbonCubesServiceImpl extends ServiceImpl<CarbonCubesMapper, CarbonCubes> implements CarbonCubesService {
    @Autowired
    private final CoalInfoMapper coalInfoMapper;

    @Autowired
    private CarbonCubesMapper carbonCubesMapper;


    @Override
@@ -52,4 +55,9 @@
        }
        return R.ok();
    }

    @Override
    public IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, CarbonCubes carbonCubes) {
        return carbonCubesMapper.pageCarbonCubes(page, carbonCubes);
    }
}

 main-business/src/main/resources/mapper/CarbonCubesMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.business.mapper.CarbonCubesMapper">


    <select id="pageCarbonCubes" resultType="com.ruoyi.business.entity.CarbonCubes">
        select * from carbon_cubes
        <where>
            <if test="ew.coal != null and ew.coal != null ">
                and coal like concat('%',#{ew.coal},'%')
            </if>
            <if test="ew.orderType != null and ew.orderType != ''">
                and order_type = #{ew.orderType}
            </if>
        </where>
    </select>
</mapper>

 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,8 +1,11 @@
package com.ruoyi;

import eu.bitwalker.useragentutils.Application;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableScheduling;

/**
@@ -17,7 +20,19 @@
    public static void main(String[] args)
    {
        // System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(RuoYiApplication.class, args);
        ConfigurableApplicationContext run = SpringApplication.run(RuoYiApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  è‹¥ä¾å¯åŠ¨æˆåŠŸ   áƒš(´ڡ`ლ)ﾞ");


        // èŽ·å–Environment实例
        Environment env = run.getEnvironment();

        // èŽ·å–端口号和上下文路径
        String serverPort = env.getProperty("server.port");
        String contextPath = env.getProperty("server.servlet.context-path", "");

        // æ‰“印启动信息
        System.out.println("\n\n===========> ç³»ç»Ÿå¯åŠ¨æˆåŠŸï¼åŽå°åœ°å€ï¼šhttp://localhost:" + serverPort + contextPath);

    }
}

 ruoyi-admin/src/main/resources/application-druid.yml.example1

@@ -11,9 +11,9 @@
#                url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                pg
#                url: jdbc:postgresql://localhost:5433/ruoyi-zd
                url: jdbc:postgresql://localhost:5433/zd-02
                url: jdbc:postgresql://172.17.0.1:5432/zd_production
                username: postgres
                password: 123456
                password: bYD#nM+-BiLb
            # ä»Žåº“数据源
            slave:
                # ä»Žæ•°æ®æºå¼€å…³/默认关闭
@@ -69,15 +69,14 @@
        # redis é…ç½®
        redis:
            # åœ°å€
            host: 127.0.0.1
            host: 172.17.0.1
            # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
            port: 6379
            # æ•°æ®åº“索引
            database: 0
            # å¯†ç 
#            password: root2022!
            #      password: 123456
            password: 123456
            password: root2022!
            # password: 123456
            # è¿žæŽ¥è¶…时时间
            timeout: 10s
            lettuce:

 ruoyi-admin/src/main/resources/mybatis/application.yml.example

@@ -16,7 +16,7 @@
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口，默认为8080
  port: 8081
  port: 8088
  servlet:
    # åº”用的访问路径
    context-path: /
@@ -65,29 +65,6 @@
    restart:
      # çƒ­éƒ¨ç½²å¼€å…³
      enabled: false
  data:
    # redis é…ç½®
    redis:
      # åœ°å€
      host: localhost
      # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
      port: 6379
      # æ•°æ®åº“索引
      database: 0
      # å¯†ç 
      password:
      # è¿žæŽ¥è¶…时时间
      timeout: 10s
      lettuce:
        pool:
          # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
          min-idle: 0
          # è¿žæŽ¥æ± ä¸­çš„最大空闲连接
          max-idle: 8
          # è¿žæŽ¥æ± çš„最大数据库连接数
          max-active: 8
          # #连接池最大阻塞等待时间（使用负值表示没有限制）
          max-wait: -1ms

# token配置
token:
@@ -135,3 +112,6 @@
  excludes: /system/notice
  # åŒ¹é…é“¾æŽ¥
  urlPatterns: /system/*,/monitor/*,/tool/*
file:
  upload-dir: /upload/file
  file-url: http://localhost:8081/file

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@
            .authorizeHttpRequests((requests) -> {
                permitAllUrl.getUrls().forEach(url -> requests.requestMatchers(url).permitAll());
                // å¯¹äºŽç™»å½•login æ³¨å†Œregister éªŒè¯ç captchaImage å…è®¸åŒ¿åè®¿é—®
                requests.requestMatchers("/login", "/register", "/captchaImage").permitAll()
                requests.requestMatchers("/login", "/register", "/captchaImage","carboncubes").permitAll()
                    // é™æ€èµ„源，可匿名访问
                    .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**.html", "/**.css", "/**.js", "/profile/**").permitAll()
                    .requestMatchers("/swagger-ui.html", "/v3/api-docs/**", "/swagger-ui/**", "/druid/**").permitAll()