后端修改

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/controller/MeterBaseSpotInfoController.java

@@ -82,6 +82,18 @@ public class MeterBaseSpotInfoController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "动态衡获取列表", notes = "不分页查询")
+    @GetMapping(value = "/DynamicNoPage")
+    public RESTfulResult DynamicNoPage(@RequestParam HashMap parmas) {
+        try {
+            List<MeterBaseSpotInfo> list = meterBaseSpotInfoService.DynamicNoPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
 
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.java

@@ -16,6 +16,8 @@ public interface MeterBaseSpotInfoMapper extends IBaseMapper<MeterBaseSpotInfo,
 
      List<MeterBaseSpotInfo> selectall();
 
+     List<MeterBaseSpotInfo> DynamicAll(Map<String, Object> params);
+
      List<MeterBaseSpotInfo> selectcorrelation();
 
      List<MeterBaseSpotInfo> calibcorrelation();

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -981,6 +981,30 @@
     <include refid="select"/>
   </select>
 
+  <select id="DynamicAll" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+        and spot_type_no in ('001019004', '001019002')
+        <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="spotTypeNo != null and spotTypeNo != ''">
+          and SPOT_TYPE_NO = #{spotTypeNo}
+        </if>
+        <if test="spotTypeName != null and spotTypeName != ''">
+          and SPOT_TYPE_NAME = #{spotTypeName}
+        </if>
+        <if test="spotStateNo != null and spotStateNo != ''">
+          and SPOT_STATE_NO = #{spotStateNo}
+        </if>
+        <if test="spotStateName != null and spotStateName != ''">
+          and SPOT_STATE_NAME = #{spotStateName}
+        </if>
+  </select>
+
   <select id="selectcorrelation"  resultMap="BaseResultMap">
     SELECT p.* from (SELECT d.* ,(
     SELECT

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/IMeterBaseSpotInfoService.java

@@ -37,6 +37,7 @@ public interface IMeterBaseSpotInfoService extends IBaseService<MeterBaseSpotInf
      List<MeterBaseSpotInfo> calibcorrelation();
 
     List<MeterBaseSpotInfo> queryall(Map<String,Object> parmas);
+    List<MeterBaseSpotInfo> DynamicNoPage(Map<String,Object> parmas);
 
      MeterBaseSpotInfo doUpdateWf(MeterBaseSpotInfo model);
 

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/impl/MeterBaseSpotInfoServiceImpl.java

@@ -179,6 +179,11 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
         return meterBaseSpotInfoMapper.selectByParameters(parmas);
     }
 
+    @Override
+    public List<MeterBaseSpotInfo> DynamicNoPage(Map<String, Object> parmas) {
+        return meterBaseSpotInfoMapper.DynamicAll(parmas);
+    }
+
     private String check(MeterBaseSpotInfo model)
     {
         if (StringUtils.isEmpty(model.getBaseSpotNo())) {

src/main/java/com/steerinfo/meterwork/meterworkimage/controller/MeterWorkImageController.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkimage.service.IMeterWorkImageService;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/steerinfo/meterwork/meterworkimage/service/IMeterWorkImageService.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.meterwork.dto.MeterWorkImageDto;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -8,12 +8,15 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkimage.service.IMeterWorkImageService;
+import com.steerinfo.meterwork.meterworkimagetemp.mapper.MeterWorkImageTempMapper;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +45,9 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
+    @Resource
+    private MeterWorkImageTempMapper meterWorkImageTempMapper;
+
     @Resource
     private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
 

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/controller/MeterWorkImageTempController.java

@@ -0,0 +1,119 @@
+package com.steerinfo.meterwork.meterworkimagetemp.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
+import com.steerinfo.meterwork.meterworkimagetemp.service.IMeterWorkImageTempService;
+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;
+
+/**
+ * MeterWorkImageTemp RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-08-20 09:39
+ * 类描述
+ * 修订历史：
+ * 日期：2022-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkImageTemp RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkimagetemps")
+public class MeterWorkImageTempController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkImageTempService meterWorkImageTempService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkimagetemp:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkImageTemp> list = meterWorkImageTempService.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("meterworkimagetemp:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkImageTemp> list = meterWorkImageTempService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkImageTemp对象创建")
+    @ApiImplicitParam(name = "meterWorkImageTemp", value = "详细实体meterWorkImageTemp", required = true, dataType = "MeterWorkImageTemp")
+    //@RequiresPermissions("meterworkimagetemp:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkImageTemp model){
+        MeterWorkImageTemp meterWorkImageTemp = meterWorkImageTempService.add(model);
+        return success(meterWorkImageTemp);
+    }
+
+    @ApiOperation(value = "动态轨道衡-C#图片创建", notes = "根据MeterWorkImageTemp对象创建")
+    @ApiImplicitParam(name = "meterWorkImageTemp", value = "详细实体meterWorkImageTemp", required = true, dataType = "MeterWorkImageTemp")
+    @PostMapping(value = "/doSaveRailwayWf", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doSaveRailwayWf(@RequestBody MeterWorkImageTemp model) {
+        try {
+            return meterWorkImageTempService.doSaveRailwayWf(model);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkimagetemp:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkImageTemp meterWorkImageTemp = meterWorkImageTempService.getById(id);
+        return success(meterWorkImageTemp);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkImageTemp信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkImageTemp", value = "详细实体meterWorkImageTemp", required = true, dataType = "MeterWorkImageTemp")
+    })
+    //@RequiresPermissions("meterworkimagetemp:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkImageTemp model){
+        model.setId(id);
+        MeterWorkImageTemp meterWorkImageTemp = meterWorkImageTempService.modify(model);
+        return success(meterWorkImageTemp);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkimagetemp: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);
+			  meterWorkImageTempService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.java

@@ -0,0 +1,9 @@
+package com.steerinfo.meterwork.meterworkimagetemp.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkImageTempMapper extends IBaseMapper<MeterWorkImageTemp, String> {
+}

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.xml

@@ -0,0 +1,265 @@
+<?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.meterwork.meterworkimagetemp.mapper.MeterWorkImageTempMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp">
+    <id column="IMAGE_NO" jdbcType="VARCHAR" property="imageNo" />
+    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
+    <result column="IMAGE_TIME" jdbcType="TIMESTAMP" property="imageTime" />
+    <result column="IMAGE_URL_2" jdbcType="VARCHAR" property="imageUrl2" />
+    <result column="IMAGE_URL_1" jdbcType="VARCHAR" property="imageUrl1" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+  </resultMap>
+  <sql id="columns">
+    IMAGE_NO, RAILWAY_NO, IMAGE_TIME, IMAGE_URL_2, IMAGE_URL_1, BASE_SPOT_NO, VALUE_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.IMAGE_NO, t.RAILWAY_NO, t.IMAGE_TIME, t.IMAGE_URL_2, t.IMAGE_URL_1, t.BASE_SPOT_NO, 
+    t.VALUE_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_IMAGE_TEMP
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_IMAGE_TEMP t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="imageNo != null and imageNo != ''">
+        and IMAGE_NO = #{imageNo}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="imageTime != null">
+        and TO_CHAR(IMAGE_TIME,'yyyy-MM-dd') = #{imageTime}
+      </if>
+      <if test="imageUrl2 != null and imageUrl2 != ''">
+        and IMAGE_URL_2 = #{imageUrl2}
+      </if>
+      <if test="imageUrl1 != null and imageUrl1 != ''">
+        and IMAGE_URL_1 = #{imageUrl1}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="imageNo != null and imageNo != ''">
+        and IMAGE_NO LIKE '%${imageNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="imageTime != null">
+        and TO_CHAR(IMAGE_TIME,'yyyy-MM-dd') = #{imageTime}
+      </if>
+      <if test="imageUrl2 != null and imageUrl2 != ''">
+        and IMAGE_URL_2 LIKE '%${imageUrl2}%'
+      </if>
+      <if test="imageUrl1 != null and imageUrl1 != ''">
+        and IMAGE_URL_1 LIKE '%${imageUrl1}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_IMAGE_TEMP
+    where IMAGE_NO = #{imageNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_IMAGE_TEMP
+    where 1!=1 
+      <if test="railwayNo != null and railwayNo != ''">
+        or RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="imageTime != null">
+        or TO_CHAR(IMAGE_TIME,'yyyy-MM-dd') = '#{imageTime}'
+      </if>
+      <if test="imageUrl2 != null and imageUrl2 != ''">
+        or IMAGE_URL_2 = #{imageUrl2}
+      </if>
+      <if test="imageUrl1 != null and imageUrl1 != ''">
+        or IMAGE_URL_1 = #{imageUrl1}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp">
+    insert into METER_WORK_IMAGE_TEMP (IMAGE_NO, RAILWAY_NO, IMAGE_TIME, 
+      IMAGE_URL_2, IMAGE_URL_1, BASE_SPOT_NO, 
+      VALUE_FLAG)
+    values (#{imageNo,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, #{imageTime,jdbcType=TIMESTAMP}, 
+      #{imageUrl2,jdbcType=VARCHAR}, #{imageUrl1,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
+      #{valueFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp">
+    insert into METER_WORK_IMAGE_TEMP
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="imageNo != null">
+        IMAGE_NO,
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO,
+      </if>
+      <if test="imageTime != null">
+        IMAGE_TIME,
+      </if>
+      <if test="imageUrl2 != null">
+        IMAGE_URL_2,
+      </if>
+      <if test="imageUrl1 != null">
+        IMAGE_URL_1,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="imageNo != null">
+        #{imageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="imageTime != null">
+        #{imageTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="imageUrl2 != null">
+        #{imageUrl2,jdbcType=VARCHAR},
+      </if>
+      <if test="imageUrl1 != null">
+        #{imageUrl1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp">
+    update METER_WORK_IMAGE_TEMP
+    set RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      IMAGE_TIME = #{imageTime,jdbcType=TIMESTAMP},
+      IMAGE_URL_2 = #{imageUrl2,jdbcType=VARCHAR},
+      IMAGE_URL_1 = #{imageUrl1,jdbcType=VARCHAR},
+      BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
+    where IMAGE_NO = #{imageNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp">
+    update METER_WORK_IMAGE_TEMP
+    <set>
+      <if test="railwayNo != null">
+        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="imageTime != null">
+        IMAGE_TIME = #{imageTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="imageUrl2 != null">
+        IMAGE_URL_2 = #{imageUrl2,jdbcType=VARCHAR},
+      </if>
+      <if test="imageUrl1 != null">
+        IMAGE_URL_1 = #{imageUrl1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where IMAGE_NO = #{imageNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where IMAGE_NO = #{imageNo,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_WORK_IMAGE_TEMP 
+      (IMAGE_NO, 
+      RAILWAY_NO, IMAGE_TIME, IMAGE_URL_2, 
+      IMAGE_URL_1, BASE_SPOT_NO, VALUE_FLAG
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.imageNo,jdbcType=VARCHAR}, 
+      #{item.railwayNo,jdbcType=VARCHAR}, #{item.imageTime,jdbcType=TIMESTAMP}, #{item.imageUrl2,jdbcType=VARCHAR}, 
+      #{item.imageUrl1,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_IMAGE_TEMP
+     set
+       IMAGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.imageNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
+       </foreach>
+       ,IMAGE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.imageTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,IMAGE_URL_2=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.imageUrl2,jdbcType=VARCHAR}
+       </foreach>
+       ,IMAGE_URL_1=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.imageUrl1,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case IMAGE_NO" close="end">
+          when #{item.imageNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+     where IMAGE_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.imageNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_IMAGE_TEMP
+    where IMAGE_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/model/MeterWorkImageTemp.java

@@ -0,0 +1,138 @@
+package com.steerinfo.meterwork.meterworkimagetemp.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterWorkImageTemp implements IBasePO<String> {
+    /**
+     * 图片主键(IMAGE_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="图片主键",required=true)
+    private String imageNo;
+
+    /**
+     * 图片车号(RAILWAY_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="图片车号",required=false)
+    private String railwayNo;
+
+    /**
+     * 图片保存时间(IMAGE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="图片保存时间",required=false)
+    private Date imageTime;
+
+    /**
+     * 图片地址_02(IMAGE_URL_2,VARCHAR,150)
+     */
+    @ApiModelProperty(value="图片地址_02",required=false)
+    private String imageUrl2;
+
+    /**
+     * 图片地址_01(IMAGE_URL_1,VARCHAR,150)
+     */
+    @ApiModelProperty(value="图片地址_01",required=false)
+    private String imageUrl1;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 是否有效（0：有效、1：无效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否有效（0：有效、1：无效）",required=false)
+    private String valueFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.imageNo;
+    }
+
+    @Override
+    public void setId(String imageNo) {
+        this.imageNo = imageNo == null ? null : imageNo.trim();
+    }
+
+    public String getImageNo() {
+        return imageNo;
+    }
+
+    public void setImageNo(String imageNo) {
+        this.imageNo = imageNo == null ? null : imageNo.trim();
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
+    }
+
+    public Date getImageTime() {
+        return imageTime;
+    }
+
+    public void setImageTime(Date imageTime) {
+        this.imageTime = imageTime;
+    }
+
+    public String getImageUrl2() {
+        return imageUrl2;
+    }
+
+    public void setImageUrl2(String imageUrl2) {
+        this.imageUrl2 = imageUrl2 == null ? null : imageUrl2.trim();
+    }
+
+    public String getImageUrl1() {
+        return imageUrl1;
+    }
+
+    public void setImageUrl1(String imageUrl1) {
+        this.imageUrl1 = imageUrl1 == null ? null : imageUrl1.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.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();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", imageNo=").append(imageNo);
+        sb.append(", railwayNo=").append(railwayNo);
+        sb.append(", imageTime=").append(imageTime);
+        sb.append(", imageUrl2=").append(imageUrl2);
+        sb.append(", imageUrl1=").append(imageUrl1);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/service/IMeterWorkImageTempService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.meterwork.meterworkimagetemp.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
+
+/**
+ * MeterWorkImageTemp服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-08-20 09:39
+ * 类描述
+ * 修订历史：
+ * 日期：2022-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkImageTemp服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkImageTempService extends IBaseService<MeterWorkImageTemp, String>{
+
+    RESTfulResult doSaveRailwayWf(MeterWorkImageTemp mwi);
+}

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/service/impl/MeterWorkImageTempServiceImpl.java

@@ -0,0 +1,69 @@
+package com.steerinfo.meterwork.meterworkimagetemp.service.impl;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
+import com.steerinfo.meterwork.meterworkimagetemp.mapper.MeterWorkImageTempMapper;
+import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
+import com.steerinfo.meterwork.meterworkimagetemp.service.IMeterWorkImageTempService;
+import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.util.PublicMethod;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * MeterWorkImageTemp服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-08-20 09:39
+ * 类描述
+ * 修订历史：
+ * 日期：2022-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkImageTemp服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkImageTempService")
+public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImageTemp, String> implements IMeterWorkImageTempService {
+
+    @Autowired(required = false)
+    private MeterWorkImageTempMapper meterWorkImageTempMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkImageTemp, String> getMapper() {
+        return meterWorkImageTempMapper;
+    }
+
+    @Override
+    public RESTfulResult doSaveRailwayWf(MeterWorkImageTemp mwi) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            mwi.setImageNo(PublicMethod.IdCreate(3));
+            meterWorkImageTempMapper.insertSelective(mwi);
+            rm.setSucceed(true);
+            rm.setMessage("操作成功");
+            rm.setData(mwi);
+        }catch(Exception ex){
+            rm.setMessage("图片信息写入表异常："+ex.getMessage());
+        }
+        return rm;
+    }
+
+    //定时刷新接口 每30秒执行一次
+//    @Scheduled(cron = "0/30 * * * * ? ")
+    @Transactional
+    public void imageAutoUpload(){
+
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -768,7 +768,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         MATTER_NAME,
         '新系统' as remark
         from METER_WORK_RAILWAY_ACTUAL
-        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019002'
+        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
         <if test="remark != null and remark != ''">
             and '新系统' LIKE '%${remark}%'
         </if>
@@ -903,7 +903,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         sender_remark,
         '新系统' remark
         from meter_work_railway_act_first
-        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019002'
+        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
         <if test="remark != null and remark != ''">
             and '新系统' LIKE '%${remark}%'
         </if>
@@ -1021,7 +1021,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         '新系统' remark
         from METER_WORK_RAILWAY_ACTUAL
         where 1= 1
-        and VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019002'
+        and VALUE_FLAG in ('2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             and net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>

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

@@ -1528,4 +1528,18 @@ throw new MarkerMetException(500, "操作异常！！");
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "C#端-动态衡皮重一次数据还原Resceived表")
+    @Transactional
+    @PostMapping(value = "/doRecovery")
+    public RESTfulResult doRecovery(@RequestBody List<MeterWorkRailwayActFirst> models) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstService.doRecovery(models);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

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

@@ -154,5 +154,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     RESTfulResult furConversion(HashMap<String, Object> params);
     RESTfulResult batchRailwayFirst(List<HashMap> models);
+
+    RESTfulResult doRecovery(List<MeterWorkRailwayActFirst> models);
 }
 

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

@@ -5071,6 +5071,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 //                mwrac.setActualFirstNo(afl + netNo);
                 String netNo = PublicMethod.IdCreate(3);
                 mwrac.setActualFirstNo(netNo);
+                mwrac.setLcNo(model.getRailwayWorkNo());
 //                mwrac.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(mwrac);
                 count++;
@@ -7508,7 +7509,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7517,8 +7517,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     actualRow.setUpdateManNo(userId);
                     actualRow.setUpdateManName(userName);
                     actualRow.setUpdateTime(new Date());
@@ -8496,5 +8496,58 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult doRecovery(List<MeterWorkRailwayActFirst> models) {
+        RESTfulResult rm = new RESTfulResult();
+        try{
+            for(MeterWorkRailwayActFirst model: models) {
+                MeterWorkRailwayActFirst modelTmep = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                Assert.isTrue(!(modelTmep.getWeightType().equals("1") && modelTmep.getValueFlag().equals("0")), "一次数据包含非皮重数据，不允许还原皮重");
+                Assert.isTrue(!(modelTmep.getValueFlag().equals("2") && modelTmep.getValueFlag().equals("0")), "一次数据包含已结净或者已作废，不允许还原皮重");
+            }
+            int count = 0;
+            for(MeterWorkRailwayActFirst model: models) {
+                MeterWorkRailwayActFirst modelTmep = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTmep != null) {
+                    //还原从表信息
+                    meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceiveds(modelTmep.getActualFirstNo());
+                    //判断是否匹配了委托，匹配了委托还原委托信息
+                    if(modelTmep.getPredictionNo() != null && StringUtils.isNotEmpty(modelTmep.getPredictionNo())) {
+                        PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(modelTmep.getPredictionNo());
+                        Assert.isTrue(!scale.getValueFlag().equals("9"), "一次数据匹配的委托已结算，不允许还原皮重");
+                        MeterWorkRailwayActFirst modelTemp = meterWorkRailwayActFirstMapper.selectAndRemove(modelTmep.getActualFirstNo());
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(modelTemp);
+                        scale.setValueFlag("1");
+                        scale.setUploadFlag("1");
+                        preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                    }
+                    //删除一次皮重数据
+                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(modelTmep.getActualFirstNo());
+                    //还原主表为未处理状态
+                    MeterWorkRailwayReceived receivedModel = meterWorkRailwayReceivedMapper.selectByPrimaryKey(modelTmep.getActualFirstNo());
+                    if(receivedModel != null){
+                        HashMap<String, Object> objMap = new HashMap<>();
+                        objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMains.size() >= 1) {
+                            recMains.get(0).setIsDispose("0");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
+                        }
+                    }
+                    count ++;
+                }
+            }
+
+            rm.setSucceed(true);
+            rm.setData("200");
+            rm.setMessage("共有" + count + "条皮重数据还原成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
 
 }

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/IMeterWorkZnlcService.java

@@ -13,4 +13,5 @@ public interface IMeterWorkZnlcService {
 
     // 汽车衡联合查询Service
     RESTfulResult getOldActual(String predictionNo);
+    Boolean oldMetering(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -31,7 +31,6 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
     MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
 
     @Override
-    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
     public RESTfulResult getOldActual(String predictionNo) {
         RESTfulResult rm =new RESTfulResult();
         rm.setSucceed();
@@ -76,33 +75,41 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
                 rm.setData(param);
                 return rm;
             }else {
-                List<HashMap> oldActuals = meterWorkZnlcMapper.doQueryActualOld(map);
-                if(oldActuals.size() >= 1) {
-                    param.put("DeviceNo", oldActuals.get(0).get("DEVICENO"));    //计量设备号
-                    param.put("WeightVoucherNo", oldActuals.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
-                    param.put("ConveyanceNo", oldActuals.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
-                    param.put("GrossWeight", oldActuals.get(0).get("GROSSWEIGHT"));    //过磅量
-                    param.put("TareWeight", oldActuals.get(0).get("TAREWEIGHT"));     //空车重
-                    param.put("NetWeight", oldActuals.get(0).get("NETWEIGHT"));      //过磅净重
-                    param.put("MeteringTime", oldActuals.get(0).get("METERINGTIME"));   //计量时刻
-                    param.put("MetringPerson", oldActuals.get(0).get("METRINGPERSON"));  //计量人
-                    rm.setData(param);
-                }else {
-                    List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
-                    param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
-                    param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
-                    param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
-                    param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
-                    param.put("TareWeight", null);     //空车重
-                    param.put("NetWeight", null);      //过磅净重
-                    param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
-                    param.put("MetringPerson", "老系统一次");  //计量人
-
-                    rm.setData(param);
-                    return rm;
-                }
+                if (oldMetering(rm, map, param)) return rm;
             }
         }
         return rm;
     }
+
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public Boolean oldMetering(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
+        List<HashMap> oldActuals = meterWorkZnlcMapper.doQueryActualOld(map);
+        if(oldActuals.size() >= 1) {
+            param.put("DeviceNo", oldActuals.get(0).get("DEVICENO"));    //计量设备号
+            param.put("WeightVoucherNo", oldActuals.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
+            param.put("ConveyanceNo", oldActuals.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
+            param.put("GrossWeight", oldActuals.get(0).get("GROSSWEIGHT"));    //过磅量
+            param.put("TareWeight", oldActuals.get(0).get("TAREWEIGHT"));     //空车重
+            param.put("NetWeight", oldActuals.get(0).get("NETWEIGHT"));      //过磅净重
+            param.put("MeteringTime", oldActuals.get(0).get("METERINGTIME"));   //计量时刻
+            param.put("MetringPerson", oldActuals.get(0).get("METRINGPERSON"));  //计量人
+            rm.setData(param);
+        }else {
+            List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
+            param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
+            param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
+            param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
+            param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
+            param.put("TareWeight", null);     //空车重
+            param.put("NetWeight", null);      //过磅净重
+            param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
+            param.put("MetringPerson", "老系统一次");  //计量人
+
+            rm.setData(param);
+            return true;
+        }
+        return false;
+    }
 }