no message

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/OpsAppApi.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.api;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.zuihou.base.R;
@@ -13,6 +14,8 @@ import com.github.zuihou.business.order.entity.Order;
 import com.github.zuihou.business.order.service.OrderService;
 import com.github.zuihou.business.productionresource.entity.ProductionResource;
 import com.github.zuihou.business.productionresource.service.ProductionTenantResourceService;
+import com.github.zuihou.business.record.entity.EquRecord;
+import com.github.zuihou.business.record.service.EquRecordService;
 import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.context.BaseContextHandler;
@@ -28,10 +31,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
 
-//import com.github.zuihou.business.record.entity.EquRecord;
-//import com.github.zuihou.business.record.service.EquRecordService;
-//import com.github.zuihou.business.record.service.impl.EquRecordServiceImpl;
-
 /**
  * 运维小程序接口
  *
@@ -46,8 +45,8 @@ public class OpsAppApi {
     private OrderService orderService;
     @Autowired
     private EquBarrelService equBarrelService;
-//    @Autowired
-//    private EquRecordService equRecordService;
+    @Autowired
+    private EquRecordService equRecordService;
     @Autowired
     private MaterialService materialService;
 
@@ -209,16 +208,16 @@ public class OpsAppApi {
     }
 
 
-//    @PostMapping("/recordList")
-//    public  R<IPage<EquRecord>> recordList(@RequestBody PageParams<EquRecord> params){
-//        BaseContextHandler.setTenant("0000");
-//        IPage<EquRecord> page = params.buildPage();
-//        LbqWrapper<EquRecord> recordQueryWrap = Wraps.lbQ();
-//        EquRecord equRecord = BeanUtil.toBean(params, EquRecord.class);
-//        recordQueryWrap.eq(EquRecord::getEquId, equRecord.getEquId()).orderByDesc(EquRecord::getCreateTime);
-//        IPage<EquRecord> list = equRecordService.pageList(page, recordQueryWrap);
-//        return R.success(list);
-//    }
+    @PostMapping("/recordList")
+    public  R<IPage<EquRecord>> recordList(@RequestBody PageParams<EquRecord> params){
+        BaseContextHandler.setTenant("0000");
+        IPage<EquRecord> page = params.buildPage();
+        LbqWrapper<EquRecord> recordQueryWrap = Wraps.lbQ();
+        EquRecord equRecord = BeanUtil.toBean(params, EquRecord.class);
+        recordQueryWrap.eq(EquRecord::getEquId, equRecord.getEquId()).orderByDesc(EquRecord::getCreateTime);
+        IPage<EquRecord> list = equRecordService.pageList(page, recordQueryWrap);
+        return R.success(list);
+    }
 
     @GetMapping("/equMaterialList")
     public  R<List<Material>> equMaterialList(@RequestParam("mtType") String mtType){
@@ -259,18 +258,18 @@ public class OpsAppApi {
      *
      * @return
      */
-//    @PostMapping("/recordSave")
-//    public R<Boolean> recordSave(@RequestBody EquRecord equRecord) {
-//        BaseContextHandler.setTenant("0000");
-//        LambdaUpdateWrapper<EquBarrel> updateWrapper = new LambdaUpdateWrapper();
-//        updateWrapper.set(EquBarrel::getMtrId, equRecord.getReplaceMaterial()).set(EquBarrel::getMtrName, equRecord.getMtName()).set(EquBarrel::getMtrResidue, equRecord.getSpecs())
-//                .set(EquBarrel::getExprTime, equRecord.getDate()).eq(EquBarrel::getId, equRecord.getMaterialId());
-//        Boolean bool = equBarrelService.update(null, updateWrapper);
-//        if(bool){
-//            bool = equRecordService.save(equRecord);
-//        }
-//        return R.success(bool);
-//    }
+    @PostMapping("/recordSave")
+    public R<Boolean> recordSave(@RequestBody EquRecord equRecord) {
+        BaseContextHandler.setTenant("0000");
+        LambdaUpdateWrapper<EquBarrel> updateWrapper = new LambdaUpdateWrapper();
+        updateWrapper.set(EquBarrel::getMtrId, equRecord.getReplaceMaterial()).set(EquBarrel::getMtrName, equRecord.getMtName()).set(EquBarrel::getMtrResidue, equRecord.getSpecs())
+                .set(EquBarrel::getExprTime, equRecord.getDate()).eq(EquBarrel::getId, equRecord.getMaterialId());
+        Boolean bool = equBarrelService.update(null, updateWrapper);
+        if(bool){
+            bool = equRecordService.save(equRecord);
+        }
+        return R.success(bool);
+    }