From d629fe1ff6a7c9c720e5ab94c8eb07a737b4dc0f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 06 八月 2021 16:28:27 +0800
Subject: [PATCH] 添加新疆大学、安科院配置
---
src/main/webapp/WEB-INF/xjdx/xjdx.properties | 10 ++++++++++
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 8 ++++++--
src/main/webapp/resources/images/新疆大学logo.png | 0
src/main/webapp/WEB-INF/aky/aky.properties | 10 ++++++++++
src/main/webapp/WEB-INF/gslab/gslab.properties | 1 +
src/main/webapp/resources/images/新疆维吾尔自治区安全科学技术研究院logo.png | 0
pom.xml | 12 ++++++++++++
7 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d4d0eac..ce7f529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,6 +484,18 @@
<profile.active>zkdsz</profile.active>
</properties>
</profile>
+ <profile>
+ <id>xjdx</id>
+ <properties>
+ <profile.active>xjdx</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>aky</id>
+ <properties>
+ <profile.active>aky</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 0c3bb58..6cb3fa6 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -118,6 +118,7 @@
AND f.user_id= #{user}
WHERE f.id IS NOT NULL
and sr.valid_flag = 1
+ and supplier.valid_flag = 1
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -149,6 +150,7 @@
AND f.user_id = #{user}
AND f.id IS NULL
where sr.valid_flag = 1
+ and supplier.valid_flag = 1
and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
@@ -247,13 +249,12 @@
<select id="getSysReagentListNew" parameterType="java.util.Map" resultMap="SysReagent">
select sr.*, ss.meta_value as product_home_name, ifnull(w.reserve,0) as reserve, bm.meta_value as control_products_name,supplier.name as supplierName
from sys_reagent as sr
-
left join base_meta as ss on sr.product_home = ss.id
left join base_meta bm on bm.id = sr.control_products
left join (select reagent_id, sum(reserve) reserve from ope_warehouse_reserve where valid_flag = 1 group by reagent_id) w on w.reagent_id = sr.id
-
left join sys_supplier supplier on supplier.id = sr.supplier_id
where sr.valid_flag = 1
+ and supplier.valid_flag = 1
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
@@ -299,6 +300,7 @@
left join sys_supplier supplier on supplier.id = sr.supplier_id
LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user}
where sr.valid_flag = 1
+ and supplier.valid_flag = 1
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
</if>
@@ -316,7 +318,9 @@
<select id="getSysReagentTotalCountNew" parameterType="java.util.Map" resultType="int">
select count(1)
from sys_reagent as sr
+ LEFT JOIN sys_supplier ss on ss.id = sr.supplier_id
where sr.valid_flag = 1
+ and ss.valid_flag = 1
<if test="cas != null and cas != ''">
and sr.cas = #{cas}
</if>
diff --git a/src/main/webapp/WEB-INF/aky/aky.properties b/src/main/webapp/WEB-INF/aky/aky.properties
new file mode 100644
index 0000000..d5c16df
--- /dev/null
+++ b/src/main/webapp/WEB-INF/aky/aky.properties
@@ -0,0 +1,10 @@
+jdbc.url=jdbc:mysql://sinanoaq.com:23306/aky_smartlab?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=NMS@uss20201!
+
+institute.id =
+institute.name =\u65B0\u7586\u7EF4\u543E\u5C14\u81EA\u6CBB\u533A\u5B89\u5168\u79D1\u5B66\u6280\u672F\u7814\u7A76\u9662
+institute.url = http://aq.sinanoaq.com:8005
+institute.app.id =
+institute.app.secret =
+alarm.url =
diff --git a/src/main/webapp/WEB-INF/gslab/gslab.properties b/src/main/webapp/WEB-INF/gslab/gslab.properties
index a2cbf01..3b91780 100644
--- a/src/main/webapp/WEB-INF/gslab/gslab.properties
+++ b/src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -1,4 +1,5 @@
jdbc.url=jdbc:mysql://192.168.0.228:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc:mysql://222.92.16.2:13306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
jdbc.username=root
jdbc.password=Gslab@uss2021!
diff --git a/src/main/webapp/WEB-INF/xjdx/xjdx.properties b/src/main/webapp/WEB-INF/xjdx/xjdx.properties
new file mode 100644
index 0000000..d4c4662
--- /dev/null
+++ b/src/main/webapp/WEB-INF/xjdx/xjdx.properties
@@ -0,0 +1,10 @@
+jdbc.url=jdbc:mysql://sinanoaq.com:23306/xjdx_smartlab?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=NMS@uss20201!
+
+institute.id =
+institute.name =\u65B0\u7586\u5927\u5B66
+institute.url = http://aq.sinanoaq.com:8003
+institute.app.id =
+institute.app.secret =
+alarm.url =
diff --git "a/src/main/webapp/resources/images/\346\226\260\347\226\206\345\244\247\345\255\246logo.png" "b/src/main/webapp/resources/images/\346\226\260\347\226\206\345\244\247\345\255\246logo.png"
new file mode 100644
index 0000000..d51b013
--- /dev/null
+++ "b/src/main/webapp/resources/images/\346\226\260\347\226\206\345\244\247\345\255\246logo.png"
Binary files differ
diff --git "a/src/main/webapp/resources/images/\346\226\260\347\226\206\347\273\264\345\220\276\345\260\224\350\207\252\346\262\273\345\214\272\345\256\211\345\205\250\347\247\221\345\255\246\346\212\200\346\234\257\347\240\224\347\251\266\351\231\242logo.png" "b/src/main/webapp/resources/images/\346\226\260\347\226\206\347\273\264\345\220\276\345\260\224\350\207\252\346\262\273\345\214\272\345\256\211\345\205\250\347\247\221\345\255\246\346\212\200\346\234\257\347\240\224\347\251\266\351\231\242logo.png"
new file mode 100644
index 0000000..d51b013
--- /dev/null
+++ "b/src/main/webapp/resources/images/\346\226\260\347\226\206\347\273\264\345\220\276\345\260\224\350\207\252\346\262\273\345\214\272\345\256\211\345\205\250\347\247\221\345\255\246\346\212\200\346\234\257\347\240\224\347\251\266\351\231\242logo.png"
Binary files differ
--
Gitblit v1.9.2