集中供料系统历史数据

ant-design-vue/src/views/ttfeedingequip/TtFeedingEquipList.vue

@@ -149,14 +149,19 @@
             dataIndex: 'eqtNo'
           },
           {
-            title:'描述',
+            title:'设备Ip',
+            align:"center",
+            dataIndex: 'eqtIp'
+          },
+          {
+            title:'设备名称',
             align:"center",
             dataIndex: 'descr'
           },
           {
             title:'料罐温度(℃)',
             align:"center",
-            dataIndex: 'bucketTemperature'
+            dataIndex: 'temperature'
           },
           {
             title:'采集时间',
@@ -181,7 +186,6 @@
           deleteBatch: "/ttfeedingequip/ttFeedingEquip/deleteBatch",
           exportXlsUrl: "/ttfeedingequip/ttFeedingEquip/exportXls",
           importExcelUrl: "ttfeedingequip/ttFeedingEquip/importExcel",
-
         },
         dictOptions:{},
         superFieldList:[],

linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/controller/TtFeedingEquipController.java

@@ -11,6 +11,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -75,21 +76,24 @@ public class TtFeedingEquipController extends JeecgController<TtFeedingEquip, IT
     @ApiOperation(value = "tt_feeding_equip-分页列表查询", notes = "tt_feeding_equip-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<TtFeedingEquip>> queryPageList(TtFeedingEquip ttFeedingEquip,
-                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                       HttpServletRequest req) {
+           HttpServletRequest req) {
         QueryWrapper<TtFeedingEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttFeedingEquip, req.getParameterMap());
         Page<TtFeedingEquip> page = new Page<TtFeedingEquip>(pageNo, pageSize);
         IPage<TtFeedingEquip> pageList = ttFeedingEquipService.page(page, queryWrapper);
         List<TtFeedingEquip> list = pageList.getRecords();
         if (list.size() > 0) {
+            // 查询所有集中供料,按ip标注
+            LambdaQueryWrapper<TtEqtBase> lwq = new LambdaQueryWrapper<>();
+            lwq.eq(TtEqtBase::getEqtStatus, 1);
+            lwq.eq(TtEqtBase::getEqtType, 5);
+            List<TtEqtBase> deviceList = ttEqtBaseService.list(lwq);
+            Map<String, TtEqtBase> deviceMap = deviceList.stream().collect(Collectors.toMap(TtEqtBase::getEqtIp, v -> v));
             for (TtFeedingEquip feeding : list) {
-                QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
+                TtEqtBase eqtBase = deviceMap.get(feeding.getEqtIp());
-                eqtBase.eq("eqt_no", feeding.getEqtNo());
+                if(eqtBase != null) {
-                eqtBase.eq("eqt_type", 5);
+                    feeding.setDescr(eqtBase.getDescr());
-                TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
-                if (ttEqtBase != null) {
-                    feeding.setDescr(ttEqtBase.getDescr());
                 }
             }
         }
@@ -180,33 +184,9 @@ public class TtFeedingEquipController extends JeecgController<TtFeedingEquip, IT
      * @param ttFeedingEquip
      */
     //@RequiresPermissions("ttfeedingequip:tt_feeding_equip:exportXls")
-//    @RequestMapping(value = "/exportXls")
-//    public ModelAndView exportXls(HttpServletRequest request, TtFeedingEquip ttFeedingEquip) {
-//        return super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
-//    }
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TtFeedingEquip ttFeedingEquip) {
-        ModelAndView modelAndView = super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
+        return super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
-        Object model = modelAndView.getModel().get("data");
-        List<TtFeedingEquip> list = new ArrayList<>();
-        if (model instanceof ArrayList<?>) {
-            for (Object o : (List<?>) model) {
-                list.add((TtFeedingEquip) o);
-            }
-            if (list.size() > 0) {
-                for (TtFeedingEquip ttFeeding : list) {
-                    QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
-                    eqtBase.eq("eqt_no", ttFeeding.getEqtNo());
-                    eqtBase.eq("eqt_type", 5);
-                    eqtBase.eq("location", "集中供料系统车间");
-                    TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
-                    if (ttEqtBase != null) {
-                        ttFeeding.setDescr(ttEqtBase.getDescr());
-                    }
-                }
-            }
-        }
-        return modelAndView;
     }
 
 

linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/entity/TtFeedingEquip.java

@@ -31,38 +31,60 @@ public class TtFeedingEquip implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
+
 	/**设备（供料系统）编号*/
 	@Excel(name = "设备（供料系统）编号", width = 15)
     @ApiModelProperty(value = "设备（供料系统）编号")
     private String eqtNo;
-    /**描述*/
+
-    @Excel(name = "描述", width = 15)
+    @Excel(name = "设备IP", width = 15)
-    @TableField(exist = false)
+    @ApiModelProperty(value = "设备IP")
-    private String descr;
+    private String eqtIp;
+
 	/**料罐温度*/
 	@Excel(name = "料罐温度", width = 15)
     @ApiModelProperty(value = "料罐温度")
-    private BigDecimal bucketTemperature;
+    private BigDecimal temperature;
+
 	/**记录的创建时间*/
     @Excel(name = "采集时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "记录的创建时间")
     private Date createTime;
+
 	/**记录的创建人，默认admin*/
     @ApiModelProperty(value = "记录的创建人，默认admin")
     private String createBy;
+
 	/**记录的修改时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "记录的修改时间")
     private Date updateTime;
+
 	/**记录的修改人，修改人员的登录账号*/
     @ApiModelProperty(value = "记录的修改人，修改人员的登录账号")
     private String updateBy;
 
+    /** 设备名称 **/
+//    @Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "设备描述")
+    @TableField(exist = false)
+    private String descr;
+
+    @ApiModelProperty(value = "设备状态")
+    @TableField(exist = false)
+    private Integer eqtStatus;
+
+    @ApiModelProperty(value = "设备近7天使用率")
+    @TableField(exist = false)
+    private BigDecimal utilizeRate;
 
+    @ApiModelProperty(value = "设备位置")
+    @TableField(exist = false)
+    private String location;
 }