修改

src/main/java/com/steerinfo/meterwork/dto/MeterWorkCarActualFirstDto.java

@@ -19,6 +19,9 @@ public class MeterWorkCarActualFirstDto extends MeterWorkCarActualFirst {
     @ApiModelProperty(value="预报编号",required=false)
     private String predictionNo;
 
+    private String updateManNo;
+    private String updateManName;
+
     @Override
     public void setId(String actualFirstNo) {
         this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
@@ -43,4 +46,20 @@ public class MeterWorkCarActualFirstDto extends MeterWorkCarActualFirst {
     public void setPredictionNo(String predictionNo) {
         this.predictionNo = predictionNo == null ? null : predictionNo.trim();
     }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo;
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -1455,4 +1455,43 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "本地计量-一次数据匹配委托", notes = "根据MeterWorkCarActualFirst对象创建")
+    @PostMapping(value = "/localMatch")
+    public RESTfulResult localMatch(@RequestBody MeterWorkCarActualFirstDto model) {
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm = meterWorkCarActualFirstService.localMatch(model.getActualFirstNo(), model.getPredictionNo(), model.getUpdateManNo(), model.getUpdateManName());
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            return failed("操作异常");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed("操作异常");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "本地计量-一次数据解除委托", notes = "根据MeterWorkCarActualFirst对象创建")
+    @PostMapping(value = "/localRemove")
+    public RESTfulResult localRemove(@RequestBody List<MeterWorkCarActualFirst> models) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkCarActualFirstService.localRemove(models);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("解除失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -158,4 +158,6 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     RESTfulResult localCleanByFirstNo(MeterWorkCarActual actualModel);
     RESTfulResult localRecoveryOrAbolishByFirstNo(MeterWorkCarActualFirst firstModel);
+    RESTfulResult localMatch(String actualFirstNo, String predictionNo, String updateManNo, String updateManName);
+    int localRemove(List<MeterWorkCarActualFirst> models);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -7496,5 +7496,159 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         return rm;
     }
+
+    @Override
+    public RESTfulResult localMatch(String actualFirstNo, String predictionNo, String updateManNo, String updateManName) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String userId = updateManNo;
+            String userName = updateManName;
+
+            Assert.isTrue(StringUtils.isNotEmpty(actualFirstNo), "作业编号为空");
+            Assert.isTrue(StringUtils.isNotEmpty(predictionNo), "预报编号为空");
+            PreTrackScale pts = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
+            Assert.isTrue(pts != null, "委托编号：" + predictionNo + "未查询到有效委托信息");
+            Assert.isTrue(!pts.getValueFlag().equals("9"), "委托编号：" + predictionNo + "已结算不允许匹配委托");
+            MeterWorkCarActualFirst model = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualFirstNo);
+            Assert.isTrue(model != null, "一次数据不存在");
+            Assert.isTrue(!model.getValueFlag().equals("2"), "一次数据已结净,不允许匹配委托，请在结净数据维护中进行结净匹配委托");
+            Assert.isTrue(model.getPredictionNo() == null && StringUtils.isEmpty(model.getPredictionNo()), "一次数据已匹配,不允许匹配委托");
+
+            //操作日志
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("C#端-本地计量一次数据维护");
+            logModel.setOperationFunction("匹配委托");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getCarNo());
+            logModel.setOperationBeforeFix(model.toString());
+
+            //匹配委托操作
+            MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectAndMatch(actualFirstNo, pts.getPredictionNo());
+            BeanUtils.copyProperties(modelTemp, model);
+            model.setIsPreScale("1");
+            model.setUpdateManNo(userId);
+            model.setUpdateManName(userName);
+            model.setUpdateTime(new Date());
+            model.setNote("一次数据匹配委托");
+            model.setPredictionNo(pts.getPredictionNo());
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
+
+            pts.setUpdateTime(new Date());
+            pts.setUpdateManNo(userId);
+            pts.setUpdateManName(userName);
+            pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
+            pts.setUploadFlag("1");
+            pts.setPredictionType("1");
+            pts.setMeasureStation(model.getBaseSpotNo());
+            pts.setMeasureStationName(model.getBaseSpotName());
+            preTrackScaleMapper.updateByPrimaryKeySelective(pts);
+
+            logModel.setOperationAfterFix(model.toString());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("匹配委托成功");
+            rm.setData(model);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    @Transactional
+    public int localRemove(List<MeterWorkCarActualFirst> models){
+        try {
+            String userId = models.get(0).getUpdateManNo();
+            String userName = models.get(0).getUpdateManName();
+            String note = models.get(0).getNote();
+
+            int num = 0;
+            Assert.isTrue(models != null && models.size() >= 1, "参数为空!!");
+
+            for(MeterWorkCarActualFirst model: models) {
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTemp != null) {
+                    if(modelTemp.getValueFlag().equals("0") || modelTemp.getValueFlag().equals("2")) {
+                        throw new MarkerMetException(500, "当前一次数据已结净或者已作废，不允许解除托!!");
+                    }
+                }
+                PreTrackScale pls = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                Assert.isTrue(!pls.getValueFlag().equals("9"), "一次数据中包含已结算的委托!!");
+            }
+
+            for (MeterWorkCarActualFirst model : models) {
+                Assert.isTrue(StringUtils.isNotEmpty(model.getPredictionNo()), "该条数据还未匹配！！");
+                PreTrackScale pls = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                Assert.isTrue(pls != null, "数据对应的委托不存在!!");
+                pls.setUpdateTime(new Date());
+                pls.setUpdateManNo(userId);
+                pls.setUpdateManName(userName);
+                pls.setValueFlag(DbConstants.VALID);
+                pls.setUploadFlag("1");
+                preTrackScaleMapper.updateByPrimaryKeySelective(pls);
+
+                //操作日志
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-本地计量一次数据维护");
+                logModel.setOperationFunction("撤销委托");
+                logModel.setOperationId(model.getActualFirstNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getCarNo());
+                logModel.setOperationBeforeFix(model.toString());
+
+                MeterWorkCarActualFirst mwcaf = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirstNo());
+                String actualFirstNo = mwcaf.getActualFirstNo();
+                //当一次计量数据是已结净的状态时，同时将该结净数据的另一条一次计量数据自动匹配该委托，并将该结净记录也进行委托匹配
+                if (mwcaf.getValueFlag().equals("2")){
+                    MeterWorkCarActual meterWorkCarActual = meterWorkCarActualMapper.selectActual(actualFirstNo);
+                    String getActualFirstNo = "";
+                    //判断传入的是哪条一次记录
+                    if (meterWorkCarActual.getActualFirst1No().equals(actualFirstNo)){
+                        getActualFirstNo = meterWorkCarActual.getActualFirst2No();
+                    }
+                    if (meterWorkCarActual.getActualFirst2No().equals(actualFirstNo)){
+                        getActualFirstNo = meterWorkCarActual.getActualFirst1No();
+                    }
+                    //另一条一次数据进行委托解除
+                    MeterWorkCarActualFirst meterWorkCarActualFirst1 = meterWorkCarActualFirstMapper.selectAndRemove(getActualFirstNo);
+                    meterWorkCarActualFirst1.setIsPreScale("0");
+                    meterWorkCarActualFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst1);
+                    //将该一次记录的结净数据委托解除
+                    MeterWorkCarActual mwca = meterWorkCarActualMapper.cleanPredcition(meterWorkCarActual.getActualNo());
+                    mwca.setIsPreScale("0");
+                    meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+                }
+
+                // 将一次计量数据设置为未匹配状态
+                //mwcaf.setValueFlag("2");
+                mwcaf.setUpdateManNo(userId);
+                mwcaf.setUpdateManName(userName);
+                mwcaf.setUpdateTime(new Date());
+                mwcaf.setNote(note);
+                mwcaf.setIsPreScale("0");
+                meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf);
+
+                logModel.setOperationAfterFix(mwcaf.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
+                num++;
+            }
+            return num;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActualTHJCompare;
 import com.steerinfo.meterwork.meterworkdatacount.model.*;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import com.steerinfo.meterwork.meterworkdatacount.service.impl.MeterWorkDataCountServiceImpl;
@@ -435,4 +436,17 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "汽车衡结净数据皮重核查-获取列表", notes = "分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carActualTareWeightComparison")
+    public RESTfulResult carActualTareWeightComparison(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<CarActualTareWeightComparison> list = meterWorkDataCountService.carActualTareWeightComparison(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.java

@@ -24,4 +24,5 @@ public interface MeterWorkDataCountMapper {
     List<StaticRailwayRemoteComparison> staticRailwayRemoteComparison(HashMap<String, Object> param);
     List<MeterBaseSpotInfo> rfidIdentifyAnalysisSummarySpot(HashMap<String, Object> param);
     List<RfidIdentifyAnalysis> rfidIdentifyAnalysisSummary(HashMap<String, Object> param);
+    List<CarActualTareWeightComparison> carActualTareWeightComparison(HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -904,4 +904,64 @@
         </if>
         order by B.create_time desc
     </select>
+
+    <select id="carActualTareWeightComparison" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.CarActualTareWeightComparison">
+        select '汽车衡' carType,
+                case when A.meter_type_Name = 'SendToOutTms' then '外发'
+                    when A.meter_type_Name = 'GM2GM' then '厂内转储'
+                    when A.meter_type_Name = 'PO2GM' then '外进'
+                    else A.meter_type_Name end meterTypeName,
+                A.actual_no actualNo,
+                A.actual_first1_no actualFirst1No,
+                A.actual_first2_no actualFirst2No,
+                A.car_no carNo,
+                A.matter_no matterNo,
+                A.matter_name matterName,
+                to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
+                to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
+                to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
+                A.gross_time grossTime,
+                A.tare_time tareTime,
+                A.net_time netTime,
+                A.base_spot1_name baseSpot1Name,
+                A.base_spot2_name baseSpot2Name,
+                A.net_spot3_name netSpot3Name,
+                case when C.weight_type = '0' then '毛重'
+                    when C.weight_type = '1' then '皮重'
+                    when C.weight_type = '2' then '期限皮'
+                    else C.weight_type end weightType,
+                A.prediction_no predictionNo,
+                A.net_spot3_no netSpot3No,
+                B.rfid_code rfidCode,
+                A.gross_man_name grossManName,
+                A.tare_man_name tareManName,
+                A.net_man_name netManName,
+                A.forwarding_unit_name forwardingUnitName,
+                A.receiving_uint_name receivingUintName,
+                A.voucher_identity voucherIdentity,
+                A.sender_remark senderRemark,
+                A.conveyance_type conveyanceType,
+                case when A.net_mode = '1' then '远程计量'
+                    when A.net_mode = '2' then '智能计量'
+                    when A.net_mode = '3' then '手工计量'
+                    else A.net_mode end netMode,
+                case when A.value_flag = '0' then '作废'
+                    when A.value_flag = '1' then '有效'
+                    else A.value_flag end valueFlag,
+                case when A.upload_flag = '1' then '待上传'
+                    when A.upload_flag = '2' then '已上传'
+                    else A.upload_flag end uploadFlag
+        from meter_work_car_actual A
+            left join meter_base_rfid_info B
+                on A.car_no = B.car_no
+            left join meter_work_car_actual_first C
+                on A.actual_first2_no = C.actual_first_no
+        where 1 = 1
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        order by A.net_time desc
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/CarActualTareWeightComparison.java

@@ -0,0 +1,295 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CarActualTareWeightComparison {
+    private String carType;
+    private String meterTypeName;
+    private String actualNo;
+    private String actualFirst1No;
+    private String actualFirst2No;
+    private String carNo;
+    private String matterNo;
+    private String matterName;
+    private BigDecimal grossWeight;
+    private BigDecimal tareWeight;
+    private BigDecimal netWeight;
+    private Date grossTime;
+    private Date tareTime;
+    private Date netTime;
+    private String baseSpot1Name;
+    private String baseSpot2Name;
+    private String netSpot3Name;
+    private String weightType;
+    private String predictionNo;
+    private String netSpot3No;
+    private String rfidCode;
+    private String grossManName;
+    private String tareManName;
+    private String netManName;
+    private String forwardingUnitName;
+    private String receivingUintName;
+    private String voucherIdentity;
+    private String senderRemark;
+    private String conveyanceType;
+    private String netMode;
+    private String valueFlag;
+    private String uploadFlag;
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName;
+    }
+
+    public String getActualNo() {
+        return actualNo;
+    }
+
+    public void setActualNo(String actualNo) {
+        this.actualNo = actualNo;
+    }
+
+    public String getActualFirst1No() {
+        return actualFirst1No;
+    }
+
+    public void setActualFirst1No(String actualFirst1No) {
+        this.actualFirst1No = actualFirst1No;
+    }
+
+    public String getActualFirst2No() {
+        return actualFirst2No;
+    }
+
+    public void setActualFirst2No(String actualFirst2No) {
+        this.actualFirst2No = actualFirst2No;
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name;
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+
+    public String getWeightType() {
+        return weightType;
+    }
+
+    public void setWeightType(String weightType) {
+        this.weightType = weightType;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getNetSpot3No() {
+        return netSpot3No;
+    }
+
+    public void setNetSpot3No(String netSpot3No) {
+        this.netSpot3No = netSpot3No;
+    }
+
+    public String getRfidCode() {
+        return rfidCode;
+    }
+
+    public void setRfidCode(String rfidCode) {
+        this.rfidCode = rfidCode;
+    }
+
+    public String getGrossManName() {
+        return grossManName;
+    }
+
+    public void setGrossManName(String grossManName) {
+        this.grossManName = grossManName;
+    }
+
+    public String getTareManName() {
+        return tareManName;
+    }
+
+    public void setTareManName(String tareManName) {
+        this.tareManName = tareManName;
+    }
+
+    public String getNetManName() {
+        return netManName;
+    }
+
+    public void setNetManName(String netManName) {
+        this.netManName = netManName;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity;
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark;
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType;
+    }
+
+    public String getNetMode() {
+        return netMode;
+    }
+
+    public void setNetMode(String netMode) {
+        this.netMode = netMode;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -22,4 +22,5 @@ public interface IMeterWorkDataCountService{
     List<HashMap> rfidIdentifyAnalysisSummary(HashMap<String, Object> params);
     PageList<RfidIdentifyAnalysis> rfidIdentifyAnalysisDetail(HashMap<String, Object> params);
     List<HashMap> pikaCarNumAnalysisSummary(HashMap<String, Object> params);
+    PageList<CarActualTareWeightComparison> carActualTareWeightComparison(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -1122,4 +1122,12 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         }
         return instrumentTypeList;
     }
+
+    @Override
+    public PageList<CarActualTareWeightComparison> carActualTareWeightComparison(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<CarActualTareWeightComparison> rows = meterWorkDataCountMapper.carActualTareWeightComparison(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }

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

@@ -55,6 +55,19 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "电子地图获取除去陇西所有的秤点信息-获取列表", notes = "分页查询")
+    //@RequiresPermissions("meterworkmonitor:view")
+    @GetMapping(value = "/listByLonxi/")
+    public RESTfulResult listByLonxi(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkMonitorDto> list = meterWorkMonitorService.listByLonxi(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -35,4 +35,5 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
 
 
     PageList<MeterWorkMonitorDto> queryForPage2(HashMap parmas, Integer pageNum, Integer pageSize);
+    PageList<MeterWorkMonitorDto> listByLonxi(HashMap parmas, Integer pageNum, Integer pageSize);
 }

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

@@ -166,6 +166,36 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         PageHelper.startPage(pageNum, pageSize);
         List<MeterWorkMonitor> rows = this.getMapper().selectByParameters(parmas);
 
+        List<MeterWorkMonitorDto> list = new ArrayList<>();
+        for (MeterWorkMonitor meterWorkMonitor : rows){
+            long time = 45*1000;//45秒
+            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;
+    }
+
+    @Override
+    public PageList<MeterWorkMonitorDto> listByLonxi(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkMonitor> rows = this.getMapper().selectByParameters(parmas);
+
         List<MeterWorkMonitor> rowsTemp = new ArrayList<>();
         if(rows.size() >= 1) {
             for (MeterWorkMonitor model: rows) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/controller/MeterWorkRailwayReceivedController.java

@@ -4,17 +4,13 @@ import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
-import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.service.IMeterWorkRailwayReceivedService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,8 +18,6 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
-import java.math.BigDecimal;
 
 /**
  * MeterWorkRailwayReceived RESTful接口：
@@ -72,6 +66,18 @@ public class MeterWorkRailwayReceivedController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiOperation(value = "获取动态轨道衡从表数据-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeDesc(@RequestBody HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayReceived> list = meterWorkRailwayReceivedService.likeByDesc(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value="获取列表", notes="分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -23,4 +23,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
 
     int deleteByPrimaryKeyLike(@Param(value = "actualFirstNo")String actualFirstNo);
     List<MeterWorkRailwayReceived> selectByPrimaryKeyLike(@Param(value = "actualFirstNo")String actualFirstNo);
+    List<MeterWorkRailwayReceived> likeByDesc(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -2043,4 +2043,94 @@
     <include refid="select" />
     where ACTUAL_FIRST_NO like '%${actualFirstNo}%'
   </select>
+
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="railwayWorkNo != null and railwayWorkNo != ''">
+        and RAILWAY_WORK_NO LIKE '%${railwayWorkNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayNoList != null and railwayNoList != ''">
+        and ( railway_no in
+        <foreach collection="railwayNoList" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+        <if test="railwayNoNull != null and railwayNoNull != ''">
+          or railway_no is null )
+        </if>
+        <if test="railwayNoNull == null or railwayNoNull == ''">
+          and railway_no is not null)
+        </if>
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO LIKE '%${lcNo}%'
+      </if>
+      <if test="startTime != null and startTime != null and endTime != '' and endTime != ''">
+        and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="lcNoTemp != null and lcNoTemp != ''">
+        and ( lc_no in
+        <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+        <if test="lcNoNull != null and lcNoNull != ''">
+          or lc_no is null )
+        </if>
+        <if test="lcNoNull == null or lcNoNull == ''">
+          and lc_no is not null)
+        </if>
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/IMeterWorkRailwayReceivedService.java

@@ -2,9 +2,12 @@ package com.steerinfo.meterwork.meterworkrailwayreceived.service;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import org.apache.shiro.crypto.hash.Hash;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -34,4 +37,6 @@ public interface IMeterWorkRailwayReceivedService extends IBaseService<MeterWork
     RESTfulResult batchMatchPre(List<MeterWorkRailwayReceived> models);
     RESTfulResult addList(List<MeterWorkRailwayReceived> models);
 
+    PageList<MeterWorkRailwayReceived> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -409,6 +409,14 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayReceived> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkRailwayReceived> rows = meterWorkRailwayReceivedMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public RESTfulResult RemovePre(List<MeterWorkRailwayReceived> models) {
         RESTfulResult rm = new RESTfulResult();