提交

src/main/java/com/steerinfo/meterwork/meterworkmonitor/controller/MeterWorkMonitorController.java

@@ -47,31 +47,8 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         try {
-            PageList<MeterWorkMonitor> list = meterWorkMonitorService.queryForPage(parmas, pageNum, pageSize);
-            List<MeterWorkMonitorDto> resultList = new ArrayList<>();
-            for (Object object : list.getList()){
-                MeterWorkMonitor meterWorkMonitor = (MeterWorkMonitor) object;
-                long time = 30*1000;//30秒
-                Date now = new Date();
-                Date beforeDate = new Date(now.getTime() - time);//30秒前的时间
-                MeterWorkMonitorDto meterWorkMonitorDto = null;
-                if (meterWorkMonitor.getLastTime() != null){
-                    boolean before = meterWorkMonitor.getLastTime().before(beforeDate);
-                    if (before){
-                        meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"N");
-                    }else{
-                        meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"Y");
-                    }
-
-
-                }else {
-                    meterWorkMonitorDto = new MeterWorkMonitorDto(meterWorkMonitor,"N");
-
-                }
-                resultList.add(meterWorkMonitorDto);
-            }
-
-            return success(resultList);
+            PageList<MeterWorkMonitorDto> list = meterWorkMonitorService.queryForPage2(parmas, pageNum, pageSize);
+            return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new MarkerMetException(500, "操作异常！！");
@@ -191,6 +168,26 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的meterWorkMonitor信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "meterWorkMonitor", value = "详细实体meterWorkMonitor", required = true, dataType = "MeterWorkMonitor")
+    })
+    //@RequiresPermissions("meterworkmonitor:update")
+    @PostMapping(value = "/doUpdateWfBySpotNo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult updateLastTime(@RequestBody MeterWorkMonitor model) {
+        try {
+            String pointNo = meterWorkMonitorService.updateLastTime(model);
+            if (pointNo.isEmpty()) {
+                return failed(null, "修改失败");
+            }
+            return success(pointNo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "测试", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterworkmonitor:view")

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/IMeterWorkMonitorService.java

@@ -2,8 +2,12 @@ package com.steerinfo.meterwork.meterworkmonitor.service;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
+import java.util.HashMap;
+
 
 /**
  * MeterWorkMonitor服务接口：
@@ -23,10 +27,12 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
     RESTfulResult doQueryWf(MeterWorkMonitor oci);
 
     String doUpdateWf(MeterWorkMonitor model);
+    String updateLastTime(MeterWorkMonitor model);
 
     void AutomaticAllocation();
 
     RESTfulResult weightByCarNo(String rfidCar);
 
 
+    PageList<MeterWorkMonitorDto> queryForPage2(HashMap parmas, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -5,12 +5,14 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.mapper.MeterWorkMonitorMapper;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import com.steerinfo.meterwork.meterworkmonitor.service.IMeterWorkMonitorService;
 import com.steerinfo.meterwork.meterworkonline.mapper.MeterWorkOnlineMapper;
 import com.steerinfo.meterwork.meterworkonline.model.MeterWorkOnline;
 import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
@@ -83,6 +86,25 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         }
     }
 
+    @Override
+    public String updateLastTime(MeterWorkMonitor model) {
+        try {
+            MeterWorkMonitor tempModel = new MeterWorkMonitor();
+            Assert.isTrue(Objects.nonNull(model.getPointNo()), "秤点编号为空");
+            if(Objects.nonNull(model.getPointNo()) && StringUtils.isNotEmpty(model.getPointNo())) {
+                tempModel = meterWorkMonitorMapper.selectByPrimaryKey(model.getPointNo());
+            }
+            Assert.isTrue(Objects.nonNull(tempModel), "未查询到秤点信息");
+            tempModel.setLastTime(new Date());
+            meterWorkMonitorMapper.updateByPrimaryKeySelective(tempModel);
+            return tempModel.getPointNo();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return null;
+        }
+    }
+
     @Autowired
     DataSource dataSource;
 
@@ -137,6 +159,36 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         }
     }
 
+    @Override
+    public PageList<MeterWorkMonitorDto> queryForPage2(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkMonitor> rows = this.getMapper().selectByParameters(parmas);
+
+        List<MeterWorkMonitorDto> list = new ArrayList<>();
+        for (MeterWorkMonitor meterWorkMonitor : rows){
+            long time = 30*1000;//30秒
+            Date now = new Date();
+            Date beforeDate = new Date(now.getTime() - time);//30秒前的时间
+            MeterWorkMonitorDto meterWorkMonitorDto = null;
+            if (meterWorkMonitor.getLastTime() != null){
+                boolean before = meterWorkMonitor.getLastTime().before(beforeDate);
+                if (before){
+                    meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"N");
+                }else{
+                    meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"Y");
+                }
+
+            }else {
+                meterWorkMonitorDto = new MeterWorkMonitorDto(meterWorkMonitor,"N");
+
+            }
+            list.add(meterWorkMonitorDto);
+        }
+
+        PageList pageInfo = new PageList(list);
+        return pageInfo;
+    }
+
 
     private void RandomAssign() {
         List<MeterWorkMonitor> list2 = meterWorkMonitorMapper.selectForAss();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -137,6 +137,19 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "C#动轨倒序获取列表", notes = "不分页模糊查询")
+    //@RequiresPermissions("meterworkrailwayactfirst:view")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.noPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取倒序列表", notes = "分页模糊查询静态铁水衡和吊钩秤委托")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -1172,13 +1185,13 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配洁净保存")
     @PostMapping(value = "/doAddNetWeight")
-    public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayCarriageWeight,MeterWorkRailwayMotorialReceived, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+    public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayCarriageWeight,MeterWorkRailwayMotorialReceived, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
         try {
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
-                rm = meterWorkRailwayActFirstService.doAddNetWeight(com.getTwo(),com.getOne());
+                rm = meterWorkRailwayActFirstService.doAddNetWeight(com.getTwo(),com.getOne(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("选择一条AI标志皮重数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条标准皮重数据进行匹配洁净保存，请确认！！");
             }else if(Objects.isNull(com.getTwo())) {
                 rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
             }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -39,6 +39,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult checkandadd(MeterWorkRailwayActFirst model);
 
     int checkandupdate(MeterWorkRailwayActFirst model);
+    List<MeterWorkRailwayActFirst> noPage(HashMap<String, Object> params);
 
     int audit(MeterWorkRailwayActFirst model);
 
@@ -114,7 +115,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
     RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels);
     RESTfulResult doAddNetInnerWf(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayAiweight tareModel);
-    RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayCarriageWeight tareModel);
+    RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayCarriageWeight tareModel, PreRailwayScale scale);
 
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -184,7 +184,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         }
     }
 
-
     /**
      * 一次计量实体，转换为预报实体
      *
@@ -4406,7 +4405,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayCarriageWeight first01) {
+    public RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayCarriageWeight first01, PreRailwayScale tempScale) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
@@ -4428,89 +4427,91 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //两个车号一样则匹配，否则则不匹配
             if (received.getRailwayNo().equals(first.getRailwayNo())) {
                 MeterWorkRailwayActFirst AIFirst = new MeterWorkRailwayActFirst();
-                //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
-                preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
-
-                //将一次表中的皮重设置为已洁净
-                String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
-                AIFirst.setActualFirstNo(firstNo);
-                AIFirst.setValueFlag("2");
-//                AIFirst.setRailwayNo(first.getRailwayNo());
-                AIFirst.setMeterWeight(new BigDecimal(first01.getCarriageWeight()));
-//                AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
-//                AIFirst.setRailwayTypeName(first.getRailwayTypeName());
-//                AIFirst.setCreateManNo(first.getCreateManNo());
-//                AIFirst.setCreateManName(first.getCreateManName());
-//                AIFirst.setCreateTime(first.getCreateTime());
-                AIFirst.setConveyanceType(first01.getCarriageCode());
-                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
 
-                //新增一条毛重信息
-                MeterWorkRailwayActFirst second = new MeterWorkRailwayActFirst();
-                second.setActualFirstNo(received.getActualFirstNo());
-                second.setValueFlag("2");
-                second.setRailwayNo(received.getRailwayNo());
-                second.setRailwayCarriageNo(received.getRailwayCarriageNo());
-                second.setRailwaySpeed(received.getRailwaySpeed());
-                second.setMeterWeight(received.getMeterWeight());
-                second.setCreateTime(received.getCreateTime());
-                second.setCreateManNo(userId);
-                second.setCreateManName(userName);
-                second.setWeightType("0");
-                second.setRailwayTypeNo(received.getRailwayTypeNo());
-                second.setRailwayTypeName(received.getRailwayTypeName());
-                second.setBaseSpotNo(received.getBaseSpotNo());
-                second.setBaseSpotName(received.getBaseSpotName());
-                second.setShipmentGrossWeight(received.getShipmentGrossWeight());
-                second.setShipmentNetWeight(received.getShipmentNetWeight());
-                second.setRailwayModelName(received.getRailwayModel());
-                meterWorkRailwayActFirstMapper.insertSelective(second);
+                if(Objects.nonNull(tempScale)) {
+                    Assert.isTrue(Objects.nonNull(tempScale.getPredictionNo()) && StringUtils.isNotEmpty(tempScale.getPredictionNo()), "秤点编号为空");
+                    PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(tempScale.getPredictionNo());
+                    Assert.isTrue(Objects.nonNull(scale), "委托信息不存在");
 
-                //新增一条洁净数据
-                MeterWorkRailwayActual netRail = new MeterWorkRailwayActual();
-                String netNo = meterWorkRailwayActualMapper.getNewID(afl);
-                netRail.setActualNo(afl + netNo);
-                netRail.setRailwayNo(received.getRailwayNo());
-                netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
-                netRail.setGrossWeight(received.getMeterWeight());
-                netRail.setGrossMode("1");
-                netRail.setGrossManNo(userId);
-                netRail.setGrossManName(userName);
-                netRail.setGrossTime(received.getCreateTime());
-                netRail.setGrossClass(received.getShipmentGrossWeight() + ""); //左右偏载
-                netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
-                netRail.setBaseSpot1No(received.getBaseSpotNo());
-                netRail.setBaseSpot1Name(received.getBaseSpotName());
-                netRail.setActualFirst1No(second.getActualFirstNo());
-                netRail.setRailwayTypeNo(received.getRailwayTypeNo());
-                netRail.setRailwayTypeName(received.getRailwayTypeName());
-                netRail.setConveyanceType(received.getRailwayModel());
-                //netRail.setRailwayModelName(received.getRailwayModel());
-                netRail.setTareWeight(AIFirst.getMeterWeight());
-                netRail.setTareManNo(userId);
-                netRail.setTareManName(userName);
-                netRail.setTareTime(AIFirst.getCreateTime());
-                netRail.setTareMode("1");
-                netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
-                netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
-                netRail.setBaseSpot2No(second.getBaseSpotNo());
-                netRail.setBaseSpot2Name(second.getBaseSpotName());
-                netRail.setActualFirst2No(second.getActualFirstNo());
-                netRail.setNetMode("1");
-                netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
-                netRail.setNetTime(new Date());
-                netRail.setNetManNo(userId);
-                netRail.setNetManName(userName);
-                netRail.setNetSpot3No(received.getBaseSpotNo());
-                netRail.setNetSpot3Name(received.getBaseSpotName());
-                netRail.setValueFlag("0");
-                netRail.setUploadFlag("0");
-                netRail.setMeterTypeNo(received.getMeterTypeNo());
-                netRail.setMeterTypeName(received.getMeterTypeName());
-                int i = meterWorkRailwayActualMapper.insertSelective(netRail);
+                }else{
+                    //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                    preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
+
+                    //将一次表中的皮重设置为已洁净
+                    String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
+                    AIFirst.setActualFirstNo(firstNo);
+                    AIFirst.setValueFlag("2");
+                    AIFirst.setMeterWeight(new BigDecimal(first01.getCarriageWeight()));
+                    AIFirst.setConveyanceType(first01.getCarriageCode());
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
+
+                    //新增一条毛重信息
+                    MeterWorkRailwayActFirst second = new MeterWorkRailwayActFirst();
+                    second.setActualFirstNo(received.getActualFirstNo());
+                    second.setValueFlag("2");
+                    second.setRailwayNo(received.getRailwayNo());
+                    second.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                    second.setRailwaySpeed(received.getRailwaySpeed());
+                    second.setMeterWeight(received.getMeterWeight());
+                    second.setCreateTime(received.getCreateTime());
+                    second.setCreateManNo(userId);
+                    second.setCreateManName(userName);
+                    second.setWeightType("0");
+                    second.setRailwayTypeNo(received.getRailwayTypeNo());
+                    second.setRailwayTypeName(received.getRailwayTypeName());
+                    second.setBaseSpotNo(received.getBaseSpotNo());
+                    second.setBaseSpotName(received.getBaseSpotName());
+                    second.setShipmentGrossWeight(received.getShipmentGrossWeight());
+                    second.setShipmentNetWeight(received.getShipmentNetWeight());
+                    second.setRailwayModelName(received.getRailwayModel());
+                    meterWorkRailwayActFirstMapper.insertSelective(second);
+
+                    //新增一条洁净数据
+                    MeterWorkRailwayActual netRail = new MeterWorkRailwayActual();
+                    String netNo = meterWorkRailwayActualMapper.getNewID(afl);
+                    netRail.setActualNo(afl + netNo);
+                    netRail.setRailwayNo(received.getRailwayNo());
+                    netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                    netRail.setGrossWeight(received.getMeterWeight());
+                    netRail.setGrossMode("1");
+                    netRail.setGrossManNo(userId);
+                    netRail.setGrossManName(userName);
+                    netRail.setGrossTime(received.getCreateTime());
+                    netRail.setGrossClass(received.getShipmentGrossWeight() + ""); //左右偏载
+                    netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
+                    netRail.setBaseSpot1No(received.getBaseSpotNo());
+                    netRail.setBaseSpot1Name(received.getBaseSpotName());
+                    netRail.setActualFirst1No(second.getActualFirstNo());
+                    netRail.setRailwayTypeNo(received.getRailwayTypeNo());
+                    netRail.setRailwayTypeName(received.getRailwayTypeName());
+                    netRail.setConveyanceType(received.getRailwayModel());
+                    //netRail.setRailwayModelName(received.getRailwayModel());
+                    netRail.setTareWeight(AIFirst.getMeterWeight());
+                    netRail.setTareManNo(userId);
+                    netRail.setTareManName(userName);
+                    netRail.setTareTime(AIFirst.getCreateTime());
+                    netRail.setTareMode("1");
+                    netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
+                    netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                    netRail.setBaseSpot2No(second.getBaseSpotNo());
+                    netRail.setBaseSpot2Name(second.getBaseSpotName());
+                    netRail.setActualFirst2No(second.getActualFirstNo());
+                    netRail.setNetMode("1");
+                    netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
+                    netRail.setNetTime(new Date());
+                    netRail.setNetManNo(userId);
+                    netRail.setNetManName(userName);
+                    netRail.setNetSpot3No(received.getBaseSpotNo());
+                    netRail.setNetSpot3Name(received.getBaseSpotName());
+                    netRail.setValueFlag("0");
+                    netRail.setUploadFlag("0");
+                    netRail.setMeterTypeNo(received.getMeterTypeNo());
+                    netRail.setMeterTypeName(received.getMeterTypeName());
+                    int i = meterWorkRailwayActualMapper.insertSelective(netRail);
 
-                if (i >= 1) {
-                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
+                    if (i >= 1) {
+                        meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
+                    }
                 }
             }
             rm.setSucceed();
@@ -4982,6 +4983,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActFirst> noPage(HashMap<String, Object> params) {
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(params);
+        return rows;
+    }
+
     public static void main(String[] args) {
         BigDecimal a = new BigDecimal(95120);
         BigDecimal b = a.divide(new BigDecimal(1000));

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -88,6 +88,18 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "C#动轨倒序获取列表", notes = "不分页模糊查询")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas) {
+        try {
+            List<PreRailwayScale> list = preRailwayScaleService.noPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
 
     @ApiOperation(value = "获取倒序列表", notes = "分页模糊查询静态铁水衡和吊钩秤委托")
     @ApiImplicitParams({

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.java

@@ -53,4 +53,5 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
 
     List<PreRailwayScale> selectByRailwayNo(@Param( value = "railwayNo") String railwayNo);
     List<PreRailwayScale> likeByDesc(Map<String, Object> var1);
+    List<PreRailwayScale> noPage(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3105,4 +3105,15 @@
       and TRUST_AVAILABILITY_TIME >= sysDate
       order by TRUST_DATE_TIME desc
     </select>
+
+  <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+      <include refid="select"/>
+      where 1 = 1
+      <if test="railwayNo != '' and railwayNo != null">
+        and railway_No like '%${railwayNo}%'
+      </if>
+      and value_flag in ('0', '1')
+      and TRUST_AVAILABILITY_TIME >= sysDate
+      order by TRUST_DATE_TIME desc
+    </select>
   </mapper>

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -47,4 +47,5 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
     List<PreRailwayScale> doQueryJLByCar(HashMap param);
 
     PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize);
+    List<PreRailwayScale> noPage(HashMap param);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -316,6 +316,12 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return pageInfo;
     }
 
+    @Override
+    public List<PreRailwayScale> noPage(HashMap param) {
+        List<PreRailwayScale> rows = preRailwayScaleMapper.noPage(param);
+        return rows;
+    }
+
     @Autowired
     DataSource dataSource;