From d11807a7506cd560df0a22bd712494df381f2bf6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 09:52:17 +0800
Subject: [PATCH] 修改bug3.0 9.8
---
inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java | 2 +-
system-run/src/main/resources/application-dev.yml | 4 ++--
standard-server/src/main/resources/mapper/TechnologyMapper.xml | 2 +-
base-server/src/main/resources/mapper/DeviceMapper.xml | 2 +-
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 9509b45..d3ae2f5 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or name like concat('%',#{message},'%')
+ or device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 1f593da..088dc3b 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -16,7 +16,7 @@
<result property="name" column="father"/>
</resultMap>
<select id="selectAllTechTem" resultMap="selectAllTechTemMap">
- select e.name elname,
+ select e.name elname,
father
from mom_ocean.technology_template t,
mom_ocean.element e,
@@ -24,6 +24,7 @@
where e.id = et.element_id
and t.id = tech_tem_id
and t.state = 1
+ and et.state=1
and type=#{type}
<if test="message!=null and message!=''">
and father like concat('%',#{message},'%')
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
index e7d2ba5..a1d1766 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
@@ -58,7 +58,7 @@
@PostMapping("/compile")
public Result compile(Integer id) {
ordersService.compile(id);
- return Result.success("缂栧埗浜у搧"+id+"瀹屾垚!");
+ return Result.success("缂栧埗浜у搧瀹屾垚!");
}
}
diff --git a/standard-server/src/main/resources/mapper/TechnologyMapper.xml b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
index c01980b..b4b32e1 100644
--- a/standard-server/src/main/resources/mapper/TechnologyMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
@@ -12,7 +12,7 @@
<!--鍙充晶鏁版嵁灞曠ず 宸ヨ壓璺嚎-->
<resultMap id="selectAllTecMap" type="map">
- <id property="name" column="father"/>
+ <id property="father" column="father"/>
<collection property="children" resultMap="selectAllTecMaps" javaType="List"/>
</resultMap>
<resultMap id="selectAllTecMaps" type="map">
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index af31743..7eb7e36 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -34,7 +34,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.218.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.0.22:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
druid:
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.218.113
+ host: 192.168.0.22
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3