后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1438,9 +1438,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             if(scaleTemp.getValueFlag().equals("9")) {
                 throw new MarkerMetException(500, "结净数据包含已结算的委托!!!");
             }
-            if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
-            }
+//            if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
+//                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
+//            }
         }
 
         UserPayload payload = UserPayload.getCurrUser();

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/impl/MeterWorkCarActualBakServiceImpl.java

@@ -1194,9 +1194,9 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             if(scaleTemp.getValueFlag().equals("9")) {
                 throw new MarkerMetException(500, "结净数据包含已结算的委托!!!");
             }
-            if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
-            }
+//            if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
+//                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
+//            }
         }
 
         UserPayload payload = UserPayload.getCurrUser();

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/controller/MeterWorkCarnoIdentifyController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.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.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import com.steerinfo.meterwork.meterworkcarnoidentify.service.IMeterWorkCarnoIdentifyService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCarnoIdentify RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-12 04:48
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-12
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarnoIdentify RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcarnoidentifys")
+public class MeterWorkCarnoIdentifyController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCarnoIdentifyService meterWorkCarnoIdentifyService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcarnoidentify:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarnoIdentify> list = meterWorkCarnoIdentifyService.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("meterworkcarnoidentify:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarnoIdentify> list = meterWorkCarnoIdentifyService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkCarnoIdentify对象创建")
+    @ApiImplicitParam(name = "meterWorkCarnoIdentify", value = "详细实体meterWorkCarnoIdentify", required = true, dataType = "MeterWorkCarnoIdentify")
+    //@RequiresPermissions("meterworkcarnoidentify:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkCarnoIdentify model){
+        MeterWorkCarnoIdentify meterWorkCarnoIdentify = meterWorkCarnoIdentifyService.add(model);
+        return success(meterWorkCarnoIdentify);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcarnoidentify:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkCarnoIdentify meterWorkCarnoIdentify = meterWorkCarnoIdentifyService.getById(id);
+        return success(meterWorkCarnoIdentify);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkCarnoIdentify信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkCarnoIdentify", value = "详细实体meterWorkCarnoIdentify", required = true, dataType = "MeterWorkCarnoIdentify")
+    })
+    //@RequiresPermissions("meterworkcarnoidentify:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkCarnoIdentify model){
+        model.setId(id);
+        MeterWorkCarnoIdentify meterWorkCarnoIdentify = meterWorkCarnoIdentifyService.modify(model);
+        return success(meterWorkCarnoIdentify);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcarnoidentify: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);
+			  meterWorkCarnoIdentifyService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkCarnoIdentifyMapper extends IBaseMapper<MeterWorkCarnoIdentify, String> {
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

@@ -0,0 +1,290 @@
+<?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.meterworkcarnoidentify.mapper.MeterWorkCarnoIdentifyMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="VIDEO_CAR_NO1" jdbcType="VARCHAR" property="videoCarNo1" />
+    <result column="VIDEO_CAR_NO2" jdbcType="VARCHAR" property="videoCarNo2" />
+    <result column="RFID_CAR_NO" jdbcType="VARCHAR" property="rfidCarNo" />
+    <result column="SCAN_CAR_NO" jdbcType="VARCHAR" property="scanCarNo" />
+    <result column="CAR_NO_TYPE" jdbcType="VARCHAR" property="carNoType" />
+  </resultMap>
+  <sql id="columns">
+    ID, ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO, 
+    CAR_NO_TYPE
+  </sql>
+  <sql id="columns_alias">
+    t.ID, t.ACTUAL_FIRST_NO, t.CAR_NO, t.VIDEO_CAR_NO1, t.VIDEO_CAR_NO2, t.RFID_CAR_NO, 
+    t.SCAN_CAR_NO, t.CAR_NO_TYPE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_WORK_CARNO_IDENTIFY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_CARNO_IDENTIFY t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID = #{id}
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="videoCarNo1 != null and videoCarNo1 != ''">
+        and VIDEO_CAR_NO1 = #{videoCarNo1}
+      </if>
+      <if test="videoCarNo2 != null and videoCarNo2 != ''">
+        and VIDEO_CAR_NO2 = #{videoCarNo2}
+      </if>
+      <if test="rfidCarNo != null and rfidCarNo != ''">
+        and RFID_CAR_NO = #{rfidCarNo}
+      </if>
+      <if test="scanCarNo != null and scanCarNo != ''">
+        and SCAN_CAR_NO = #{scanCarNo}
+      </if>
+      <if test="carNoType != null and carNoType != ''">
+        and CAR_NO_TYPE = #{carNoType}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID LIKE '%${id}%'
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="videoCarNo1 != null and videoCarNo1 != ''">
+        and VIDEO_CAR_NO1 LIKE '%${videoCarNo1}%'
+      </if>
+      <if test="videoCarNo2 != null and videoCarNo2 != ''">
+        and VIDEO_CAR_NO2 LIKE '%${videoCarNo2}%'
+      </if>
+      <if test="rfidCarNo != null and rfidCarNo != ''">
+        and RFID_CAR_NO LIKE '%${rfidCarNo}%'
+      </if>
+      <if test="scanCarNo != null and scanCarNo != ''">
+        and SCAN_CAR_NO LIKE '%${scanCarNo}%'
+      </if>
+      <if test="carNoType != null and carNoType != ''">
+        and CAR_NO_TYPE LIKE '%${carNoType}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_CARNO_IDENTIFY
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_CARNO_IDENTIFY
+    where 1!=1 
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        or ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="videoCarNo1 != null and videoCarNo1 != ''">
+        or VIDEO_CAR_NO1 = #{videoCarNo1}
+      </if>
+      <if test="videoCarNo2 != null and videoCarNo2 != ''">
+        or VIDEO_CAR_NO2 = #{videoCarNo2}
+      </if>
+      <if test="rfidCarNo != null and rfidCarNo != ''">
+        or RFID_CAR_NO = #{rfidCarNo}
+      </if>
+      <if test="scanCarNo != null and scanCarNo != ''">
+        or SCAN_CAR_NO = #{scanCarNo}
+      </if>
+      <if test="carNoType != null and carNoType != ''">
+        or CAR_NO_TYPE = #{carNoType}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
+    insert into METER_WORK_CARNO_IDENTIFY (ID, ACTUAL_FIRST_NO, CAR_NO, 
+      VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO, 
+      SCAN_CAR_NO, CAR_NO_TYPE)
+    values (#{id,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{videoCarNo1,jdbcType=VARCHAR}, #{videoCarNo2,jdbcType=VARCHAR}, #{rfidCarNo,jdbcType=VARCHAR}, 
+      #{scanCarNo,jdbcType=VARCHAR}, #{carNoType,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
+    insert into METER_WORK_CARNO_IDENTIFY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="videoCarNo1 != null">
+        VIDEO_CAR_NO1,
+      </if>
+      <if test="videoCarNo2 != null">
+        VIDEO_CAR_NO2,
+      </if>
+      <if test="rfidCarNo != null">
+        RFID_CAR_NO,
+      </if>
+      <if test="scanCarNo != null">
+        SCAN_CAR_NO,
+      </if>
+      <if test="carNoType != null">
+        CAR_NO_TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirstNo != null">
+        #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="videoCarNo1 != null">
+        #{videoCarNo1,jdbcType=VARCHAR},
+      </if>
+      <if test="videoCarNo2 != null">
+        #{videoCarNo2,jdbcType=VARCHAR},
+      </if>
+      <if test="rfidCarNo != null">
+        #{rfidCarNo,jdbcType=VARCHAR},
+      </if>
+      <if test="scanCarNo != null">
+        #{scanCarNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNoType != null">
+        #{carNoType,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
+    update METER_WORK_CARNO_IDENTIFY
+    set ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      VIDEO_CAR_NO1 = #{videoCarNo1,jdbcType=VARCHAR},
+      VIDEO_CAR_NO2 = #{videoCarNo2,jdbcType=VARCHAR},
+      RFID_CAR_NO = #{rfidCarNo,jdbcType=VARCHAR},
+      SCAN_CAR_NO = #{scanCarNo,jdbcType=VARCHAR},
+      CAR_NO_TYPE = #{carNoType,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
+    update METER_WORK_CARNO_IDENTIFY
+    <set>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="videoCarNo1 != null">
+        VIDEO_CAR_NO1 = #{videoCarNo1,jdbcType=VARCHAR},
+      </if>
+      <if test="videoCarNo2 != null">
+        VIDEO_CAR_NO2 = #{videoCarNo2,jdbcType=VARCHAR},
+      </if>
+      <if test="rfidCarNo != null">
+        RFID_CAR_NO = #{rfidCarNo,jdbcType=VARCHAR},
+      </if>
+      <if test="scanCarNo != null">
+        SCAN_CAR_NO = #{scanCarNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNoType != null">
+        CAR_NO_TYPE = #{carNoType,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where ID = #{id,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_CARNO_IDENTIFY 
+      (ID, 
+      ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1, 
+      VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO, 
+      CAR_NO_TYPE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.id,jdbcType=VARCHAR}, 
+      #{item.actualFirstNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.videoCarNo1,jdbcType=VARCHAR}, 
+      #{item.videoCarNo2,jdbcType=VARCHAR}, #{item.rfidCarNo,jdbcType=VARCHAR}, #{item.scanCarNo,jdbcType=VARCHAR}, 
+      #{item.carNoType,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_CARNO_IDENTIFY
+     set
+       ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
+       </foreach>
+       ,ACTUAL_FIRST_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,VIDEO_CAR_NO1=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.videoCarNo1,jdbcType=VARCHAR}
+       </foreach>
+       ,VIDEO_CAR_NO2=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.videoCarNo2,jdbcType=VARCHAR}
+       </foreach>
+       ,RFID_CAR_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.rfidCarNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SCAN_CAR_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.scanCarNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
+          when #{item.id,jdbcType=VARCHAR} then #{item.carNoType,jdbcType=VARCHAR}
+       </foreach>
+     where ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.id,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_CARNO_IDENTIFY
+    where ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/model/MeterWorkCarnoIdentify.java

@@ -0,0 +1,141 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="null")
+public class MeterWorkCarnoIdentify implements IBasePO<String> {
+    /**
+     * 主键(ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String id;
+
+    /**
+     * 一次数据编号(ACTUAL_FIRST_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="一次数据编号",required=true)
+    private String actualFirstNo;
+
+    /**
+     * 最终车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="最终车号",required=false)
+    private String carNo;
+
+    /**
+     * 视觉识别车号1(VIDEO_CAR_NO1,VARCHAR,20)
+     */
+    @ApiModelProperty(value="视觉识别车号1",required=false)
+    private String videoCarNo1;
+
+    /**
+     * 视觉识别车号2(VIDEO_CAR_NO2,VARCHAR,20)
+     */
+    @ApiModelProperty(value="视觉识别车号2",required=false)
+    private String videoCarNo2;
+
+    /**
+     * RFID车号(RFID_CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="RFID车号",required=false)
+    private String rfidCarNo;
+
+    /**
+     * 扫码识别车号(SCAN_CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码识别车号",required=false)
+    private String scanCarNo;
+
+    /**
+     * 识别方式(CAR_NO_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="识别方式",required=false)
+    private String carNoType;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getVideoCarNo1() {
+        return videoCarNo1;
+    }
+
+    public void setVideoCarNo1(String videoCarNo1) {
+        this.videoCarNo1 = videoCarNo1 == null ? null : videoCarNo1.trim();
+    }
+
+    public String getVideoCarNo2() {
+        return videoCarNo2;
+    }
+
+    public void setVideoCarNo2(String videoCarNo2) {
+        this.videoCarNo2 = videoCarNo2 == null ? null : videoCarNo2.trim();
+    }
+
+    public String getRfidCarNo() {
+        return rfidCarNo;
+    }
+
+    public void setRfidCarNo(String rfidCarNo) {
+        this.rfidCarNo = rfidCarNo == null ? null : rfidCarNo.trim();
+    }
+
+    public String getScanCarNo() {
+        return scanCarNo;
+    }
+
+    public void setScanCarNo(String scanCarNo) {
+        this.scanCarNo = scanCarNo == null ? null : scanCarNo.trim();
+    }
+
+    public String getCarNoType() {
+        return carNoType;
+    }
+
+    public void setCarNoType(String carNoType) {
+        this.carNoType = carNoType == null ? null : carNoType.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", actualFirstNo=").append(actualFirstNo);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", videoCarNo1=").append(videoCarNo1);
+        sb.append(", videoCarNo2=").append(videoCarNo2);
+        sb.append(", rfidCarNo=").append(rfidCarNo);
+        sb.append(", scanCarNo=").append(scanCarNo);
+        sb.append(", carNoType=").append(carNoType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/IMeterWorkCarnoIdentifyService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCarnoIdentify服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-12 04:48
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-12
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarnoIdentify服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkCarnoIdentifyService extends IBaseService<MeterWorkCarnoIdentify, String>{
+
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import com.steerinfo.meterwork.meterworkcarnoidentify.mapper.MeterWorkCarnoIdentifyMapper;
+import com.steerinfo.meterwork.meterworkcarnoidentify.service.IMeterWorkCarnoIdentifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCarnoIdentify服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-12 04:48
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-12
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarnoIdentify服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkCarnoIdentifyService")
+public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWorkCarnoIdentify, String> implements IMeterWorkCarnoIdentifyService {
+
+    @Autowired
+    private MeterWorkCarnoIdentifyMapper meterWorkCarnoIdentifyMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkCarnoIdentify, String> getMapper() {
+        return meterWorkCarnoIdentifyMapper;
+    }
+}

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

@@ -166,7 +166,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
 
         List<MeterWorkMonitorDto> list = new ArrayList<>();
         for (MeterWorkMonitor meterWorkMonitor : rows){
-            long time = 30*1000;//30秒
+            long time = 45*1000;//45秒
             Date now = new Date();
             Date beforeDate = new Date(now.getTime() - time);//30秒前的时间
             MeterWorkMonitorDto meterWorkMonitorDto = null;

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

@@ -2570,12 +2570,13 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO
     FROM METER_WORK_RAILWAY_ACT_FIRST where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0
         and actual_first_no not in (select distinct B.actual_first_no from METER_WORK_RAILWAY_ACT_FIRST B where B.actual_first_no like '%bak%')
+        and actual_first_no not like '%YJ%'
   </select>
 
 
   <select id="getLcNo" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(LC_NO,TO_NUMBER(instr(LC_NO,'('))-3,3))),0) + 1,3,'0')
-    FROM METER_WORK_RAILWAY_ACT_FIRST where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND BASE_SPOT_NO=#{baseSpotNo,jdbcType=VARCHAR}
+    FROM METER_WORK_RAILWAY_ACT_FIRST where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND BASE_SPOT_NO=#{baseSpotNo,jdbcType=VARCHAR} and lc_no not like '%YJ%'
   </select>
 
   <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">

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

@@ -171,6 +171,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 scale.setValueFlag("4");
+                scale.setUploadFlag("1");
                 scale.setMeasureStation(model.getBaseSpotNo());
                 scale.setMeasureStationName(model.getBaseSpotName());
                 scale.setPredictionType("1");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/mapper/MeterWorkRailwayActFirstBakMapper.xml

@@ -2575,13 +2575,13 @@
   </sql>
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO
-    FROM METER_WORK_RAILWAY_ACT_FIRST_BAK where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0
+    FROM METER_WORK_RAILWAY_ACT_FIRST_BAK where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0 and ACTUAL_FIRST_NO not like '%YJ%'
   </select>
 
 
   <select id="getLcNo" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(LC_NO,TO_NUMBER(instr(LC_NO,'('))-3,3))),0) + 1,3,'0')
-    FROM METER_WORK_RAILWAY_ACT_FIRST_BAK where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND BASE_SPOT_NO=#{baseSpotNo,jdbcType=VARCHAR}
+    FROM METER_WORK_RAILWAY_ACT_FIRST_BAK where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND BASE_SPOT_NO=#{baseSpotNo,jdbcType=VARCHAR} and lc_no not like '%YJ%'
   </select>
 
   <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/impl/MeterWorkRailwayActFirstBakServiceImpl.java

@@ -6088,24 +6088,24 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
     }
 
     @Override
-    public RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirstBak> models) {
-        RESTfulResult rm = new RESTfulResult();
-        rm.setFailed();
-        try {
-            if(!CollectionUtils.isEmpty(models)){
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                String afl = sdf.format(new Date());
-                String lcNo = meterWorkRailwayActFirstBakMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
-                int count = 0;
-                for (MeterWorkRailwayActFirstBak model : models) {
-                    model.setMeterWeight(null);
-                    model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
-                            .replaceAll("轨道衡", "")
-                            .replaceAll("静轨", "")
-                            .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
-                    meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
-                    count++;
-                }
+        public RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirstBak> models) {
+            RESTfulResult rm = new RESTfulResult();
+            rm.setFailed();
+            try {
+                if(!CollectionUtils.isEmpty(models)){
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                    String afl = sdf.format(new Date());
+                    String lcNo = meterWorkRailwayActFirstBakMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
+                    int count = 0;
+                    for (MeterWorkRailwayActFirstBak model : models) {
+                        model.setMeterWeight(null);
+                        model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
+                                .replaceAll("轨道衡", "")
+                                .replaceAll("静轨", "")
+                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                        meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
+                        count++;
+                    }
                 rm.setSucceed();
                 rm.setCode("200");
                 rm.setData(count);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.xml

@@ -2969,12 +2969,12 @@
 
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_NO, LENGTH(ACTUAL_NO) - 3))),0) + 1,4,'0') ACTUAL_NO
-    FROM METER_WORK_RAILWAY_ACTUAL_BAK where instr(ACTUAL_NO,#{afl,jdbcType=VARCHAR})>0
+    FROM METER_WORK_RAILWAY_ACTUAL_BAK where instr(ACTUAL_NO,#{afl,jdbcType=VARCHAR})>0 and ACTUAL_NO not like '%YJ%'
   </select>
 
   <select id="getLcNo" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(LC_NO,TO_NUMBER(instr(LC_NO,'('))-3,3))),0) + 1,3,'0')
-    FROM METER_WORK_RAILWAY_ACTUAL_BAK where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND net_spot3_no=#{netSpot3No,jdbcType=VARCHAR}
+    FROM METER_WORK_RAILWAY_ACTUAL_BAK where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND net_spot3_no=#{netSpot3No,jdbcType=VARCHAR} and lc_no not like '%YJ%'
   </select>
 
   <select id="manualAdd" parameterType="java.lang.String" resultMap="BaseResultMap">

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -70,6 +70,18 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "C#端获取列表", notes = "根据车号查询委托信息，车号参数和查询的委托信息为空返回空")
+    @GetMapping(value = "/findCarScale")
+    public RESTfulResult findCarScale(@RequestParam HashMap params) {
+        try {
+            PreTrackScale list = preTrackScaleService.findCarScale(params);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -58,4 +58,7 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
     int setPreIndex(PreTrackScale scale);
     //汽车衡新一次补录界面的委托显示
     List<PreTrackScale> selectInUseAndNoUse(HashMap<String, Object> model);
+
+    //根据委托编号查询委托信息，委托编号参数和查询的委托信息为空返回空
+    PreTrackScale findCarScale(HashMap model);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -32,6 +32,7 @@ import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
 import com.steerinfo.util.DoChinFilters;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
+import oracle.jdbc.proxy.annotation.Pre;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -362,6 +363,16 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         return scales;
     }
 
+    @Override
+    public PreTrackScale findCarScale(HashMap param) {
+        String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+        if(StringUtils.isEmpty(predictionNo)) {
+            return null;
+        }
+        PreTrackScale list = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
+        return list;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int abolish(List<PreTrackScale> models) {