From 805ebd0bdb7ec39f7bde8c810192ba08377ebe02 Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Fri, 28 Apr 2023 16:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E9=81=93=E7=B3=BB=E7=BB=9F=E6=B8=A9?= =?UTF-8?q?=E5=BA=A6=E6=95=B0=E6=8D=AEecharts=E5=9B=BE=E8=A1=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/LineChartMultid.vue | 37 ++-- .../TtWaterwayCollectList.vue | 4 + .../views/ttwaterwayfid/TtWaterwayFidList.vue | 4 + .../TtWaterwayMessageList.vue | 2 +- .../TtWaterwayOutenterList.vue | 4 + .../ttwaterwaysystem/ttxhWaterTempChart.vue | 171 ++++++++++++++++++ .../ttxhWaterTempParamList.vue | 2 +- .../TtWaterwayCollectController.java | 90 ++++++++- .../entity/TtWaterwayTempCharts.java | 17 ++ 9 files changed, 305 insertions(+), 26 deletions(-) create mode 100644 ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempChart.vue create mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/entity/TtWaterwayTempCharts.java diff --git a/ant-design-vue/src/components/chart/LineChartMultid.vue b/ant-design-vue/src/components/chart/LineChartMultid.vue index 68a8534..358195b 100644 --- a/ant-design-vue/src/components/chart/LineChartMultid.vue +++ b/ant-design-vue/src/components/chart/LineChartMultid.vue @@ -5,8 +5,8 @@ - - + + @@ -26,20 +26,21 @@ dataSource: { type: Array, default: () => [ - { type: 'Jan', jeecg: 7.0, jeebt: 3.9 }, - { type: 'Feb', jeecg: 6.9, jeebt: 4.2 }, - { type: 'Mar', jeecg: 9.5, jeebt: 5.7 }, - { type: 'Apr', jeecg: 14.5, jeebt: 8.5 }, - { type: 'May', jeecg: 18.4, jeebt: 11.9 }, - { type: 'Jun', jeecg: 21.5, jeebt: 15.2 }, - { type: 'Jul', jeecg: 25.2, jeebt: 17.0 }, - { type: 'Aug', jeecg: 26.5, jeebt: 16.6 }, - { type: 'Sep', jeecg: 23.3, jeebt: 14.2 }, - { type: 'Oct', jeecg: 18.3, jeebt: 10.3 }, - { type: 'Nov', jeecg: 13.9, jeebt: 6.6 }, - { type: 'Dec', jeecg: 9.6, jeebt: 4.8 } + { id: 'Jan', jeecg: 7.0, jeebt: 3.9 }, + { id: 'Feb', jeecg: 6.9, jeebt: 4.2 }, + { id: 'Mar', jeecg: 9.5, jeebt: 5.7 }, + { id: 'Apr', jeecg: 14.5, jeebt: 8.5 }, + { id: 'May', jeecg: 18.4, jeebt: 11.9 }, + { id: 'Jun', jeecg: 21.5, jeebt: 15.2 }, + { id: 'Jul', jeecg: 25.2, jeebt: 17.0 }, + { id: 'Aug', jeecg: 26.5, jeebt: 16.6 }, + { id: 'Sep', jeecg: 23.3, jeebt: 14.2 }, + { id: 'Oct', jeecg: 18.3, jeebt: 10.3 }, + { id: 'Nov', jeecg: 13.9, jeebt: 6.6 }, + { id: 'Dec', jeecg: 9.6, jeebt: 4.8 } ] }, + fields: { type: Array, default: () => ['jeecg', 'jeebt'] @@ -56,9 +57,11 @@ }, data() { return { + // 定义x轴标准, 主字段key scale: [{ type: 'cat', - dataKey: 'x', + dataKey: 'id', + tickCount: 16, min: 0, max: 1 }], @@ -71,8 +74,8 @@ dv.transform({ type: 'fold', fields: this.fields, - key: 'x', - value: 'y' + key: 'x', // 字段 + value: 'y' // 字段值 }) let rows = dv.rows // 替换别名 diff --git a/ant-design-vue/src/views/ttwaterwaycollect/TtWaterwayCollectList.vue b/ant-design-vue/src/views/ttwaterwaycollect/TtWaterwayCollectList.vue index 2c19ba4..bc15a58 100644 --- a/ant-design-vue/src/views/ttwaterwaycollect/TtWaterwayCollectList.vue +++ b/ant-design-vue/src/views/ttwaterwaycollect/TtWaterwayCollectList.vue @@ -187,6 +187,10 @@ importExcelUrl: "ttwaterwaycollect/ttWaterwayCollect/importExcel", }, + isorter:{ + column: 'id', + order: 'desc', + }, dictOptions:{}, superFieldList:[], } diff --git a/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue b/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue index 1a35c56..e86d9dc 100644 --- a/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue +++ b/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue @@ -196,6 +196,10 @@ exportXlsUrl: "/ttwaterwayfid/ttWaterwayFid/exportXls", importExcelUrl: "ttwaterwayfid/ttWaterwayFid/importExcel", }, + isorter:{ + column: 'id', + order: 'desc', + }, dictOptions:{}, superFieldList:[], /* 分页参数 */ diff --git a/ant-design-vue/src/views/ttwaterwaymessage/TtWaterwayMessageList.vue b/ant-design-vue/src/views/ttwaterwaymessage/TtWaterwayMessageList.vue index b7aeaaf..ad5d006 100644 --- a/ant-design-vue/src/views/ttwaterwaymessage/TtWaterwayMessageList.vue +++ b/ant-design-vue/src/views/ttwaterwaymessage/TtWaterwayMessageList.vue @@ -169,7 +169,7 @@ importExcelUrl: "ttwaterwaymessage/ttWaterwayMessage/importExcel", }, isorter:{ - column: 'time', + column: 'id', order: 'desc', }, dictOptions:{}, diff --git a/ant-design-vue/src/views/ttwaterwayoutenter/TtWaterwayOutenterList.vue b/ant-design-vue/src/views/ttwaterwayoutenter/TtWaterwayOutenterList.vue index 84abb12..8a092de 100644 --- a/ant-design-vue/src/views/ttwaterwayoutenter/TtWaterwayOutenterList.vue +++ b/ant-design-vue/src/views/ttwaterwayoutenter/TtWaterwayOutenterList.vue @@ -181,6 +181,10 @@ importExcelUrl: "ttwaterwayoutenter/ttWaterwayOutenter/importExcel", }, + isorter:{ + column: 'id', + order: 'desc', + }, dictOptions:{}, superFieldList:[], } diff --git a/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempChart.vue b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempChart.vue new file mode 100644 index 0000000..9648427 --- /dev/null +++ b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempChart.vue @@ -0,0 +1,171 @@ + + + + + + diff --git a/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue index ff46260..a8675db 100644 --- a/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue +++ b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue @@ -87,7 +87,7 @@ export default { this.locale.emptyText = "请双击选择一条历史记录"; } else { var params = this.getQueryParams() - console.log(params); + // console.log(params); getAction(this.url.info, { thatTime: params.time, }).then(res => { diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/controller/TtWaterwayCollectController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/controller/TtWaterwayCollectController.java index 7aca719..3668bb3 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/controller/TtWaterwayCollectController.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/controller/TtWaterwayCollectController.java @@ -1,10 +1,8 @@ package org.jeecg.modules.demo.ttwaterwaycollect.controller; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -12,12 +10,15 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; +import org.checkerframework.checker.units.qual.A; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.ttwaterwaycollect.entity.TtWaterwayCollect; +import org.jeecg.modules.demo.ttwaterwaycollect.entity.TtWaterwayTempCharts; import org.jeecg.modules.demo.ttwaterwaycollect.service.ITtWaterwayCollectService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,6 +26,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.ttwaterwayfid.entity.TtWaterwayFid; +import org.jeecg.modules.demo.ttwaterwayfid.service.ITtWaterwayFidService; +import org.jeecg.modules.demo.ttwaterwayoutenter.entity.TtWaterwayOutenter; +import org.jeecg.modules.demo.ttwaterwayoutenter.service.ITtWaterwayOutenterService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -55,7 +60,16 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class TtWaterwayCollectController extends JeecgController { @Autowired private ITtWaterwayCollectService ttWaterwayCollectService; - + + @Autowired + private ITtWaterwayFidService ttWaterwayFidService; + + @Autowired + private ITtWaterwayOutenterService ttWaterwayOutenterService; + + + private static final Integer X_Series = 16; + /** * 分页列表查询 * @@ -77,8 +91,70 @@ public class TtWaterwayCollectController extends JeecgController pageList = ttWaterwayCollectService.page(page, queryWrapper); return Result.OK(pageList); } - - /** + + + /** + * 查找指定批次框号温度记录 + */ + @ApiOperation(value="指定批次框号查询温度记录", notes="指定批次框号查询温度记录") + @RequestMapping(value = "/listbyfid", method = {RequestMethod.GET,RequestMethod.POST}) + public Result queryTempListByFid( + @RequestParam("batchId") String batchId, @RequestParam("number") Integer number, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + QueryWrapper qwrFid = new QueryWrapper<>(); + // 相同的批次框号条件下，取最新绑定的记录 + qwrFid.lambda().eq(TtWaterwayFid::getBatchNumber, batchId).eq(TtWaterwayFid::getNumber, number). + orderByDesc(TtWaterwayFid::getBindTime).last("limit 1"); + TtWaterwayFid waterwayFid = ttWaterwayFidService.getOne(qwrFid); + List tempList = new ArrayList<>(); + IPage pageList = new Page<>(pageNo, pageSize); + if (waterwayFid != null) { + Date bindTime = waterwayFid.getBindTime(); + String fid = waterwayFid.getFid(); + QueryWrapper qwrOutEnter = new QueryWrapper<>(); + // 相同的fid和入水时间下，取最靠近入水时间的一条 + qwrOutEnter.lambda().eq(TtWaterwayOutenter::getFid, fid).ge(TtWaterwayOutenter::getWaterEnter, bindTime). + orderByAsc(TtWaterwayOutenter::getWaterEnter).last("limit 1"); + TtWaterwayOutenter waterwayOutenter = ttWaterwayOutenterService.getOne(qwrOutEnter); + if (waterwayOutenter != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String startTime = null; + String endTime = null; + Date waterEnter = waterwayOutenter.getWaterEnter(); + if (waterEnter != null) { + startTime = sdf.format(waterEnter); + } + Date waterYure = waterwayOutenter.getWaterYure(); + if (waterYure != null) { + endTime = sdf.format(waterYure); + } + Date waterOut = waterwayOutenter.getWaterOut(); + if (waterOut != null) { + endTime = sdf.format(waterOut); + } + if (startTime != null && endTime != null) { + QueryWrapper qwrCollect = new QueryWrapper<>(); + qwrCollect.lambda().between(TtWaterwayCollect::getTime, startTime, endTime); +// long count = ttWaterwayCollectService.count(qwrCollect); + pageList = ttWaterwayCollectService.page(pageList, qwrCollect); + long count = pageList.getTotal(); + if (count > 0L) { + int mod = (int) count / X_Series; + qwrCollect.apply("id % {0} = 0", mod); + tempList = ttWaterwayCollectService.list(qwrCollect); + } + } + } + } + TtWaterwayTempCharts tempCharts = new TtWaterwayTempCharts(); + tempCharts.setCharts(tempList); + tempCharts.setPages(pageList); + return Result.OK(tempCharts); + } + + + /** * 添加 * * @param ttWaterwayCollect diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/entity/TtWaterwayTempCharts.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/entity/TtWaterwayTempCharts.java new file mode 100644 index 0000000..fabccd1 --- /dev/null +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttwaterwaycollect/entity/TtWaterwayTempCharts.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.ttwaterwaycollect.entity; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.Data; + +import java.util.List; + +@Data +public class TtWaterwayTempCharts { + + // echarts图表记录 + private List charts; + + // 分页记录 + private IPage pages; + +}