no message

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

@@ -1,8 +1,6 @@
 package com.github.zuihou.api;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.zuihou.base.R;
@@ -13,15 +11,8 @@ import com.github.zuihou.business.material.entity.Material;
 import com.github.zuihou.business.material.service.MaterialService;
 import com.github.zuihou.business.order.entity.Order;
 import com.github.zuihou.business.order.service.OrderService;
-import com.github.zuihou.business.productionresource.dto.EquGoodsDto;
-import com.github.zuihou.business.productionresource.dto.ReloadMtrDto;
-import com.github.zuihou.business.productionresource.entity.EquAndGoods;
 import com.github.zuihou.business.productionresource.entity.ProductionResource;
-import com.github.zuihou.business.productionresource.service.EquAndGoodsService;
 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.record.service.impl.EquRecordServiceImpl;
 import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.context.BaseContextHandler;
@@ -29,16 +20,18 @@ import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.utils.DateUtils;
-import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 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;
+
 /**
  * 运维小程序接口
  *
@@ -53,8 +46,8 @@ public class OpsAppApi {
     private OrderService orderService;
     @Autowired
     private EquBarrelService equBarrelService;
-    @Autowired
-    private EquRecordService equRecordService;
+//    @Autowired
+//    private EquRecordService equRecordService;
     @Autowired
     private MaterialService materialService;
 
@@ -216,16 +209,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){
@@ -266,18 +259,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);
+//    }
 
 
 

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/login/index.vue

@@ -203,6 +203,7 @@
   import loginApi from "@/api/Login.js";
   import oauthApi from '@/api/Oauth'
   import {Base64} from 'js-base64';
+  // import md5 from 'js-md5';
 
 
   export default {