From b87cf2da4364d61675dd1fa54dc9b0545ac694da Mon Sep 17 00:00:00 2001 From: aikai Date: Thu, 28 Mar 2024 17:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dev=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20-=20=E8=BF=87=E6=BB=A4=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yaml | 21 +++++++++++++++++++ .../src/main/resources/bootstrap-local.yaml | 4 ++-- .../oa/BpmOAProcurePayServiceImpl.java | 2 +- .../src/main/resources/application-dev.yaml | 12 +++++------ .../src/main/resources/application-dev.yaml | 12 +++++------ .../src/main/resources/application-dev.yaml | 12 +++++------ .../factory/FactoryScreenDataController.java | 10 ++++----- .../src/main/resources/application-dev.yaml | 12 +++++------ 8 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 yudao-gateway/src/main/resources/bootstrap-dev.yaml diff --git a/yudao-gateway/src/main/resources/bootstrap-dev.yaml b/yudao-gateway/src/main/resources/bootstrap-dev.yaml new file mode 100644 index 00000000..ccbc4424 --- /dev/null +++ b/yudao-gateway/src/main/resources/bootstrap-dev.yaml @@ -0,0 +1,21 @@ +--- #################### 注册中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 192.168.1.105:8848 + discovery: + namespace: dev # 命名空间。这里使用 dev 开发环境 + +--- #################### 配置中心相关配置 #################### + +spring: + cloud: + nacos: + # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 + config: + server-addr: 192.168.1.105:8848 # Nacos 服务器地址 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name + file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-gateway/src/main/resources/bootstrap-local.yaml b/yudao-gateway/src/main/resources/bootstrap-local.yaml index 0c5ff27a..6e338949 100644 --- a/yudao-gateway/src/main/resources/bootstrap-local.yaml +++ b/yudao-gateway/src/main/resources/bootstrap-local.yaml @@ -5,7 +5,7 @@ spring: nacos: server-addr: 127.0.0.1:8848 discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: local # 命名空间。这里使用 dev 开发环境 --- #################### 配置中心相关配置 #################### @@ -15,7 +15,7 @@ spring: # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 config: server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: local # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java index 58e3c4ff..79af9aa5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java @@ -17,7 +17,6 @@ import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAProcurePayItemConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcureDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcurePayDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcurePayItemDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAProcureMapper; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAProcurePayItemMapper; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAProcurePayMapper; @@ -142,6 +141,7 @@ public class BpmOAProcurePayServiceImpl extends BpmOABaseService implements BpmO //根据用户ids 获取所有可用采购单 return oaProcureMapper.selectList(new LambdaQueryWrapperX() .in(BpmOAProcureDO::getUserId, userIds) + .eq(BpmOAProcureDO::getResult, BpmProcessInstanceResultEnum.APPROVE) .eq(BpmOAProcureDO::getPayFlag, BpmOAProcureDO.FLAG_FALSE) ); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml index b335b292..023bbe87 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml @@ -40,23 +40,23 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.1.101 # 地址 + host: 192.168.1.105 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + password: yhtkj@2024! # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml index 2c55a855..12eed2fd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml @@ -40,23 +40,23 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.1.101 # 地址 + host: 192.168.1.105 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + password: yhtkj@2024! # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml index f128b07d..8a3fb97c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml @@ -40,23 +40,23 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.1.101 # 地址 + host: 192.168.1.105 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + password: yhtkj@2024! # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 #################### diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java index 596df041..61f85af3 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.*; -import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factory.SfFactoryInfoDO; -import cn.iocoder.yudao.module.smartfactory.service.factory.SfFactoryInfoService; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; +import cn.iocoder.yudao.module.smartfactory.service.factoryinfo.FactoryInfoService; import cn.iocoder.yudao.module.smartfactory.service.screendata.ScreenDataService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,7 +29,7 @@ public class FactoryScreenDataController { @Resource private ScreenDataService screenDataService; @Resource - private SfFactoryInfoService sfFactoryInfoService; + private FactoryInfoService factoryInfoService; /** * @param code @@ -169,8 +169,8 @@ public class FactoryScreenDataController { @GetMapping("/getFactoryInfoById") @Operation(summary = "获取工厂详情") @PermitAll - public CommonResult getFactoryInfoById(@RequestParam Long factoryId) { - SfFactoryInfoDO sfFactoryInfo = sfFactoryInfoService.getSfFactoryInfo(factoryId); + public CommonResult getFactoryInfoById(@RequestParam Long factoryId) { + FactoryInfoDO sfFactoryInfo = factoryInfoService.getFactoryInfo(factoryId); return success(sfFactoryInfo); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml index 8e97c1ed..43b40e6d 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml @@ -40,23 +40,23 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://192.168.1.101:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.1.105:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 driver-class-name: com.mysql.jdbc.Driver username: root - password: yhtkj2024! + password: yhtkj@2024! # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.1.101 # 地址 + host: 192.168.1.105 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + password: yhtkj@2024! # 密码，建议生产环境开启 --- #################### MQ 消息队列相关配置 ####################