修改

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/controller/MeterBaseScalePointController.java

@@ -61,6 +61,24 @@ public class MeterBaseScalePointController extends BaseRESTfulController {
         }
     }
 
+
+    @ApiOperation(value = "除去关键字“陇西”的所有站点-获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasescalepoint:view")
+    @GetMapping(value = "/notIncludedLonXi/")
+    public RESTfulResult notIncludedLonXi(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterBaseScalePoint> list = meterBaseScalePointService.notIncludedLonXi(parmas, pageNum, pageSize);
+            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/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.java

@@ -15,4 +15,5 @@ public interface MeterBaseScalePointMapper extends IBaseMapper<MeterBaseScalePoi
      String getNewID(@Param(value="baseSpotNo")String baseSpotNo);
 
      List<MeterBaseScalePoint> selectForUpdate(Map<String, Object> parameters);
+     List<MeterBaseScalePoint> notIncludedLonXi(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.xml

@@ -1641,4 +1641,190 @@
       </if>
     </where>
   </select>
+  <select id="notIncludedLonXi" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+        and SCALE_POINT_NAME not like '%陇西%'
+      <if test="scalePointNo != null and scalePointNo != ''">
+        and SCALE_POINT_NO LIKE '%${scalePointNo}%'
+      </if>
+      <if test="scalePointName != null and scalePointName != ''">
+        and SCALE_POINT_NAME LIKE '%${scalePointName}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="weighInstrumentModel != null and weighInstrumentModel != ''">
+        and WEIGH_INSTRUMENT_MODEL LIKE '%${weighInstrumentModel}%'
+      </if>
+      <if test="weighInstrumentParam != null and weighInstrumentParam != ''">
+        and WEIGH_INSTRUMENT_PARAM LIKE '%${weighInstrumentParam}%'
+      </if>
+      <if test="moxaIp != null and moxaIp != ''">
+        and MOXA_IP LIKE '%${moxaIp}%'
+      </if>
+      <if test="moxaPort != null and moxaPort != ''">
+        and MOXA_PORT LIKE '%${moxaPort}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="lastTime != null">
+        and TO_CHAR(LAST_TIME,'yyyy-MM-dd') = #{lastTime}
+      </if>
+      <if test="weightTime != null">
+        and TO_CHAR(WEIGHT_TIME,'yyyy-MM-dd') = #{weightTime}
+      </if>
+      <if test="userNo != null and userNo != ''">
+        and USER_NO LIKE '%${userNo}%'
+      </if>
+      <if test="monitorUserNo != null and monitorUserNo != ''">
+        and MONITOR_USER_NO LIKE '%${monitorUserNo}%'
+      </if>
+      <if test="weight != null">
+        and WEIGHT = #{weight}
+      </if>
+      <if test="collectionCode != null and collectionCode != ''">
+        and COLLECTION_CODE LIKE '%${collectionCode}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO LIKE '%${spotTypeNo}%'
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME LIKE '%${spotTypeName}%'
+      </if>
+      <if test="weightZero != null">
+        and WEIGHT_ZERO = #{weightZero}
+      </if>
+      <if test="monitorUserIp != null and monitorUserIp != ''">
+        and MONITOR_USER_IP LIKE '%${monitorUserIp}%'
+      </if>
+      <if test="isHelp != null and isHelp != ''">
+        and IS_HELP LIKE '%${isHelp}%'
+      </if>
+      <if test="isTakeOver != null and isTakeOver != ''">
+        and IS_TAKE_OVER LIKE '%${isTakeOver}%'
+      </if>
+      <if test="ledWriter != null and ledWriter != ''">
+        and LED_WRITER LIKE '%${ledWriter}%'
+      </if>
+      <if test="rfidCar != null and rfidCar != ''">
+        and RFID_CAR LIKE '%${rfidCar}%'
+      </if>
+      <if test="photoCar != null and photoCar != ''">
+        and PHOTO_CAR LIKE '%${photoCar}%'
+      </if>
+      <if test="wgtErr != null and wgtErr != ''">
+        and WGT_ERR LIKE '%${wgtErr}%'
+      </if>
+      <if test="userIp != null and userIp != ''">
+        and USER_IP LIKE '%${userIp}%'
+      </if>
+      <if test="aiWeight != null and aiWeight != ''">
+        and AI_WEIGHT LIKE '%${aiWeight}%'
+      </if>
+      <if test="carErr != null and carErr != ''">
+        and CAR_ERR LIKE '%${carErr}%'
+      </if>
+      <if test="powerState != null and powerState != ''">
+        and POWER_STATE LIKE '%${powerState}%'
+      </if>
+      <if test="dvrState != null and dvrState != ''">
+        and DVR_STATE LIKE '%${dvrState}%'
+      </if>
+      <if test="moxaState != null and moxaState != ''">
+        and MOXA_STATE LIKE '%${moxaState}%'
+      </if>
+      <if test="plcState != null and plcState != ''">
+        and PLC_STATE LIKE '%${plcState}%'
+      </if>
+      <if test="leftInfraredRayState != null and leftInfraredRayState != ''">
+        and LEFT_INFRARED_RAY_STATE LIKE '%${leftInfraredRayState}%'
+      </if>
+      <if test="rightInfraredRayState != null and rightInfraredRayState != ''">
+        and RIGHT_INFRARED_RAY_STATE LIKE '%${rightInfraredRayState}%'
+      </if>
+      <if test="amplifierState != null and amplifierState != ''">
+        and AMPLIFIER_STATE LIKE '%${amplifierState}%'
+      </if>
+      <if test="lampState != null and lampState != ''">
+        and LAMP_STATE LIKE '%${lampState}%'
+      </if>
+      <if test="entrustState != null and entrustState != ''">
+        and ENTRUST_STATE LIKE '%${entrustState}%'
+      </if>
+      <if test="version != null">
+        and VERSION = #{version}
+      </if>
+      <if test="scanCar != null and scanCar != ''">
+        and SCAN_CAR LIKE '%${scanCar}%'
+      </if>
+      <if test="msgInfo != null and msgInfo != ''">
+        and MSG_INFO LIKE '%${msgInfo}%'
+      </if>
+      <if test="stopOverTime != null and stopOverTime != ''">
+        and STOP_OVER_TIME LIKE '%${stopOverTime}%'
+      </if>
+      <if test="validIsPre != null and validIsPre != ''">
+        and VALID_IS_PRE LIKE '%${validIsPre}%'
+      </if>
+      <if test="redGreenLightState != null and redGreenLightState != ''">
+        and RED_GREEN_LIGHT_STATE LIKE '%${redGreenLightState}%'
+      </if>
+      <if test="frontInfraredRayState != null and frontInfraredRayState != ''">
+        and FRONT_INFRARED_RAY_STATE LIKE '%${frontInfraredRayState}%'
+      </if>
+      <if test="rearInfraredRayState != null and rearInfraredRayState != ''">
+        and REAR_INFRARED_RAY_STATE LIKE '%${rearInfraredRayState}%'
+      </if>
+      <if test="rfidState != null and rfidState != ''">
+        and RFID_STATE LIKE '%${rfidState}%'
+      </if>
+      <if test="zeroState != null and zeroState != ''">
+        and ZERO_STATE LIKE '%${zeroState}%'
+      </if>
+      <if test="autoscaleIp != null and autoscaleIp != ''">
+        and AUTOSCALE_IP LIKE '%${autoscaleIp}%'
+      </if>
+      <if test="plcIp != null and plcIp != ''">
+        and PLC_IP LIKE '%${plcIp}%'
+      </if>
+      <if test="dvrIp != null and dvrIp != ''">
+        and DVR_IP LIKE '%${dvrIp}%'
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME LIKE '%${userName}%'
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/service/IMeterBaseScalePointService.java

@@ -2,6 +2,7 @@ package com.steerinfo.baseinfo.meterbasescalepoint.service;
 
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint;
+import com.steerinfo.framework.service.pagehelper.PageList;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +32,8 @@ public interface IMeterBaseScalePointService extends IBaseService<MeterBaseScale
 
     List<MeterBaseScalePoint> queryAll(Map<String,Object> parmas);
 
+    PageList<MeterBaseScalePoint> notIncludedLonXi(Map<String, Object> params, Integer pageNum, Integer pageSize);
+
     /**
      * 数据修改
      * @param model

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/service/impl/MeterBaseScalePointServiceImpl.java

@@ -5,6 +5,8 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint;
 import com.steerinfo.baseinfo.meterbasescalepoint.mapper.MeterBaseScalePointMapper;
 import com.steerinfo.baseinfo.meterbasescalepoint.service.IMeterBaseScalePointService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.base.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -122,6 +124,14 @@ public class MeterBaseScalePointServiceImpl extends BaseServiceImpl<MeterBaseSca
         return meterBaseScalePointMapper.selectByParameters(parmas);
     }
 
+    @Override
+    public PageList<MeterBaseScalePoint> notIncludedLonXi(Map<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseScalePoint> rows = meterBaseScalePointMapper.notIncludedLonXi(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     /**
      * 客户端：数据更新
      * @param model

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

@@ -3,10 +3,12 @@ package com.steerinfo.baseinfo.meterbasespotinfo.mapper;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.shiro.crypto.hash.Hash;
 
 @Mapper
 public interface MeterBaseSpotInfoMapper extends IBaseMapper<MeterBaseSpotInfo, String> {
@@ -30,4 +32,7 @@ public interface MeterBaseSpotInfoMapper extends IBaseMapper<MeterBaseSpotInfo,
 
      List<MeterBaseSpotInfo> carSpotGroupByActualAndFirst(Map<String, Object> param);
      List<MeterBaseSpotInfo> staticSpotGroupByActualAndFirst(Map<String, Object> param);
+
+     List<MeterBaseSpotInfo> spotGroupCarActual(HashMap<String, Object> params);
+     List<MeterBaseSpotInfo> spotGroupRailwayActual(HashMap<String, Object> params);
 }

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

@@ -1321,4 +1321,46 @@
     group by base_spot_no,
     base_spot_name
   </select>
+
+  <select id="spotGroupCarActual" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select A.net_spot3_no base_spot_no,
+            A.net_spot3_name base_spot_name
+    from meter_work_car_actual A
+    where A.value_flag != '0'
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+        and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+        and A.net_spot3_no in
+        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    group by A.net_spot3_no,
+            A.net_spot3_name
+  </select>
+
+  <select id="spotGroupRailwayActual" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select A.net_spot3_no base_spot_no,
+    A.net_spot3_name base_spot_name
+    from meter_work_railway_actual A
+    where A.value_flag != '0'
+    and A.railway_type_no in
+    <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    group by A.net_spot3_no,
+    A.net_spot3_name
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/controller/MeterBaseVehicleRangePrintConfigController.java

@@ -0,0 +1,132 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.controller;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.service.IMeterBaseVehicleRangePrintConfigService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseVehicleRangePrintConfig RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-28 03:51
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-28
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangePrintConfig RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasevehiclerangeprintconfigs")
+public class MeterBaseVehicleRangePrintConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseVehicleRangePrintConfigService meterBaseVehicleRangePrintConfigService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasevehiclerangeprintconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVehicleRangePrintConfig> list = meterBaseVehicleRangePrintConfigService.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("meterbasevehiclerangeprintconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVehicleRangePrintConfig> list = meterBaseVehicleRangePrintConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseVehicleRangePrintConfig对象创建")
+    @ApiImplicitParam(name = "meterBaseVehicleRangePrintConfig", value = "详细实体meterBaseVehicleRangePrintConfig", required = true, dataType = "MeterBaseVehicleRangePrintConfig")
+    //@RequiresPermissions("meterbasevehiclerangeprintconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseVehicleRangePrintConfig model){
+        MeterBaseVehicleRangePrintConfig meterBaseVehicleRangePrintConfig = meterBaseVehicleRangePrintConfigService.add(model);
+        return success(meterBaseVehicleRangePrintConfig);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasevehiclerangeprintconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseVehicleRangePrintConfig meterBaseVehicleRangePrintConfig = meterBaseVehicleRangePrintConfigService.getById(id);
+        return success(meterBaseVehicleRangePrintConfig);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseVehicleRangePrintConfig信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseVehicleRangePrintConfig", value = "详细实体meterBaseVehicleRangePrintConfig", required = true, dataType = "MeterBaseVehicleRangePrintConfig")
+    })
+    //@RequiresPermissions("meterbasevehiclerangeprintconfig:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseVehicleRangePrintConfig model){
+        model.setId(id);
+        MeterBaseVehicleRangePrintConfig meterBaseVehicleRangePrintConfig = meterBaseVehicleRangePrintConfigService.modify(model);
+        return success(meterBaseVehicleRangePrintConfig);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasevehiclerangeprintconfig: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);
+			  meterBaseVehicleRangePrintConfigService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas){
+        PageList<MeterBaseVehicleRangePrintConfig> list = meterBaseVehicleRangePrintConfigService.likeByDesc(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+        return success(list);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterBaseVehicleRangePrintConfig model){
+        MeterBaseVehicleRangePrintConfig meterBaseVehicleRangePrintConfig = meterBaseVehicleRangePrintConfigService.updateModel(model);
+        return success(meterBaseVehicleRangePrintConfig);
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterBaseVehicleRangePrintConfig model){
+        MeterBaseVehicleRangePrintConfig meterBaseVehicleRangePrintConfig = meterBaseVehicleRangePrintConfigService.addModel(model);
+        return success(meterBaseVehicleRangePrintConfig);
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/mapper/MeterBaseVehicleRangePrintConfigMapper.java

@@ -0,0 +1,14 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterBaseVehicleRangePrintConfigMapper extends IBaseMapper<MeterBaseVehicleRangePrintConfig, String> {
+    List<MeterBaseVehicleRangePrintConfig> likeByDesc(HashMap params);
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/mapper/MeterBaseVehicleRangePrintConfigMapper.xml

@@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig">
+    <id column="VEHICLE_RANGE_ID" jdbcType="VARCHAR" property="vehicleRangeId" />
+    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="CARRIGE_NO" jdbcType="VARCHAR" property="carrigeNo" />
+    <result column="LOAD_WEIGHT" jdbcType="DECIMAL" property="loadWeight" />
+    <result column="NET_WEIGHT_UPPER" jdbcType="DECIMAL" property="netWeightUpper" />
+    <result column="NET_WEIGHT_LOWER" jdbcType="DECIMAL" property="netWeightLower" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+  </resultMap>
+  <sql id="columns">
+    VEHICLE_RANGE_ID, RAILWAY_NO, MATTER_NO, MATTER_NAME, CARRIGE_NO, LOAD_WEIGHT, NET_WEIGHT_UPPER, 
+    NET_WEIGHT_LOWER, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+    UPDATE_TIME, VALUE_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.VEHICLE_RANGE_ID, t.RAILWAY_NO, t.MATTER_NO, t.MATTER_NAME, t.CARRIGE_NO, t.LOAD_WEIGHT, 
+    t.NET_WEIGHT_UPPER, t.NET_WEIGHT_LOWER, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
+    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.VALUE_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_VEHICLE_RANGE_PRINT_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="vehicleRangeId != null and vehicleRangeId != ''">
+        and VEHICLE_RANGE_ID = #{vehicleRangeId}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        and CARRIGE_NO = #{carrigeNo}
+      </if>
+      <if test="loadWeight != null">
+        and LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="netWeightUpper != null">
+        and NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        and NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="vehicleRangeId != null and vehicleRangeId != ''">
+        and VEHICLE_RANGE_ID LIKE '%${vehicleRangeId}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        and CARRIGE_NO LIKE '%${carrigeNo}%'
+      </if>
+      <if test="loadWeight != null">
+        and LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="netWeightUpper != null">
+        and NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        and NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </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_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    where 1!=1 
+      <if test="railwayNo != null and railwayNo != ''">
+        or RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        or CARRIGE_NO = #{carrigeNo}
+      </if>
+      <if test="loadWeight != null">
+        or LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="netWeightUpper != null">
+        or NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        or NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig">
+    insert into METER_BASE_VEHICLE_RANGE_PRINT_CONFIG (VEHICLE_RANGE_ID, RAILWAY_NO, MATTER_NO, 
+      MATTER_NAME, CARRIGE_NO, LOAD_WEIGHT, 
+      NET_WEIGHT_UPPER, NET_WEIGHT_LOWER, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+      UPDATE_MAN_NAME, UPDATE_TIME, VALUE_FLAG
+      )
+    values (#{vehicleRangeId,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
+      #{matterName,jdbcType=VARCHAR}, #{carrigeNo,jdbcType=VARCHAR}, #{loadWeight,jdbcType=DECIMAL}, 
+      #{netWeightUpper,jdbcType=DECIMAL}, #{netWeightLower,jdbcType=DECIMAL}, #{createManNo,jdbcType=VARCHAR}, 
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, 
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{valueFlag,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig">
+    insert into METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="vehicleRangeId != null">
+        VEHICLE_RANGE_ID,
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="carrigeNo != null">
+        CARRIGE_NO,
+      </if>
+      <if test="loadWeight != null">
+        LOAD_WEIGHT,
+      </if>
+      <if test="netWeightUpper != null">
+        NET_WEIGHT_UPPER,
+      </if>
+      <if test="netWeightLower != null">
+        NET_WEIGHT_LOWER,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="vehicleRangeId != null">
+        #{vehicleRangeId,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrigeNo != null">
+        #{carrigeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadWeight != null">
+        #{loadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightUpper != null">
+        #{netWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightLower != null">
+        #{netWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig">
+    update METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    set RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      CARRIGE_NO = #{carrigeNo,jdbcType=VARCHAR},
+      LOAD_WEIGHT = #{loadWeight,jdbcType=DECIMAL},
+      NET_WEIGHT_UPPER = #{netWeightUpper,jdbcType=DECIMAL},
+      NET_WEIGHT_LOWER = #{netWeightLower,jdbcType=DECIMAL},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig">
+    update METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    <set>
+      <if test="railwayNo != null">
+        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrigeNo != null">
+        CARRIGE_NO = #{carrigeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadWeight != null">
+        LOAD_WEIGHT = #{loadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightUpper != null">
+        NET_WEIGHT_UPPER = #{netWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightLower != null">
+        NET_WEIGHT_LOWER = #{netWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_VEHICLE_RANGE_PRINT_CONFIG 
+      (VEHICLE_RANGE_ID, 
+      RAILWAY_NO, MATTER_NO, MATTER_NAME, 
+      CARRIGE_NO, LOAD_WEIGHT, NET_WEIGHT_UPPER, 
+      NET_WEIGHT_LOWER, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      VALUE_FLAG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.vehicleRangeId,jdbcType=VARCHAR}, 
+      #{item.railwayNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, 
+      #{item.carrigeNo,jdbcType=VARCHAR}, #{item.loadWeight,jdbcType=DECIMAL}, #{item.netWeightUpper,jdbcType=DECIMAL}, 
+      #{item.netWeightLower,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.valueFlag,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+     set
+       VEHICLE_RANGE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.vehicleRangeId,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.carrigeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,LOAD_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.loadWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,NET_WEIGHT_UPPER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.netWeightUpper,jdbcType=DECIMAL}
+       </foreach>
+       ,NET_WEIGHT_LOWER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.netWeightLower,jdbcType=DECIMAL}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+     where VEHICLE_RANGE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.vehicleRangeId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_VEHICLE_RANGE_PRINT_CONFIG
+    where VEHICLE_RANGE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+    <if test="railwayNo != null and railwayNo != ''">
+      and RAILWAY_NO LIKE '%${railwayNo}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and MATTER_NO LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and MATTER_NAME LIKE '%${matterName}%'
+    </if>
+    <if test="carrigeNo != null and carrigeNo != ''">
+      and CARRIGE_NO LIKE '%${carrigeNo}%'
+    </if>
+    <if test="loadWeight != null">
+      and LOAD_WEIGHT = #{loadWeight}
+    </if>
+    order by create_time desc
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/model/MeterBaseVehicleRangePrintConfig.java

@@ -0,0 +1,258 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.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 MeterBaseVehicleRangePrintConfig implements IBasePO<String> {
+    /**
+     * 车型范围ID(VEHICLE_RANGE_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车型范围ID",required=true)
+    private String vehicleRangeId;
+
+    /**
+     * 车号(RAILWAY_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String railwayNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 车型(CARRIGE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String carrigeNo;
+
+    /**
+     * 载重(LOAD_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="载重",required=false)
+    private Long loadWeight;
+
+    /**
+     * 净重上限(NET_WEIGHT_UPPER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="净重上限",required=false)
+    private Long netWeightUpper;
+
+    /**
+     * 净重下限(NET_WEIGHT_LOWER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="净重下限",required=false)
+    private Long netWeightLower;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(CREATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人名称",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人名称(UPDATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人名称",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 状态（0：无效、1：有效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：无效、1：有效）",required=true)
+    private String valueFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.vehicleRangeId;
+    }
+
+    @Override
+    public void setId(String vehicleRangeId) {
+        this.vehicleRangeId = vehicleRangeId == null ? null : vehicleRangeId.trim();
+    }
+
+    public String getVehicleRangeId() {
+        return vehicleRangeId;
+    }
+
+    public void setVehicleRangeId(String vehicleRangeId) {
+        this.vehicleRangeId = vehicleRangeId == null ? null : vehicleRangeId.trim();
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo == null ? null : matterNo.trim();
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName == null ? null : matterName.trim();
+    }
+
+    public String getCarrigeNo() {
+        return carrigeNo;
+    }
+
+    public void setCarrigeNo(String carrigeNo) {
+        this.carrigeNo = carrigeNo == null ? null : carrigeNo.trim();
+    }
+
+    public Long getLoadWeight() {
+        return loadWeight;
+    }
+
+    public void setLoadWeight(Long loadWeight) {
+        this.loadWeight = loadWeight;
+    }
+
+    public Long getNetWeightUpper() {
+        return netWeightUpper;
+    }
+
+    public void setNetWeightUpper(Long netWeightUpper) {
+        this.netWeightUpper = netWeightUpper;
+    }
+
+    public Long getNetWeightLower() {
+        return netWeightLower;
+    }
+
+    public void setNetWeightLower(Long netWeightLower) {
+        this.netWeightLower = netWeightLower;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    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(", vehicleRangeId=").append(vehicleRangeId);
+        sb.append(", railwayNo=").append(railwayNo);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", carrigeNo=").append(carrigeNo);
+        sb.append(", loadWeight=").append(loadWeight);
+        sb.append(", netWeightUpper=").append(netWeightUpper);
+        sb.append(", netWeightLower=").append(netWeightLower);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/service/IMeterBaseVehicleRangePrintConfigService.java

@@ -0,0 +1,28 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.service;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.HashMap;
+
+/**
+ * MeterBaseVehicleRangePrintConfig服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-28 03:51
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-28
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangePrintConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseVehicleRangePrintConfigService extends IBaseService<MeterBaseVehicleRangePrintConfig, String>{
+    PageList<MeterBaseVehicleRangePrintConfig> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    MeterBaseVehicleRangePrintConfig updateModel(MeterBaseVehicleRangePrintConfig model);
+    MeterBaseVehicleRangePrintConfig addModel(MeterBaseVehicleRangePrintConfig model);
+
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/service/impl/MeterBaseVehicleRangePrintConfigServiceImpl.java

@@ -0,0 +1,91 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.service.impl;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.service.IMeterBaseVehicleRangePrintConfigService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseVehicleRangePrintConfig服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-28 03:51
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-28
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangePrintConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseVehicleRangePrintConfigService")
+public class MeterBaseVehicleRangePrintConfigServiceImpl extends BaseServiceImpl<MeterBaseVehicleRangePrintConfig, String> implements IMeterBaseVehicleRangePrintConfigService {
+
+    @Autowired(required = false)
+    private MeterBaseVehicleRangePrintConfigMapper meterBaseVehicleRangePrintConfigMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseVehicleRangePrintConfig, String> getMapper() {
+        return meterBaseVehicleRangePrintConfigMapper;
+    }
+
+    @Override
+    public PageList<MeterBaseVehicleRangePrintConfig> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseVehicleRangePrintConfig> rows = meterBaseVehicleRangePrintConfigMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterBaseVehicleRangePrintConfig updateModel(MeterBaseVehicleRangePrintConfig model) {
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setUpdateManNo(userId);
+        model.setUpdateManName(userName);
+        model.setUpdateTime(new Date());
+        meterBaseVehicleRangePrintConfigMapper.updateByPrimaryKeySelective(model);
+        return meterBaseVehicleRangePrintConfigMapper.selectByPrimaryKey(model.getVehicleRangeId());
+    }
+
+    @Override
+    public MeterBaseVehicleRangePrintConfig addModel(MeterBaseVehicleRangePrintConfig model) {
+        model.setVehicleRangeId(PublicMethod.IdCreate(3));
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setCreateManNo(userId);
+        model.setCreateManName(userName);
+        model.setCreateTime(new Date());
+        model.setValueFlag("1");
+        meterBaseVehicleRangePrintConfigMapper.insert(model);
+        return model;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -423,4 +423,16 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "pika车号数核查-获取列表", notes = "不分页模糊查询")
+    @PostMapping(value = "/pikaCarNumAnalysisSummary")
+    public RESTfulResult pikaCarNumAnalysisSummary(@RequestBody HashMap parmas) {
+        try {
+            List<HashMap> list = meterWorkDataCountService.pikaCarNumAnalysisSummary(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -856,45 +856,52 @@
 
     <select id="rfidIdentifyAnalysisSummarySpot" parameterType="java.util.HashMap"
             resultType="com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo">
-        select C.base_spot_no baseSpotNo, C.base_spot_name baseSpotName
-            from meter_work_carno_identify A
-          left join meter_base_rfid_info B
-            on A.rfid_car_no = B.rfid_code
-          left join meter_work_car_actual_first C
-            on A.actual_first_no = C.actual_first_no
-         where A.car_no_type = '2'
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and  C.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-                and C.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-            </if>
-         group by C.base_spot_no, C.base_spot_name
+        select B.base_spot_no baseSpotNo,
+            B.base_spot_name baseSpotName
+        from meter_work_carno_identify A
+            left join meter_work_car_actual_first B
+                on A.Actual_First_No = B.actual_first_no
+        where 1 = 1
+            and B.car_no in (select car_no from meter_base_rfid_info where value_flag = '0')
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  B.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        group by B.base_spot_no, B.base_spot_name
     </select>
 
     <select id="rfidIdentifyAnalysisSummary" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.RfidIdentifyAnalysis">
-        select C.base_spot_no baseSpotNo,
-                C.base_spot_name baseSpotName,
-                C.actual_first_no actualFirstNo,
-                C.car_no firstCarNo,
-                C.create_time firstCreateTime,
-                B.car_no rfidInfoCarNo,
-                A.rfid_car_no rfidIdentifyRfidCarNo,
-                A.car_no rfidIdentifyCarNo
-            from meter_work_carno_identify A
-          left join meter_base_rfid_info B
-            on A.rfid_car_no = B.rfid_code
-          left join meter_work_car_actual_first C
-            on A.actual_first_no = C.actual_first_no
-         where A.car_no_type = '2'
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and  C.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-                and C.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-            </if>
-            <if test="baseSpotNo != null and baseSpotNo != ''">
-                and C.base_spot_no like '%${baseSpotNo}%'
-            </if>
-            <if test="baseSpotName != null and baseSpotName != ''">
-                and C.base_spot_name like '%${baseSpotName}%'
-            </if>
+        select B.base_spot_no baseSpotNo,
+            B.base_spot_name baseSpotName,
+            B.actual_first_no actualFirstNo,
+            B.car_no firstCarNo,
+            B.create_time firstCreateTime,
+            A.rfid_car_no rfidIdentifyRfidCarNo,
+            A.car_no rfidIdentifyCarNo,
+            case when A.car_no_type = '1' then '视觉识别'
+                 when A.car_no_type = '2' then 'Rfid识别'
+                 when A.car_no_type = '3' then '扫码识别'
+                 when A.car_no_type = '4' then '车号重置'
+                 else null end carNoType,
+            A.video_car_no1 videoCarNo1,
+            A.video_car_no2 videoCarNo2,
+            A.scan_car_no scanCarNo
+        from meter_work_carno_identify A
+            left join meter_work_car_actual_first B
+                on A.Actual_First_No = B.actual_first_no
+        where 1 = 1
+            and B.car_no in (select car_no from meter_base_rfid_info where value_flag = '0')
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  B.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and B.base_spot_no like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and B.base_spot_name like '%${baseSpotName}%'
+        </if>
+        order by B.create_time desc
     </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/RfidIdentifyAnalysis.java

@@ -9,9 +9,12 @@ public class RfidIdentifyAnalysis {
     private String actualFirstNo;
     private String firstCarNo;
     private Date firstCreateTime;
-    private String rfidInfoCarNo;
     private String rfidIdentifyRfidCarNo;
     private String rfidIdentifyCarNo;
+    private String carNoType;
+    private String videoCarNo1;
+    private String videoCarNo2;
+    private String scanCarNo;
 
     public String getBaseSpotNo() {
         return baseSpotNo;
@@ -53,14 +56,6 @@ public class RfidIdentifyAnalysis {
         this.firstCreateTime = firstCreateTime;
     }
 
-    public String getRfidInfoCarNo() {
-        return rfidInfoCarNo;
-    }
-
-    public void setRfidInfoCarNo(String rfidInfoCarNo) {
-        this.rfidInfoCarNo = rfidInfoCarNo;
-    }
-
     public String getRfidIdentifyRfidCarNo() {
         return rfidIdentifyRfidCarNo;
     }
@@ -76,4 +71,36 @@ public class RfidIdentifyAnalysis {
     public void setRfidIdentifyCarNo(String rfidIdentifyCarNo) {
         this.rfidIdentifyCarNo = rfidIdentifyCarNo;
     }
+
+    public String getCarNoType() {
+        return carNoType;
+    }
+
+    public void setCarNoType(String carNoType) {
+        this.carNoType = carNoType;
+    }
+
+    public String getVideoCarNo1() {
+        return videoCarNo1;
+    }
+
+    public void setVideoCarNo1(String videoCarNo1) {
+        this.videoCarNo1 = videoCarNo1;
+    }
+
+    public String getVideoCarNo2() {
+        return videoCarNo2;
+    }
+
+    public void setVideoCarNo2(String videoCarNo2) {
+        this.videoCarNo2 = videoCarNo2;
+    }
+
+    public String getScanCarNo() {
+        return scanCarNo;
+    }
+
+    public void setScanCarNo(String scanCarNo) {
+        this.scanCarNo = scanCarNo;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -21,4 +21,5 @@ public interface IMeterWorkDataCountService{
     PageList<StaticRailwayRemoteComparison> staticRailwayRemoteComparison(HashMap<String, Object> params);
     List<HashMap> rfidIdentifyAnalysisSummary(HashMap<String, Object> params);
     PageList<RfidIdentifyAnalysis> rfidIdentifyAnalysisDetail(HashMap<String, Object> params);
+    List<HashMap> pikaCarNumAnalysisSummary(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -8,13 +8,17 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper;
 import com.steerinfo.meterwork.meterworkdatacount.model.*;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.util.StringUtils;
+import org.apache.shiro.crypto.hash.Hash;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -954,6 +958,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 long countFirst = 0L;
                 long countIdentifyYes = 0L;
                 long countIdentifyNo = 0L;
+                long countOtherIdentify = 0L;
                 if(rfidIdentifyList.size() >= 1) {
                     //一次计量数据总数
                     countFirst = rfidIdentifyList.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
@@ -962,11 +967,17 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     //Rfid识别总数
                     countIdentifyYes = rfidIdentifyList.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getCarNoType().equals("Rfid识别")
                             && StringUtils.isNotEmpty(item.getRfidIdentifyRfidCarNo())).count();
                     //Rfid未识别总数
                     countIdentifyNo = rfidIdentifyList.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && item.getCarNoType().equals("Rfid识别")
                             && StringUtils.isEmpty(item.getRfidIdentifyRfidCarNo())).count();
+                    //其他视频识别总数
+                    countOtherIdentify = rfidIdentifyList.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
+                            && !item.getCarNoType().equals("Rfid识别")).count();
                 }
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("baseSpotNo", spotModel.getBaseSpotNo());
@@ -974,6 +985,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 map.put("countFirst", countFirst);
                 map.put("countIdentifyYes", countIdentifyYes);
                 map.put("countIdentifyNo", countIdentifyNo);
+                map.put("countOtherIdentify", countOtherIdentify);
                 mapList.add(map);
             }
         }
@@ -987,4 +999,123 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public List<HashMap> pikaCarNumAnalysisSummary(HashMap<String, Object> params) {
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+        List<HashMap> instrumentTypeList = new ArrayList<>();
+
+        //汽车衡
+        HashMap<String, Object> map = new HashMap<>();
+        List<MeterBaseSpotInfo> spotModels = meterBaseSpotInfoMapper.spotGroupCarActual(params);
+        if(spotModels.size() >= 1) {
+            HashMap<String, Object> instrumentTypeMap = new HashMap<>();
+            instrumentTypeMap.put("instrumentType", "汽车衡");
+            List<HashMap> spotList = new ArrayList<>();
+            List<MeterWorkCarActual> carActual = meterWorkCarActualMapper.countAllState(params);
+            for(MeterBaseSpotInfo spotModel: spotModels) {
+                long countActual = 0L;
+                long countMatchedActual = 0L;
+                long countNotMatchActual = 0L;
+                long countUploadActual = 0L;
+                if(carActual.size() >= 1) {
+                    countActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                        && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                        && !item.getValueFlag().equals("0")).count();
+                    countMatchedActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                            && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                            && !item.getValueFlag().equals("0")
+                            && item.getIsPreScale().equals("1")).count();
+                    countNotMatchActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                            && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                            && !item.getValueFlag().equals("0")
+                            && ( StringUtils.isEmpty(item.getIsPreScale()) || item.getIsPreScale().equals("0") )).count();
+                    countUploadActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                            && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                            && !item.getValueFlag().equals("0")
+                            && item.getIsPreScale().equals("1")
+                            && item.getValueFlag().equals("1")
+                            && item.getUploadFlag().equals("2")).count();
+
+                }
+                HashMap<String, Object> actualMap = new HashMap<>();
+                actualMap.put("baseSpotNo", spotModel.getBaseSpotNo());
+                actualMap.put("baseSpotName", spotModel.getBaseSpotName());
+                actualMap.put("countActual", countActual);
+                actualMap.put("countMatchedActual", countMatchedActual);
+                actualMap.put("countNotMatchActual", countNotMatchActual);
+                actualMap.put("countUploadActual", countUploadActual);
+                spotList.add(actualMap);
+            }
+            instrumentTypeMap.put("spotList", spotList);
+            instrumentTypeList.add(instrumentTypeMap);
+        }
+
+        String[][] railwayTypeNoList = new String[][]{{"001019001"}, {"001019002"}, {"001019003", "001019004"}, {"001019005"}};
+        for (int i = 0; i <= railwayTypeNoList.length - 1; i++) {
+            String[] typeNoStr = railwayTypeNoList[i];
+            HashMap<String, Object> railwayMap = new HashMap<>();
+            railwayMap.put("startTime", params.get("startTime"));
+            railwayMap.put("endTime", params.get("endTime"));
+            railwayMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
+            railwayMap.put("spotNoStr", params.get("spotNoStr"));
+            railwayMap.put("railwayTypeNoStr", "1");
+            railwayMap.put("typeNoStr", typeNoStr);
+            spotModels = meterBaseSpotInfoMapper.spotGroupRailwayActual(railwayMap);
+            if(spotModels.size() >= 1) {
+                HashMap<String, Object> instrumentTypeMap = new HashMap<>();
+                if (i == 0) {
+                    instrumentTypeMap.put("instrumentType", "静态轨轨道衡");
+                } else if (i == 1) {
+                    instrumentTypeMap.put("instrumentType", "动态轨轨道衡");
+                } else if (i == 2) {
+                    instrumentTypeMap.put("instrumentType", "铁水衡");
+                } else if (i == 3) {
+                    instrumentTypeMap.put("instrumentType", "吊钩秤");
+                }
+                List<HashMap> spotList = new ArrayList<>();
+                List<MeterWorkRailwayActual> carActual = meterWorkRailwayActualMapper.carActualDataDetail(railwayMap);
+                for(MeterBaseSpotInfo spotModel: spotModels) {
+                    long countActual = 0L;
+                    long countMatchedActual = 0L;
+                    long countNotMatchActual = 0L;
+                    long countUploadActual = 0L;
+                    if(carActual.size() >= 1) {
+                        countActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                                && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                                && !item.getValueFlag().equals("0")).count();
+                        countMatchedActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                                && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                                && !item.getValueFlag().equals("0")
+                                && item.getIsPreSacale().equals("1")).count();
+                        countNotMatchActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                                && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                                && !item.getValueFlag().equals("0")
+                                && ( StringUtils.isEmpty(item.getIsPreSacale()) || item.getIsPreSacale().equals("0") )).count();
+                        countUploadActual = carActual.stream().filter(item -> item.getNetSpot3No().equals(spotModel.getBaseSpotNo())
+                                && item.getNetSpot3Name().equals(spotModel.getBaseSpotName())
+                                && !item.getValueFlag().equals("0")
+                                && item.getIsPreSacale().equals("1")
+                                && item.getValueFlag().equals("2")
+                                && item.getUploadFlag().equals("2")).count();
+
+                    }
+                    HashMap<String, Object> actualMap = new HashMap<>();
+                    actualMap.put("baseSpotNo", spotModel.getBaseSpotNo());
+                    actualMap.put("baseSpotName", spotModel.getBaseSpotName());
+                    actualMap.put("countActual", countActual);
+                    actualMap.put("countMatchedActual", countMatchedActual);
+                    actualMap.put("countNotMatchActual", countNotMatchActual);
+                    actualMap.put("countUploadActual", countUploadActual);
+                    spotList.add(actualMap);
+                }
+                instrumentTypeMap.put("spotList", spotList);
+                instrumentTypeList.add(instrumentTypeMap);
+            }
+        }
+        return instrumentTypeList;
+    }
 }

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

@@ -13,6 +13,7 @@ import com.steerinfo.meterwork.meterworkonline.mapper.MeterWorkOnlineMapper;
 import com.steerinfo.meterwork.meterworkonline.model.MeterWorkOnline;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
+import io.micrometer.core.instrument.Meter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -165,8 +166,17 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         PageHelper.startPage(pageNum, pageSize);
         List<MeterWorkMonitor> rows = this.getMapper().selectByParameters(parmas);
 
+        List<MeterWorkMonitor> rowsTemp = new ArrayList<>();
+        if(rows.size() >= 1) {
+            for (MeterWorkMonitor model: rows) {
+                if(!model.getPointName().contains("陇西")) {
+                    rowsTemp.add(model);
+                }
+            }
+        }
+
         List<MeterWorkMonitorDto> list = new ArrayList<>();
-        for (MeterWorkMonitor meterWorkMonitor : rows){
+        for (MeterWorkMonitor meterWorkMonitor : rowsTemp){
             long time = 45*1000;//45秒
             Date now = new Date();
             Date beforeDate = new Date(now.getTime() - time);//30秒前的时间

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

@@ -4318,6 +4318,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
+    @Transactional
     public RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst
             grossModel, MeterWorkRailwayActFirst tareModel, boolean needUpload) {
         RESTfulResult rm = new RESTfulResult();
@@ -4556,6 +4557,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
         }
         return rm;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -8,6 +8,8 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAi
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper;
+import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -34,6 +36,7 @@ import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import io.micrometer.core.instrument.Meter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -86,6 +89,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Resource
     private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
 
+    @Resource
+    private MeterBaseVehicleRangePrintConfigMapper meterBaseVehicleRangePrintConfigMapper;
+
 
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
@@ -3112,6 +3118,31 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             params.put("matterNameList", matterNameModels);
             List<MeterWorkRailwayActual> actualModels = meterWorkRailwayActualMapper.autoPrintRailway(params);
 
+            //获取轨道衡有效打印限制配置（车号、车型、自重、净重上限、净重下限）
+            HashMap<String, Object> printMap = new HashMap<>();
+            printMap.put("valueFlag", "1");
+            List<MeterBaseVehicleRangePrintConfig> printConfigs = meterBaseVehicleRangePrintConfigMapper.likeByDesc(printMap);
+            List<MeterWorkRailwayActual> railwayModels = new ArrayList<>();
+            if(actualModels.size() >= 1) {
+                for (MeterWorkRailwayActual model: actualModels) {
+                    if(printConfigs.size() >= 1) {
+                        //循环所有净重信息
+                        for (MeterBaseVehicleRangePrintConfig configModel: printConfigs){
+                            //判断净重信息物料、车型相同、并且净重在净重上限、下限之间就是有效数据；否者不显示
+                            if(configModel.getRailwayNo().equals(model.getRailwayNo())
+                                && configModel.getCarrigeNo().equals(model.getConveyanceType())) {
+                                if((model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightUpper())) != 1)
+                                        && (model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightLower()))) != -1) {
+                                    railwayModels.add(model);
+                                }
+                            }else{
+                                railwayModels.add(model);
+                            }
+                        }
+                    }
+                }
+            }
+
             rm.setSucceed();
             rm.setCode("200");
             rm.setData(actualModels);