maven
2025-12-01 6ecd163bb1bf043845d109f4549a27cdcfc3841f
yys  配置文件
已修改18个文件
100 ■■■■ 文件已修改
basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main-business/src/main/java/com/ruoyi/business/controller/SalesRecordController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-bhmy.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-cjny.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-hbxm.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-hcmy.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-jjxm.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-jlsn.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-jsmy.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-jsyny.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-mkzs.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-rzny.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-tjxm.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-xyhb.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.entity.Customer;
import com.ruoyi.basic.service.CustomerService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -54,6 +55,21 @@
    }
    /**
     * 批量新增
     */
    @PostMapping("/addBatch")
    @Operation(summary = "客户信息表-批量新增")
    public R addBatch(@RequestBody List<CustomerDto> list) {
        if (list.size() == 0) {
            return R.fail("请选择要导入的数据");
        }
        list.forEach(item -> {
            customerService.addOrEditCustomer(item);
        });
       return R.ok();
    }
    /**
     * 删除
     */
    @DeleteMapping("/delCustomer")
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
@@ -6,6 +6,8 @@
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.SupplyService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/supply")
@Tag(name = "供应商信息表")
public class SupplyController {
    private SupplyService supplyService;
@@ -54,6 +57,21 @@
    }
    /**
     * 批量新增
     */
    @PostMapping("/addBatch")
    @Operation(summary = "供应商信息表-批量新增")
    public R addBatch(@RequestBody List<SupplyDto> list) {
        if (list.size() == 0) {
            return R.fail("请选择要导入的数据");
        }
        list.forEach(item -> {
            supplyService.addOrEditSupply(item);
        });
       return R.ok();
    }
    /**
     * 删除
     */
    @DeleteMapping("/delSupply")
main-business/src/main/java/com/ruoyi/business/controller/PurchaseRegistrationController.java
@@ -6,8 +6,11 @@
import com.ruoyi.business.entity.PurchaseRegistration;
import com.ruoyi.business.service.PurchaseRegistrationService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * <p>
@@ -42,6 +45,21 @@
    }
    /**
     * 批量新增
     */
    @PostMapping("/addBatch")
    @Operation(summary = "采购登记表-批量新增")
    public R addBatch(@RequestBody List<PurchaseRegistrationDto> list) {
        if (list.size() == 0) {
            return R.fail("请选择要导入的数据");
        }
        list.forEach(item -> {
            purchaseRegistrationService.addOrEditPR(item);
        });
        return R.ok();
    }
    /**
     * 采购登记表删除
     */
    @DeleteMapping("/delPR")
main-business/src/main/java/com/ruoyi/business/controller/SalesRecordController.java
@@ -7,9 +7,12 @@
import com.ruoyi.business.entity.SalesRecord;
import com.ruoyi.business.service.SalesRecordService;
import com.ruoyi.common.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * <p>
@@ -45,6 +48,21 @@
    }
    /**
     * 批量新增
     */
    @PostMapping("/addBatch")
    @Operation(summary = "销售记录表-批量新增")
    public R addBatch(@RequestBody List<SalesRecordDto> list) {
        if (list.size() == 0) {
            return R.fail("请选择要导入的数据");
        }
        list.forEach(item -> {
            salesRecordService.addOrEditSalesRecord(item);
        });
        return R.ok();
    }
    /**
     * 销售记录表删除
     */
    @DeleteMapping("/delSalesRecord")
ruoyi-admin/src/main/resources/application-bhmy.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-bhmy
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-bhmy
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-cjny.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-cjny
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-cjny
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-druid.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-demo
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-demo
                username: root
                password: xd@123456..
            # 从库数据源
@@ -87,7 +87,7 @@
        # redis 配置
        redis:
            # 地址
            host: 192.168.1.185
            host: 172.17.0.1
            # 端口,默认为6379
            port: 6379
            # 数据库索引
ruoyi-admin/src/main/resources/application-hbxm.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-hbxm
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-hbxm
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-hcmy.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-hcmy
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-hcmy
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-jjxm.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-jjxm
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-jjxm
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-jlsn.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-jlsn
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-jlsn
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-jsmy.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-jsmy
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-jsmy
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-jsyny.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-jsyny
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-jsyny
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-mkzs.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-mkzs
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-mkzs
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-rzny.yml
@@ -28,7 +28,7 @@
                #                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://192.168.1.185:5432/zd_production-rzny
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-rzny
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-tjxm.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-tjxm
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-tjxm
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application-xyhb.yml
@@ -29,7 +29,7 @@
                #                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://192.168.1.185:5432/zd_production-xyhb
                url: jdbc:postgresql://172.17.0.1:5432/zd_production-xyhb
                username: root
                password: xd@123456..
            # 从库数据源
ruoyi-admin/src/main/resources/application.yml
@@ -36,7 +36,7 @@
    # 国际化资源文件路径
    basename: i18n/messages
  profiles:
    active: druid
    active: jsyny
  # 文件上传
  servlet:
    multipart: