Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no commit message

Browse Source
This commit is contained in:
ICEC
2020-07-16 22:07:13 +08:00
parent d96936ba38
commit 53dc52e9c8
5 changed files with 182 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
View File

@ -341,7 +341,6 @@ public class DB_Ajax_DashBoard_48102 {
"CAST (" +
" REPLACE( db1.line, '#', '' ) AS INT)";
Statement stmt = conn.createStatement();//
System.out.println(sql);
ResultSet rs = stmt.executeQuery(sql);
while (rs.next()) {
// 截面积(mm2)

74
ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_ChangeMouldTime_48102.java
View File

@ -76,28 +76,78 @@ public class DB_Ajax_DashBoard_ChangeMouldTime_48102 {
}
public static List<HashMap<String,String>> DoGet_avg_changemouldtime_date_range(String fstarttime, String fendtime) {
public static List<HashMap<String,String>> DoGetChangeMouldTimeListDateRange(String fstarttime, String fendtime) {
List<HashMap<String,String>> hashMapList = new ArrayList<>();
try {
Connection conn = getSQLConnection();
String sql = "SELECT AVG\r\n" +
" (\r\n" +
" DATEDIFF( MINUTE, StartTime, EndTime )) AS avgchangemouldtime \r\n" +
"FROM\r\n" +
" dbo.MouldingDisplayBoard \r\n" +
"WHERE\r\n" +
"\tChangeMould = 1 and \tDATEDIFF( minute,starttime, endtime) > 20\n" +
" AND Deleted = 0 \r\n" +
" AND StartTime > '" + fstarttime + "' \r\n" +
" AND endtime < '" + fendtime + "'";
String sql = "SELECT\n" +
"\tLine,\n" +
"\tLEFT ( MouldingStyleCode, charindex( '-', MouldingStyleCode ) - 1 ) AS Mould,\n" +
"\tMouldingStyleCode,\n" +
"\tStartTime,\n" +
"\tEndTime,\n" +
"\tDATEDIFF( MINUTE, starttime, endtime ) AS ChangeMouldTime \n" +
"FROM\n" +
"\t[dbo].[MouldingDisplayBoard] \n" +
"WHERE\n" +
"\tChangeMould = 1 \n" +
"\tAND DATEDIFF( MINUTE, starttime, endtime ) > 20 \n" +
"\tAND endtime >= '"+fstarttime+"' \n" +
"\tAND endtime <= '"+fendtime+"' \n" +
"ORDER BY\n" +
"\tstarttime DESC";
Statement stmt = conn.createStatement();//
ResultSet rs = stmt.executeQuery(sql);
while (rs.next()) {
// 截面积(mm2)
HashMap<String,String> map = new HashMap<>();
map.put("Line",rs.getString("Line"));
map.put("Mould",rs.getString("Mould"));
map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
map.put("StartTime",rs.getString("StartTime"));
map.put("EndTime",rs.getString("EndTime"));
map.put("ChangeMouldTime",rs.getString("ChangeMouldTime"));
hashMapList.add(map);
}
rs.close();
stmt.close();
conn.close();
} catch (SQLException e) {
e.printStackTrace();
}
return hashMapList;
}
public static List<HashMap<String,String>> DoGet_avg_changemouldtime_date_range(String fstarttime, String fendtime) {
List<HashMap<String,String>> hashMapList = new ArrayList<>();
try {
Connection conn = getSQLConnection();
String sql = "SELECT AVG\n" +
"\t(\n" +
"\tDATEDIFF( MINUTE, StartTime, EndTime )) AS avgchangemouldtime , count\n" +
"\t(\n" +
"\tDATEDIFF( MINUTE, StartTime, EndTime )) AS num \n" +
"FROM\n" +
"\tdbo.MouldingDisplayBoard \n" +
"WHERE\n" +
"\tChangeMould = 1 \n" +
"\tAND DATEDIFF( MINUTE, starttime, endtime ) > 20 \n" +
"\tAND Deleted = 0 " +
" AND StartTime > '" + fstarttime + "' \r\n" +
" AND endtime < '" + fendtime + "'";
Statement stmt = conn.createStatement();//
ResultSet rs = stmt.executeQuery(sql);
while (rs.next()) {
// 截面积(mm2)
HashMap<String,String> map = new HashMap<>();
map.put("avgchangemouldtime",rs.getString("avgchangemouldtime"));
map.put("num",rs.getString("num"));
hashMapList.add(map);
}

10
ruoyi/src/main/java/com/ruoyi/project/fx_changemouldtime/controller/ChangeMouldTimeController.java
View File

@ -19,11 +19,19 @@ public class ChangeMouldTimeController extends BaseController
{
// @PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping("/list")
public AjaxResult get30Day() throws Exception
public AjaxResult DoGetChangeMouldTimeList() throws Exception
{
return AjaxResult.success(DB_Ajax_DashBoard_ChangeMouldTime_48102.DoGetChangeMouldTimeList());
}
@GetMapping("/DoGetChangeMouldTimeListDateRange/{fDateStart}/{fDateEnd}")
public AjaxResult DoGetChangeMouldTimeListDateRange(@PathVariable String fDateStart, @PathVariable String fDateEnd) throws Exception
{
return AjaxResult.success(DB_Ajax_DashBoard_ChangeMouldTime_48102.DoGetChangeMouldTimeListDateRange(fDateStart,fDateEnd));
}
@GetMapping("/rangetimeavg/{fDateStart}/{fDateEnd}")
public AjaxResult getRangeTimeAvg(@PathVariable String fDateStart, @PathVariable String fDateEnd) throws Exception
{