后端修改

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/controller/MeterBaseRailwayHisTareDataController.java

@@ -0,0 +1,121 @@
+package com.steerinfo.baseinfo.meterbaserailwayhistaredata.controller;
+
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.service.IMeterBaseRailwayHisTareDataService;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseRailwayHisTareData RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-24 10:04
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayHisTareData RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaserailwayhistaredatas")
+public class MeterBaseRailwayHisTareDataController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseRailwayHisTareDataService meterBaseRailwayHisTareDataService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwayhistaredata:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseRailwayHisTareData> list = meterBaseRailwayHisTareDataService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwayhistaredata:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseRailwayHisTareData> list = meterBaseRailwayHisTareDataService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseRailwayHisTareData对象创建")
+    @ApiImplicitParam(name = "meterBaseRailwayHisTareData", value = "详细实体meterBaseRailwayHisTareData", required = true, dataType = "MeterBaseRailwayHisTareData")
+    //@RequiresPermissions("meterbaserailwayhistaredata:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseRailwayHisTareData model){
+        MeterBaseRailwayHisTareData meterBaseRailwayHisTareData = meterBaseRailwayHisTareDataService.add(model);
+        return success(meterBaseRailwayHisTareData);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaserailwayhistaredata:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseRailwayHisTareData meterBaseRailwayHisTareData = meterBaseRailwayHisTareDataService.getById(id);
+        return success(meterBaseRailwayHisTareData);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseRailwayHisTareData信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseRailwayHisTareData", value = "详细实体meterBaseRailwayHisTareData", required = true, dataType = "MeterBaseRailwayHisTareData")
+    })
+    //@RequiresPermissions("meterbaserailwayhistaredata:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseRailwayHisTareData model){
+        model.setId(id);
+        MeterBaseRailwayHisTareData meterBaseRailwayHisTareData = meterBaseRailwayHisTareDataService.modify(model);
+        return success(meterBaseRailwayHisTareData);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaserailwayhistaredata:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterBaseRailwayHisTareDataService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据火车车号和计量重量保存历史皮重", notes="根据火车车号和计量重量保存历史皮重")
+    @PostMapping(value = "railwayHisTare")//String
+    public RESTfulResult railwayHisTare(@RequestBody HashMap params){
+        RESTfulResult rm = failed();
+
+        String railwayNo = params.get("railwayNo") == null ? "" : params.get("railwayNo").toString();
+        String meterWeight = params.get("meterWeight") == null ? "" : params.get("meterWeight").toString();
+        String meterName = params.get("meterName") == null ? "" : params.get("meterName").toString();
+        String baseSpotNo = params.get("baseSpotNo") == null ? "" : params.get("baseSpotNo").toString();
+        String baseSpotName = params.get("baseSpotName") == null ? "" : params.get("baseSpotName").toString();
+        rm = meterBaseRailwayHisTareDataService.railwayHisTare(railwayNo, meterWeight,meterName, baseSpotNo, baseSpotName);
+
+        return rm;
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/mapper/MeterBaseRailwayHisTareDataMapper.java

@@ -0,0 +1,11 @@
+package com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper;
+
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface MeterBaseRailwayHisTareDataMapper extends IBaseMapper<MeterBaseRailwayHisTareData, String> {
+    String getNewID(@Param(value="afl")String afl);
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/mapper/MeterBaseRailwayHisTareDataMapper.xml

@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData">
+    <id column="DATA_NO" jdbcType="VARCHAR" property="dataNo" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
+    <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
+    <result column="METER_NAME" jdbcType="VARCHAR" property="meterName" />
+    <result column="METER_TIME" jdbcType="TIMESTAMP" property="meterTime" />
+    <result column="UP_WEIGHT" jdbcType="DECIMAL" property="upWeight" />
+    <result column="AVG_WEIGHT" jdbcType="DECIMAL" property="avgWeight" />
+    <result column="METER_NUM" jdbcType="DECIMAL" property="meterNum" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="columns">
+    DATA_NO, BASE_SPOT_NO, BASE_SPOT_NAME, RAILWAY_NO, METER_WEIGHT, METER_NAME, METER_TIME, 
+    UP_WEIGHT, AVG_WEIGHT, METER_NUM, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.DATA_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.RAILWAY_NO, t.METER_WEIGHT, t.METER_NAME, 
+    t.METER_TIME, t.UP_WEIGHT, t.AVG_WEIGHT, t.METER_NUM, t.VALUE_FLAG, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_BASE_RAILWAY_HIS_TARE_DATA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_RAILWAY_HIS_TARE_DATA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="dataNo != null and dataNo != ''">
+        and DATA_NO = #{dataNo}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="meterName != null and meterName != ''">
+        and METER_NAME = #{meterName}
+      </if>
+      <if test="meterTime != null">
+        and TO_CHAR(METER_TIME,'yyyy-MM-dd') = #{meterTime}
+      </if>
+      <if test="upWeight != null">
+        and UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="avgWeight != null">
+        and AVG_WEIGHT = #{avgWeight}
+      </if>
+      <if test="meterNum != null">
+        and METER_NUM = #{meterNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="dataNo != null and dataNo != ''">
+        and DATA_NO LIKE '%${dataNo}%'
+      </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="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="meterName != null and meterName != ''">
+        and METER_NAME LIKE '%${meterName}%'
+      </if>
+      <if test="meterTime != null">
+        and TO_CHAR(METER_TIME,'yyyy-MM-dd') = #{meterTime}
+      </if>
+      <if test="upWeight != null">
+        and UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="avgWeight != null">
+        and AVG_WEIGHT = #{avgWeight}
+      </if>
+      <if test="meterNum != null">
+        and METER_NUM = #{meterNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_RAILWAY_HIS_TARE_DATA
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_RAILWAY_HIS_TARE_DATA
+    where 1!=1 
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        or RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="meterWeight != null">
+        or METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="meterName != null and meterName != ''">
+        or METER_NAME = #{meterName}
+      </if>
+      <if test="meterTime != null">
+        or TO_CHAR(METER_TIME,'yyyy-MM-dd') = '#{meterTime}'
+      </if>
+      <if test="upWeight != null">
+        or UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="avgWeight != null">
+        or AVG_WEIGHT = #{avgWeight}
+      </if>
+      <if test="meterNum != null">
+        or METER_NUM = #{meterNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData">
+    insert into METER_BASE_RAILWAY_HIS_TARE_DATA (DATA_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      RAILWAY_NO, METER_WEIGHT, METER_NAME, 
+      METER_TIME, UP_WEIGHT, AVG_WEIGHT, 
+      METER_NUM, VALUE_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME)
+    values (#{dataNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{railwayNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, #{meterName,jdbcType=VARCHAR}, 
+      #{meterTime,jdbcType=TIMESTAMP}, #{upWeight,jdbcType=DECIMAL}, #{avgWeight,jdbcType=DECIMAL}, 
+      #{meterNum,jdbcType=DECIMAL}, #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, 
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData">
+    insert into METER_BASE_RAILWAY_HIS_TARE_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="dataNo != null">
+        DATA_NO,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO,
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT,
+      </if>
+      <if test="meterName != null">
+        METER_NAME,
+      </if>
+      <if test="meterTime != null">
+        METER_TIME,
+      </if>
+      <if test="upWeight != null">
+        UP_WEIGHT,
+      </if>
+      <if test="avgWeight != null">
+        AVG_WEIGHT,
+      </if>
+      <if test="meterNum != null">
+        METER_NUM,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="dataNo != null">
+        #{dataNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        #{meterWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="meterName != null">
+        #{meterName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTime != null">
+        #{meterTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="upWeight != null">
+        #{upWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="avgWeight != null">
+        #{avgWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="meterNum != null">
+        #{meterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData">
+    update METER_BASE_RAILWAY_HIS_TARE_DATA
+    set BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      METER_NAME = #{meterName,jdbcType=VARCHAR},
+      METER_TIME = #{meterTime,jdbcType=TIMESTAMP},
+      UP_WEIGHT = #{upWeight,jdbcType=DECIMAL},
+      AVG_WEIGHT = #{avgWeight,jdbcType=DECIMAL},
+      METER_NUM = #{meterNum,jdbcType=DECIMAL},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData">
+    update METER_BASE_RAILWAY_HIS_TARE_DATA
+    <set>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="meterName != null">
+        METER_NAME = #{meterName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTime != null">
+        METER_TIME = #{meterTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="upWeight != null">
+        UP_WEIGHT = #{upWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="avgWeight != null">
+        AVG_WEIGHT = #{avgWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="meterNum != null">
+        METER_NUM = #{meterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_RAILWAY_HIS_TARE_DATA 
+      (DATA_NO, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, RAILWAY_NO, 
+      METER_WEIGHT, METER_NAME, METER_TIME, 
+      UP_WEIGHT, AVG_WEIGHT, METER_NUM, 
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.dataNo,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, 
+      #{item.meterWeight,jdbcType=DECIMAL}, #{item.meterName,jdbcType=VARCHAR}, #{item.meterTime,jdbcType=TIMESTAMP}, 
+      #{item.upWeight,jdbcType=DECIMAL}, #{item.avgWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_RAILWAY_HIS_TARE_DATA
+     set
+       DATA_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.dataNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,METER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterName,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UP_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.upWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,AVG_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.avgWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,METER_NUM=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterNum,jdbcType=DECIMAL}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where DATA_NO in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.dataNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_RAILWAY_HIS_TARE_DATA
+    where DATA_NO in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(data_no, LENGTH(data_no) - 3))),0) + 1, 4, '0') data_no
+    FROM meter_base_railway_his_tare_data
+    where instr(data_no, #{afl, jdbcType = VARCHAR}) > 0
+  </select>
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/model/MeterBaseRailwayHisTareData.java

@@ -0,0 +1,243 @@
+package com.steerinfo.baseinfo.meterbaserailwayhistaredata.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 MeterBaseRailwayHisTareData implements IBasePO<String> {
+    /**
+     * 数据编号（YYYYMMDD+4位流水）(DATA_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="数据编号（YYYYMMDD+4位流水）",required=true)
+    private String dataNo;
+
+    /**
+     * 皮重计量编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重计量编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 皮重计量点名称(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="皮重计量点名称",required=false)
+    private String baseSpotName;
+
+    /**
+     * 火车车号(RAILWAY_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="火车车号",required=false)
+    private String railwayNo;
+
+    /**
+     * 皮重数据（KG）(METER_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="皮重数据（KG）",required=false)
+    private Long meterWeight;
+
+    /**
+     * 皮重计量员(METER_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重计量员",required=false)
+    private String meterName;
+
+    /**
+     * 皮重计量时间（YYYY-MM-dd HH:mm:ss）(METER_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="皮重计量时间（YYYY-MM-dd HH:mm:ss）",required=false)
+    private Date meterTime;
+
+    /**
+     * 上一次皮重（KG）(UP_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="上一次皮重（KG）",required=false)
+    private Long upWeight;
+
+    /**
+     * 平均皮重（平均*次数+当前)/(次数+1)(AVG_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="平均皮重（平均*次数+当前)/(次数+1)",required=false)
+    private Long avgWeight;
+
+    /**
+     * 皮重次数(METER_NUM,DECIMAL,10)
+     */
+    @ApiModelProperty(value="皮重次数",required=false)
+    private Long meterNum;
+
+    /**
+     * 状态（0：有效; 1：无效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：有效; 1：无效）",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:ss）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:ss）",required=false)
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.dataNo;
+    }
+
+    @Override
+    public void setId(String dataNo) {
+        this.dataNo = dataNo == null ? null : dataNo.trim();
+    }
+
+    public String getDataNo() {
+        return dataNo;
+    }
+
+    public void setDataNo(String dataNo) {
+        this.dataNo = dataNo == null ? null : dataNo.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
+    }
+
+    public Long getMeterWeight() {
+        return meterWeight;
+    }
+
+    public void setMeterWeight(Long meterWeight) {
+        this.meterWeight = meterWeight;
+    }
+
+    public String getMeterName() {
+        return meterName;
+    }
+
+    public void setMeterName(String meterName) {
+        this.meterName = meterName == null ? null : meterName.trim();
+    }
+
+    public Date getMeterTime() {
+        return meterTime;
+    }
+
+    public void setMeterTime(Date meterTime) {
+        this.meterTime = meterTime;
+    }
+
+    public Long getUpWeight() {
+        return upWeight;
+    }
+
+    public void setUpWeight(Long upWeight) {
+        this.upWeight = upWeight;
+    }
+
+    public Long getAvgWeight() {
+        return avgWeight;
+    }
+
+    public void setAvgWeight(Long avgWeight) {
+        this.avgWeight = avgWeight;
+    }
+
+    public Long getMeterNum() {
+        return meterNum;
+    }
+
+    public void setMeterNum(Long meterNum) {
+        this.meterNum = meterNum;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", dataNo=").append(dataNo);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", railwayNo=").append(railwayNo);
+        sb.append(", meterWeight=").append(meterWeight);
+        sb.append(", meterName=").append(meterName);
+        sb.append(", meterTime=").append(meterTime);
+        sb.append(", upWeight=").append(upWeight);
+        sb.append(", avgWeight=").append(avgWeight);
+        sb.append(", meterNum=").append(meterNum);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/service/IMeterBaseRailwayHisTareDataService.java

@@ -0,0 +1,22 @@
+package com.steerinfo.baseinfo.meterbaserailwayhistaredata.service;
+
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * MeterBaseRailwayHisTareData服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-24 10:04
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayHisTareData服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseRailwayHisTareDataService extends IBaseService<MeterBaseRailwayHisTareData, String>{
+    RESTfulResult railwayHisTare(String railwayNo, String meterWeight, String meterName, String baseSpotNo, String baseSpotName);
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/service/impl/MeterBaseRailwayHisTareDataServiceImpl.java

@@ -0,0 +1,116 @@
+package com.steerinfo.baseinfo.meterbaserailwayhistaredata.service.impl;
+
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper;
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.service.IMeterBaseRailwayHisTareDataService;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.user.UserPayload;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseRailwayHisTareData服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-24 10:04
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayHisTareData服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseRailwayHisTareDataService")
+public class MeterBaseRailwayHisTareDataServiceImpl extends BaseServiceImpl<MeterBaseRailwayHisTareData, String> implements IMeterBaseRailwayHisTareDataService {
+
+    @Autowired
+    private MeterBaseRailwayHisTareDataMapper meterBaseRailwayHisTareDataMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseRailwayHisTareData, String> getMapper() {
+        return meterBaseRailwayHisTareDataMapper;
+    }
+
+    @Override
+    public RESTfulResult railwayHisTare(String railwayNo, String meterWeight,String meterName, String baseSpotNo, String baseSpotName) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            if (railwayNo.equals("")) {
+                rm.setMessage("火车车号不能为空！！");
+                return rm;
+            }
+            if (meterWeight.equals("")) {
+                rm.setMessage("计量重量不能为空！！");
+                return rm;
+            }
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("railwayNo", railwayNo);
+            List<MeterBaseRailwayHisTareData> model = meterBaseRailwayHisTareDataMapper.selectByParameters(map);
+            if (model.size() >= 1) {
+                MeterBaseRailwayHisTareData hisTaremodel = model.get(0);
+                hisTaremodel.setMeterWeight(Long.parseLong(meterWeight));
+                hisTaremodel.setMeterTime(new Date());
+                hisTaremodel.setValueFlag("0");
+                hisTaremodel.setUpWeight(hisTaremodel.getMeterWeight());
+                //新平均重量 = 当前平均重量*总次数+当前计量重量/(总次数+1)
+                Long num = hisTaremodel.getMeterNum() + 1;
+                Long avg = (hisTaremodel.getAvgWeight() * hisTaremodel.getMeterNum() + Long.parseLong(meterWeight)) / num;
+                hisTaremodel.setAvgWeight(avg);
+                hisTaremodel.setMeterNum(num);
+                hisTaremodel.setBaseSpotNo(baseSpotNo);
+                hisTaremodel.setBaseSpotName(baseSpotName);
+                int i = meterBaseRailwayHisTareDataMapper.updateByPrimaryKeySelective(hisTaremodel);
+                if (i >= 1) {
+                    rm.setSucceed();
+                    rm.setData(hisTaremodel);
+                    rm.setMessage("操作成功！！");
+                    return rm;
+                }
+            } else {
+                MeterBaseRailwayHisTareData hisTareData = new MeterBaseRailwayHisTareData();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                String no = meterBaseRailwayHisTareDataMapper.getNewID(sdf.format(new Date()));
+                hisTareData.setDataNo(sdf.format(new Date()) + no);
+                hisTareData.setRailwayNo(railwayNo);
+                hisTareData.setMeterWeight(Long.parseLong(meterWeight));
+                hisTareData.setMeterNum(new Long(1));
+                hisTareData.setAvgWeight(Long.parseLong(meterWeight));
+                hisTareData.setUpWeight(Long.parseLong(meterWeight));
+                hisTareData.setValueFlag("0");
+                hisTareData.setMeterName(meterName);
+                hisTareData.setMeterTime(new Date());
+                hisTareData.setCreateTime(new Date());
+                UserPayload payload = UserPayload.getCurrUser();
+                String userId = payload.getId();
+                String userName = payload.getUserName();
+                hisTareData.setCreateManNo(userId);
+                hisTareData.setCreateManName(userName);
+                /*hisTareData.setCreateManNo("userId");
+                hisTareData.setCreateManName("userName");*/
+                hisTareData.setBaseSpotNo(baseSpotNo);
+                hisTareData.setBaseSpotName(baseSpotName);
+                int i = meterBaseRailwayHisTareDataMapper.insertSelective(hisTareData);
+                if (i >= 1) {
+                    rm.setSucceed();
+                    rm.setData(hisTareData);
+                    rm.setMessage("操作成功！！");
+                    return rm;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return rm;
+        }
+        return rm;
+    }
+
+}

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

@@ -3393,6 +3393,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
                 //将毛重委托匹配到皮重中
                 MeterWorkCarActualFirst meterWorkCarActualFirst = meterWorkCarActualFirstMapper.selectAndMatch(actualFirst.getActualFirstNo(), model.getPredictionNo());
+                meterWorkCarActualFirst.setIsPreScale("1s");
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meterWorkCarActualFirst);
 
                 //修改毛重数据状态为结净

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

@@ -846,16 +846,39 @@ throw new MarkerMetException(500, "操作异常！！");
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/fixedTare")
     public RESTfulResult fixedTare(@RequestBody HashMap parmas) {
+        RESTfulResult rm = failed();
         try {
-            String actualNo = parmas.get("actualNo").toString();
-            String predictionNo = parmas.get("predictionNo").toString();
-            String tareWeight = parmas.get("tareWeight").toString();
+            String actualNo = parmas.get("actualNo") == null ? "" : parmas.get("actualNo").toString();
+            String predictionNo = parmas.get("predictionNo") == null ? "" : parmas.get("predictionNo").toString();
+            String tareWeight = parmas.get("tareWeight") == null ? "" : parmas.get("tareWeight").toString();
 
             String msg = meterWorkRailwayActFirstService.fixedTare(actualNo, tareWeight, predictionNo);
-            if (msg != "" || !msg.equals("")){
-                return failed(null,msg);
+            if (msg.equals("")){
+                return rm;
             }
-            return success();
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage(msg);
+            return rm;
+
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "历史皮重洁净", notes = "历史皮重洁净")
+    //@RequiresPermissions("meterworkcaractual:view")
+    @PostMapping(value = "/HistoricalTare")
+    public RESTfulResult HistoricalTare(@RequestBody HashMap parmas) {
+        RESTfulResult rm = failed();
+        try {
+            String actualNo = parmas.get("actualNo") == null ? "" : parmas.get("actualNo").toString();
+            String predictionNo = parmas.get("predictionNo") == null ? "" : parmas.get("predictionNo").toString();
+
+            rm = meterWorkRailwayActFirstService.HistoricalTare(actualNo, predictionNo);
+            return rm;
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new MarkerMetException(500, "操作异常！！");

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

@@ -87,5 +87,6 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     String mixedLoading(String actualNo1, String actualNo2, String actualNo3, String predictionNo1,String predictionNo2);
     String mixedDischarge(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String predictionNo2);
     String fixedTare(String actualNo, String tareWeight, String predictionNo);
+    RESTfulResult HistoricalTare(String actualNo, String predictionNo);
 }
 

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

@@ -1,7 +1,8 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
-import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper;
+import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
 import com.steerinfo.baseinfo.meterbasevideoinfo.mapper.MeterBaseVideoinfoMapper;
@@ -16,8 +17,6 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.constants.DbConstants;
 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.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
@@ -27,10 +26,9 @@ import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayAct
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.FieldsCollector;
-import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import net.sf.ehcache.hibernate.strategy.ReadOnlyEhcacheCollectionRegionAccessStrategy;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,6 +68,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
 
+    @Resource
+    private MeterBaseRailwayHisTareDataMapper meterBaseRailwayHisTareDataMapper;
+
     @Resource
     private MeterBaseVideoinfoMapper meterBaseVideoinfoMapper;
 
@@ -966,6 +967,110 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return "";
     }
 
+    @Override
+    public RESTfulResult HistoricalTare(String actualNo, String predictionNo) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        if(com.steerinfo.util.StringUtils.isEmpty(actualNo)){
+            rm.setMessage("实绩编号不存在，请确认！！");
+            return rm;
+        }
+        MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo);
+        if(grossModel == null){
+            rm.setMessage("未找到一次计量数据，请确认！！");
+            return rm;
+        }
+        if(!grossModel.getValueFlag().equals("1")){
+            rm.setMessage("当前计量数据已洁净，请确认！！");
+            return rm;
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        String railwayNo = grossModel.getRailwayNo();
+        map.put("railwayNo", railwayNo);
+        map.put("valueFlag", "0");
+        List<MeterBaseRailwayHisTareData> hisTareModel = meterBaseRailwayHisTareDataMapper.selectByParameters(map);
+        if(hisTareModel.size() >= 1){
+            Long tareWeight = hisTareModel.get(0).getMeterWeight();
+            MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            tareModel.setActualFirstNo(firstNo);
+            tareModel.setMeterWeight(new BigDecimal(tareWeight));
+            tareModel.setWeightType("3");
+            int i = meterWorkRailwayActFirstMapper.insert(tareModel);
+
+            if(i >= 1){
+                tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareModel.getActualFirstNo());
+                MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+
+                PreRailwayScale scale = new PreRailwayScale();
+                if(!com.steerinfo.util.StringUtils.isEmpty(predictionNo)){
+                    scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
+                }
+                if(!com.steerinfo.util.StringUtils.isEmpty(predictionNo) && scale != null){  //有预报编号进行预报更新
+                    //将委托中的编号和收发货的等数据拷贝进一次数据中
+                    MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), predictionNo);
+                    BeanUtils.copyProperties(first1, grossModel);
+                    MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), predictionNo);
+                    BeanUtils.copyProperties(first2, tareModel);
+                    grossModel.setIsPreSacale("1");
+                    tareModel.setIsPreSacale("1");
+
+                    //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+                    MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), predictionNo);
+                    BeanUtils.copyProperties(mwca1, actualRow);
+                    actualRow.setIsPreSacale("1");
+
+                    //更新预报数据
+                    scale.setPredictionNo(predictionNo);
+                    scale.setValueFlag(DbConstants.NET);
+                    scale.setUpdateTime(new Date());
+                    scale.setUpdateManNo("system");
+                    scale.setUpdateManName("二次计量洁净更新");
+                    scale.setUploadFlag("1");
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                }else{
+                    //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+                    MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                    BeanUtils.copyProperties(mwca1, actualRow);
+                }
+                grossModel.setValueFlag(DbConstants.NET);
+                grossModel.setUpdateManNo("system");
+                grossModel.setUpdateManName("二次计量洁净更新");
+                grossModel.setUpdateTime(new Date());
+                meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+                //更新第一次皮重数据
+                tareModel.setValueFlag(DbConstants.NET);
+                tareModel.setUpdateManNo("system");
+                tareModel.setUpdateManName("二次计量洁净更新");
+                tareModel.setUpdateTime(new Date());
+                meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+
+                String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("历史皮重洁净");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("2");
+                actualRow.setCreateManName("洁净");
+                actualRow.setCreateTime(new Date());
+                actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(actualRow);
+                rm.setSucceed();
+                rm.setMessage("操作成功");
+                return rm;
+            }
+            return rm;
+        }else{
+            rm.setMessage("当前火车车号在历史皮重表里未找到历史皮重信息，不能历史皮重洁净，请确认！！");
+            return rm;
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<MeterWorkRailwayActFirst> selectSta(HashMap parmas) {

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

@@ -66,6 +66,20 @@ public class MeterWorkRailwayReceivedController extends BaseRESTfulController {
         PageList<MeterWorkRailwayReceived> list = meterWorkRailwayReceivedService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayreceived:view")
+    @PostMapping(value = "/listLikePost/")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas){
+        Integer pageNum = parmas.get("pageNum") == null ? 1 : Integer.parseInt(parmas.get("pageNum").toString());
+        Integer pageSize =parmas.get("pageSize") == null ? 20 : Integer.parseInt(parmas.get("pageSize").toString());
+        PageList<MeterWorkRailwayReceived> list = meterWorkRailwayReceivedService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterWorkRailwayReceived对象创建")
     @ApiImplicitParam(name = "meterWorkRailwayReceived", value = "详细实体meterWorkRailwayReceived", required = true, dataType = "MeterWorkRailwayReceived")

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/controller/MeterWorkRailwayRecMainController.java

@@ -74,8 +74,10 @@ public class MeterWorkRailwayRecMainController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("meterworkrailwayrecmain:view")
-    @PostMapping(value = "/like/")
-    public RESTfulResult listLikePost(@RequestBody HashMap parmas,Integer pageNum, Integer pageSize){
+    @PostMapping(value = "/listLikePost/")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas){
+        Integer pageNum = parmas.get("pageNum") == null ? 1 : Integer.parseInt(parmas.get("pageNum").toString());
+        Integer pageSize =parmas.get("pageSize") == null ? 20 : Integer.parseInt(parmas.get("pageSize").toString());
         PageList<MeterWorkRailwayRecMain> list = meterWorkRailwayRecMainService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }