From b51f37241e4b369718d5e27a3686ca7edadaf69b Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 06 三月 2025 16:37:52 +0800
Subject: [PATCH] 新增工时查询接口, 修改配置文件
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 29 +++
ruoyi-admin/src/main/resources/application-test.yml | 153 +++++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java | 10 +
ruoyi-admin/src/main/resources/application.yml | 43 -----
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml | 14 ++
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 22 +++
performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java | 10 +
ruoyi-admin/src/main/resources/application-prod.yml | 37 +++++
ruoyi-admin/src/main/resources/application-druid.yml | 37 +++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 3
performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java | 9 +
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java | 13 +
13 files changed, 339 insertions(+), 44 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 347696b..46c968f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -1,6 +1,7 @@
package com.ruoyi.inspect.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
@@ -14,7 +15,10 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.service.InsOrderFileService;
import com.ruoyi.inspect.service.InsOrderPlanService;
+import com.ruoyi.inspect.service.InsOrderRatesService;
import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -36,10 +40,9 @@
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
-
private InsOrderFileService insOrderFileService;
-
private InsProductService insProductService;
+ private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -263,4 +266,26 @@
public Result<?> delProductTreeByProductId(Integer productId) {
return Result.success(insProductService.removeBindingProductTree(productId));
}
+
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @return
+ */
+ @ApiOperation(value = "鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏")
+ @PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
+ @GetMapping("/getWorkingHoursByOrderId")
+ public Result<IPage<AuxiliaryOutputWorkingHoursTemporary>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
+ }
+
+ /**
+ * 淇敼宸ユ椂璇︽儏
+ * @return
+ */
+ @ApiOperation(value = "淇敼宸ユ椂璇︽儏")
+ @PreAuthorize("@ss.hasPermi('update:order:workingHours')")
+ @PostMapping("/updateWorkingHours")
+ public Result updateWorkingHours(@RequestBody AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return Result.success(auxiliaryOutputWorkingHoursTemporaryService.updateById(workingHoursTemporary));
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
index 9f7fef2..8464b1c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.inspect.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.pojo.InsOrderRates;
+import org.apache.ibatis.annotations.Param;
/**
* 璁㈠崟璐圭敤琛�
@@ -11,5 +16,10 @@
*/
public interface InsOrderRatesMapper extends BaseMapper<InsOrderRates> {
+ /**
+ * 鏌ヨ璁㈠崟璐圭敤鍒楄〃
+ * @return
+ */
+ IPage<SampleOrderDto> selectInsOrderRates(Page page, @Param("ew") QueryWrapper<SampleOrderDto> ew);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
index 592f6fb..43178e5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.mapper.InsOrderRatesMapper;
import com.ruoyi.inspect.pojo.InsOrderRates;
@@ -26,7 +27,7 @@
*/
@Override
public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
- return null;
+ return baseMapper.selectInsOrderRates(page, QueryWrappers.queryWrappers(sampleOrderDto));
}
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 28495bc..186e0a1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -442,6 +442,9 @@
if (StringUtils.isBlank(product.getAsk()) || StringUtils.isBlank(product.getTell())) {
throw new ErrorException("鏈夋楠岄」鐨勮姹傚�兼垨瑕佹眰鎻忚堪涓虹┖, 璇峰厛鍘绘爣鍑嗗簱閰嶇疆瑕佹眰鍊兼垨瑕佹眰鎻忚堪");
}
+ if (StringUtils.isBlank(product.getSonLaboratory())) {
+ throw new ErrorException("鏈夋楠岄」鐨勭殑瀛愬疄楠屽涓虹粦瀹�, 璇峰厛缁戝畾瀛愬疄楠屽");
+ }
insProductMapper.insert(product);
}
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
new file mode 100644
index 0000000..82ede85
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -0,0 +1,22 @@
+<?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.inspect.mapper.InsOrderRatesMapper">
+ <!-- 鏌ヨ璐圭敤鍒楄〃 -->
+ <select id="selectInsOrderRates" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
+ select *
+ from (select io.*,
+ case
+ when
+ io.type_source = 0
+ then io.sample_view
+ else io.sample end sample,
+ GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
+ from ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+ group by io.id) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+</mapper>
diff --git a/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java b/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
index 0f9be14..524a730 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.performance.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import org.apache.ibatis.annotations.Param;
/**
* 宸ユ椂鏆傚瓨琛�
@@ -11,5 +15,11 @@
*/
public interface AuxiliaryOutputWorkingHoursTemporaryMapper extends BaseMapper<AuxiliaryOutputWorkingHoursTemporary> {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @return
+ */
+ IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, @Param("ew") QueryWrapper<AuxiliaryOutputWorkingHoursTemporary> ew);
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
index dd5078e..b86c132 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
@@ -1,5 +1,7 @@
package com.ruoyi.performance.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.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
@@ -11,5 +13,12 @@
*/
public interface AuxiliaryOutputWorkingHoursTemporaryService extends IService<AuxiliaryOutputWorkingHoursTemporary> {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @param workingHoursTemporary
+ * @return
+ */
+ IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary);
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
index 09e3154..8ae2353 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
@@ -1,6 +1,9 @@
package com.ruoyi.performance.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
@@ -15,5 +18,15 @@
@Service
public class AuxiliaryOutputWorkingHoursTemporaryServiceImpl extends ServiceImpl<AuxiliaryOutputWorkingHoursTemporaryMapper, AuxiliaryOutputWorkingHoursTemporary> implements AuxiliaryOutputWorkingHoursTemporaryService {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @param workingHoursTemporary
+ * @return
+ */
+ @Override
+ public IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return baseMapper.getWorkingHoursByOrderId(page, QueryWrappers.queryWrappers(workingHoursTemporary));
+ }
}
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
new file mode 100644
index 0000000..106206c
--- /dev/null
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
@@ -0,0 +1,14 @@
+<?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.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper">
+
+ <!-- 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏 -->
+ <select id="getWorkingHoursByOrderId"
+ resultType="com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary">
+ select *
+ from auxiliary_output_working_hours_temporary
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index f466a7f..722d41f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -1,3 +1,5 @@
+# 鏈湴
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -60,6 +62,41 @@
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # # 瀵嗙爜
+ # password: root2022!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
minio:
endpoint: http://114.132.189.42/
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 32be6bd..8b41a4d 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,3 +1,5 @@
+# 鍏徃娴嬭瘯搴�
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -60,6 +62,41 @@
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 1
+ # 瀵嗙爜
+ password: root2022!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
minio:
endpoint: http://114.132.189.42/
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
new file mode 100644
index 0000000..183b9a1
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -0,0 +1,153 @@
+# 瑁呭娴嬭瘯搴撻厤缃�
+
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ url: jdbc:mysql://localhost:3306/center-lims-dz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: zttZTT123!
+
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+ connectTimeout: 30000
+ # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+ socketTimeout: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # # 瀵嗙爜
+ password: zttZTT123!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+
+#minio:
+# endpoint: http://114.132.189.42/
+# port: 7019
+# secure: false
+# accessKey: admin
+# secretKey: 12345678
+# preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+ path: /center-lims/Work/img
+ # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+ allowed: png,jpg,jpeg,gif
+
+wordUrl: /center-lims/Work/word
+twoCode: /center-lims/Work/two_code
+
+
+#oa:
+# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
+# prodIp: http://192.168.21.53:8081
+# unqualifiedProcessId: 41974
+
+wechat:
+ # 璐ㄩ噺鎶ユ閫氱煡
+ examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
+
+ifs:
+ contract: ZTZB
+ contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
+ contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
+ custorder: http://192.168.20.47/PurchService.ashx?
+ custorder-port: http://192.168.20.47:8008/PurchService.ashx?
+ erp-services: http://192.168.20.47:8081
+
+# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
+mqtt:
+ url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
+ username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: javaPublish # clientId
+ subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8a825d3..54fd4cb 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -15,8 +15,8 @@
# 寮�鍙戠幆澧冮厤缃�
server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8002
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛
+ port: 8001
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -70,28 +70,6 @@
# restart:
# # 鐑儴缃插紑鍏�
# enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
-# # 瀵嗙爜
-# password: root2022!
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
# token閰嶇疆
token:
@@ -108,11 +86,6 @@
supportMethodsArguments: true
params: count=countSql
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
-
# 闃叉XSS鏀诲嚮
xss:
# 杩囨护寮�鍏�
@@ -122,16 +95,4 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-# mybatis-plus閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:mapper/**/*Mapper.xml
- type-aliases-package: com.ruoyi.**.domain
- global-config:
- banner: off
- db-config:
- id-type: auto
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
--
Gitblit v1.9.3