后端提交

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/controller/MeterBaseHisTareDetailController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasehistaredetail.controller;
 
+import com.steerinfo.baseinfo.meterbasehistaredata.model.MeterBaseHisTareData;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -7,11 +8,14 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail;
 import com.steerinfo.baseinfo.meterbasehistaredetail.service.IMeterBaseHisTareDetailService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -137,4 +141,40 @@ throw new MarkerMetException(500, "操作异常！！");
 throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "启用-网页", notes = "根据传过来的MeterBaseHisTareData集合信息来更新详细信息")
+    @ApiImplicitParam(name = "MeterBaseHisTareDetail", value = "详细实体MeterBaseHisTareDetail", required = true, dataType = "MeterBaseHisTareDetail")
+    @Transactional
+    @PostMapping(value = "/Recovery")
+    public RESTfulResult Recovery(@RequestBody MeterBaseHisTareDetail model) {
+        try {
+            String msg = meterBaseHisTareDetailService.Recovery(model);
+            if (StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "逻辑删除-网页", notes = "根据传过来的MeterBaseHisTareData集合信息来更新详细信息")
+    @ApiImplicitParam(name = "MeterBaseHisTareDetail", value = "详细实体MeterBaseHisTareDetail", required = true, dataType = "MeterBaseHisTareDetail")
+    @Transactional
+    @PostMapping(value = "/abolish")
+    public RESTfulResult abolish(@RequestBody MeterBaseHisTareDetail model) {
+        try {
+            String msg = meterBaseHisTareDetailService.abolish(model);
+            if (StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+        return success();
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/mapper/MeterBaseHisTareDetailMapper.xml

@@ -11,23 +11,24 @@
     <result column="METER_NAME" jdbcType="VARCHAR" property="meterName" />
     <result column="METER_TIME" jdbcType="TIMESTAMP" property="meterTime" />
     <result column="METER_ORDER" jdbcType="VARCHAR" property="meterOrder" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
   </resultMap>
   <sql id="columns">
     DETAIL_NO, ACTUAL_FIRST_NO, BASE_SPOT_NO, BASE_SPOT_NAME, CAR_NO, METER_WEIGHT, METER_NAME, 
-    METER_TIME, METER_ORDER
+    METER_TIME, METER_ORDER, VALUE_FLAG
   </sql>
   <sql id="columns_alias">
     t.DETAIL_NO, t.ACTUAL_FIRST_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.CAR_NO, t.METER_WEIGHT, 
-    t.METER_NAME, t.METER_TIME, t.METER_ORDER
+    t.METER_NAME, t.METER_TIME, t.METER_ORDER, t.VALUE_FLAG
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_HIS_TARE_DETAIL
+    SELECT <include refid="columns" /> FROM METER_BASE_HIS_TARE_DETAIL
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_HIS_TARE_DETAIL t
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_HIS_TARE_DETAIL t
   </sql>
   <sql id="where">
-    <where>
+    <where> 
       <if test="detailNo != null and detailNo != ''">
         and DETAIL_NO = #{detailNo}
       </if>
@@ -55,10 +56,13 @@
       <if test="meterOrder != null and meterOrder != ''">
         and METER_ORDER = #{meterOrder}
       </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where>
+    <where> 
       <if test="detailNo != null and detailNo != ''">
         and DETAIL_NO LIKE '%${detailNo}%'
       </if>
@@ -86,6 +90,9 @@
       <if test="meterOrder != null and meterOrder != ''">
         and METER_ORDER LIKE '%${meterOrder}%'
       </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -119,16 +126,19 @@
       <if test="meterOrder != null and meterOrder != ''">
         or METER_ORDER = #{meterOrder}
       </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail">
     insert into METER_BASE_HIS_TARE_DETAIL (DETAIL_NO, ACTUAL_FIRST_NO, BASE_SPOT_NO, 
       BASE_SPOT_NAME, CAR_NO, METER_WEIGHT, 
-      METER_NAME, METER_TIME, METER_ORDER
-      )
+      METER_NAME, METER_TIME, METER_ORDER, 
+      VALUE_FLAG)
     values (#{detailNo,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
       #{baseSpotName,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, 
-      #{meterName,jdbcType=VARCHAR}, #{meterTime,jdbcType=TIMESTAMP}, #{meterOrder,jdbcType=VARCHAR}
-      )
+      #{meterName,jdbcType=VARCHAR}, #{meterTime,jdbcType=TIMESTAMP}, #{meterOrder,jdbcType=VARCHAR}, 
+      #{valueFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail">
     insert into METER_BASE_HIS_TARE_DETAIL
@@ -160,6 +170,9 @@
       <if test="meterOrder != null">
         METER_ORDER,
       </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="detailNo != null">
@@ -189,6 +202,9 @@
       <if test="meterOrder != null">
         #{meterOrder,jdbcType=VARCHAR},
       </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail">
@@ -200,7 +216,8 @@
       METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
       METER_NAME = #{meterName,jdbcType=VARCHAR},
       METER_TIME = #{meterTime,jdbcType=TIMESTAMP},
-      METER_ORDER = #{meterOrder,jdbcType=VARCHAR}
+      METER_ORDER = #{meterOrder,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
     where DETAIL_NO = #{detailNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail">
@@ -230,85 +247,92 @@
       <if test="meterOrder != null">
         METER_ORDER = #{meterOrder,jdbcType=VARCHAR},
       </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
     </set>
     where DETAIL_NO = #{detailNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where DETAIL_NO = #{detailNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  METER_TIME desc
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by  METER_TIME desc
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_BASE_HIS_TARE_DETAIL 
       (DETAIL_NO, 
       ACTUAL_FIRST_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
       CAR_NO, METER_WEIGHT, METER_NAME, 
-      METER_TIME, METER_ORDER)
+      METER_TIME, METER_ORDER, VALUE_FLAG
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.detailNo,jdbcType=VARCHAR}, 
       #{item.actualFirstNo,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, 
       #{item.carNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, #{item.meterName,jdbcType=VARCHAR}, 
-      #{item.meterTime,jdbcType=TIMESTAMP}, #{item.meterOrder,jdbcType=VARCHAR} from dual  
+      #{item.meterTime,jdbcType=TIMESTAMP}, #{item.meterOrder,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
      update METER_BASE_HIS_TARE_DETAIL
      set
        DETAIL_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.detailNo,jdbcType=VARCHAR}
        </foreach>
        ,ACTUAL_FIRST_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
        </foreach>
        ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
        </foreach>
        ,METER_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
        </foreach>
        ,METER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.meterName,jdbcType=VARCHAR}
        </foreach>
        ,METER_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.meterTime,jdbcType=TIMESTAMP}
        </foreach>
        ,METER_ORDER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DETAIL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
           when #{item.detailNo,jdbcType=VARCHAR} then #{item.meterOrder,jdbcType=VARCHAR}
        </foreach>
+       ,VALUE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAIL_NO" separator=" ">
+          when #{item.detailNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
      where DETAIL_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.detailNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_HIS_TARE_DETAIL
     where DETAIL_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -318,4 +342,5 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(DETAIL_NO, LENGTH(DETAIL_NO) - 3))),0) + 1,4,'0') DETAIL_NO
     FROM METER_BASE_HIS_TARE_DETAIL where instr(DETAIL_NO,#{afl,jdbcType=VARCHAR})>0
   </select>
+  
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/model/MeterBaseHisTareDetail.java

@@ -1,20 +1,23 @@
 package com.steerinfo.baseinfo.meterbasehistaredetail.model;
 
 import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
+@ApiModel(value="历史皮重计算配置表")
 public class MeterBaseHisTareDetail implements IBasePO<String> {
     /**
-     * 数据编号(DETAIL_NO,VARCHAR,20)
+     * 数据编号（YYYYMMDD+4位流水）(DETAIL_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="数据编号",required=true)
+    @ApiModelProperty(value="数据编号（YYYYMMDD+4位流水）",required=true)
     private String detailNo;
 
     /**
      * 作业编号(ACTUAL_FIRST_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="作业编号",required=true)
+    @ApiModelProperty(value="作业编号",required=false)
     private String actualFirstNo;
 
     /**
@@ -36,29 +39,35 @@ public class MeterBaseHisTareDetail implements IBasePO<String> {
     private String carNo;
 
     /**
-     * 皮重数据(METER_WEIGHT,DECIMAL,10)
+     * 皮重数据（KG）(METER_WEIGHT,DECIMAL,10)
      */
-    @ApiModelProperty(value="皮重数据",required=true)
+    @ApiModelProperty(value="皮重数据（KG）",required=true)
     private Long meterWeight;
 
     /**
      * 皮重计量员(METER_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="皮重计量员",required=true)
+    @ApiModelProperty(value="皮重计量员",required=false)
     private String meterName;
 
     /**
-     * 皮重计量时间(METER_TIME,TIMESTAMP,7)
+     * 皮重计量时间（YYYY-MM-DD HH:mm:ss）(METER_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="皮重计量时间",required=true)
+    @ApiModelProperty(value="皮重计量时间（YYYY-MM-DD HH:mm:ss）",required=true)
     private Date meterTime;
 
     /**
-     * 计量次序(METER_ORDER,VARCHAR,1)
+     * 计量次序（1：一次计量；2：二次计量；3：期限皮重）(METER_ORDER,VARCHAR,1)
      */
-    @ApiModelProperty(value="计量次序",required=true)
+    @ApiModelProperty(value="计量次序（1：一次计量；2：二次计量；3：期限皮重）",required=true)
     private String meterOrder;
 
+    /**
+     * 状态（0：有效；1：无效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：有效；1：无效）",required=false)
+    private String valueFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -143,6 +152,14 @@ public class MeterBaseHisTareDetail implements IBasePO<String> {
         this.meterOrder = meterOrder == null ? null : meterOrder.trim();
     }
 
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -158,6 +175,7 @@ public class MeterBaseHisTareDetail implements IBasePO<String> {
         sb.append(", meterName=").append(meterName);
         sb.append(", meterTime=").append(meterTime);
         sb.append(", meterOrder=").append(meterOrder);
+        sb.append(", valueFlag=").append(valueFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/service/IMeterBaseHisTareDetailService.java

@@ -17,5 +17,7 @@ import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetai
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterBaseHisTareDetailService extends IBaseService<MeterBaseHisTareDetail, String>{
+    String Recovery(MeterBaseHisTareDetail model);
+    String abolish(MeterBaseHisTareDetail model);
 
 }

src/main/java/com/steerinfo/baseinfo/meterbasehistaredetail/service/impl/MeterBaseHisTareDetailServiceImpl.java

@@ -1,5 +1,7 @@
 package com.steerinfo.baseinfo.meterbasehistaredetail.service.impl;
 
+import com.steerinfo.baseinfo.meterbasehistaredata.mapper.MeterBaseHisTareDataMapper;
+import com.steerinfo.baseinfo.meterbasehistaredata.model.MeterBaseHisTareData;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail;
@@ -7,6 +9,12 @@ import com.steerinfo.baseinfo.meterbasehistaredetail.mapper.MeterBaseHisTareDeta
 import com.steerinfo.baseinfo.meterbasehistaredetail.service.IMeterBaseHisTareDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseHisTareDetail服务实现：
@@ -24,11 +32,69 @@ import org.springframework.stereotype.Service;
 @Service(value = "meterBaseHisTareDetailService")
 public class MeterBaseHisTareDetailServiceImpl extends BaseServiceImpl<MeterBaseHisTareDetail, String> implements IMeterBaseHisTareDetailService {
 
-    @Autowired
+    @Resource
     private MeterBaseHisTareDetailMapper meterBaseHisTareDetailMapper;
 
+    @Resource
+    private MeterBaseHisTareDataMapper meterBaseHisTareDataMapper;
+
     @Override
     protected IBaseMapper<MeterBaseHisTareDetail, String> getMapper() {
         return meterBaseHisTareDetailMapper;
     }
+
+    @Override
+    public String Recovery(MeterBaseHisTareDetail model) {
+        try{
+            if(!model.getValueFlag().equals("1")) {
+                return "请选择作废数据";
+            }
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("carNo", model.getCarNo());
+            obj.put("valueFlag", "0");
+            List<MeterBaseHisTareData> hisTareDataList = meterBaseHisTareDataMapper.selectByParameters(obj);
+            if(obj.size() >= 1) {
+                MeterBaseHisTareData hisData = hisTareDataList.get(0);
+                long avg = ((hisData.getAvgWeight()*hisData.getMeterNum())+model.getMeterWeight())/(hisData.getMeterNum()+1);
+                hisData.setAvgWeight(avg);
+                hisData.setMeterNum(hisData.getMeterNum()+1);
+                meterBaseHisTareDataMapper.updateByPrimaryKeySelective(hisData);
+            }
+            model.setValueFlag("0");
+            meterBaseHisTareDetailMapper.updateByPrimaryKeySelective(model);
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return "操作异常，请联系管理员";
+        }
+        return "";
+    }
+
+    @Override
+    @Transactional
+    public String abolish(MeterBaseHisTareDetail model) {
+        try{
+            if(!model.getValueFlag().equals("0")) {
+                return "请选择有效数据";
+            }
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("carNo", model.getCarNo());
+            obj.put("valueFlag", "0");
+            List<MeterBaseHisTareData> hisTareDataList = meterBaseHisTareDataMapper.selectByParameters(obj);
+            if(obj.size() >= 1) {
+                MeterBaseHisTareData hisData = hisTareDataList.get(0);
+                long avg = ((hisData.getAvgWeight()*hisData.getMeterNum())-model.getMeterWeight())/(hisData.getMeterNum()-1);
+                hisData.setAvgWeight(avg);
+                hisData.setMeterNum(hisData.getMeterNum()-1);
+                meterBaseHisTareDataMapper.updateByPrimaryKeySelective(hisData);
+            }
+            model.setValueFlag("1");
+            meterBaseHisTareDetailMapper.updateByPrimaryKeySelective(model);
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return "操作异常，请联系管理员";
+        }
+        return "";
+    }
 }

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

@@ -1306,4 +1306,6 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             return failed(null, "操作异常，请确认！");
         }
     }
+
+
 }

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

@@ -17,6 +17,7 @@ import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
@@ -1282,4 +1283,19 @@ throw new MarkerMetException(500, "操作异常！！");
             return rm;
         }
     }
+
+    @ApiOperation(value = "轨道衡批量匹配界面显示")
+    @Transactional
+    @PostMapping(value = "/batchMatchView")
+    public RESTfulResult batchMatchView(@RequestBody HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.batchMatchView(param);
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.java

@@ -6,6 +6,7 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualF
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.shiro.crypto.hash.Hash;
 
 import java.util.*;
 
@@ -50,4 +51,5 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
 
     void repairPre(Map<String, Object> map);
     List<MeterWorkRailwayActFirst> selectById(List<String> actualNoList);
+    List<HashMap> batchMatchView(HashMap params);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3599,4 +3599,64 @@
       #{item}
     </foreach>
   </select>
+
+  <select id="batchMatchView" parameterType="java.util.HashMap" resultType="HashMap">
+    select A.create_time createTime,
+         A.lc_no lcNo,
+         A.railway_no railwayNo,
+         A.meter_weight meterWeight,
+         A.weight_type weightType,
+         A.value_flag vlaueFlag,
+         A.is_pre_sacale isPreSacale,
+         C.meter_weight hisTareWeight,
+         A.conveyance_type conveyanceType,
+         A.railway_factory_weight railwayFactoryWeight,
+         B.CARRIAGE_CODE carriageCode,
+         B.CARRIAGE_WEIGHT carriageWeight
+    from meter_work_railway_act_first A
+    left join meter_base_railway_carriage_weight B
+      on A.conveyance_type = B.Carriage_Code
+         and B.value_flag = '1'
+    left join meter_base_railway_his_tare_data C
+      on A.railway_no = C.railway_no
+         and C.value_flag = '0'
+   where 1=1
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  A.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="railwayNo != null and railwayNo != ''">
+      and  A.railway_no like  '%${railwayNo}%'
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  A.base_spot_No like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  A.base_spot_name like '%${baseSpotName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and  A.matter_no like '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and  A.matter_name like '%${matterName}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and  A.prediction_no like '%${predictionNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and  A.forwarding_Unit_Name like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and  A.receiving_Uint_Name like '%${receivingUintName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  A.value_flag = #{valueFlag}
+    </if>
+    <if test="lcNo != null and lcNo != ''">
+      and  A.lc_No like '%${lcNo}%'
+    </if>
+    order by A.create_time desc
+  </select>
 </mapper>

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

@@ -126,5 +126,6 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     PageList<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
 
     RESTfulResult doStandardMatch(HashMap<String, Object> param);
+    RESTfulResult batchMatchView(HashMap<String, Object> param);
 }
 

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

@@ -5725,6 +5725,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return null;
     }
 
+    @Override
+    public RESTfulResult batchMatchView(HashMap<String, Object> param) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setMessage("操作成功");
+        rm.setCode("200");
+        rm.setData(meterWorkRailwayActFirstMapper.batchMatchView(param));
+        return rm;
+    }
+
     @Override
     public List<MeterWorkRailwayActFirst> noPage(HashMap<String, Object> params) {
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(params);

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -10,20 +10,21 @@
     <result column="VIDEO_NAME" jdbcType="VARCHAR" property="videoName" />
     <result column="SOUND_NAME" jdbcType="VARCHAR" property="soundName" />
     <result column="TRACK_WAY" jdbcType="VARCHAR" property="trackWay" />
+    <result column="IS_DISPOSE" jdbcType="VARCHAR" property="isDispose" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME, 
-    TRACK_WAY
+    TRACK_WAY, IS_DISPOSE
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.CREATE_TIME, t.CARRIAGE_NUM, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.VIDEO_NAME, 
-    t.SOUND_NAME, t.TRACK_WAY
+    t.SOUND_NAME, t.TRACK_WAY, t.IS_DISPOSE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_WORK_RAILWAY_REC_MAIN
+    SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_REC_MAIN
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_WORK_RAILWAY_REC_MAIN t
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_RAILWAY_REC_MAIN t
   </sql>
   <sql id="where">
     <where> 
@@ -51,6 +52,9 @@
       <if test="trackWay != null and trackWay != ''">
         and TRACK_WAY = #{trackWay}
       </if>
+      <if test="isDispose != null and isDispose != ''">
+        and IS_DISPOSE = #{isDispose}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -79,8 +83,8 @@
       <if test="trackWay != null and trackWay != ''">
         and TRACK_WAY LIKE '%${trackWay}%'
       </if>
-      <if test="startTime != null and endTime != null and startTime != '' 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 test="isDispose != null and isDispose != ''">
+        and IS_DISPOSE LIKE '%${isDispose}%'
       </if>
     </where>
   </sql>
@@ -112,14 +116,19 @@
       <if test="trackWay != null and trackWay != ''">
         or TRACK_WAY = #{trackWay}
       </if>
+      <if test="isDispose != null and isDispose != ''">
+        or IS_DISPOSE = #{isDispose}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain">
     insert into METER_WORK_RAILWAY_REC_MAIN (ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM, 
       BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME, 
-      SOUND_NAME, TRACK_WAY)
+      SOUND_NAME, TRACK_WAY, IS_DISPOSE
+      )
     values (#{actualNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{carriageNum,jdbcType=DECIMAL}, 
       #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{videoName,jdbcType=VARCHAR}, 
-      #{soundName,jdbcType=VARCHAR}, #{trackWay,jdbcType=VARCHAR})
+      #{soundName,jdbcType=VARCHAR}, #{trackWay,jdbcType=VARCHAR}, #{isDispose,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain">
     insert into METER_WORK_RAILWAY_REC_MAIN
@@ -148,6 +157,9 @@
       <if test="trackWay != null">
         TRACK_WAY,
       </if>
+      <if test="isDispose != null">
+        IS_DISPOSE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -174,6 +186,9 @@
       <if test="trackWay != null">
         #{trackWay,jdbcType=VARCHAR},
       </if>
+      <if test="isDispose != null">
+        #{isDispose,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain">
@@ -184,7 +199,8 @@
       BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
       VIDEO_NAME = #{videoName,jdbcType=VARCHAR},
       SOUND_NAME = #{soundName,jdbcType=VARCHAR},
-      TRACK_WAY = #{trackWay,jdbcType=VARCHAR}
+      TRACK_WAY = #{trackWay,jdbcType=VARCHAR},
+      IS_DISPOSE = #{isDispose,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain">
@@ -211,79 +227,86 @@
       <if test="trackWay != null">
         TRACK_WAY = #{trackWay,jdbcType=VARCHAR},
       </if>
+      <if test="isDispose != null">
+        IS_DISPOSE = #{isDispose,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_RAILWAY_REC_MAIN 
       (ACTUAL_NO, 
       CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO, 
       BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME, 
-      TRACK_WAY)
+      TRACK_WAY, IS_DISPOSE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.carriageNum,jdbcType=DECIMAL}, #{item.baseSpotNo,jdbcType=VARCHAR}, 
       #{item.baseSpotName,jdbcType=VARCHAR}, #{item.videoName,jdbcType=VARCHAR}, #{item.soundName,jdbcType=VARCHAR}, 
-      #{item.trackWay,jdbcType=VARCHAR} from dual  
+      #{item.trackWay,jdbcType=VARCHAR}, #{item.isDispose,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
      update METER_WORK_RAILWAY_REC_MAIN
      set
        ACTUAL_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualNo,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
        ,CARRIAGE_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.carriageNum,jdbcType=DECIMAL}
        </foreach>
        ,BASE_SPOT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
        </foreach>
        ,VIDEO_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.videoName,jdbcType=VARCHAR}
        </foreach>
        ,SOUND_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.soundName,jdbcType=VARCHAR}
        </foreach>
        ,TRACK_WAY=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.trackWay,jdbcType=VARCHAR}
        </foreach>
+       ,IS_DISPOSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.isDispose,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_RAILWAY_REC_MAIN
     where ACTUAL_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -298,4 +321,5 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/model/MeterWorkRailwayRecMain.java

@@ -3,12 +3,13 @@ package com.steerinfo.meterwork.meterworkrailwayrecmain.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
 @ApiModel(value="动轨采集主表")
 public class MeterWorkRailwayRecMain implements IBasePO<String> {
     /**
-     * 作业编号(ACTUAL_NO,VARCHAR,20)
+     * 作业编号(ACTUAL_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="作业编号",required=true)
     private String actualNo;
@@ -38,13 +39,13 @@ public class MeterWorkRailwayRecMain implements IBasePO<String> {
     private String baseSpotName;
 
     /**
-     * 视频文件(VIDEO_NAME,VARCHAR,100)
+     * 视频文件(VIDEO_NAME,VARCHAR,300)
      */
     @ApiModelProperty(value="视频文件",required=false)
     private String videoName;
 
     /**
-     * 音频文件(SOUND_NAME,VARCHAR,100)
+     * 音频文件(SOUND_NAME,VARCHAR,300)
      */
     @ApiModelProperty(value="音频文件",required=false)
     private String soundName;
@@ -55,6 +56,12 @@ public class MeterWorkRailwayRecMain implements IBasePO<String> {
     @ApiModelProperty(value="方向",required=false)
     private String trackWay;
 
+    /**
+     * 状态(0:未处理  1:已处理)(IS_DISPOSE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:未处理  1:已处理)",required=false)
+    private String isDispose;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -131,6 +138,14 @@ public class MeterWorkRailwayRecMain implements IBasePO<String> {
         this.trackWay = trackWay == null ? null : trackWay.trim();
     }
 
+    public String getIsDispose() {
+        return isDispose;
+    }
+
+    public void setIsDispose(String isDispose) {
+        this.isDispose = isDispose == null ? null : isDispose.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -145,6 +160,7 @@ public class MeterWorkRailwayRecMain implements IBasePO<String> {
         sb.append(", videoName=").append(videoName);
         sb.append(", soundName=").append(soundName);
         sb.append(", trackWay=").append(trackWay);
+        sb.append(", isDispose=").append(isDispose);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -2926,6 +2926,7 @@
             <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
                 and create_time between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
             </if>
+            and TRUST_AVAILABILITY_TIME >= sysDate
         </where>
         order by CREATE_TIME desc
     </select>