后端提交

src/main/java/com/jisco/dynamicweight/dynamicbasecamera/controller/DynamicBaseCameraController.java

@@ -1,6 +1,5 @@
 package com.jisco.dynamicweight.dynamicbasecamera.controller;
 
-import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicbasecamera.model.DynamicBaseCamera;
 import com.jisco.dynamicweight.dynamicbasecamera.service.IDynamicBaseCameraService;
 import com.jisco.dynamicweight.dynamicbasecamera.service.IFLVService;
@@ -12,22 +11,21 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.bytedeco.javacv.*;
-import org.bytedeco.opencv.opencv_core.IplImage;
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.Frame;
+import org.bytedeco.javacv.Java2DFrameConverter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import sun.misc.BASE64Encoder;
+import java.util.Date;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
-import java.nio.Buffer;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -77,6 +75,7 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     //@RequiresPermissions("dynamicbasecamera:view")
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+
         PageList<DynamicBaseCamera> list = dynamicBaseCameraService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
@@ -86,6 +85,13 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     //@RequiresPermissions("dynamicbasecamera:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody DynamicBaseCamera model) {
+//        UserPayload payload = UserPayload.getCurrUser();
+//        String userId = payload.getId();
+//        String userName = payload.getUserName();
+//        model.setCreateManNo(userId);
+//        model.setCreateManName(userName);
+
+        model.setCreateTime(new Date());
         DynamicBaseCamera dynamicBaseCamera = dynamicBaseCameraService.add(model);
         return success(dynamicBaseCamera);
     }
@@ -188,7 +194,6 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
 //        System.err.println("jpg_base64：" + (end - start));
 //        start = end;
 //        ImageIO.write(bufferedImage, "jpg", new File("D:/qrcode1.jpg"));
-//        System.out.println("值为：" + "data:image/jpg;base64," + jpg_base64);
         return success("data:image/jpg;base64," + jpg_base64);
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasecamera/factories/ConverterFactories.java

@@ -104,9 +104,7 @@ public class ConverterFactories extends Thread implements Converter {
 					recorder.setAudioBitrate(grabber.getAudioBitrate());
 					recorder.setAudioCodec(grabber.getAudioCodec());
 				}
-				System.out.println("11111");
 				recorder.setFormat("flv");
-				/////
 
 
 
@@ -140,7 +138,7 @@ public class ConverterFactories extends Thread implements Converter {
 					Thread.sleep(5);
 				}
 			} else {
-				//System.out.println("为什么会走到这？");
+				////system.out.println("为什么会走到这？");
 				isCloseGrabberAndResponse = false;
 				// 需要转码为视频H264格式,音频AAC格式
 				ConverterTranFactories c = new ConverterTranFactories(url, key, factories, outEntitys,grabber,videoId);
@@ -199,12 +197,12 @@ public class ConverterFactories extends Thread implements Converter {
 	 * @param isCloseGrabberAndResponse
 	 */
 	public void completeResponse(boolean isCloseGrabberAndResponse) {
-		System.out.println("isCloseGrabberAndResponse="+isCloseGrabberAndResponse);
+		//system.out.println("isCloseGrabberAndResponse="+isCloseGrabberAndResponse);
 		if (isCloseGrabberAndResponse) {
 			Iterator<AsyncContext> it = outEntitys.iterator();
 			while (it.hasNext()) {
 				AsyncContext o = it.next();
-				System.out.println("o="+o);
+				//system.out.println("o="+o);
 				//o.getResponse().setContentType("application/json;charset=utf-8");
 				try{
 					o.getResponse().flushBuffer();

src/main/java/com/jisco/dynamicweight/dynamicbasecamera/factories/HLSConverterFactories.java

@@ -1,5 +1,6 @@
 package com.jisco.dynamicweight.dynamicbasecamera.factories;
 
+
 import org.bytedeco.ffmpeg.avcodec.AVPacket;
 import org.bytedeco.ffmpeg.avformat.AVFormatContext;
 import org.bytedeco.ffmpeg.global.avcodec;
@@ -108,7 +109,7 @@ public class HLSConverterFactories extends Thread implements Converter {
 				recorder = new FFmpegFrameRecorder(url, grabber.getImageWidth(), grabber.getImageHeight(),
 						grabber.getAudioChannels());
 
-				System.out.println("11111");
+				//system.out.println("11111");
 				// 设置比特率
 				recorder.setVideoBitrate(bitrate);
 				// h264编/解码器
@@ -144,7 +145,7 @@ public class HLSConverterFactories extends Thread implements Converter {
 					no_pkt_index++;
 					continue;
 				}
-				System.out.println("----------------------");
+				//system.out.println("----------------------");
 				// 获取到的pkt的dts，pts异常，将此包丢弃掉。
 				if (pkt.dts() == avutil.AV_NOPTS_VALUE && pkt.pts() == avutil.AV_NOPTS_VALUE || pkt.pts() < dts) {
 					err_index++;

src/main/java/com/jisco/dynamicweight/dynamicbasecamera/service/impl/FLVService.java

@@ -35,7 +35,6 @@ public class FLVService implements IFLVService {
 		AsyncContext async = request.startAsync();
 		async.setTimeout(0);
 		if (converters.containsKey(key) && url.indexOf("/tracks")==-1) {
-			System.out.println("exit Transter");
 			Converter c = converters.get(key);
 			try {
 				c.addOutputStreamEntity(key, async);
@@ -46,10 +45,8 @@ public class FLVService implements IFLVService {
 		} else {
 		   Converter converter = converters.get(key);
 			if(converter!=null){
-				System.out.println("converter exit to exit");
 				converter.exit();
 			}
-			System.out.println("new Transter");
 			List<AsyncContext> outs = new ArrayList<AsyncContext>();
 			outs.add(async);
 			ConverterFactories c = new ConverterFactories(url, key, converters, outs,videoId);
@@ -57,7 +54,6 @@ public class FLVService implements IFLVService {
 			converters.put(key, c);
 		}
 
-		//System.out.println(converters);
 		response.setContentType("video/x-flv");
 		response.setHeader("Connection", "keep-alive");
 

src/main/java/com/jisco/dynamicweight/dynamicworktly/controller/DynamicWorkTlyController.java

@@ -76,8 +76,8 @@ public class DynamicWorkTlyController extends BaseRESTfulController {
         Assert.isTrue(model.getRq() != null, "日期不能为空");
         Assert.isTrue(model.getWeight() != null && model.getWeight().compareTo(new BigDecimal(0)) > 0, "脱硫液重量必须大于0");
         model.setValidFlag("1");
-        model.setCreateManNo(UserUtil.getCurrentUserId());
-        model.setCreateManName(UserUtil.getCurrentUserName());
+//        model.setCreateManNo(UserUtil.getCurrentUserId());
+//        model.setCreateManName(UserUtil.getCurrentUserName());
         model.setCreateTime(new Date());
         DynamicWorkTly dynamicWorkTly = dynamicWorkTlyService.add(model);
         return success(dynamicWorkTly);
@@ -102,8 +102,8 @@ public class DynamicWorkTlyController extends BaseRESTfulController {
     public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkTly model){
         Assert.isTrue(model.getRq() != null, "日期不能为空");
         Assert.isTrue(model.getWeight() != null && model.getWeight().compareTo(new BigDecimal(0)) > 0, "脱硫液重量必须大于0");
-        model.setUpdateManNo(UserUtil.getCurrentUserId());
-        model.setUpdateManName(UserUtil.getCurrentUserName());
+//        model.setUpdateManNo(UserUtil.getCurrentUserId());
+//        model.setUpdateManName(UserUtil.getCurrentUserName());
         model.setUpdateTime(new Date());
         model.setId(id);
         DynamicWorkTly dynamicWorkTly = dynamicWorkTlyService.modify(model);

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/impl/DynamicWorkUpdataServiceImpl.java

@@ -119,14 +119,19 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         }
         BigDecimal weight = null;
         Map<String, Object> map = new HashMap<>();
+//        if (updata.getMaterialCode() == null) {
+//            updata.setMaterialCode("123123");
+//        }
         map.put("meterialCode", updata.getMaterialCode());
         map.put("date1", date1);
         map.put("date2", date2);
         map.put("weight", weight);
         dynamicWorkUpdataMapper.returnedDustWeight(map);
         if (map.get("weight") == null) {
-            weight = new BigDecimal(0);
+            map.put("weight", new BigDecimal(0));
+//            weight = new BigDecimal(0);
         }
+        Assert.isTrue(map.get("weight") !=null,"未获取到重量！");
         weight = new BigDecimal(map.get("weight").toString());
         return weight;
     }
@@ -140,7 +145,7 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
     @Override
     public void returnedDust(String id, List<ReturnedDustDto> list) {
         DynamicWorkUpdata updata = this.getById(id);
-        Assert.isTrue(updata.getIsReturnedDust().compareTo(new BigDecimal(1))==0, updata.getMaterialName() + "不能进行返粉！");
+        Assert.isTrue( updata !=null && updata.getIsReturnedDust()!=null && updata.getIsReturnedDust().compareTo(new BigDecimal(1))==0, updata.getMaterialName() + "不能进行返粉！");
         BigDecimal weight = this.returnedDustWeight(id);
         Assert.isTrue(weight.compareTo(new BigDecimal(0)) > 0, updata.getStationName() + "重量为0,不能进行返粉!");
         BigDecimal total = new BigDecimal(0);

src/main/java/com/jisco/dynamicweight/util/UserUtil.java

@@ -7,6 +7,8 @@ public class UserUtil {
     public static String getCurrentUserId(){
         UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
+
+
         return userId;
     }
 

src/main/java/com/jisco/ymtappoint/controller/YMTGetController.java

@@ -52,7 +52,7 @@ public class YMTGetController {
 //        ResponseEntity<String> entity = client.postForEntity(url, params, String.class);
 //        JSONObject jsonObject = JSONObject.parseObject(entity.getBody());
 //        //获取3方接口返回的数据通过entity.getBody();它返回的是一个字符串；
-////        System.out.println(jsonObject.get("access_token"));
+////        //system.out.println(jsonObject.get("access_token"));
 ////        return jsonObject.get("access_token").toString();
 ////        if(jsonObject.get("code").toString().equals("200")){
 ////            return true;

src/main/java/com/jisco/ymtappoint/demo.java

@@ -16,7 +16,6 @@ public class demo {
     public static void main(String[] args) {
 //        getToken();
 
-        System.out.println(api2RebackStp2tgMES());
         test02();
 
     }
@@ -36,7 +35,6 @@ public class demo {
         ResponseEntity<String> entity = client.postForEntity(url, null, String.class);
         JSONObject jsonObject = JSONObject.parseObject(entity.getBody());
         //获取3方接口返回的数据通过entity.getBody();它返回的是一个字符串；
-//        System.out.println(jsonObject.get("access_token"));
 //        if(jsonObject.get("code").toString().equals("200")){
 //            return true;
 //        }
@@ -76,9 +74,9 @@ public class demo {
 //        ResponseEntity<String> entity = client.postForEntity(url, request, String.class);
         ResponseEntity<String> entity = client.postForEntity(url, null, String.class);
         JSONObject jsonObject = JSONObject.parseObject(entity.getBody());
-        System.out.println(jsonObject);
+        //system.out.println(jsonObject);
         //获取3方接口返回的数据通过entity.getBody();它返回的是一个字符串；
-//        System.out.println(jsonObject.get("access_token"));
+//        //system.out.println(jsonObject.get("access_token"));
 //        return jsonObject.get("access_token").toString();
 //        if(jsonObject.get("code").toString().equals("200")){
 //            return true;
@@ -107,10 +105,10 @@ public class demo {
 //        JSONObject jsonObject = JSONObject.parseObject(entity.getBody());
         //获取3方接口返回的数据通过entity.getBody();它返回的是一个字符串；
        JSONObject jsonObject = JSONObject.parseObject(entity.getBody());
-//       System.out.println(jsonObject.get("data").toString());
+//       //system.out.println(jsonObject.get("data").toString());
 //       return jsonObject.get("access_token").toString();
 //        if(jsonObject.get("code").toString().equals("200")){
-//            System.out.println("ssssssss");
+//            //system.out.println("ssssssss");
 //        }
 
     }

src/main/java/com/steerinfo/baseinfo/appphonehelp/service/impl/AppPhoneHelpServiceImpl.java

@@ -9,6 +9,7 @@ import com.steerinfo.baseinfo.appphonehelp.service.IAppPhoneHelpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -29,7 +30,7 @@ import java.util.HashMap;
 @Service(value = "appPhoneHelpService")
 public class AppPhoneHelpServiceImpl extends BaseServiceImpl<AppPhoneHelp, String> implements IAppPhoneHelpService {
 
-    @Autowired
+    @Resource
     private AppPhoneHelpMapper appPhoneHelpMapper;
 
     @Override

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/mapper/MeterBaseUnitInfoMapper.xml

@@ -17,16 +17,22 @@
     <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="VAULE_FLAG" jdbcType="VARCHAR" property="vauleFlag" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
   </resultMap>
   <sql id="columns">
     UNIT_NO, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UNIT_NO, RECEIVING_UNIT_NAME, 
     ALLOWED_TARE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, VAULE_FLAG, 
+    MATTER_NO, MATTER_NAME, CAR_NO
   </sql>
   <sql id="columns_alias">
     t.UNIT_NO, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UNIT_NO, t.RECEIVING_UNIT_NAME, 
     t.ALLOWED_TARE_WEIGHT, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
-    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, 
+    t.VAULE_FLAG, t.MATTER_NO, t.MATTER_NAME, t.CAR_NO
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_UNIT_INFO
@@ -81,6 +87,18 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="vauleFlag != null and vauleFlag != ''">
+        and VAULE_FLAG = #{vauleFlag}
+      </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="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -130,6 +148,18 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="vauleFlag != null and vauleFlag != ''">
+        and VAULE_FLAG LIKE '%${vauleFlag}%'
+      </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="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -181,20 +211,34 @@
       <if test="deleteTime != null">
         or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
       </if>
+      <if test="vauleFlag != null and vauleFlag != ''">
+        or VAULE_FLAG = #{vauleFlag}
+      </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="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseunitinfo.model.MeterBaseUnitInfo">
     insert into METER_BASE_UNIT_INFO (UNIT_NO, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
       RECEIVING_UNIT_NO, RECEIVING_UNIT_NAME, ALLOWED_TARE_WEIGHT, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      VAULE_FLAG, MATTER_NO, MATTER_NAME, 
+      CAR_NO)
     values (#{unitNo,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, 
       #{receivingUnitNo,jdbcType=VARCHAR}, #{receivingUnitName,jdbcType=VARCHAR}, #{allowedTareWeight,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
-      )
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{vauleFlag,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
+      #{carNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseunitinfo.model.MeterBaseUnitInfo">
     insert into METER_BASE_UNIT_INFO
@@ -244,6 +288,18 @@
       <if test="deleteTime != null">
         DELETE_TIME,
       </if>
+      <if test="vauleFlag != null">
+        VAULE_FLAG,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="unitNo != null">
@@ -291,6 +347,18 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="vauleFlag != null">
+        #{vauleFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseunitinfo.model.MeterBaseUnitInfo">
@@ -308,7 +376,11 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      VAULE_FLAG = #{vauleFlag,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR}
     where UNIT_NO = #{unitNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseunitinfo.model.MeterBaseUnitInfo">
@@ -356,6 +428,18 @@
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="vauleFlag != null">
+        VAULE_FLAG = #{vauleFlag,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="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where UNIT_NO = #{unitNo,jdbcType=VARCHAR}
   </update>
@@ -379,8 +463,9 @@
       ALLOWED_TARE_WEIGHT, CREATE_MAN_NO, 
       CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      VAULE_FLAG, MATTER_NO, MATTER_NAME, 
+      CAR_NO)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.unitNo,jdbcType=VARCHAR}, 
@@ -389,8 +474,9 @@
       #{item.allowedTareWeight,jdbcType=VARCHAR}, #{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.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.vauleFlag,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -456,6 +542,22 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
           when #{item.unitNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
+       ,VAULE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.vauleFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
      where UNIT_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.unitNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/model/MeterBaseUnitInfo.java

@@ -3,7 +3,6 @@ package com.steerinfo.baseinfo.meterbaseunitinfo.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.util.Date;
 
 @ApiModel(value="收发货单位期限配置表")
@@ -41,25 +40,25 @@ public class MeterBaseUnitInfo implements IBasePO<String> {
     /**
      * 是否允许使用期限皮重(0不可，1可以)(ALLOWED_TARE_WEIGHT,VARCHAR,1)
      */
-    @ApiModelProperty(value="是否允许使用期限皮重(0不可，1可以)",required=false)
+    @ApiModelProperty(value="是否允许使用期限皮重(0不可，1可以)",required=true)
     private String allowedTareWeight;
 
     /**
      * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="创建人编号",required=true)
+    @ApiModelProperty(value="创建人编号",required=false)
     private String createManNo;
 
     /**
      * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
      */
-    @ApiModelProperty(value="创建人姓名",required=true)
+    @ApiModelProperty(value="创建人姓名",required=false)
     private String createManName;
 
     /**
      * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date createTime;
 
     /**
@@ -98,6 +97,30 @@ public class MeterBaseUnitInfo implements IBasePO<String> {
     @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date deleteTime;
 
+    /**
+     * 是否有效（0：无效；1：有效）(VAULE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否有效（0：无效；1：有效）",required=false)
+    private String vauleFlag;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -230,6 +253,38 @@ public class MeterBaseUnitInfo implements IBasePO<String> {
         this.deleteTime = deleteTime;
     }
 
+    public String getVauleFlag() {
+        return vauleFlag;
+    }
+
+    public void setVauleFlag(String vauleFlag) {
+        this.vauleFlag = vauleFlag == null ? null : vauleFlag.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 getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -251,6 +306,10 @@ public class MeterBaseUnitInfo implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", vauleFlag=").append(vauleFlag);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", carNo=").append(carNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -2901,8 +2901,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //皮重一次
                 model02 = meterWorkCarActualFirstMapper.selectByPrimaryKey(one.getActualFirstNo());
             }
-            MeterWorkCarActualFirst model03 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model01.getActualFirstNo());
-            MeterWorkCarActualFirst model04 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model02.getActualFirstNo());
+            MeterWorkCarActualFirst model03 = new MeterWorkCarActualFirst();
+            MeterWorkCarActualFirst model04 = new MeterWorkCarActualFirst();
 
             PreTrackScale scale01 = preTrackScaleMapper.selectByPrimaryKey(three.getPredictionNo());
             PreTrackScale scale02 = preTrackScaleMapper.selectByPrimaryKey(four.getPredictionNo());
@@ -2912,9 +2912,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(first1,model01);
             MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale01.getPredictionNo());
             BeanUtils.copyProperties(first2, model02);
-            MeterWorkCarActualFirst first3 = meterWorkCarActualFirstMapper.selectAndMatch(model03.getActualFirstNo(), scale02.getPredictionNo());
+            MeterWorkCarActualFirst first3 = meterWorkCarActualFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale02.getPredictionNo());
             BeanUtils.copyProperties(first3,model03);
-            MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(model04.getActualFirstNo(), scale02.getPredictionNo());
+            MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale02.getPredictionNo());
             BeanUtils.copyProperties(first4, model04);
 
             //更新预报数据
@@ -2958,7 +2958,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model02.setPredictionNo(scale01.getPredictionNo());
             model02.setPredictionType("5");
             model02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
-            meterWorkCarActualFirstMapper.updateByPrimaryKey(model02);
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model02);
             //添加第一次毛重数据库
             String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
             model03.setActualFirstNo(actualFirstNo);

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/controller/MeterWorkCompareSpotController.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.xml

@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkcomparespot.mapper.MeterWorkCompareSpotMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
+    <id column="COMPARE_SPOT_ID" jdbcType="VARCHAR" property="compareSpotId" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="CREATE_MAN_PHONE" jdbcType="VARCHAR" property="createManPhone" />
+    <result column="UPDATE_MAN_PHONE" jdbcType="VARCHAR" property="updateManPhone" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="WEIGHT_NUM1" jdbcType="DECIMAL" property="weightNum1" />
+    <result column="WEIGHT_DATE1" jdbcType="TIMESTAMP" property="weightDate1" />
+    <result column="WEIGHT_NUM2" jdbcType="DECIMAL" property="weightNum2" />
+    <result column="WEIGHT_DATE2" jdbcType="TIMESTAMP" property="weightDate2" />
+    <result column="WEIGHT_NUM3" jdbcType="DECIMAL" property="weightNum3" />
+    <result column="WEIGHT_DATE3" jdbcType="TIMESTAMP" property="weightDate3" />
+    <result column="WEIGHT_NUM4" jdbcType="DECIMAL" property="weightNum4" />
+    <result column="WEIGHT_DATE4" jdbcType="TIMESTAMP" property="weightDate4" />
+    <result column="WEIGHT_NUM5" jdbcType="DECIMAL" property="weightNum5" />
+    <result column="WEIGHT_DATE5" jdbcType="TIMESTAMP" property="weightDate5" />
+  </resultMap>
+  <sql id="columns">
+    COMPARE_SPOT_ID, VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
+    CREATE_MAN_PHONE, UPDATE_MAN_PHONE, CAR_NO, WEIGHT_NUM1, WEIGHT_DATE1, WEIGHT_NUM2, 
+    WEIGHT_DATE2, WEIGHT_NUM3, WEIGHT_DATE3, WEIGHT_NUM4, WEIGHT_DATE4, WEIGHT_NUM5, 
+    WEIGHT_DATE5
+  </sql>
+  <sql id="columns_alias">
+    t.COMPARE_SPOT_ID, t.VALUE_FLAG, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.CREATE_MAN_PHONE, t.UPDATE_MAN_PHONE, t.CAR_NO, t.WEIGHT_NUM1, t.WEIGHT_DATE1, 
+    t.WEIGHT_NUM2, t.WEIGHT_DATE2, t.WEIGHT_NUM3, t.WEIGHT_DATE3, t.WEIGHT_NUM4, t.WEIGHT_DATE4, 
+    t.WEIGHT_NUM5, t.WEIGHT_DATE5
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_COMPARE_SPOT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_COMPARE_SPOT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="compareSpotId != null and compareSpotId != ''">
+        and COMPARE_SPOT_ID = #{compareSpotId}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="weightNum1 != null">
+        and WEIGHT_NUM1 = #{weightNum1}
+      </if>
+      <if test="weightDate1 != null">
+        and TO_CHAR(WEIGHT_DATE1,'yyyy-MM-dd') = #{weightDate1}
+      </if>
+      <if test="weightNum2 != null">
+        and WEIGHT_NUM2 = #{weightNum2}
+      </if>
+      <if test="weightDate2 != null">
+        and TO_CHAR(WEIGHT_DATE2,'yyyy-MM-dd') = #{weightDate2}
+      </if>
+      <if test="weightNum3 != null">
+        and WEIGHT_NUM3 = #{weightNum3}
+      </if>
+      <if test="weightDate3 != null">
+        and TO_CHAR(WEIGHT_DATE3,'yyyy-MM-dd') = #{weightDate3}
+      </if>
+      <if test="weightNum4 != null">
+        and WEIGHT_NUM4 = #{weightNum4}
+      </if>
+      <if test="weightDate4 != null">
+        and TO_CHAR(WEIGHT_DATE4,'yyyy-MM-dd') = #{weightDate4}
+      </if>
+      <if test="weightNum5 != null">
+        and WEIGHT_NUM5 = #{weightNum5}
+      </if>
+      <if test="weightDate5 != null">
+        and TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = #{weightDate5}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="compareSpotId != null and compareSpotId != ''">
+        and COMPARE_SPOT_ID LIKE '%${compareSpotId}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE LIKE '%${createManPhone}%'
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE LIKE '%${updateManPhone}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="weightNum1 != null">
+        and WEIGHT_NUM1 = #{weightNum1}
+      </if>
+      <if test="weightDate1 != null">
+        and TO_CHAR(WEIGHT_DATE1,'yyyy-MM-dd') = #{weightDate1}
+      </if>
+      <if test="weightNum2 != null">
+        and WEIGHT_NUM2 = #{weightNum2}
+      </if>
+      <if test="weightDate2 != null">
+        and TO_CHAR(WEIGHT_DATE2,'yyyy-MM-dd') = #{weightDate2}
+      </if>
+      <if test="weightNum3 != null">
+        and WEIGHT_NUM3 = #{weightNum3}
+      </if>
+      <if test="weightDate3 != null">
+        and TO_CHAR(WEIGHT_DATE3,'yyyy-MM-dd') = #{weightDate3}
+      </if>
+      <if test="weightNum4 != null">
+        and WEIGHT_NUM4 = #{weightNum4}
+      </if>
+      <if test="weightDate4 != null">
+        and TO_CHAR(WEIGHT_DATE4,'yyyy-MM-dd') = #{weightDate4}
+      </if>
+      <if test="weightNum5 != null">
+        and WEIGHT_NUM5 = #{weightNum5}
+      </if>
+      <if test="weightDate5 != null">
+        and TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = #{weightDate5}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_COMPARE_SPOT
+    where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_COMPARE_SPOT
+    where 1!=1 
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        or CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        or UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="weightNum1 != null">
+        or WEIGHT_NUM1 = #{weightNum1}
+      </if>
+      <if test="weightDate1 != null">
+        or TO_CHAR(WEIGHT_DATE1,'yyyy-MM-dd') = '#{weightDate1}'
+      </if>
+      <if test="weightNum2 != null">
+        or WEIGHT_NUM2 = #{weightNum2}
+      </if>
+      <if test="weightDate2 != null">
+        or TO_CHAR(WEIGHT_DATE2,'yyyy-MM-dd') = '#{weightDate2}'
+      </if>
+      <if test="weightNum3 != null">
+        or WEIGHT_NUM3 = #{weightNum3}
+      </if>
+      <if test="weightDate3 != null">
+        or TO_CHAR(WEIGHT_DATE3,'yyyy-MM-dd') = '#{weightDate3}'
+      </if>
+      <if test="weightNum4 != null">
+        or WEIGHT_NUM4 = #{weightNum4}
+      </if>
+      <if test="weightDate4 != null">
+        or TO_CHAR(WEIGHT_DATE4,'yyyy-MM-dd') = '#{weightDate4}'
+      </if>
+      <if test="weightNum5 != null">
+        or WEIGHT_NUM5 = #{weightNum5}
+      </if>
+      <if test="weightDate5 != null">
+        or TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = '#{weightDate5}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
+    insert into METER_WORK_COMPARE_SPOT (COMPARE_SPOT_ID, VALUE_FLAG, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, CAR_NO, 
+      WEIGHT_NUM1, WEIGHT_DATE1, WEIGHT_NUM2, 
+      WEIGHT_DATE2, WEIGHT_NUM3, WEIGHT_DATE3, 
+      WEIGHT_NUM4, WEIGHT_DATE4, WEIGHT_NUM5, 
+      WEIGHT_DATE5)
+    values (#{compareSpotId,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{createManPhone,jdbcType=VARCHAR}, #{updateManPhone,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{weightNum1,jdbcType=DECIMAL}, #{weightDate1,jdbcType=TIMESTAMP}, #{weightNum2,jdbcType=DECIMAL}, 
+      #{weightDate2,jdbcType=TIMESTAMP}, #{weightNum3,jdbcType=DECIMAL}, #{weightDate3,jdbcType=TIMESTAMP}, 
+      #{weightNum4,jdbcType=DECIMAL}, #{weightDate4,jdbcType=TIMESTAMP}, #{weightNum5,jdbcType=DECIMAL}, 
+      #{weightDate5,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
+    insert into METER_WORK_COMPARE_SPOT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="compareSpotId != null">
+        COMPARE_SPOT_ID,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE,
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="weightNum1 != null">
+        WEIGHT_NUM1,
+      </if>
+      <if test="weightDate1 != null">
+        WEIGHT_DATE1,
+      </if>
+      <if test="weightNum2 != null">
+        WEIGHT_NUM2,
+      </if>
+      <if test="weightDate2 != null">
+        WEIGHT_DATE2,
+      </if>
+      <if test="weightNum3 != null">
+        WEIGHT_NUM3,
+      </if>
+      <if test="weightDate3 != null">
+        WEIGHT_DATE3,
+      </if>
+      <if test="weightNum4 != null">
+        WEIGHT_NUM4,
+      </if>
+      <if test="weightDate4 != null">
+        WEIGHT_DATE4,
+      </if>
+      <if test="weightNum5 != null">
+        WEIGHT_NUM5,
+      </if>
+      <if test="weightDate5 != null">
+        WEIGHT_DATE5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="compareSpotId != null">
+        #{compareSpotId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightNum1 != null">
+        #{weightNum1,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate1 != null">
+        #{weightDate1,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum2 != null">
+        #{weightNum2,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate2 != null">
+        #{weightDate2,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum3 != null">
+        #{weightNum3,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate3 != null">
+        #{weightDate3,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum4 != null">
+        #{weightNum4,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate4 != null">
+        #{weightDate4,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum5 != null">
+        #{weightNum5,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate5 != null">
+        #{weightDate5,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
+    update METER_WORK_COMPARE_SPOT
+    set VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      WEIGHT_NUM1 = #{weightNum1,jdbcType=DECIMAL},
+      WEIGHT_DATE1 = #{weightDate1,jdbcType=TIMESTAMP},
+      WEIGHT_NUM2 = #{weightNum2,jdbcType=DECIMAL},
+      WEIGHT_DATE2 = #{weightDate2,jdbcType=TIMESTAMP},
+      WEIGHT_NUM3 = #{weightNum3,jdbcType=DECIMAL},
+      WEIGHT_DATE3 = #{weightDate3,jdbcType=TIMESTAMP},
+      WEIGHT_NUM4 = #{weightNum4,jdbcType=DECIMAL},
+      WEIGHT_DATE4 = #{weightDate4,jdbcType=TIMESTAMP},
+      WEIGHT_NUM5 = #{weightNum5,jdbcType=DECIMAL},
+      WEIGHT_DATE5 = #{weightDate5,jdbcType=TIMESTAMP}
+    where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
+    update METER_WORK_COMPARE_SPOT
+    <set>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,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="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightNum1 != null">
+        WEIGHT_NUM1 = #{weightNum1,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate1 != null">
+        WEIGHT_DATE1 = #{weightDate1,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum2 != null">
+        WEIGHT_NUM2 = #{weightNum2,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate2 != null">
+        WEIGHT_DATE2 = #{weightDate2,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum3 != null">
+        WEIGHT_NUM3 = #{weightNum3,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate3 != null">
+        WEIGHT_DATE3 = #{weightDate3,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum4 != null">
+        WEIGHT_NUM4 = #{weightNum4,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate4 != null">
+        WEIGHT_DATE4 = #{weightDate4,jdbcType=TIMESTAMP},
+      </if>
+      <if test="weightNum5 != null">
+        WEIGHT_NUM5 = #{weightNum5,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDate5 != null">
+        WEIGHT_DATE5 = #{weightDate5,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_COMPARE_SPOT 
+      (COMPARE_SPOT_ID, 
+      VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, 
+      CAR_NO, WEIGHT_NUM1, WEIGHT_DATE1, 
+      WEIGHT_NUM2, WEIGHT_DATE2, WEIGHT_NUM3, 
+      WEIGHT_DATE3, WEIGHT_NUM4, WEIGHT_DATE4, 
+      WEIGHT_NUM5, WEIGHT_DATE5)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.compareSpotId,jdbcType=VARCHAR}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.createManPhone,jdbcType=VARCHAR}, #{item.updateManPhone,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.weightNum1,jdbcType=DECIMAL}, #{item.weightDate1,jdbcType=TIMESTAMP}, 
+      #{item.weightNum2,jdbcType=DECIMAL}, #{item.weightDate2,jdbcType=TIMESTAMP}, #{item.weightNum3,jdbcType=DECIMAL}, 
+      #{item.weightDate3,jdbcType=TIMESTAMP}, #{item.weightNum4,jdbcType=DECIMAL}, #{item.weightDate4,jdbcType=TIMESTAMP}, 
+      #{item.weightNum5,jdbcType=DECIMAL}, #{item.weightDate5,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_COMPARE_SPOT
+     set
+       COMPARE_SPOT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.compareSpotId,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.createManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.updateManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_NUM1=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightNum1,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DATE1=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate1,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WEIGHT_NUM2=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightNum2,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DATE2=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate2,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WEIGHT_NUM3=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightNum3,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DATE3=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate3,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WEIGHT_NUM4=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightNum4,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DATE4=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate4,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WEIGHT_NUM5=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightNum5,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DATE5=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate5,jdbcType=TIMESTAMP}
+       </foreach>
+     where COMPARE_SPOT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.compareSpotId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_COMPARE_SPOT
+    where COMPARE_SPOT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/model/MeterWorkCompareSpot.java

@@ -0,0 +1,317 @@
+package com.steerinfo.meterwork.meterworkcomparespot.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 MeterWorkCompareSpot implements IBasePO<String> {
+    /**
+     * 主键(COMPARE_SPOT_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String compareSpotId;
+
+    /**
+     * 数据状态(0：作废，1：未使用， 2：已使用)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="数据状态(0：作废，1：未使用， 2：已使用)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 创建人手机号(CREATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人手机号",required=false)
+    private String createManPhone;
+
+    /**
+     * 修改人手机号码(UPDATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人手机号码",required=false)
+    private String updateManPhone;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,10)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 重量1(WEIGHT_NUM1,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量1",required=false)
+    private Long weightNum1;
+
+    /**
+     * 时间1(WEIGHT_DATE1,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="时间1",required=false)
+    private Date weightDate1;
+
+    /**
+     * 重量2(WEIGHT_NUM2,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量2",required=false)
+    private Long weightNum2;
+
+    /**
+     * 时间2(WEIGHT_DATE2,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="时间2",required=false)
+    private Date weightDate2;
+
+    /**
+     * 重量3(WEIGHT_NUM3,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量3",required=false)
+    private Long weightNum3;
+
+    /**
+     * 时间3(WEIGHT_DATE3,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="时间3",required=false)
+    private Date weightDate3;
+
+    /**
+     * 重量4(WEIGHT_NUM4,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量4",required=false)
+    private Long weightNum4;
+
+    /**
+     * 时间4(WEIGHT_DATE4,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="时间4",required=false)
+    private Date weightDate4;
+
+    /**
+     * 重量5(WEIGHT_NUM5,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量5",required=false)
+    private Long weightNum5;
+
+    /**
+     * 时间5(WEIGHT_DATE5,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="时间5",required=false)
+    private Date weightDate5;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.compareSpotId;
+    }
+
+    @Override
+    public void setId(String compareSpotId) {
+        this.compareSpotId = compareSpotId == null ? null : compareSpotId.trim();
+    }
+
+    public String getCompareSpotId() {
+        return compareSpotId;
+    }
+
+    public void setCompareSpotId(String compareSpotId) {
+        this.compareSpotId = compareSpotId == null ? null : compareSpotId.trim();
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.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 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 getCreateManPhone() {
+        return createManPhone;
+    }
+
+    public void setCreateManPhone(String createManPhone) {
+        this.createManPhone = createManPhone == null ? null : createManPhone.trim();
+    }
+
+    public String getUpdateManPhone() {
+        return updateManPhone;
+    }
+
+    public void setUpdateManPhone(String updateManPhone) {
+        this.updateManPhone = updateManPhone == null ? null : updateManPhone.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public Long getWeightNum1() {
+        return weightNum1;
+    }
+
+    public void setWeightNum1(Long weightNum1) {
+        this.weightNum1 = weightNum1;
+    }
+
+    public Date getWeightDate1() {
+        return weightDate1;
+    }
+
+    public void setWeightDate1(Date weightDate1) {
+        this.weightDate1 = weightDate1;
+    }
+
+    public Long getWeightNum2() {
+        return weightNum2;
+    }
+
+    public void setWeightNum2(Long weightNum2) {
+        this.weightNum2 = weightNum2;
+    }
+
+    public Date getWeightDate2() {
+        return weightDate2;
+    }
+
+    public void setWeightDate2(Date weightDate2) {
+        this.weightDate2 = weightDate2;
+    }
+
+    public Long getWeightNum3() {
+        return weightNum3;
+    }
+
+    public void setWeightNum3(Long weightNum3) {
+        this.weightNum3 = weightNum3;
+    }
+
+    public Date getWeightDate3() {
+        return weightDate3;
+    }
+
+    public void setWeightDate3(Date weightDate3) {
+        this.weightDate3 = weightDate3;
+    }
+
+    public Long getWeightNum4() {
+        return weightNum4;
+    }
+
+    public void setWeightNum4(Long weightNum4) {
+        this.weightNum4 = weightNum4;
+    }
+
+    public Date getWeightDate4() {
+        return weightDate4;
+    }
+
+    public void setWeightDate4(Date weightDate4) {
+        this.weightDate4 = weightDate4;
+    }
+
+    public Long getWeightNum5() {
+        return weightNum5;
+    }
+
+    public void setWeightNum5(Long weightNum5) {
+        this.weightNum5 = weightNum5;
+    }
+
+    public Date getWeightDate5() {
+        return weightDate5;
+    }
+
+    public void setWeightDate5(Date weightDate5) {
+        this.weightDate5 = weightDate5;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", compareSpotId=").append(compareSpotId);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", createManPhone=").append(createManPhone);
+        sb.append(", updateManPhone=").append(updateManPhone);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", weightNum1=").append(weightNum1);
+        sb.append(", weightDate1=").append(weightDate1);
+        sb.append(", weightNum2=").append(weightNum2);
+        sb.append(", weightDate2=").append(weightDate2);
+        sb.append(", weightNum3=").append(weightNum3);
+        sb.append(", weightDate3=").append(weightDate3);
+        sb.append(", weightNum4=").append(weightNum4);
+        sb.append(", weightDate4=").append(weightDate4);
+        sb.append(", weightNum5=").append(weightNum5);
+        sb.append(", weightDate5=").append(weightDate5);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/IMeterWorkCompareSpotService.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/impl/MeterWorkCompareSpotServiceImpl.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/controller/MeterWorkCompareSpotScaleController.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/mapper/MeterWorkCompareSpotScaleMapper.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/mapper/MeterWorkCompareSpotScaleMapper.xml

@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkcomparespotscale.mapper.MeterWorkCompareSpotScaleMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale">
+    <id column="COMPARE_SPOT_SCALE_ID" jdbcType="VARCHAR" property="compareSpotScaleId" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="CREATE_MAN_PHONE" jdbcType="VARCHAR" property="createManPhone" />
+    <result column="UPDATE_MAN_PHONE" jdbcType="VARCHAR" property="updateManPhone" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="NUM" jdbcType="DECIMAL" property="num" />
+  </resultMap>
+  <sql id="columns">
+    COMPARE_SPOT_SCALE_ID, VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NAME, 
+    UPDATE_TIME, CREATE_MAN_PHONE, UPDATE_MAN_PHONE, CAR_NO, NUM
+  </sql>
+  <sql id="columns_alias">
+    t.COMPARE_SPOT_SCALE_ID, t.VALUE_FLAG, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.CREATE_MAN_PHONE, t.UPDATE_MAN_PHONE, t.CAR_NO, t.NUM
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_COMPARE_SPOT_SCALE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_COMPARE_SPOT_SCALE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="compareSpotScaleId != null and compareSpotScaleId != ''">
+        and COMPARE_SPOT_SCALE_ID = #{compareSpotScaleId}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="num != null">
+        and NUM = #{num}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="compareSpotScaleId != null and compareSpotScaleId != ''">
+        and COMPARE_SPOT_SCALE_ID LIKE '%${compareSpotScaleId}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE LIKE '%${createManPhone}%'
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE LIKE '%${updateManPhone}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="num != null">
+        and NUM = #{num}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_COMPARE_SPOT_SCALE
+    where COMPARE_SPOT_SCALE_ID = #{compareSpotScaleId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_COMPARE_SPOT_SCALE
+    where 1!=1 
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        or CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        or UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="num != null">
+        or NUM = #{num}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale">
+    insert into METER_WORK_COMPARE_SPOT_SCALE (COMPARE_SPOT_SCALE_ID, VALUE_FLAG, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, CAR_NO, 
+      NUM)
+    values (#{compareSpotScaleId,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{createManPhone,jdbcType=VARCHAR}, #{updateManPhone,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{num,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale">
+    insert into METER_WORK_COMPARE_SPOT_SCALE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="compareSpotScaleId != null">
+        COMPARE_SPOT_SCALE_ID,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE,
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="num != null">
+        NUM,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="compareSpotScaleId != null">
+        #{compareSpotScaleId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="num != null">
+        #{num,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale">
+    update METER_WORK_COMPARE_SPOT_SCALE
+    set VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      NUM = #{num,jdbcType=DECIMAL}
+    where COMPARE_SPOT_SCALE_ID = #{compareSpotScaleId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale">
+    update METER_WORK_COMPARE_SPOT_SCALE
+    <set>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,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="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="num != null">
+        NUM = #{num,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where COMPARE_SPOT_SCALE_ID = #{compareSpotScaleId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where COMPARE_SPOT_SCALE_ID = #{compareSpotScaleId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_COMPARE_SPOT_SCALE 
+      (COMPARE_SPOT_SCALE_ID, 
+      VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, 
+      CAR_NO, NUM)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.compareSpotScaleId,jdbcType=VARCHAR}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.createManPhone,jdbcType=VARCHAR}, #{item.updateManPhone,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.num,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_COMPARE_SPOT_SCALE
+     set
+       COMPARE_SPOT_SCALE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.compareSpotScaleId,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.createManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.updateManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_SCALE_ID" close="end">
+          when #{item.compareSpotScaleId,jdbcType=VARCHAR} then #{item.num,jdbcType=DECIMAL}
+       </foreach>
+     where COMPARE_SPOT_SCALE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.compareSpotScaleId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_COMPARE_SPOT_SCALE
+    where COMPARE_SPOT_SCALE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/model/MeterWorkCompareSpotScale.java

@@ -0,0 +1,182 @@
+package com.steerinfo.meterwork.meterworkcomparespotscale.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 MeterWorkCompareSpotScale implements IBasePO<String> {
+    /**
+     * 主键(COMPARE_SPOT_SCALE_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String compareSpotScaleId;
+
+    /**
+     * 数据状态(0：作废，1：未使用， 2：已使用)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="数据状态(0：作废，1：未使用， 2：已使用)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 创建人手机号(CREATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人手机号",required=false)
+    private String createManPhone;
+
+    /**
+     * 修改人手机号码(UPDATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人手机号码",required=false)
+    private String updateManPhone;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,10)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 数量(NUM,DECIMAL,10)
+     */
+    @ApiModelProperty(value="数量",required=false)
+    private Long num;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.compareSpotScaleId;
+    }
+
+    @Override
+    public void setId(String compareSpotScaleId) {
+        this.compareSpotScaleId = compareSpotScaleId == null ? null : compareSpotScaleId.trim();
+    }
+
+    public String getCompareSpotScaleId() {
+        return compareSpotScaleId;
+    }
+
+    public void setCompareSpotScaleId(String compareSpotScaleId) {
+        this.compareSpotScaleId = compareSpotScaleId == null ? null : compareSpotScaleId.trim();
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.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 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 getCreateManPhone() {
+        return createManPhone;
+    }
+
+    public void setCreateManPhone(String createManPhone) {
+        this.createManPhone = createManPhone == null ? null : createManPhone.trim();
+    }
+
+    public String getUpdateManPhone() {
+        return updateManPhone;
+    }
+
+    public void setUpdateManPhone(String updateManPhone) {
+        this.updateManPhone = updateManPhone == null ? null : updateManPhone.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public Long getNum() {
+        return num;
+    }
+
+    public void setNum(Long num) {
+        this.num = num;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", compareSpotScaleId=").append(compareSpotScaleId);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", createManPhone=").append(createManPhone);
+        sb.append(", updateManPhone=").append(updateManPhone);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", num=").append(num);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/IMeterWorkCompareSpotScaleService.java

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

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/impl/MeterWorkCompareSpotScaleServiceImpl.java

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

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/controller/MeterWorkHookActFirstController.java

@@ -84,6 +84,23 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactfirst:view")
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkHookActFirst> list = meterWorkHookActFirstService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterWorkHookActFirst对象创建")
     @ApiImplicitParam(name = "meterWorkHookActFirst", value = "详细实体meterWorkHookActFirst", required = true, dataType = "MeterWorkHookActFirst")
     //@RequiresPermissions("meterworkhookactfirst:create")

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/mapper/MeterWorkHookActFirstMapper.java

@@ -15,6 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface MeterWorkHookActFirstMapper extends IBaseMapper<MeterWorkHookActFirst, String> {
     String getNewID(String format);
 
+    List<MeterWorkHookActFirst> likeByDesc(HashMap parmas);
+
     List<MeterWorkRailwayActFirst> selectView(HashMap parmas);
 
     MeterWorkHookActFirst selectAndRemove(String actualFirstNo);

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/mapper/MeterWorkHookActFirstMapper.xml

@@ -2033,6 +2033,14 @@
     from METER_WORK_HOOK_ACT_FIRST
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
   </select>
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME &lt;= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    order by create_time desc
+  </select>
 
   <select id="selectAndMatch" parameterType="java.lang.String" resultMap="BaseResultMap">
     select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t.RAILWAY_NO, t1.RAILWAY_CARRIAGE_NO,

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/IMeterWorkHookActFirstService.java

@@ -29,6 +29,8 @@ public interface IMeterWorkHookActFirstService extends IBaseService<MeterWorkHoo
 
     int checkandupdate(MeterWorkHookActFirst model);
 
+    PageList<MeterWorkHookActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+
     int audit(MeterWorkHookActFirst model);
 
     int unaudit(MeterWorkHookActFirst model);

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/impl/MeterWorkHookActFirstServiceImpl.java

@@ -111,6 +111,14 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
         }
     }
 
+    @Override
+    public PageList<MeterWorkHookActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkHookActFirst> rows = meterWorkHookActFirstMapper.likeByDesc(parameters);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     private void check(MeterWorkHookActFirst model) throws MarkerMetException {
         if ("001019005".equals(model.getRailwayTypeNo())) {
             if (model.getRailwayNo() == null || model.getRailwayNo().equals("")) {

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

@@ -3,7 +3,6 @@ package com.steerinfo.meterwork.meterworkmonitor.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.util.Date;
 
 @ApiModel(value="计量监控表")

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml

@@ -1,6 +1,421 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.meterwork.meterworkprewgttype.mapper.MeterWorkPreWgttypeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    <id column="WGT_TYPE_ID" jdbcType="VARCHAR" property="wgtTypeId" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="WEIGHT_TYPE_NO" jdbcType="VARCHAR" property="weightTypeNo" />
+    <result column="WEIGHT_TYPE_NAME" jdbcType="VARCHAR" property="weightTypeName" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="CREATE_MAN_PHONE" jdbcType="VARCHAR" property="createManPhone" />
+    <result column="UPDATE_MAN_PHONE" jdbcType="VARCHAR" property="updateManPhone" />
+    <result column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="SUBMIT_FLAG" jdbcType="VARCHAR" property="submitFlag" />
+  </resultMap>
+  <sql id="columns">
+    WGT_TYPE_ID, CAR_NO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, VALUE_FLAG, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, CREATE_MAN_PHONE, UPDATE_MAN_PHONE, ACTUAL_FIRST_NO, 
+    SUBMIT_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.WGT_TYPE_ID, t.CAR_NO, t.WEIGHT_TYPE_NO, t.WEIGHT_TYPE_NAME, t.VALUE_FLAG, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.CREATE_MAN_PHONE, t.UPDATE_MAN_PHONE, 
+    t.ACTUAL_FIRST_NO, t.SUBMIT_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_WORK_PRE_WGTTYPE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_PRE_WGTTYPE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="wgtTypeId != null and wgtTypeId != ''">
+        and WGT_TYPE_ID = #{wgtTypeId}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        and WEIGHT_TYPE_NO = #{weightTypeNo}
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        and WEIGHT_TYPE_NAME = #{weightTypeName}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="submitFlag != null and submitFlag != ''">
+        and SUBMIT_FLAG = #{submitFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="wgtTypeId != null and wgtTypeId != ''">
+        and WGT_TYPE_ID LIKE '%${wgtTypeId}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        and WEIGHT_TYPE_NO LIKE '%${weightTypeNo}%'
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        and WEIGHT_TYPE_NAME LIKE '%${weightTypeName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE LIKE '%${createManPhone}%'
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE LIKE '%${updateManPhone}%'
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="submitFlag != null and submitFlag != ''">
+        and SUBMIT_FLAG LIKE '%${submitFlag}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_PRE_WGTTYPE
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_PRE_WGTTYPE
+    where 1!=1 
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        or WEIGHT_TYPE_NO = #{weightTypeNo}
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        or WEIGHT_TYPE_NAME = #{weightTypeName}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        or CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        or UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        or ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="submitFlag != null and submitFlag != ''">
+        or SUBMIT_FLAG = #{submitFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    insert into METER_WORK_PRE_WGTTYPE (WGT_TYPE_ID, CAR_NO, WEIGHT_TYPE_NO, 
+      WEIGHT_TYPE_NAME, VALUE_FLAG, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, ACTUAL_FIRST_NO, 
+      SUBMIT_FLAG)
+    values (#{wgtTypeId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{weightTypeNo,jdbcType=VARCHAR}, 
+      #{weightTypeName,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{createManPhone,jdbcType=VARCHAR}, #{updateManPhone,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}, 
+      #{submitFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    insert into METER_WORK_PRE_WGTTYPE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="wgtTypeId != null">
+        WGT_TYPE_ID,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="weightTypeNo != null">
+        WEIGHT_TYPE_NO,
+      </if>
+      <if test="weightTypeName != null">
+        WEIGHT_TYPE_NAME,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE,
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE,
+      </if>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO,
+      </if>
+      <if test="submitFlag != null">
+        SUBMIT_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="wgtTypeId != null">
+        #{wgtTypeId,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeNo != null">
+        #{weightTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeName != null">
+        #{weightTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirstNo != null">
+        #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="submitFlag != null">
+        #{submitFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    update METER_WORK_PRE_WGTTYPE
+    set CAR_NO = #{carNo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NO = #{weightTypeNo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NAME = #{weightTypeName,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR},
+      SUBMIT_FLAG = #{submitFlag,jdbcType=VARCHAR}
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    update METER_WORK_PRE_WGTTYPE
+    <set>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeNo != null">
+        WEIGHT_TYPE_NO = #{weightTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeName != null">
+        WEIGHT_TYPE_NAME = #{weightTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,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="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="submitFlag != null">
+        SUBMIT_FLAG = #{submitFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_PRE_WGTTYPE 
+      (WGT_TYPE_ID, 
+      CAR_NO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, 
+      VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, 
+      ACTUAL_FIRST_NO, SUBMIT_FLAG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.wgtTypeId,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.weightTypeNo,jdbcType=VARCHAR}, #{item.weightTypeName,jdbcType=VARCHAR}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.createManPhone,jdbcType=VARCHAR}, #{item.updateManPhone,jdbcType=VARCHAR}, 
+      #{item.actualFirstNo,jdbcType=VARCHAR}, #{item.submitFlag,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_PRE_WGTTYPE
+     set
+       WGT_TYPE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.wgtTypeId,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_PHONE=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_PHONE=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,ACTUAL_FIRST_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SUBMIT_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.submitFlag,jdbcType=VARCHAR}
+       </foreach>
+     where WGT_TYPE_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.wgtTypeId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_PRE_WGTTYPE
+    where WGT_TYPE_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
     <id column="WGT_TYPE_ID" jdbcType="VARCHAR" property="wgtTypeId" />
     <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
@@ -25,10 +440,10 @@
     t.ACTUAL_FIRST_NO
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_WORK_PRE_WGTTYPE
+    SELECT <include refid="columns" /> FROM METER_WORK_PRE_WGTTYPE
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_WORK_PRE_WGTTYPE t
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_PRE_WGTTYPE t
   </sql>
   <sql id="where">
     <where> 
@@ -297,16 +712,16 @@
     where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where WGT_TYPE_ID = #{wgtTypeId,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_PRE_WGTTYPE 
@@ -330,62 +745,62 @@
      update METER_WORK_PRE_WGTTYPE
      set
        WGT_TYPE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.wgtTypeId,jdbcType=VARCHAR}
        </foreach>
        ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
        </foreach>
        ,WEIGHT_TYPE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeNo,jdbcType=VARCHAR}
        </foreach>
        ,WEIGHT_TYPE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeName,jdbcType=VARCHAR}
        </foreach>
        ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
        ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
        </foreach>
        ,CREATE_MAN_PHONE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManPhone,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_MAN_PHONE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManPhone,jdbcType=VARCHAR}
        </foreach>
        ,ACTUAL_FIRST_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case WGT_TYPE_ID" separator=" ">
           when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
        </foreach>
      where WGT_TYPE_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.wgtTypeId,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_PRE_WGTTYPE
     where WGT_TYPE_ID 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/meterworkprewgttype/model/MeterWorkPreWgttype.java

@@ -79,6 +79,12 @@ public class MeterWorkPreWgttype implements IBasePO<String> {
     @ApiModelProperty(value="一次计量数据NO",required=false)
     private String actualFirstNo;
 
+    /**
+     * 确认状态(0：未确认；1：已确认)(SUBMIT_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="确认状态(0：未确认；1：已确认)",required=false)
+    private String submitFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -187,6 +193,14 @@ public class MeterWorkPreWgttype implements IBasePO<String> {
         this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
     }
 
+    public String getSubmitFlag() {
+        return submitFlag;
+    }
+
+    public void setSubmitFlag(String submitFlag) {
+        this.submitFlag = submitFlag == null ? null : submitFlag.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -205,6 +219,7 @@ public class MeterWorkPreWgttype implements IBasePO<String> {
         sb.append(", createManPhone=").append(createManPhone);
         sb.append(", updateManPhone=").append(updateManPhone);
         sb.append(", actualFirstNo=").append(actualFirstNo);
+        sb.append(", submitFlag=").append(submitFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -13,17 +13,22 @@ import com.steerinfo.meterwork.dto.CommonCombination;
 import com.steerinfo.meterwork.dto.MeterWorkRailwayActFirstDto;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.StringUtils;
 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.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -802,6 +807,33 @@ throw new MarkerMetException(500, "操作异常！！");
 throw new MarkerMetException(500, "操作异常！！");
         }
     }
+    @ApiOperation(value = "智能终端混装混卸--远程计量")
+    @Transactional
+    @PostMapping(value = "/doAddNetHZHX", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doAddNetHZHX(@RequestBody CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActual,MeterWorkRailwayActFirst, MeterMonitorNote> com) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstService.doAddNetHZHX(com.getOne(), com.getTwo(), com.getThree(), com.getFour());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
+    @ApiOperation(value = "双委托洁净--远程计量")
+    @Transactional
+    @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActual, PreRailwayScale, PreRailwayScale> com) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstService.doNetAddTwo(com.getOne(), com.getTwo(), com.getThree(), com.getFour());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 
     @ApiOperation(value = "轨道衡双委托匹配洁净", notes = "轨道衡双委托匹配洁净")
     //@RequiresPermissions("meterworkcaractual:view")

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

@@ -4,11 +4,14 @@ import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeigh
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
@@ -87,6 +90,9 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
 //    PageList<MeterWorkRailwayActFirst> selectTa(HashMap parmas, Integer pageNum, Integer pageSize);
 
+    RESTfulResult doAddNetHZHX(MeterWorkRailwayActFirst first02, MeterWorkRailwayActual carModel, MeterWorkRailwayActFirst first03,  MeterMonitorNote note);
+    RESTfulResult doNetAddTwo(MeterWorkRailwayActFirst one, MeterWorkRailwayActual two, PreRailwayScale three, PreRailwayScale four);
+
     String doubleEntrustMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2);
     String mixedLoading(String actualNo1, String actualNo2, String actualNo3, String predictionNo1,String predictionNo2);
     String mixedDischarge(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String predictionNo2);

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

@@ -16,9 +16,11 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.constants.DbConstants;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
@@ -29,6 +31,7 @@ import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayAct
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -534,6 +537,340 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return model.getActualFirstNo();
     }
 
+    @Override
+    public RESTfulResult doAddNetHZHX(MeterWorkRailwayActFirst first02, MeterWorkRailwayActual carModel, MeterWorkRailwayActFirst first03, MeterMonitorNote note) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+
+            //存储当前计量的数据
+            String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            first02.setActualFirstNo(firstNo01);
+            meterWorkRailwayActFirstMapper.insertSelective(first02);
+
+            //毛重一次
+            MeterWorkRailwayActFirst model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(carModel.getActualFirst1No());
+            //皮重一次
+            MeterWorkRailwayActFirst model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(carModel.getActualFirst2No());
+            PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(carModel.getPredictionNo());
+            //判断当前一次重量类型、0：毛重，则为混装操作、1：常规皮重，则为混卸操作
+            if (first02.getWeightType().equals("0")) {       //混装
+                //修改委托状态
+                //将委托中的编号和收发货的等数据拷贝进一次数据中
+                MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first1, model02);
+                MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(first02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first2, first02);
+
+                //修改委托编号
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("混装洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("7");
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                //修改毛重一次数据状态
+                first02.setValueFlag(DbConstants.NET);
+                first02.setUpdateManName("system");
+                first02.setUpdateManName("混装洁净更新");
+                first02.setUpdateTime(new Date());
+                first02.setWeightType("0");
+                first02.setIsPreSacale("1");
+                first02.setPredictionNo(scale.getPredictionNo());
+                first02.setPredictionType("7");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
+                //修改皮重一次数据状态
+                model02.setValueFlag(DbConstants.NET);
+                model02.setUpdateManName("system");
+                model02.setUpdateManName("混装洁净更新");
+                model02.setUpdateTime(new Date());
+                model02.setWeightType("1");
+                model02.setIsPreSacale("1");
+                model02.setPredictionNo(scale.getPredictionNo());
+                model02.setPredictionType("7");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+
+                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(first02.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(mwca1, carModel);
+                //保存洁净
+                String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                carModel.setActualNo(sdf.format(new Date()) + no);
+                carModel.setNetTime(new Date());
+                carModel.setNetMode(DbConstants.TYPE);
+                carModel.setNote("混装匹配洁净");
+                carModel.setNetMode("4");
+                carModel.setUploadFlag("1");
+                carModel.setValueFlag("1");
+                carModel.setIsPreSacale("1");
+                carModel.setPredictionNo(scale.getPredictionNo());
+                carModel.setPredictionType("7");
+                carModel.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(carModel);
+
+            } else if (first02.getWeightType().equals("1")) {         //混卸
+                //修改委托状态
+                //将委托中的编号和收发货的等数据拷贝进一次数据中
+                MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first1, model01);
+                MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(first02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first2, first02);
+
+                //修改委托编号
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("混卸洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("6");
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                //修改毛重一次数据状态
+                first02.setValueFlag(DbConstants.NET);
+                first02.setUpdateManName("system");
+                first02.setUpdateManName("混卸洁净更新");
+                first02.setUpdateTime(new Date());
+                first02.setWeightType("0");
+                first02.setIsPreSacale("1");
+                first02.setPredictionNo(scale.getPredictionNo());
+                first02.setPredictionType("6");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
+                //修改皮重一次数据状态
+                model01.setValueFlag(DbConstants.NET);
+                model01.setUpdateManName("system");
+                model01.setUpdateManName("混卸洁净更新");
+                model01.setUpdateTime(new Date());
+                model01.setWeightType("1");
+                model01.setIsPreSacale("1");
+                model01.setPredictionNo(scale.getPredictionNo());
+                model01.setPredictionType("6");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
+
+                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), first02.getActualFirstNo(),  scale.getPredictionNo());
+                BeanUtils.copyProperties(mwca1, carModel);
+
+                //保存洁净
+                String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                carModel.setActualNo(sdf.format(new Date()) + no);
+                carModel.setNetTime(new Date());
+                carModel.setNetMode(DbConstants.TYPE);
+                carModel.setNote("混卸匹配洁净");
+                carModel.setNetMode("5");
+                carModel.setUploadFlag("1");
+                carModel.setValueFlag("1");
+                carModel.setIsPreSacale("1");
+                carModel.setPredictionNo(scale.getPredictionNo());
+                carModel.setPredictionType("6");
+                carModel.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(carModel);
+            }
+
+            //存储当前计量的数据
+            if(first03 != null) {
+                String fristNo03 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                first03.setActualFirstNo(fristNo03);
+                meterWorkRailwayActFirstMapper.insertSelective(first03);
+            }
+            /*//6、修改计量监控
+            updateMonitor(first02.getBaseSpotNo());
+            //保存日志
+            saveNote(note);
+            updateMonitorOver(first02.getActualFirstNo(), first02.getBaseSpotNo());
+
+            //补充附加重量的数据
+            if (StringUtils.isNotEmpty(first02.getAddWgtPk())) {
+                insertAddWgtNo(first02.getActualFirstNo(), first02.getAddWgtPk(), first02.getCreateManNo(), first02.getCreateManName());
+            }*/
+            rm.setSucceed();
+            rm.setData(first02.getActualFirstNo());
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            return rm;
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
+    @Override
+    public RESTfulResult doNetAddTwo(MeterWorkRailwayActFirst one, MeterWorkRailwayActual two, PreRailwayScale three, PreRailwayScale four) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        try{
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+
+            //存储当前计量的数据
+            String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            one.setActualFirstNo(firstNo01);
+            meterWorkRailwayActFirstMapper.insertSelective(one);
+
+            MeterWorkRailwayActFirst model01 = new MeterWorkRailwayActFirst();
+            MeterWorkRailwayActFirst model02 = new MeterWorkRailwayActFirst();
+
+            MeterWorkRailwayActual actualRow1 = new MeterWorkRailwayActual();
+            MeterWorkRailwayActual actualRow2 = new MeterWorkRailwayActual();
+            if(one.getWeightType().equals("0")){
+                //毛重一次
+                model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(one.getActualFirstNo());
+                //皮重一次
+                model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(two.getActualFirst2No());
+            }else if(one.getWeightType().equals("1")) {
+                //毛重一次
+                model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(two.getActualFirst1No());
+                //皮重一次
+                model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(one.getActualFirstNo());
+            }
+            MeterWorkRailwayActFirst model03 = new MeterWorkRailwayActFirst();
+            MeterWorkRailwayActFirst model04 = new MeterWorkRailwayActFirst();
+
+            PreRailwayScale scale01 = preRailwayScaleMapper.selectByPrimaryKey(three.getPredictionNo());
+            PreRailwayScale scale02 = preRailwayScaleMapper.selectByPrimaryKey(four.getPredictionNo());
+
+            //将委托中的编号和收发货的等数据拷贝进一次数据中
+            MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale01.getPredictionNo());
+            BeanUtils.copyProperties(first1,model01);
+            MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale01.getPredictionNo());
+            BeanUtils.copyProperties(first2, model02);
+            MeterWorkRailwayActFirst first3 = meterWorkRailwayActFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale02.getPredictionNo());
+            BeanUtils.copyProperties(first3,model03);
+            MeterWorkRailwayActFirst first4 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale02.getPredictionNo());
+            BeanUtils.copyProperties(first4, model04);
+
+            //更新预报数据
+            scale01.setValueFlag(DbConstants.NET);
+            scale01.setUpdateTime(new Date());
+            scale01.setUpdateManNo("system");
+            scale01.setUpdateManName("双委托洁净更新");
+            scale01.setUploadFlag("1");
+            scale01.setPredictionType("5");
+            scale01.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            preRailwayScaleMapper.updateByPrimaryKeySelective(scale01);
+
+            scale02.setValueFlag(DbConstants.NET);
+            scale02.setUpdateTime(new Date());
+            scale02.setUpdateManNo("system");
+            scale02.setUpdateManName("双委托洁净更新");
+            scale02.setUploadFlag("1");
+            scale02.setPredictionType("5");
+            scale02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            preRailwayScaleMapper.updateByPrimaryKeySelective(scale02);
+
+            //更新一次数据
+            //更新第一次毛重数据库
+            model01.setValueFlag(DbConstants.NET);
+            model01.setUpdateManName("system");
+            model01.setUpdateManName("双委托洁净更新");
+            model01.setUpdateTime(new Date());
+            model01.setWeightType("0");
+            model01.setIsPreSacale("1");
+            model01.setPredictionNo(scale01.getPredictionNo());
+            model01.setPredictionType("5");
+            model01.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            meterWorkRailwayActFirstMapper.updateByPrimaryKey(model01);
+            //更新第一次皮重数据库
+            model02.setValueFlag(DbConstants.NET);
+            model02.setUpdateManName("system");
+            model02.setUpdateManName("双委托洁净更新");
+            model02.setUpdateTime(new Date());
+            model02.setWeightType("1");
+            model02.setIsPreSacale("1");
+            model02.setPredictionNo(scale01.getPredictionNo());
+            model02.setPredictionType("5");
+            model02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            meterWorkRailwayActFirstMapper.updateByPrimaryKey(model02);
+            //添加第一次毛重数据库
+            String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            model03.setActualFirstNo(actualFirstNo);
+            model03.setValueFlag(DbConstants.NET);
+            model03.setUpdateManName("system");
+            model03.setUpdateManName("双委托洁净更新");
+            model03.setWeightType("0");
+            model03.setUpdateTime(new Date());
+            model03.setIsPreSacale("1");
+            model03.setPredictionNo(scale02.getPredictionNo());
+            model03.setPredictionType("5");
+            model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            meterWorkRailwayActFirstMapper.insertSelective(model03);
+            //添加第二次皮重数据库
+            String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            model04.setActualFirstNo(actualSecondNo);
+            model04.setValueFlag(DbConstants.NET);
+            model04.setUpdateManName("system");
+            model04.setUpdateManName("双委托洁净更新");
+            model04.setWeightType("1");
+            model04.setUpdateTime(new Date());
+            model04.setIsPreSacale("1");
+            model04.setPredictionNo(scale02.getPredictionNo());
+            model04.setPredictionType("5");
+            model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            meterWorkRailwayActFirstMapper.insertSelective(model04);
+
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), model02.getActualFirstNo(), scale01.getPredictionNo());
+            BeanUtils.copyProperties(mwca1, actualRow1);
+            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(model03.getActualFirstNo(), model04.getActualFirstNo(), scale02.getPredictionNo());
+            BeanUtils.copyProperties(mwca2, actualRow2);
+
+            //添加结净数据
+            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+            actualRow1.setActualNo(sdf.format(new Date()) + no);
+            actualRow1.setNetTime(new Date());
+            actualRow1.setNetMode(DbConstants.TYPE);
+            actualRow1.setNote("双委托匹配洁净");
+            actualRow1.setNetMode("3");
+            actualRow1.setUploadFlag("1");
+            actualRow1.setValueFlag("1");
+            actualRow1.setIsPreSacale("1");
+            actualRow1.setPredictionNo(scale01.getPredictionNo());
+            actualRow1.setPredictionType("5");
+            actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            actualRow1.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
+            meterWorkRailwayActualMapper.insertSelective(actualRow1);
+
+            String no1 = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+            actualRow2.setNetTime(new Date());
+            actualRow2.setNetMode(DbConstants.TYPE);
+            actualRow2.setNote("双委托匹配洁净");
+            actualRow2.setNetMode("3");
+            actualRow2.setValueFlag("1");
+            actualRow2.setUploadFlag("1");
+            actualRow2.setIsPreSacale("1");
+            actualRow2.setPredictionNo(scale02.getPredictionNo());
+            actualRow2.setPredictionType("5");
+            actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            actualRow2.setNetWeight(model03.getMeterWeight().subtract(model04.getMeterWeight()));
+            meterWorkRailwayActualMapper.insertSelective(actualRow2);
+
+            /*//11、修改计量监控
+            updateMonitor(one.getBaseSpotNo());
+            //12、当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+            updatePreWeight(one.getCarNo());
+            updateMonitorOver(one.getActualFirstNo(), one.getBaseSpotNo());
+            //补充附加重量的数据
+            if (StringUtils.isNotEmpty(one.getAddWgtPk())) {
+                insertAddWgtNo(one.getActualFirstNo(), one.getAddWgtPk(), one.getCreateManNo(), one.getCreateManName());
+            }*/
+
+            rm.setSucceed();
+            rm.setData(one.getActualFirstNo());
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            return rm;
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
     @Override
     public String doubleEntrustMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2) {
 

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -13,14 +13,18 @@
     <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
     <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
     <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="MEASURE_TASK_NUM" jdbcType="VARCHAR" property="measureTaskNum" />
+    <result column="WARM_TYPE" jdbcType="VARCHAR" property="warmType" />
+    <result column="WARM_TYPE_NAME" jdbcType="VARCHAR" property="warmTypeName" />
   </resultMap>
   <sql id="columns">
     HELP_ID, CAR_NO, HELP_CONTENT, CREATE_TIME, END_TIME, CREATE_NO, CREATE_NAME, RESULT, 
-    VALUE_FLAG, BASE_SPOT_NO, BASE_SPOT_NAME
+    VALUE_FLAG, BASE_SPOT_NO, BASE_SPOT_NAME, MEASURE_TASK_NUM, WARM_TYPE, WARM_TYPE_NAME
   </sql>
   <sql id="columns_alias">
     t.HELP_ID, t.CAR_NO, t.HELP_CONTENT, t.CREATE_TIME, t.END_TIME, t.CREATE_NO, t.CREATE_NAME, 
-    t.RESULT, t.VALUE_FLAG, t.BASE_SPOT_NO, t.BASE_SPOT_NAME
+    t.RESULT, t.VALUE_FLAG, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.MEASURE_TASK_NUM, t.WARM_TYPE, 
+    t.WARM_TYPE_NAME
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_SCHEDULED_HELP
@@ -63,6 +67,15 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         and BASE_SPOT_NAME = #{baseSpotName}
       </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM = #{measureTaskNum}
+      </if>
+      <if test="warmType != null and warmType != ''">
+        and WARM_TYPE = #{warmType}
+      </if>
+      <if test="warmTypeName != null and warmTypeName != ''">
+        and WARM_TYPE_NAME = #{warmTypeName}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -100,6 +113,15 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
       </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="warmType != null and warmType != ''">
+        and WARM_TYPE LIKE '%${warmType}%'
+      </if>
+      <if test="warmTypeName != null and warmTypeName != ''">
+        and WARM_TYPE_NAME LIKE '%${warmTypeName}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -139,16 +161,27 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         or BASE_SPOT_NAME = #{baseSpotName}
       </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        or MEASURE_TASK_NUM = #{measureTaskNum}
+      </if>
+      <if test="warmType != null and warmType != ''">
+        or WARM_TYPE = #{warmType}
+      </if>
+      <if test="warmTypeName != null and warmTypeName != ''">
+        or WARM_TYPE_NAME = #{warmTypeName}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
     insert into METER_WORK_SCHEDULED_HELP (HELP_ID, CAR_NO, HELP_CONTENT, 
       CREATE_TIME, END_TIME, CREATE_NO, 
       CREATE_NAME, RESULT, VALUE_FLAG, 
-      BASE_SPOT_NO, BASE_SPOT_NAME)
+      BASE_SPOT_NO, BASE_SPOT_NAME, MEASURE_TASK_NUM, 
+      WARM_TYPE, WARM_TYPE_NAME)
     values (#{helpId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{helpContent,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createNo,jdbcType=VARCHAR}, 
       #{createName,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
-      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR})
+      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR}, 
+      #{warmType,jdbcType=VARCHAR}, #{warmTypeName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
     insert into METER_WORK_SCHEDULED_HELP
@@ -186,6 +219,15 @@
       <if test="baseSpotName != null">
         BASE_SPOT_NAME,
       </if>
+      <if test="measureTaskNum != null">
+        MEASURE_TASK_NUM,
+      </if>
+      <if test="warmType != null">
+        WARM_TYPE,
+      </if>
+      <if test="warmTypeName != null">
+        WARM_TYPE_NAME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="helpId != null">
@@ -221,6 +263,15 @@
       <if test="baseSpotName != null">
         #{baseSpotName,jdbcType=VARCHAR},
       </if>
+      <if test="measureTaskNum != null">
+        #{measureTaskNum,jdbcType=VARCHAR},
+      </if>
+      <if test="warmType != null">
+        #{warmType,jdbcType=VARCHAR},
+      </if>
+      <if test="warmTypeName != null">
+        #{warmTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
@@ -234,7 +285,10 @@
       RESULT = #{result,jdbcType=VARCHAR},
       VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
       BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
-      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR}
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      MEASURE_TASK_NUM = #{measureTaskNum,jdbcType=VARCHAR},
+      WARM_TYPE = #{warmType,jdbcType=VARCHAR},
+      WARM_TYPE_NAME = #{warmTypeName,jdbcType=VARCHAR}
     where HELP_ID = #{helpId,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
@@ -270,6 +324,15 @@
       <if test="baseSpotName != null">
         BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
       </if>
+      <if test="measureTaskNum != null">
+        MEASURE_TASK_NUM = #{measureTaskNum,jdbcType=VARCHAR},
+      </if>
+      <if test="warmType != null">
+        WARM_TYPE = #{warmType,jdbcType=VARCHAR},
+      </if>
+      <if test="warmTypeName != null">
+        WARM_TYPE_NAME = #{warmTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     where HELP_ID = #{helpId,jdbcType=VARCHAR}
   </update>
@@ -291,14 +354,16 @@
       CAR_NO, HELP_CONTENT, CREATE_TIME, 
       END_TIME, CREATE_NO, CREATE_NAME, 
       RESULT, VALUE_FLAG, BASE_SPOT_NO, 
-      BASE_SPOT_NAME)
+      BASE_SPOT_NAME, MEASURE_TASK_NUM, 
+      WARM_TYPE, WARM_TYPE_NAME)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.helpId,jdbcType=VARCHAR}, 
       #{item.carNo,jdbcType=VARCHAR}, #{item.helpContent,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
       #{item.endTime,jdbcType=TIMESTAMP}, #{item.createNo,jdbcType=VARCHAR}, #{item.createName,jdbcType=VARCHAR}, 
       #{item.result,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, 
-      #{item.baseSpotName,jdbcType=VARCHAR} from dual  
+      #{item.baseSpotName,jdbcType=VARCHAR}, #{item.measureTaskNum,jdbcType=VARCHAR}, 
+      #{item.warmType,jdbcType=VARCHAR}, #{item.warmTypeName,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -348,6 +413,18 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
           when #{item.helpId,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
        </foreach>
+       ,MEASURE_TASK_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
+          when #{item.helpId,jdbcType=VARCHAR} then #{item.measureTaskNum,jdbcType=VARCHAR}
+       </foreach>
+       ,WARM_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
+          when #{item.helpId,jdbcType=VARCHAR} then #{item.warmType,jdbcType=VARCHAR}
+       </foreach>
+       ,WARM_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
+          when #{item.helpId,jdbcType=VARCHAR} then #{item.warmTypeName,jdbcType=VARCHAR}
+       </foreach>
      where HELP_ID in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.helpId,jdbcType=VARCHAR}

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/model/MeterWorkScheduledHelp.java

@@ -3,7 +3,6 @@ package com.steerinfo.meterwork.meterworkscheduledhelp.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.util.Date;
 
 @ApiModel(value="null")
@@ -21,7 +20,7 @@ public class MeterWorkScheduledHelp implements IBasePO<String> {
     private String carNo;
 
     /**
-     * 报警内容(HELP_CONTENT,VARCHAR,20)
+     * 报警内容(HELP_CONTENT,VARCHAR,200)
      */
     @ApiModelProperty(value="报警内容",required=false)
     private String helpContent;
@@ -74,6 +73,24 @@ public class MeterWorkScheduledHelp implements IBasePO<String> {
     @ApiModelProperty(value="计量站点名称",required=false)
     private String baseSpotName;
 
+    /**
+     * 是否上传智能料场(MEASURE_TASK_NUM,VARCHAR,2)
+     */
+    @ApiModelProperty(value="是否上传智能料场",required=false)
+    private String measureTaskNum;
+
+    /**
+     * 报警类型（1：事后匹配报警；2：智能终端报警；3：跟车报警）(WARM_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="报警类型（1：事后匹配报警；2：智能终端报警；3：跟车报警）",required=false)
+    private String warmType;
+
+    /**
+     * 报警类型名称(WARM_TYPE_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="报警类型名称",required=false)
+    private String warmTypeName;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -174,6 +191,30 @@ public class MeterWorkScheduledHelp implements IBasePO<String> {
         this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
     }
 
+    public String getMeasureTaskNum() {
+        return measureTaskNum;
+    }
+
+    public void setMeasureTaskNum(String measureTaskNum) {
+        this.measureTaskNum = measureTaskNum == null ? null : measureTaskNum.trim();
+    }
+
+    public String getWarmType() {
+        return warmType;
+    }
+
+    public void setWarmType(String warmType) {
+        this.warmType = warmType == null ? null : warmType.trim();
+    }
+
+    public String getWarmTypeName() {
+        return warmTypeName;
+    }
+
+    public void setWarmTypeName(String warmTypeName) {
+        this.warmTypeName = warmTypeName == null ? null : warmTypeName.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -191,6 +232,9 @@ public class MeterWorkScheduledHelp implements IBasePO<String> {
         sb.append(", valueFlag=").append(valueFlag);
         sb.append(", baseSpotNo=").append(baseSpotNo);
         sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", measureTaskNum=").append(measureTaskNum);
+        sb.append(", warmType=").append(warmType);
+        sb.append(", warmTypeName=").append(warmTypeName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/resources/application-dev.properties

@@ -0,0 +1,125 @@
+server.port=9004
+#\u5FAE\u670D\u52A1\u7AEF\u53E3
+spring.jmx.default-domain=project1
+#\u6307\u5B9A\u7248\u672C
+api.version=v1
+#\u6307\u5B9Aencoding\u683C\u5F0F
+server.tomcat.uri-encoding=UTF-8
+
+# \u5B9A\u4E49swagger2\u5305\u8DEF\u5F84
+swagger2.enable=true
+swagger2.basepackage=com.steerinfo
+
+#\u542F\u7528shutdown
+# endpoints.shutdown.enabled=true
+#\u7981\u7528\u5BC6\u7801\u9A8C\u8BC1
+# endpoints.shutdown.sensitive=false
+#7*24*60*60*1000
+access.token.ttl=604800000
+#3*7*24*60*60*1000
+refresh.token.ttl=1814400000
+#;/${api.version}/sys/**/export;/${api.version}/sys/**/import;/**,auth
+# \u62E6\u622A\u5668\u9644\u52A0\u914D\u7F6E\uFF1A\u6BCF\u4E2Aurl\u8DEF\u5F84\u4EE5;\u5206\u9694\uFF1Burl\u7684\u9017\u53F7\u540Eauth\u8868\u793A\u9700\u8981\u8BA4\u8BC1\u540E\u624D\u80FD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6216\u8005anon\u8868\u793A\u4E0D\u6821\u9A8C
+shiro.chains=/auth/login/**;/ktr/;/${api.version}/sys/**/export;/${api.version}/syspromachineauths/verify**;/${api.version}/sys/**/import;/**,auth
+# \u62E6\u622A\u5668\u9644\u52A0\u914D\u7F6E\uFF1A\u6BCF\u4E2Aurl\u8DEF\u5F84\u4EE5;\u5206\u9694\uFF1Burl\u7684\u9017\u53F7\u540Eauth\u8868\u793A\u8BA4\u8BC1\u540E\u624D\u80FD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6216\u8005anon\u8868\u793A\u4E0D\u6821\u9A8C
+shiro.chains.append=/swagger**;/idmg/**;/ktr/;/${api.version}/sysposts/list/user**;/webjars/**;/v2/api**;/images/**;/configuration/**;
+
+# Redis\u7F13\u5B58\u914D\u7F6E
+cache.level=1
+#Redis\u7F13\u5B58\u914D\u7F6E
+redis.host=127.0.0.1
+redis.port=6379
+redis.pwd=123456
+redis.project.prefix=sysmanage
+redis.pool.maxTotal=8
+redis.pool.maxWaitMillis=1000
+redis.pool.maxIdle=4
+redis.cache.time=864000000
+redis.database=6
+
+#mq
+#spring.rabbitmq.host=192.168.1.33
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.username=admin
+#spring.rabbitmq.password=admin
+
+#\u65E5\u5FD7 purchase
+#\u652F\u6301\u9AD8\u4EAE\u8F93\u51FA
+spring.output.ansi.enabled=ALWAYS
+spring.main.show-banner=false
+logging.level.com.steer=ERROR
+#DEBUG,INFO,WARN,ERROR
+
+#\u56FD\u9645\u5316
+spring.messages.basename=message
+spring.messages.encoding=UTF-8
+
+# MyBatis \u914D\u7F6E
+mybatis.mapper-locations=classpath*:com/hnshituo/mapper/*.xml
+###spring boot\u81EA\u52A8\u914D\u7F6E\u5355\u6570\u636E\u6E90###
+#spring.datasource.url=jdbc:oracle:thin:@192.168.1.160:1521:orcl
+#spring.datasource.username=sale
+#spring.datasource.password=oracle
+
+#wuliujiekou
+openfeign.dil.url= ${DIL_URL:192.168.107.61:8000}
+#openfeign.dil.url= ${DIL_URL:192.168.0.193:8092}
+
+#\u591A\u6570\u636E\u6E90\u914D\u7F6E
+#master
+#multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
+#multiple.datasource.master.url=jdbc:oracle:thin:@192.168.102.45:1521/cxdb
+#multiple.datasource.master.username=lims
+#multiple.datasource.master.password=Lims123789
+
+multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
+multiple.datasource.master.url=jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl
+multiple.datasource.master.username=lims_dev
+multiple.datasource.master.password=lims_2021
+
+multiple.datasource.master.initial-size=15
+multiple.datasource.master.min-idle=15
+multiple.datasource.master.maxActive=15
+multiple.datasource.master.maxWait=1000
+multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
+multiple.datasource.master.minEvictableIdleTimeMillis=300000
+
+#slave1
+multiple.datasource.slave1.driver-class-name=
+multiple.datasource.slave1.url=
+multiple.datasource.slave1.username=
+multiple.datasource.slave1.password=
+#slave2
+multiple.datasource.slave2.driver-class-name=
+multiple.datasource.slave2.url=
+multiple.datasource.slave2.username=
+multiple.datasource.slave2.password=
+#other
+multiple.datasource.other.driver-class-name=
+multiple.datasource.other.url=
+multiple.datasource.other.username=
+multiple.datasource.other.password=
+
+
+web.upload-path=/static/
+genxml.pth=/genxml/
+spring.http.encoding.force=true
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,\
+  classpath:/static/,classpath:/genxml/,classpath:/public/,file:${web.upload-path},file:${genxml.pth}
+
+#是否将自己注册到Eureka Server上，默认为true
+eureka.client.register-with-eureka=false  
+#是否从Eureka Server上获取注册信息，默认为true
+eureka.client.fetch-registry=false
+
+#SSO
+sso.url=https://jgwzjl.jiugang.com/icore.icp.web/pass
+sso.appuser=appuser
+sso.password=appuser@123456
+
+server.tomcat.accept-count=500
+server.tomcat.max-threads=400
+server.connection-timeout=20000
+
+logging.level.com=debug

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>system-base-pass</id>
+
+	<classpath>
+		<dir name="D:/Desktop/酒钢计量项目/代码管理/服务端/jisco_api_wzjl/target/classes">
+		</dir>
+	</classpath>
+
+</application>