1.修改应用启动名称2修改自建站解析刻度数据插入sql,使其兼容oracle和postgresql
This commit is contained in:
parent
f4c3fa55a7
commit
1bb5e40bad
|
@ -32,8 +32,6 @@
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<insert id="createBatch" parameterType="org.jeecg.modules.base.entity.rnauto.GardsCalibration">
|
<insert id="createBatch" parameterType="org.jeecg.modules.base.entity.rnauto.GardsCalibration">
|
||||||
begin
|
|
||||||
<foreach collection="calibrations" separator=";" close=";" item="calibration">
|
|
||||||
insert into RNAUTO.GARDS_CALIBRATION(
|
insert into RNAUTO.GARDS_CALIBRATION(
|
||||||
SAMPLE_ID,
|
SAMPLE_ID,
|
||||||
IDANALYSIS,
|
IDANALYSIS,
|
||||||
|
@ -46,6 +44,7 @@
|
||||||
COEFF_STRING,
|
COEFF_STRING,
|
||||||
moddate)
|
moddate)
|
||||||
values
|
values
|
||||||
|
<foreach collection="calibrations" separator="," item="calibration">
|
||||||
(#{calibration.sampleId},
|
(#{calibration.sampleId},
|
||||||
#{calibration.idAnalysis},
|
#{calibration.idAnalysis},
|
||||||
#{calibration.sampleType},
|
#{calibration.sampleType},
|
||||||
|
@ -57,7 +56,6 @@
|
||||||
#{calibration.coeffString},
|
#{calibration.coeffString},
|
||||||
#{calibration.moddate})
|
#{calibration.moddate})
|
||||||
</foreach>
|
</foreach>
|
||||||
end;
|
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class JeecgAbnormalAlarmApplication extends SpringBootServletInitializer
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application AbnormalAlarm is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class JeecgAppProcessStart extends SpringBootServletInitializer implement
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application AppProcess is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application AutoProcess is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class JeecgLogManageApplication extends SpringBootServletInitializer impl
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application LogManage is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application SpectrumAnalysis is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class JeecgStationOperationApplication extends SpringBootServletInitializ
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application StationOperation is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application SystemCloud is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer
|
||||||
String port = env.getProperty("server.port");
|
String port = env.getProperty("server.port");
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info("\n----------------------------------------------------------\n\t" +
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
"Application WebStatistics is running! Access URLs:\n\t" +
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
||||||
|
|
Loading…
Reference in New Issue
Block a user