后端修改

src/main/java/com/steerinfo/baseinfo/appphonehelp/controller/AppPhoneHelpController.java

@@ -138,10 +138,10 @@ public class AppPhoneHelpController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "App端远程求助确认按钮", notes = "App端远程求助确认按钮")
-    @PostMapping(value = "/phoneHelpComfirm")
-    public RESTfulResult phoneHelpComfirm(@RequestBody HashMap params) {
+    @PostMapping(value = "/phoneHelpConfirm")
+    public RESTfulResult phoneHelpConfirm(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
-        String id = params.get("id") == null ? "": params.get("id").toString();
+        String id = params.get("helpId") == null ? "": params.get("helpId").toString();
         String createNo = params.get("createNo") == null ? "" : params.get("createNo").toString();
         String createName = params.get("createName") == null ? "" : params.get("createName").toString();
         String result = params.get("result") == null ? "" : params.get("result").toString();

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -203,10 +203,11 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 HashMap queryCar = new HashMap();
                 queryCar.put("carNo", params.get("carNo").toString());
                 queryCar.put("validFlag", "0");
+                String carNo = params.get("carNo").toString();
                 //查询服役状态的车辆信息
                 List<MeterBaseCar> queryList01 = meterBaseCarService.query(queryCar);
                 //查询停役、删除状态的车辆信息
-                List<MeterBaseCar> queryList02 = meterBaseCarMapper.selectByMap(params.get("carNo").toString());
+                List<MeterBaseCar> queryList02 = meterBaseCarMapper.selectByMap(queryCar);
 
                 //meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
 
@@ -230,10 +231,13 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     meterBaseCarService.add(car);
                 }else if(queryList02.size() >= 1){
                     for (MeterBaseCar model: queryList02) {
+                        HashMap map = new HashMap();
+                        queryCar.put("carId",model.getCarNo());
+                        queryCar.put("pkNo", model.getPkNo());
                         //停役或者删除状态的车辆信息更新为服役状态
-                        meterBaseCarMapper.updateValidFlagById(model.getPkNo());
+                        meterBaseCarMapper.updateValidFlagById(map);
                         //停役或者删除状态的司机信息更新为服役状态
-                        meterBaseDriverMapper.updateValidFlagByCarId(model.getCarNo());
+                        meterBaseDriverMapper.updateValidFlagByCarId(map);
                     }
                 }
                 // 拆分司机list，新增司机表
@@ -255,7 +259,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
 //                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //                        String no = meterBaseDriverMapper.getNewID(sdf.format(new Date()));
 //                        driver.setId(sdf.format(new Date()) + no);
-                        driver.setId(params.get("carNo").toString() + driver.getTelNum());
+                        String pkNO = params.get("carNo").toString() + driver.getTelNum();
+                        driver.setId(pkNO);
                         driver.setCarId(params.get("carNo").toString());
                         driver.setDriverName(driver.getDriverName());
                         driver.setTelNum(driver.getTelNum());
@@ -264,7 +269,15 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         driver.setCreateManName("admins");
                         driver.setCreateTime(new Date());
 
-                        meterBaseDriverService.add(driver);
+                        MeterBaseDriver list1 = meterBaseDriverMapper.selectByPrimaryKey(pkNO);
+                        if(list1 == null){
+                            meterBaseDriverService.add(driver);
+                        }
+                        else {
+                            list1.setValidFlag("0");
+                            meterBaseDriverMapper.updateByPrimaryKeySelective(list1);
+                        }
+
                     }
 
                     if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

@@ -20,7 +20,7 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
 
     void deleteCarById(@Param("list") List<String> driverNos);
 
-    List<MeterBaseCar> selectByMap(String carNo);
+    List<MeterBaseCar> selectByMap(Map<String, Object> parameters);
 
-    int updateValidFlagById(String pkNo);
+    int updateValidFlagById(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -753,15 +753,15 @@
     </foreach>
   </update>
 
-  <select id="selectByMap" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where valid_flag in ('1', '2')
-      <if test="carNo != null">
-        and CAR_NO = #{carNo,jdbcType=VARCHAR},
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = '${carNo}'
      </if>
   </select>
 
-  <update id="updateValidFlagById" parameterType="java.lang.String">
+  <update id="updateValidFlagById" parameterType="java.util.HashMap">
     update METER_BASE_CAR set VALID_FLAG = '0'
     where 1=1
       <if test="pkNo != null and pkNo != ''">

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import java.util.List;
+import java.util.Map;
 
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import feign.Param;
@@ -24,5 +25,5 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
 
     List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
 
-    int updateValidFlagByCarId(String carId);
+    int updateValidFlagByCarId(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

@@ -539,7 +539,7 @@
     select * from METER_BASE_DRIVER where CAR_ID in (select CAR_NO from METER_BASE_CAR WHERE CUSTOMER_SUPPLIER_NO = #{customerSupplierNo})
   </select>
 
-  <update id="updateValidFlagByCarId" parameterType="java.util.List">
+  <update id="updateValidFlagByCarId" parameterType="java.util.HashMap">
     update METER_BASE_DRIVER set VALID_FLAG = '0'
     where 1=1
       <if test="carId != null and carId != ''">

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -747,4 +747,26 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+
+    @ApiOperation(value = "根据实绩id获取一次计量信息和委托信息", notes = "根据实绩id获取一次计量信息和委托信息")
+    @PostMapping(value = "/firstAndEntrustById")
+    public RESTfulResult firstAndEntrustById(@RequestBody HashMap params) {
+        RESTfulResult rm = failed();
+        try {
+            String actualNo = params.get("actualNo") == null ? "" : params.get("actualNo").toString();
+            rm = meterWorkCarActualService.firstAndEntrustById(actualNo);
+            if (rm.getData() != null) {
+                return rm;
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java

@@ -53,4 +53,6 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<MeterWorkCarActual> getCarActual(Map<String, Object> obj);
 
     MeterWorkCarActual selectActual(String actualFirstNo);
+
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -87,4 +87,6 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     // 根据传入的一次计量数据和洁净数据实体进行洁净操作
     MeterWorkCarActual clientClean(MeterWorkCarActualFirst first, MeterWorkCarActual net);
+    //根据实绩id获取一次计量信息和委托信息
+    RESTfulResult firstAndEntrustById(String actualNo);
 }

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

@@ -856,6 +856,32 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
     }
 
+    @Override
+    public RESTfulResult firstAndEntrustById(String actualNo) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setMessage("查询失败！");
+        rm.setFailed();
+
+        List<String> actualNoList = new ArrayList<>();
+        MeterWorkCarActual carActual = meterWorkCarActualMapper.selectByPrimaryKey(actualNo);
+        if(carActual != null) {
+            actualNoList.add(0, carActual.getActualFirst1No());
+            actualNoList.add(1, carActual.getActualFirst2No());
+            String entrust = carActual.getPredictionNo() == null ? "" : carActual.getPredictionNo();
+            List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectById(actualNoList);
+            PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(entrust);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("firstList", firstList);
+            map.put("scale", scale);
+            rm.setData(map);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            return rm;
+        }
+        return null;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkCarActual matchPrediction (String actualNo, String predictionNo, String note) throws MarkerMetException {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.dto.*;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import feign.Param;
+import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.*;
@@ -74,4 +75,6 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     void repairPre(Map<String, Object> map);
 
     List<MeterWorkCarActualFirst> likeByValueFlag(Map<String, Object> params);
+
+    List<MeterWorkCarActualFirst> selectById(List<String> actualNoList);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2821,4 +2821,12 @@
   <update id="repairPre" parameterType="java.util.HashMap">
     update METER_WORK_CAR_ACTUAL_FIRST set PREDICTION_NO = #{predictionNo} where ACTUAL_FIRST_NO = #{actualFirstNo}
   </update>
+
+  <select id="selectById" parameterType="java.util.List" resultMap="BaseResultMap">
+      <include refid="select"/>
+      where ACTUAL_FIRST_NO in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+  </select>
 </mapper>

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

@@ -1769,10 +1769,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         mwm.setUserNo("");
         meterWorkMonitorMapper.updateByPrimaryKeyNotUserNo(mwm);
         //修改在线状态
-        if (mwo != null) {
+        /*if (mwo != null) {
             mwo.setWorkFlag("0");//未接管
             meterWorkOnlineMapper.updateByPrimaryKey(mwo);
-        }
+        }*/
     }
 
     public void updateMonitorOver(String actualFirstNo, String baseSpotNo) {

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

@@ -72,6 +72,18 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "不分页模糊查询最新前100条记录")
+    @GetMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestParam HashMap parmas) {
+        try {
+            List<MeterWorkMonitor> list = meterWorkMonitorService.queryLikeNoPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterWorkMonitor对象创建")
     @ApiImplicitParam(name = "meterWorkMonitor", value = "详细实体meterWorkMonitor", required = true, dataType = "MeterWorkMonitor")
     //@RequiresPermissions("meterworkmonitor:create")

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -41,6 +41,8 @@
     <result column="MOXA_IP" jdbcType="VARCHAR" property="moxaIp" />
     <result column="MOXA_PORT" jdbcType="VARCHAR" property="moxaPort" />
     <result column="VALID_LIANDA" jdbcType="VARCHAR" property="validLianda" />
+    <result column="IS_OPEN_SCANNING" jdbcType="VARCHAR" property="isOpenScanning" />
+    <result column="VALID_IS_PRE" jdbcType="VARCHAR" property="validIsPre" />
   </resultMap>
   <sql id="columns">
     POINT_NO, POINT_NAME, VALID_WGT, VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL,
@@ -48,7 +50,8 @@
     CAR_MONITOR, CAR_MONITOR_LVL, IS_HELP, IS_TAKE_OVER, LED_WRITER, PRINT_NUM, COLLECTION_CODE,
     IS_OVER_WGT, USER_NO, MONITOR_USER_NO, SET_CAR, LED_KEEP, RFID_CAR, PHOTO_CAR, SCAN_CAR,
     EDIT_CAR, CAR_ERR, WGT_ERR, LAST_TIME, STOP_OVER_TIME, MSG_INFO, WGT, IS_REMOTE,
-    WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_LIANDA
+    WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_LIANDA,
+    IS_OPEN_SCANNING, VALID_IS_PRE
   </sql>
   <sql id="columns_alias">
     t.POINT_NO, t.POINT_NAME, t.VALID_WGT, t.VALID_CARNO, t.VALID_TARE_TIME, t.VALID_TIME_INTERVAL,
@@ -57,13 +60,13 @@
     t.COLLECTION_CODE, t.IS_OVER_WGT, t.USER_NO, t.MONITOR_USER_NO, t.SET_CAR, t.LED_KEEP,
     t.RFID_CAR, t.PHOTO_CAR, t.SCAN_CAR, t.EDIT_CAR, t.CAR_ERR, t.WGT_ERR, t.LAST_TIME,
     t.STOP_OVER_TIME, t.MSG_INFO, t.WGT, t.IS_REMOTE, t.WEIGH_INSTRUMENT_MODEL, t.WEIGH_INSTRUMENT_PARAM,
-    t.MOXA_IP, t.MOXA_PORT, t.VALID_LIANDA
+    t.MOXA_IP, t.MOXA_PORT, t.VALID_LIANDA, t.IS_OPEN_SCANNING, t.VALID_IS_PRE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_WORK_MONITOR
+    SELECT <include refid="columns" /> FROM METER_WORK_MONITOR
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_WORK_MONITOR t
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_MONITOR t
   </sql>
   <sql id="where">
     <where>
@@ -184,6 +187,12 @@
       <if test="validLianda != null and validLianda != ''">
         and VALID_LIANDA = #{validLianda}
       </if>
+      <if test="isOpenScanning != null and isOpenScanning != ''">
+        and IS_OPEN_SCANNING = #{isOpenScanning}
+      </if>
+      <if test="validIsPre != null and validIsPre != ''">
+        and VALID_IS_PRE = #{validIsPre}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -305,6 +314,12 @@
       <if test="validLianda != null and validLianda != ''">
         and VALID_LIANDA LIKE '%${validLianda}%'
       </if>
+      <if test="isOpenScanning != null and isOpenScanning != ''">
+        and IS_OPEN_SCANNING LIKE '%${isOpenScanning}%'
+      </if>
+      <if test="validIsPre != null and validIsPre != ''">
+        and VALID_IS_PRE LIKE '%${validIsPre}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -428,36 +443,42 @@
     <if test="validLianda != null and validLianda != ''">
       or VALID_LIANDA = #{validLianda}
     </if>
+    <if test="isOpenScanning != null and isOpenScanning != ''">
+      or IS_OPEN_SCANNING = #{isOpenScanning}
+    </if>
+    <if test="validIsPre != null and validIsPre != ''">
+      or VALID_IS_PRE = #{validIsPre}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR (POINT_NO, POINT_NAME, VALID_WGT,
-      VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL,
-      VALID_PARK_STATUS, VALID_EXCEED_WGT, VALID_PREDICTION_DIFF,
-      VALID_FLAG, VALID_MAT_TIME, CAR_MONITOR,
-      CAR_MONITOR_LVL, IS_HELP, IS_TAKE_OVER,
-      LED_WRITER, PRINT_NUM, COLLECTION_CODE,
-      IS_OVER_WGT, USER_NO, MONITOR_USER_NO,
-      SET_CAR, LED_KEEP, RFID_CAR,
-      PHOTO_CAR, SCAN_CAR, EDIT_CAR,
-      CAR_ERR, WGT_ERR, LAST_TIME,
-      STOP_OVER_TIME, MSG_INFO, WGT,
-      IS_REMOTE, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
-      MOXA_IP, MOXA_PORT, VALID_LIANDA
-      )
+                                    VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL,
+                                    VALID_PARK_STATUS, VALID_EXCEED_WGT, VALID_PREDICTION_DIFF,
+                                    VALID_FLAG, VALID_MAT_TIME, CAR_MONITOR,
+                                    CAR_MONITOR_LVL, IS_HELP, IS_TAKE_OVER,
+                                    LED_WRITER, PRINT_NUM, COLLECTION_CODE,
+                                    IS_OVER_WGT, USER_NO, MONITOR_USER_NO,
+                                    SET_CAR, LED_KEEP, RFID_CAR,
+                                    PHOTO_CAR, SCAN_CAR, EDIT_CAR,
+                                    CAR_ERR, WGT_ERR, LAST_TIME,
+                                    STOP_OVER_TIME, MSG_INFO, WGT,
+                                    IS_REMOTE, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
+                                    MOXA_IP, MOXA_PORT, VALID_LIANDA,
+                                    IS_OPEN_SCANNING, VALID_IS_PRE)
     values (#{pointNo,jdbcType=VARCHAR}, #{pointName,jdbcType=VARCHAR}, #{validWgt,jdbcType=VARCHAR},
-      #{validCarno,jdbcType=VARCHAR}, #{validTareTime,jdbcType=VARCHAR}, #{validTimeInterval,jdbcType=VARCHAR},
-      #{validParkStatus,jdbcType=VARCHAR}, #{validExceedWgt,jdbcType=VARCHAR}, #{validPredictionDiff,jdbcType=VARCHAR},
-      #{validFlag,jdbcType=VARCHAR}, #{validMatTime,jdbcType=VARCHAR}, #{carMonitor,jdbcType=VARCHAR},
-      #{carMonitorLvl,jdbcType=DECIMAL}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR},
-      #{ledWriter,jdbcType=VARCHAR}, #{printNum,jdbcType=DECIMAL}, #{collectionCode,jdbcType=VARCHAR},
-      #{isOverWgt,jdbcType=VARCHAR}, #{userNo,jdbcType=VARCHAR}, #{monitorUserNo,jdbcType=VARCHAR},
-      #{setCar,jdbcType=VARCHAR}, #{ledKeep,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR},
-      #{photoCar,jdbcType=VARCHAR}, #{scanCar,jdbcType=VARCHAR}, #{editCar,jdbcType=VARCHAR},
-      #{carErr,jdbcType=VARCHAR}, #{wgtErr,jdbcType=VARCHAR}, #{lastTime,jdbcType=TIMESTAMP},
-      #{stopOverTime,jdbcType=VARCHAR}, #{msgInfo,jdbcType=VARCHAR}, #{wgt,jdbcType=DECIMAL},
-      #{isRemote,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR},
-      #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validLianda,jdbcType=VARCHAR}
-      )
+            #{validCarno,jdbcType=VARCHAR}, #{validTareTime,jdbcType=VARCHAR}, #{validTimeInterval,jdbcType=VARCHAR},
+            #{validParkStatus,jdbcType=VARCHAR}, #{validExceedWgt,jdbcType=VARCHAR}, #{validPredictionDiff,jdbcType=VARCHAR},
+            #{validFlag,jdbcType=VARCHAR}, #{validMatTime,jdbcType=VARCHAR}, #{carMonitor,jdbcType=VARCHAR},
+            #{carMonitorLvl,jdbcType=DECIMAL}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR},
+            #{ledWriter,jdbcType=VARCHAR}, #{printNum,jdbcType=DECIMAL}, #{collectionCode,jdbcType=VARCHAR},
+            #{isOverWgt,jdbcType=VARCHAR}, #{userNo,jdbcType=VARCHAR}, #{monitorUserNo,jdbcType=VARCHAR},
+            #{setCar,jdbcType=VARCHAR}, #{ledKeep,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR},
+            #{photoCar,jdbcType=VARCHAR}, #{scanCar,jdbcType=VARCHAR}, #{editCar,jdbcType=VARCHAR},
+            #{carErr,jdbcType=VARCHAR}, #{wgtErr,jdbcType=VARCHAR}, #{lastTime,jdbcType=TIMESTAMP},
+            #{stopOverTime,jdbcType=VARCHAR}, #{msgInfo,jdbcType=VARCHAR}, #{wgt,jdbcType=DECIMAL},
+            #{isRemote,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR},
+            #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validLianda,jdbcType=VARCHAR},
+            #{isOpenScanning,jdbcType=VARCHAR}, #{validIsPre,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR
@@ -579,6 +600,12 @@
       <if test="validLianda != null">
         VALID_LIANDA,
       </if>
+      <if test="isOpenScanning != null">
+        IS_OPEN_SCANNING,
+      </if>
+      <if test="validIsPre != null">
+        VALID_IS_PRE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pointNo != null">
@@ -698,48 +725,56 @@
       <if test="validLianda != null">
         #{validLianda,jdbcType=VARCHAR},
       </if>
+      <if test="isOpenScanning != null">
+        #{isOpenScanning,jdbcType=VARCHAR},
+      </if>
+      <if test="validIsPre != null">
+        #{validIsPre,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     update METER_WORK_MONITOR
     set POINT_NAME = #{pointName,jdbcType=VARCHAR},
-      VALID_WGT = #{validWgt,jdbcType=VARCHAR},
-      VALID_CARNO = #{validCarno,jdbcType=VARCHAR},
-      VALID_TARE_TIME = #{validTareTime,jdbcType=VARCHAR},
-      VALID_TIME_INTERVAL = #{validTimeInterval,jdbcType=VARCHAR},
-      VALID_PARK_STATUS = #{validParkStatus,jdbcType=VARCHAR},
-      VALID_EXCEED_WGT = #{validExceedWgt,jdbcType=VARCHAR},
-      VALID_PREDICTION_DIFF = #{validPredictionDiff,jdbcType=VARCHAR},
-      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      VALID_MAT_TIME = #{validMatTime,jdbcType=VARCHAR},
-      CAR_MONITOR = #{carMonitor,jdbcType=VARCHAR},
-      CAR_MONITOR_LVL = #{carMonitorLvl,jdbcType=DECIMAL},
-      IS_HELP = #{isHelp,jdbcType=VARCHAR},
-      IS_TAKE_OVER = #{isTakeOver,jdbcType=VARCHAR},
-      LED_WRITER = #{ledWriter,jdbcType=VARCHAR},
-      PRINT_NUM = #{printNum,jdbcType=DECIMAL},
-      COLLECTION_CODE = #{collectionCode,jdbcType=VARCHAR},
-      IS_OVER_WGT = #{isOverWgt,jdbcType=VARCHAR},
-      USER_NO = #{userNo,jdbcType=VARCHAR},
-      MONITOR_USER_NO = #{monitorUserNo,jdbcType=VARCHAR},
-      SET_CAR = #{setCar,jdbcType=VARCHAR},
-      LED_KEEP = #{ledKeep,jdbcType=VARCHAR},
-      RFID_CAR = #{rfidCar,jdbcType=VARCHAR},
-      PHOTO_CAR = #{photoCar,jdbcType=VARCHAR},
-      SCAN_CAR = #{scanCar,jdbcType=VARCHAR},
-      EDIT_CAR = #{editCar,jdbcType=VARCHAR},
-      CAR_ERR = #{carErr,jdbcType=VARCHAR},
-      WGT_ERR = #{wgtErr,jdbcType=VARCHAR},
-      LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
-      STOP_OVER_TIME = #{stopOverTime,jdbcType=VARCHAR},
-      MSG_INFO = #{msgInfo,jdbcType=VARCHAR},
-      WGT = #{wgt,jdbcType=DECIMAL},
-      IS_REMOTE = #{isRemote,jdbcType=VARCHAR},
-      WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel,jdbcType=VARCHAR},
-      WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam,jdbcType=VARCHAR},
-      MOXA_IP = #{moxaIp,jdbcType=VARCHAR},
-      MOXA_PORT = #{moxaPort,jdbcType=VARCHAR},
-      VALID_LIANDA = #{validLianda,jdbcType=VARCHAR}
+        VALID_WGT = #{validWgt,jdbcType=VARCHAR},
+        VALID_CARNO = #{validCarno,jdbcType=VARCHAR},
+        VALID_TARE_TIME = #{validTareTime,jdbcType=VARCHAR},
+        VALID_TIME_INTERVAL = #{validTimeInterval,jdbcType=VARCHAR},
+        VALID_PARK_STATUS = #{validParkStatus,jdbcType=VARCHAR},
+        VALID_EXCEED_WGT = #{validExceedWgt,jdbcType=VARCHAR},
+        VALID_PREDICTION_DIFF = #{validPredictionDiff,jdbcType=VARCHAR},
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+        VALID_MAT_TIME = #{validMatTime,jdbcType=VARCHAR},
+        CAR_MONITOR = #{carMonitor,jdbcType=VARCHAR},
+        CAR_MONITOR_LVL = #{carMonitorLvl,jdbcType=DECIMAL},
+        IS_HELP = #{isHelp,jdbcType=VARCHAR},
+        IS_TAKE_OVER = #{isTakeOver,jdbcType=VARCHAR},
+        LED_WRITER = #{ledWriter,jdbcType=VARCHAR},
+        PRINT_NUM = #{printNum,jdbcType=DECIMAL},
+        COLLECTION_CODE = #{collectionCode,jdbcType=VARCHAR},
+        IS_OVER_WGT = #{isOverWgt,jdbcType=VARCHAR},
+        USER_NO = #{userNo,jdbcType=VARCHAR},
+        MONITOR_USER_NO = #{monitorUserNo,jdbcType=VARCHAR},
+        SET_CAR = #{setCar,jdbcType=VARCHAR},
+        LED_KEEP = #{ledKeep,jdbcType=VARCHAR},
+        RFID_CAR = #{rfidCar,jdbcType=VARCHAR},
+        PHOTO_CAR = #{photoCar,jdbcType=VARCHAR},
+        SCAN_CAR = #{scanCar,jdbcType=VARCHAR},
+        EDIT_CAR = #{editCar,jdbcType=VARCHAR},
+        CAR_ERR = #{carErr,jdbcType=VARCHAR},
+        WGT_ERR = #{wgtErr,jdbcType=VARCHAR},
+        LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
+        STOP_OVER_TIME = #{stopOverTime,jdbcType=VARCHAR},
+        MSG_INFO = #{msgInfo,jdbcType=VARCHAR},
+        WGT = #{wgt,jdbcType=DECIMAL},
+        IS_REMOTE = #{isRemote,jdbcType=VARCHAR},
+        WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel,jdbcType=VARCHAR},
+        WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam,jdbcType=VARCHAR},
+        MOXA_IP = #{moxaIp,jdbcType=VARCHAR},
+        MOXA_PORT = #{moxaPort,jdbcType=VARCHAR},
+        VALID_LIANDA = #{validLianda,jdbcType=VARCHAR},
+        IS_OPEN_SCANNING = #{isOpenScanning,jdbcType=VARCHAR},
+        VALID_IS_PRE = #{validIsPre,jdbcType=VARCHAR}
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -859,20 +894,26 @@
       <if test="validLianda != null">
         VALID_LIANDA = #{validLianda,jdbcType=VARCHAR},
       </if>
+      <if test="isOpenScanning != null">
+        IS_OPEN_SCANNING = #{isOpenScanning,jdbcType=VARCHAR},
+      </if>
+      <if test="validIsPre != null">
+        VALID_IS_PRE = #{validIsPre,jdbcType=VARCHAR},
+      </if>
     </set>
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_MONITOR
@@ -890,8 +931,8 @@
     WGT_ERR, LAST_TIME, STOP_OVER_TIME,
     MSG_INFO, WGT, IS_REMOTE,
     WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
-    MOXA_IP, MOXA_PORT, VALID_LIANDA
-    )
+    MOXA_IP, MOXA_PORT, VALID_LIANDA,
+    IS_OPEN_SCANNING, VALID_IS_PRE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.pointNo,jdbcType=VARCHAR},
@@ -908,178 +949,186 @@
     #{item.wgtErr,jdbcType=VARCHAR}, #{item.lastTime,jdbcType=TIMESTAMP}, #{item.stopOverTime,jdbcType=VARCHAR},
     #{item.msgInfo,jdbcType=VARCHAR}, #{item.wgt,jdbcType=DECIMAL}, #{item.isRemote,jdbcType=VARCHAR},
     #{item.weighInstrumentModel,jdbcType=VARCHAR}, #{item.weighInstrumentParam,jdbcType=VARCHAR},
-    #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validLianda,jdbcType=VARCHAR}
-    from dual
+    #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validLianda,jdbcType=VARCHAR},
+    #{item.isOpenScanning,jdbcType=VARCHAR}, #{item.validIsPre,jdbcType=VARCHAR} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
     update METER_WORK_MONITOR
     set
     POINT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.pointNo,jdbcType=VARCHAR}
     </foreach>
     ,POINT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.pointName,jdbcType=VARCHAR}
     </foreach>
     ,VALID_WGT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validWgt,jdbcType=VARCHAR}
     </foreach>
     ,VALID_CARNO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validCarno,jdbcType=VARCHAR}
     </foreach>
     ,VALID_TARE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validTareTime,jdbcType=VARCHAR}
     </foreach>
     ,VALID_TIME_INTERVAL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validTimeInterval,jdbcType=VARCHAR}
     </foreach>
     ,VALID_PARK_STATUS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validParkStatus,jdbcType=VARCHAR}
     </foreach>
     ,VALID_EXCEED_WGT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validExceedWgt,jdbcType=VARCHAR}
     </foreach>
     ,VALID_PREDICTION_DIFF=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validPredictionDiff,jdbcType=VARCHAR}
     </foreach>
     ,VALID_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
     </foreach>
     ,VALID_MAT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validMatTime,jdbcType=VARCHAR}
     </foreach>
     ,CAR_MONITOR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.carMonitor,jdbcType=VARCHAR}
     </foreach>
     ,CAR_MONITOR_LVL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.carMonitorLvl,jdbcType=DECIMAL}
     </foreach>
     ,IS_HELP=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.isHelp,jdbcType=VARCHAR}
     </foreach>
     ,IS_TAKE_OVER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.isTakeOver,jdbcType=VARCHAR}
     </foreach>
     ,LED_WRITER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.ledWriter,jdbcType=VARCHAR}
     </foreach>
     ,PRINT_NUM=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.printNum,jdbcType=DECIMAL}
     </foreach>
     ,COLLECTION_CODE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.collectionCode,jdbcType=VARCHAR}
     </foreach>
     ,IS_OVER_WGT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.isOverWgt,jdbcType=VARCHAR}
     </foreach>
     ,USER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.userNo,jdbcType=VARCHAR}
     </foreach>
     ,MONITOR_USER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.monitorUserNo,jdbcType=VARCHAR}
     </foreach>
     ,SET_CAR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.setCar,jdbcType=VARCHAR}
     </foreach>
     ,LED_KEEP=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.ledKeep,jdbcType=VARCHAR}
     </foreach>
     ,RFID_CAR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.rfidCar,jdbcType=VARCHAR}
     </foreach>
     ,PHOTO_CAR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.photoCar,jdbcType=VARCHAR}
     </foreach>
     ,SCAN_CAR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.scanCar,jdbcType=VARCHAR}
     </foreach>
     ,EDIT_CAR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.editCar,jdbcType=VARCHAR}
     </foreach>
     ,CAR_ERR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.carErr,jdbcType=VARCHAR}
     </foreach>
     ,WGT_ERR=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.wgtErr,jdbcType=VARCHAR}
     </foreach>
     ,LAST_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.lastTime,jdbcType=TIMESTAMP}
     </foreach>
     ,STOP_OVER_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.stopOverTime,jdbcType=VARCHAR}
     </foreach>
     ,MSG_INFO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.msgInfo,jdbcType=VARCHAR}
     </foreach>
     ,WGT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.wgt,jdbcType=DECIMAL}
     </foreach>
     ,IS_REMOTE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.isRemote,jdbcType=VARCHAR}
     </foreach>
     ,WEIGH_INSTRUMENT_MODEL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.weighInstrumentModel,jdbcType=VARCHAR}
     </foreach>
     ,WEIGH_INSTRUMENT_PARAM=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.weighInstrumentParam,jdbcType=VARCHAR}
     </foreach>
     ,MOXA_IP=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.moxaIp,jdbcType=VARCHAR}
     </foreach>
     ,MOXA_PORT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.moxaPort,jdbcType=VARCHAR}
     </foreach>
     ,VALID_LIANDA=
-    <foreach collection="list" item="item" index="index" separator=" " open="case POINT_NO" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
       when #{item.pointNo,jdbcType=VARCHAR} then #{item.validLianda,jdbcType=VARCHAR}
     </foreach>
+    ,IS_OPEN_SCANNING=
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+      when #{item.pointNo,jdbcType=VARCHAR} then #{item.isOpenScanning,jdbcType=VARCHAR}
+    </foreach>
+    ,VALID_IS_PRE=
+    <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+      when #{item.pointNo,jdbcType=VARCHAR} then #{item.validIsPre,jdbcType=VARCHAR}
+    </foreach>
     where POINT_NO in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.pointNo,jdbcType=VARCHAR}
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_MONITOR
     where POINT_NO in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
-@ApiModel(value="MeterWorkMonitor-计量监控表")
+@ApiModel(value="计量监控表")
 public class MeterWorkMonitor implements IBasePO<String> {
     /**
      * 计量点编号(POINT_NO,VARCHAR,20)
@@ -80,9 +80,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String carMonitor;
 
     /**
-     * 车号修正级别1-3(CAR_MONITOR_LVL,DECIMAL,0)
+     * 车号修正级别1-3（1=修正1位；2=修正连续的2位；3=修正连续的3位）(CAR_MONITOR_LVL,DECIMAL,0)
      */
-    @ApiModelProperty(value="车号修正级别1-3",required=false)
+    @ApiModelProperty(value="车号修正级别1-3（1=修正1位；2=修正连续的2位；3=修正连续的3位）",required=false)
     private Short carMonitorLvl;
 
     /**
@@ -98,7 +98,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String isTakeOver;
 
     /**
-     * 写入LED的值(LED_WRITER,OTHER,100)
+     * 写入LED的值(LED_WRITER,VARCHAR,200)
      */
     @ApiModelProperty(value="写入LED的值",required=false)
     private String ledWriter;
@@ -194,7 +194,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String stopOverTime;
 
     /**
-     * 现场终端提示信息(MSG_INFO,OTHER,200)
+     * 现场终端提示信息(MSG_INFO,VARCHAR,400)
      */
     @ApiModelProperty(value="现场终端提示信息",required=false)
     private String msgInfo;
@@ -241,6 +241,19 @@ public class MeterWorkMonitor implements IBasePO<String> {
     @ApiModelProperty(value="验证联达  0不验证  1验证",required=false)
     private String validLianda;
 
+    /**
+     * 现场扫码器是否正常连接(0=连接异常，1=连接正常)(IS_OPEN_SCANNING,VARCHAR,1)
+     */
+    @ApiModelProperty(value="现场扫码器是否正常连接(0=连接异常，1=连接正常)",required=false)
+    private String isOpenScanning;
+
+    /**
+     * 验证是否存在委托  0不验证  1验证(valid_is_pre,VARCHAR,255)
+     */
+    @ApiModelProperty(value="验证是否存在委托  0不验证  1验证",required=false)
+    private String validIsPre;
+
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -378,7 +391,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
     }
 
     public void setLedWriter(String ledWriter) {
-        this.ledWriter = ledWriter== null ? null : ledWriter.trim();
+        this.ledWriter = ledWriter == null ? null : ledWriter.trim();
     }
 
     public Short getPrintNum() {
@@ -565,6 +578,23 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.validLianda = validLianda == null ? null : validLianda.trim();
     }
 
+    public String getIsOpenScanning() {
+        return isOpenScanning;
+    }
+
+    public void setIsOpenScanning(String isOpenScanning) {
+        this.isOpenScanning = isOpenScanning == null ? null : isOpenScanning.trim();
+    }
+
+    public String getValidIsPre() {
+        return validIsPre;
+    }
+
+    public void setValidIsPre(String validIsPre) {
+        this.validIsPre = validIsPre == null ? null : validIsPre.trim();
+    }
+
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -610,6 +640,8 @@ public class MeterWorkMonitor implements IBasePO<String> {
         sb.append(", moxaIp=").append(moxaIp);
         sb.append(", moxaPort=").append(moxaPort);
         sb.append(", validLianda=").append(validLianda);
+        sb.append(", isOpenScanning=").append(isOpenScanning);
+        sb.append(", validIsPre=").append(validIsPre);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -4,6 +4,9 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * MeterWorkMonitor服务接口：
  * @author generator
@@ -24,4 +27,6 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
     String doUpdateWf(MeterWorkMonitor model);
 
     void AutomaticAllocation();
+
+    List<MeterWorkMonitor> queryLikeNoPage(HashMap<String, Object> parmas);
 }

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

@@ -109,6 +109,11 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         System.out.println("DATASOURCE = " + dataSource  );
     }
 
+    @Override
+    public List<MeterWorkMonitor> queryLikeNoPage(HashMap<String, Object> parmas) {
+        return null;
+    }
+
     private void RandomAssign() {
         List<MeterWorkMonitor> list2 = meterWorkMonitorMapper.selectForAss();
         if (list2.size() > 0) {

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

@@ -523,19 +523,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             BeanUtils.copyProperties(first3,mwcaf03);
             MeterWorkRailwayActFirst first4 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo2, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf04);
-            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
-            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
-            BeanUtils.copyProperties(mwca1, actualRow1);
-            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo2);
-            BeanUtils.copyProperties(mwca2,actualRow2);
+
             //更新预报数据
             PreRailwayScale scale = new PreRailwayScale();
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("二次计量洁净更新");
+            scale.setUpdateManName("双委托洁净更新");
             scale.setUploadFlag("1");
+            scale.setPredictionType("5");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
 
             PreRailwayScale scale1 = new PreRailwayScale();
@@ -543,24 +541,32 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
             scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("二次计量洁净更新");
+            scale1.setUpdateManName("双委托洁净更新");
             scale1.setUploadFlag("1");
+            scale1.setPredictionType("5");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
 
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
             mwcaf01.setUpdateManName("system");
-            mwcaf01.setUpdateManName("二次计量洁净更新");
+            mwcaf01.setUpdateManName("双委托洁净更新");
             mwcaf01.setUpdateTime(new Date());
             mwcaf01.setIsPreSacale("1");
+            mwcaf01.setPredictionNo(predictionNo1);
+            mwcaf01.setPredictionType("5");
+            mwcaf01.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf01);
             //更新第一次皮重数据库
             mwcaf02.setValueFlag(DbConstants.NET);
             mwcaf02.setUpdateManName("system");
-            mwcaf02.setUpdateManName("二次计量洁净更新");
+            mwcaf02.setUpdateManName("双委托洁净更新");
             mwcaf02.setUpdateTime(new Date());
             mwcaf02.setIsPreSacale("1");
+            mwcaf02.setPredictionNo(predictionNo1);
+            mwcaf02.setPredictionType("5");
+            mwcaf02.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf02);
             //添加第一次毛重数据库
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -569,9 +575,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf03.setActualFirstNo(actualFirstNo);
             mwcaf03.setValueFlag(DbConstants.NET);
             mwcaf03.setUpdateManName("system");
-            mwcaf03.setUpdateManName("二次计量洁净更新");
+            mwcaf03.setUpdateManName("双委托洁净更新");
             mwcaf03.setUpdateTime(new Date());
             mwcaf03.setIsPreSacale("1");
+            mwcaf03.setPredictionNo(predictionNo2);
+            mwcaf03.setPredictionType("5");
+            mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf03);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
@@ -580,10 +589,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf04.setActualFirstNo(actualSecondNo);
             mwcaf04.setValueFlag(DbConstants.NET);
             mwcaf04.setUpdateManName("system");
-            mwcaf04.setUpdateManName("二次计量洁净更新");
+            mwcaf04.setUpdateManName("双委托洁净更新");
             mwcaf04.setUpdateTime(new Date());
             mwcaf04.setIsPreSacale("1");
+            mwcaf04.setPredictionNo(predictionNo2);
+            mwcaf04.setPredictionType("5");
+            mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf04);
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
+            BeanUtils.copyProperties(mwca1, actualRow1);
+            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualFirstNo, actualSecondNo, predictionNo2);
+            BeanUtils.copyProperties(mwca2,actualRow2);
 
             //添加结净数据
             String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
@@ -593,6 +610,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setNote("双委托匹配洁净");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreSacale("1");
+            actualRow1.setPredictionNo(predictionNo1);
+            actualRow1.setPredictionType("5");
+            actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
@@ -603,6 +623,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setNote("双委托匹配洁净");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreSacale("1");
+            actualRow2.setPredictionNo(predictionNo2);
+            actualRow2.setPredictionType("5");
+            actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
         }catch(Exception e){

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -3,6 +3,7 @@ package com.steerinfo.meterwork.meterworkrailwayactual.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -626,6 +627,18 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="列次编号",required=false)
     private String lcNo;
 
+    /**
+     * 委托类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报、5：双委托、6：混卸、7：混装）(PREDICTION_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="委托类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报、5：双委托、6：混卸、7：混装）",required=false)
+    private String predictionType;
+
+    /**
+     * 委托组合(PREDICTION_COMBINATION,VARCHAR,40)
+     */
+    @ApiModelProperty(value="委托组合",required=false)
+    private String predictionCombination;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1462,6 +1475,22 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.lcNo = lcNo == null ? null : lcNo.trim();
     }
 
+    public String getPredictionType() {
+        return predictionType;
+    }
+
+    public void setPredictionType(String predictionType) {
+        this.predictionType = predictionType == null ? null : predictionType.trim();
+    }
+
+    public String getPredictionCombination() {
+        return predictionCombination;
+    }
+
+    public void setPredictionCombination(String predictionCombination) {
+        this.predictionCombination = predictionCombination == null ? null : predictionCombination.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1571,6 +1600,8 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", note=").append(note);
         sb.append(", isPreSacale=").append(isPreSacale);
         sb.append(", lcNo=").append(lcNo);
+        sb.append(", predictionType=").append(predictionType);
+        sb.append(", predictionCombination=").append(predictionCombination);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();