合并修改

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/controller/MeterMonitorNoteCarController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.metermonitor.metermonitornotecar.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.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar;
+import com.steerinfo.metermonitor.metermonitornotecar.service.IMeterMonitorNoteCarService;
+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;
+
+/**
+ * MeterMonitorNoteCar RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-21 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-21
+ * 作者：generator
+ * 参考：
+ * 描述：MeterMonitorNoteCar RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/metermonitornotecars")
+public class MeterMonitorNoteCarController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterMonitorNoteCarService meterMonitorNoteCarService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("metermonitornotecar:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterMonitorNoteCar> list = meterMonitorNoteCarService.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("metermonitornotecar:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterMonitorNoteCar> list = meterMonitorNoteCarService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterMonitorNoteCar对象创建")
+    @ApiImplicitParam(name = "meterMonitorNoteCar", value = "详细实体meterMonitorNoteCar", required = true, dataType = "MeterMonitorNoteCar")
+    //@RequiresPermissions("metermonitornotecar:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterMonitorNoteCar model){
+        MeterMonitorNoteCar meterMonitorNoteCar = meterMonitorNoteCarService.add(model);
+        return success(meterMonitorNoteCar);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("metermonitornotecar:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterMonitorNoteCar meterMonitorNoteCar = meterMonitorNoteCarService.getById(id);
+        return success(meterMonitorNoteCar);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterMonitorNoteCar信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterMonitorNoteCar", value = "详细实体meterMonitorNoteCar", required = true, dataType = "MeterMonitorNoteCar")
+    })
+    //@RequiresPermissions("metermonitornotecar:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterMonitorNoteCar model){
+        model.setId(id);
+        MeterMonitorNoteCar meterMonitorNoteCar = meterMonitorNoteCarService.modify(model);
+        return success(meterMonitorNoteCar);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("metermonitornotecar: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);
+			  meterMonitorNoteCarService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/mapper/MeterMonitorNoteCarMapper.java

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

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/mapper/MeterMonitorNoteCarMapper.xml

@@ -0,0 +1,496 @@
+<?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.metermonitor.metermonitornotecar.mapper.MeterMonitorNoteCarMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar">
+    <id column="NOTE_NO" jdbcType="VARCHAR" property="noteNo" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="NOTE_TYPE_NO" jdbcType="VARCHAR" property="noteTypeNo" />
+    <result column="NOTE_TYPE_NAME" jdbcType="VARCHAR" property="noteTypeName" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
+    <result column="OPERATION_CONTENT" jdbcType="VARCHAR" property="operationContent" />
+    <result column="OPERATION_TIME" jdbcType="TIMESTAMP" property="operationTime" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+  </resultMap>
+  <sql id="columns">
+    NOTE_NO, BASE_SPOT_NO, BASE_SPOT_NAME, NOTE_TYPE_NO, NOTE_TYPE_NAME, CAR_NO, PREDICTION_NO, 
+    OPERATION_CONTENT, OPERATION_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME, MEMO
+  </sql>
+  <sql id="columns_alias">
+    t.NOTE_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.NOTE_TYPE_NO, t.NOTE_TYPE_NAME, t.CAR_NO, 
+    t.PREDICTION_NO, t.OPERATION_CONTENT, t.OPERATION_TIME, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_MONITOR_NOTE_CAR
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_MONITOR_NOTE_CAR t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="noteNo != null and noteNo != ''">
+        and NOTE_NO = #{noteNo}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        and OPERATION_CONTENT = #{operationContent}
+      </if>
+      <if test="operationTime != null">
+        and TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = #{operationTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="noteNo != null and noteNo != ''">
+        and NOTE_NO LIKE '%${noteNo}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO LIKE '%${noteTypeNo}%'
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME LIKE '%${noteTypeName}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        and OPERATION_CONTENT LIKE '%${operationContent}%'
+      </if>
+      <if test="operationTime != null">
+        and TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = #{operationTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_MONITOR_NOTE_CAR
+    where NOTE_NO = #{noteNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_MONITOR_NOTE_CAR
+    where 1!=1 
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        or NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        or NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        or PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        or OPERATION_CONTENT = #{operationContent}
+      </if>
+      <if test="operationTime != null">
+        or TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = '#{operationTime}'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar">
+    insert into METER_MONITOR_NOTE_CAR (NOTE_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      NOTE_TYPE_NO, NOTE_TYPE_NAME, CAR_NO, 
+      PREDICTION_NO, OPERATION_CONTENT, OPERATION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO)
+    values (#{noteNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{noteTypeNo,jdbcType=VARCHAR}, #{noteTypeName,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{predictionNo,jdbcType=VARCHAR}, #{operationContent,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar">
+    insert into METER_MONITOR_NOTE_CAR
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="noteNo != null">
+        NOTE_NO,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO,
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO,
+      </if>
+      <if test="operationContent != null">
+        OPERATION_CONTENT,
+      </if>
+      <if test="operationTime != null">
+        OPERATION_TIME,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="noteNo != null">
+        #{noteNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeNo != null">
+        #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="operationContent != null">
+        #{operationContent,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null">
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar">
+    update METER_MONITOR_NOTE_CAR
+    set BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      OPERATION_CONTENT = #{operationContent,jdbcType=VARCHAR},
+      OPERATION_TIME = #{operationTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      MEMO = #{memo,jdbcType=VARCHAR}
+    where NOTE_NO = #{noteNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.metermonitor.metermonitornotecar.model.MeterMonitorNoteCar">
+    update METER_MONITOR_NOTE_CAR
+    <set>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="operationContent != null">
+        OPERATION_CONTENT = #{operationContent,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null">
+        OPERATION_TIME = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where NOTE_NO = #{noteNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where NOTE_NO = #{noteNo,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_MONITOR_NOTE_CAR 
+      (NOTE_NO, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, NOTE_TYPE_NO, 
+      NOTE_TYPE_NAME, CAR_NO, PREDICTION_NO, 
+      OPERATION_CONTENT, OPERATION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.noteNo,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.noteTypeNo,jdbcType=VARCHAR}, 
+      #{item.noteTypeName,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.predictionNo,jdbcType=VARCHAR}, 
+      #{item.operationContent,jdbcType=VARCHAR}, #{item.operationTime,jdbcType=TIMESTAMP}, 
+      #{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.memo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_MONITOR_NOTE_CAR
+     set
+       NOTE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.noteNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.noteTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.noteTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,PREDICTION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.operationContent,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.operationTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+     where NOTE_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.noteNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_MONITOR_NOTE_CAR
+    where NOTE_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/model/MeterMonitorNoteCar.java

@@ -0,0 +1,272 @@
+package com.steerinfo.metermonitor.metermonitornotecar.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="司机终端操作日志管理")
+public class MeterMonitorNoteCar implements IBasePO<String> {
+    /**
+     * 日志主键(NOTE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="日志主键",required=true)
+    private String noteNo;
+
+    /**
+     * 计量点编号(meter_base_spot_info)(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号(meter_base_spot_info)",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(meter_base_spot_info)(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称(meter_base_spot_info)",required=false)
+    private String baseSpotName;
+
+    /**
+     * 计量日志类型编码(NOTE_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量日志类型编码",required=false)
+    private String noteTypeNo;
+
+    /**
+     * 计量日志类型名称(NOTE_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量日志类型名称",required=false)
+    private String noteTypeName;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 委托编号(PREDICTION_NO,VARCHAR,25)
+     */
+    @ApiModelProperty(value="委托编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 日志内容(OPERATION_CONTENT,VARCHAR,150)
+     */
+    @ApiModelProperty(value="日志内容",required=false)
+    private String operationContent;
+
+    /**
+     * 记录时间(OPERATION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录时间",required=false)
+    private Date operationTime;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.noteNo;
+    }
+
+    @Override
+    public void setId(String noteNo) {
+        this.noteNo = noteNo == null ? null : noteNo.trim();
+    }
+
+    public String getNoteNo() {
+        return noteNo;
+    }
+
+    public void setNoteNo(String noteNo) {
+        this.noteNo = noteNo == null ? null : noteNo.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    public String getNoteTypeNo() {
+        return noteTypeNo;
+    }
+
+    public void setNoteTypeNo(String noteTypeNo) {
+        this.noteTypeNo = noteTypeNo == null ? null : noteTypeNo.trim();
+    }
+
+    public String getNoteTypeName() {
+        return noteTypeName;
+    }
+
+    public void setNoteTypeName(String noteTypeName) {
+        this.noteTypeName = noteTypeName == null ? null : noteTypeName.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
+    }
+
+    public String getOperationContent() {
+        return operationContent;
+    }
+
+    public void setOperationContent(String operationContent) {
+        this.operationContent = operationContent == null ? null : operationContent.trim();
+    }
+
+    public Date getOperationTime() {
+        return operationTime;
+    }
+
+    public void setOperationTime(Date operationTime) {
+        this.operationTime = operationTime;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", noteNo=").append(noteNo);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", noteTypeNo=").append(noteTypeNo);
+        sb.append(", noteTypeName=").append(noteTypeName);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", predictionNo=").append(predictionNo);
+        sb.append(", operationContent=").append(operationContent);
+        sb.append(", operationTime=").append(operationTime);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", memo=").append(memo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/service/IMeterMonitorNoteCarService.java

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

src/main/java/com/steerinfo/metermonitor/metermonitornotecar/service/impl/MeterMonitorNoteCarServiceImpl.java

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

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/controller/MeterMonitorNoteProgramController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.metermonitor.metermonitornoteprogram.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.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram;
+import com.steerinfo.metermonitor.metermonitornoteprogram.service.IMeterMonitorNoteProgramService;
+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;
+
+/**
+ * MeterMonitorNoteProgram RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-21 11:28
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-21
+ * 作者：generator
+ * 参考：
+ * 描述：MeterMonitorNoteProgram RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/metermonitornoteprograms")
+public class MeterMonitorNoteProgramController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterMonitorNoteProgramService meterMonitorNoteProgramService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("metermonitornoteprogram:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterMonitorNoteProgram> list = meterMonitorNoteProgramService.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("metermonitornoteprogram:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterMonitorNoteProgram> list = meterMonitorNoteProgramService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterMonitorNoteProgram对象创建")
+    @ApiImplicitParam(name = "meterMonitorNoteProgram", value = "详细实体meterMonitorNoteProgram", required = true, dataType = "MeterMonitorNoteProgram")
+    //@RequiresPermissions("metermonitornoteprogram:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterMonitorNoteProgram model){
+        MeterMonitorNoteProgram meterMonitorNoteProgram = meterMonitorNoteProgramService.add(model);
+        return success(meterMonitorNoteProgram);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("metermonitornoteprogram:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterMonitorNoteProgram meterMonitorNoteProgram = meterMonitorNoteProgramService.getById(id);
+        return success(meterMonitorNoteProgram);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterMonitorNoteProgram信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterMonitorNoteProgram", value = "详细实体meterMonitorNoteProgram", required = true, dataType = "MeterMonitorNoteProgram")
+    })
+    //@RequiresPermissions("metermonitornoteprogram:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterMonitorNoteProgram model){
+        model.setId(id);
+        MeterMonitorNoteProgram meterMonitorNoteProgram = meterMonitorNoteProgramService.modify(model);
+        return success(meterMonitorNoteProgram);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("metermonitornoteprogram: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);
+			  meterMonitorNoteProgramService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/mapper/MeterMonitorNoteProgramMapper.java

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

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/mapper/MeterMonitorNoteProgramMapper.xml

@@ -0,0 +1,496 @@
+<?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.metermonitor.metermonitornoteprogram.mapper.MeterMonitorNoteProgramMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram">
+    <id column="ALARM_NO" jdbcType="VARCHAR" property="alarmNo" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="NOTE_TYPE_NO" jdbcType="VARCHAR" property="noteTypeNo" />
+    <result column="NOTE_TYPE_NAME" jdbcType="VARCHAR" property="noteTypeName" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
+    <result column="OPERATION_CONTENT" jdbcType="VARCHAR" property="operationContent" />
+    <result column="OPERATION_TIME" jdbcType="TIMESTAMP" property="operationTime" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+  </resultMap>
+  <sql id="columns">
+    ALARM_NO, BASE_SPOT_NO, BASE_SPOT_NAME, NOTE_TYPE_NO, NOTE_TYPE_NAME, CAR_NO, PREDICTION_NO, 
+    OPERATION_CONTENT, OPERATION_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME, MEMO
+  </sql>
+  <sql id="columns_alias">
+    t.ALARM_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.NOTE_TYPE_NO, t.NOTE_TYPE_NAME, t.CAR_NO, 
+    t.PREDICTION_NO, t.OPERATION_CONTENT, t.OPERATION_TIME, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_MONITOR_NOTE_PROGRAM
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_MONITOR_NOTE_PROGRAM t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="alarmNo != null and alarmNo != ''">
+        and ALARM_NO = #{alarmNo}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        and OPERATION_CONTENT = #{operationContent}
+      </if>
+      <if test="operationTime != null">
+        and TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = #{operationTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="alarmNo != null and alarmNo != ''">
+        and ALARM_NO LIKE '%${alarmNo}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO LIKE '%${noteTypeNo}%'
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME LIKE '%${noteTypeName}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        and OPERATION_CONTENT LIKE '%${operationContent}%'
+      </if>
+      <if test="operationTime != null">
+        and TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = #{operationTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_MONITOR_NOTE_PROGRAM
+    where ALARM_NO = #{alarmNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_MONITOR_NOTE_PROGRAM
+    where 1!=1 
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        or NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        or NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        or PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        or OPERATION_CONTENT = #{operationContent}
+      </if>
+      <if test="operationTime != null">
+        or TO_CHAR(OPERATION_TIME,'yyyy-MM-dd') = '#{operationTime}'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram">
+    insert into METER_MONITOR_NOTE_PROGRAM (ALARM_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      NOTE_TYPE_NO, NOTE_TYPE_NAME, CAR_NO, 
+      PREDICTION_NO, OPERATION_CONTENT, OPERATION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO)
+    values (#{alarmNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{noteTypeNo,jdbcType=VARCHAR}, #{noteTypeName,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{predictionNo,jdbcType=VARCHAR}, #{operationContent,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram">
+    insert into METER_MONITOR_NOTE_PROGRAM
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="alarmNo != null">
+        ALARM_NO,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO,
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO,
+      </if>
+      <if test="operationContent != null">
+        OPERATION_CONTENT,
+      </if>
+      <if test="operationTime != null">
+        OPERATION_TIME,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="alarmNo != null">
+        #{alarmNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeNo != null">
+        #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="operationContent != null">
+        #{operationContent,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null">
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram">
+    update METER_MONITOR_NOTE_PROGRAM
+    set BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      OPERATION_CONTENT = #{operationContent,jdbcType=VARCHAR},
+      OPERATION_TIME = #{operationTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      MEMO = #{memo,jdbcType=VARCHAR}
+    where ALARM_NO = #{alarmNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.metermonitor.metermonitornoteprogram.model.MeterMonitorNoteProgram">
+    update METER_MONITOR_NOTE_PROGRAM
+    <set>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="operationContent != null">
+        OPERATION_CONTENT = #{operationContent,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null">
+        OPERATION_TIME = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ALARM_NO = #{alarmNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ALARM_NO = #{alarmNo,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_MONITOR_NOTE_PROGRAM 
+      (ALARM_NO, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, NOTE_TYPE_NO, 
+      NOTE_TYPE_NAME, CAR_NO, PREDICTION_NO, 
+      OPERATION_CONTENT, OPERATION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.alarmNo,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.noteTypeNo,jdbcType=VARCHAR}, 
+      #{item.noteTypeName,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.predictionNo,jdbcType=VARCHAR}, 
+      #{item.operationContent,jdbcType=VARCHAR}, #{item.operationTime,jdbcType=TIMESTAMP}, 
+      #{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.memo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_MONITOR_NOTE_PROGRAM
+     set
+       ALARM_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.alarmNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.noteTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.noteTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,PREDICTION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.operationContent,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.operationTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ALARM_NO" close="end">
+          when #{item.alarmNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+     where ALARM_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.alarmNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_MONITOR_NOTE_PROGRAM
+    where ALARM_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/model/MeterMonitorNoteProgram.java

@@ -0,0 +1,272 @@
+package com.steerinfo.metermonitor.metermonitornoteprogram.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="计量程序处理日志表")
+public class MeterMonitorNoteProgram implements IBasePO<String> {
+    /**
+     * 表主键(ALARM_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="表主键",required=true)
+    private String alarmNo;
+
+    /**
+     * 计量点编号(meter_base_spot_info)(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号(meter_base_spot_info)",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(meter_base_spot_info)(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称(meter_base_spot_info)",required=false)
+    private String baseSpotName;
+
+    /**
+     * 计量日志类型编码(NOTE_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量日志类型编码",required=false)
+    private String noteTypeNo;
+
+    /**
+     * 计量日志类型名称(NOTE_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量日志类型名称",required=false)
+    private String noteTypeName;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 委托编号(PREDICTION_NO,VARCHAR,25)
+     */
+    @ApiModelProperty(value="委托编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 日志内容(OPERATION_CONTENT,VARCHAR,150)
+     */
+    @ApiModelProperty(value="日志内容",required=false)
+    private String operationContent;
+
+    /**
+     * 记录时间(OPERATION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录时间",required=false)
+    private Date operationTime;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.alarmNo;
+    }
+
+    @Override
+    public void setId(String alarmNo) {
+        this.alarmNo = alarmNo == null ? null : alarmNo.trim();
+    }
+
+    public String getAlarmNo() {
+        return alarmNo;
+    }
+
+    public void setAlarmNo(String alarmNo) {
+        this.alarmNo = alarmNo == null ? null : alarmNo.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    public String getNoteTypeNo() {
+        return noteTypeNo;
+    }
+
+    public void setNoteTypeNo(String noteTypeNo) {
+        this.noteTypeNo = noteTypeNo == null ? null : noteTypeNo.trim();
+    }
+
+    public String getNoteTypeName() {
+        return noteTypeName;
+    }
+
+    public void setNoteTypeName(String noteTypeName) {
+        this.noteTypeName = noteTypeName == null ? null : noteTypeName.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
+    }
+
+    public String getOperationContent() {
+        return operationContent;
+    }
+
+    public void setOperationContent(String operationContent) {
+        this.operationContent = operationContent == null ? null : operationContent.trim();
+    }
+
+    public Date getOperationTime() {
+        return operationTime;
+    }
+
+    public void setOperationTime(Date operationTime) {
+        this.operationTime = operationTime;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", alarmNo=").append(alarmNo);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", noteTypeNo=").append(noteTypeNo);
+        sb.append(", noteTypeName=").append(noteTypeName);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", predictionNo=").append(predictionNo);
+        sb.append(", operationContent=").append(operationContent);
+        sb.append(", operationTime=").append(operationTime);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", memo=").append(memo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/service/IMeterMonitorNoteProgramService.java

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

src/main/java/com/steerinfo/metermonitor/metermonitornoteprogram/service/impl/MeterMonitorNoteProgramServiceImpl.java

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

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

@@ -14,6 +14,7 @@ import com.steerinfo.meterwork.meterworkcaractual.service.IMeterWorkCarActualSer
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
+import io.micrometer.core.instrument.Meter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -293,6 +294,31 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "数据撤销发布", notes = "根据MeterWorkCarActual对象创建")
+    @ApiImplicitParam(name = "MeterWorkCarActual", value = "详细实体MeterWorkCarActual", required = true, dataType = "MeterWorkCarActual")
+    //@RequiresPermissions("meterworkcaractualfirst:create")
+    @PostMapping(value = "/revocation")
+    public RESTfulResult revocation(@RequestBody MeterWorkCarActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkCarActualService.revocation(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("操作失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "条件查询视图", notes = "根据传入参数进行查询")
     @GetMapping(value = "/selectView")
     public RESTfulResult selectView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
@@ -331,6 +357,29 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "手工录入数据")
+    @PostMapping(value = "/manualInput")
+    public RESTfulResult manualInput(@RequestBody MeterWorkCarActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkCarActualService.manualInput(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("新增失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "匹配委托")
     @PostMapping(value = "/matchPrediction")
     public RESTfulResult matchPrediction(@RequestParam String actualNo, String predictionNo, String note) {

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

@@ -34,10 +34,14 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     int publish(MeterWorkCarActual model);
 
+    int revocation(MeterWorkCarActual model);
+
     int updateCar(MeterWorkCarActual model);
 
     int cancel(MeterWorkCarActual model);
 
+    int manualInput (MeterWorkCarActual model);
+
     MeterWorkCarActual matchPrediction(String actualNo, String predictionNo, String note);
 
     MeterWorkCarActual cleanPrediction(MeterWorkCarActual model);

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

@@ -156,6 +156,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             if (model == null) {
                 throw new MarkerMetException(500, "参数为空！！");
             }
+            if (!model.getValueFlag().equals("1")) {
+                throw new MarkerMetException(500, "只有未发布状态的数据才能进行发布数据操作");
+            }
             check(model);
             model.setValueFlag("2"); // 状态改为发布
             int num = meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
@@ -165,6 +168,25 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int revocation(MeterWorkCarActual model) {
+        try {
+            if (model == null) {
+                throw new MarkerMetException(500, "参数为空！！");
+            }
+            if (!model.getValueFlag().equals("2")) {
+                throw new MarkerMetException(500, "只有发布状态的数据才能进行撤销发布操作");
+            }
+            check(model);
+            model.setValueFlag("1"); // 状态改为未发布
+            int num = meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+            return num;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int cancel(MeterWorkCarActual model) {
@@ -368,6 +390,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 // 清空毛重数据中的委托信息
                 MeterWorkCarActualFirst mwcafg = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
                 mwcafg.setValueFlag(DbConstants.VALID);
+                mwcafg.setNote(model.getNote());
                 mwcafg.setUpdateManName("system");
                 mwcafg.setUpdateManName("二次计量解除更新");
                 mwcafg.setUpdateTime(new Date());
@@ -389,6 +412,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         mwcaft.setValueFlag(DbConstants.VALID);
                         mwcaft.setUpdateManName("system");
                         mwcaft.setUpdateManName("二次计量解除更新");
+                        mwcaft.setNote(model.getNote());
                         mwcaft.setUpdateTime(new Date());
                     }
                     meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaft);
@@ -404,7 +428,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     PreTrackScale scale = new PreTrackScale();
                     scale.setPredictionNo(model.getPredictionNo());
-                    scale.setValueFlag("4");
+                    scale.setValueFlag("1");
                     scale.setUpdateTime(new Date());
                     scale.setUpdateManNo("system");
                     scale.setUpdateManName("计量洁净数据解除操作");
@@ -421,6 +445,20 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+
+    public int manualInput (MeterWorkCarActual model) {
+        try {
+            // 校验传入数据是否完整
+            manualCheck(model);
+            int num = meterWorkCarActualMapper.insertSelective(model);
+            return num;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkCarActual matchPrediction (String actualNo, String predictionNo, String note) throws MarkerMetException {
@@ -667,6 +705,53 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
     }
 
+    private void manualCheck(MeterWorkCarActual model) throws MarkerMetException {
+        if (model.getCarNo() == null || model.getCarNo().equals("")) {
+            throw new MarkerMetException(500, "车号不能为空" + model.getCarNo());
+        }
+        if (model.getMatterNo() == null || model.getMatterNo().equals("")) {
+            throw new MarkerMetException(500, "物资编码不能为空" + model.getCarNo());
+        }
+        if (model.getMatterName() == null || model.getMatterName().equals("")) {
+            throw new MarkerMetException(500, "物资名称不能为空" + model.getCarNo());
+        }
+        if (model.getForwardingUnitNo() == null || model.getForwardingUnitNo().equals("")) {
+            throw new MarkerMetException(500, "发货单位编码不能为空" + model.getCarNo());
+        }
+        if (model.getForwardingUnitName() == null || model.getForwardingUnitName().equals("")) {
+            throw new MarkerMetException(500, "发货单位名称不能为空" + model.getCarNo());
+        }
+        if (model.getReceivingUintNo() == null || model.getReceivingUintNo().equals("")) {
+            throw new MarkerMetException(500, "收货单位编码不能为空" + model.getCarNo());
+        }
+        if (model.getReceivingUintName() == null || model.getReceivingUintName().equals("")) {
+            throw new MarkerMetException(500, "收货单位名称不能为空" + model.getCarNo());
+        }
+        if (model.getGrossTime() == null || model.getGrossTime().equals("")) {
+            throw new MarkerMetException(500, "毛重计量时间不能为空");
+        }
+        if (model.getTareTime() == null || model.getTareTime().equals("")) {
+            throw new MarkerMetException(500, "皮重计量时间不能为空");
+        }
+        if (model.getActualNo() == null && model.getValueFlag() == null) {
+            model.setValueFlag("4");//手工录入
+        }
+
+        if (model.getActualNo() == null && model.getUploadFlag() == null)
+            model.setUploadFlag("2");
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getId();
+        String userName = payload.getUserName();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        if (model.getActualNo() == null) {
+            model.setNetTime(new Date());
+            model.setNetManNo(userId);
+            model.setNetManName(userName);
+            model.setNetWeight(model.getGrossWeight().subtract(model.getTareWeight()));
+            model.setActualNo(meterWorkCarActualMapper.getNewID(sdf.format(new Date())));
+        }
+    }
+
     @Override
     public RESTfulResult doQueryWf(CommonPage<MeterWorkCarActual> oci) {
         RESTfulResult rm = new RESTfulResult();

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/controller/MeterWorkMalfunctionAlarmController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworkmalfunctionalarm.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.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm;
+import com.steerinfo.meterwork.meterworkmalfunctionalarm.service.IMeterWorkMalfunctionAlarmService;
+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;
+
+/**
+ * MeterWorkMalfunctionAlarm RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-21 11:26
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-21
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkMalfunctionAlarm RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkmalfunctionalarms")
+public class MeterWorkMalfunctionAlarmController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkMalfunctionAlarmService meterWorkMalfunctionAlarmService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkmalfunctionalarm:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkMalfunctionAlarm> list = meterWorkMalfunctionAlarmService.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("meterworkmalfunctionalarm:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkMalfunctionAlarm> list = meterWorkMalfunctionAlarmService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkMalfunctionAlarm对象创建")
+    @ApiImplicitParam(name = "meterWorkMalfunctionAlarm", value = "详细实体meterWorkMalfunctionAlarm", required = true, dataType = "MeterWorkMalfunctionAlarm")
+    //@RequiresPermissions("meterworkmalfunctionalarm:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkMalfunctionAlarm model){
+        MeterWorkMalfunctionAlarm meterWorkMalfunctionAlarm = meterWorkMalfunctionAlarmService.add(model);
+        return success(meterWorkMalfunctionAlarm);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkmalfunctionalarm:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkMalfunctionAlarm meterWorkMalfunctionAlarm = meterWorkMalfunctionAlarmService.getById(id);
+        return success(meterWorkMalfunctionAlarm);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkMalfunctionAlarm信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkMalfunctionAlarm", value = "详细实体meterWorkMalfunctionAlarm", required = true, dataType = "MeterWorkMalfunctionAlarm")
+    })
+    //@RequiresPermissions("meterworkmalfunctionalarm:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkMalfunctionAlarm model){
+        model.setId(id);
+        MeterWorkMalfunctionAlarm meterWorkMalfunctionAlarm = meterWorkMalfunctionAlarmService.modify(model);
+        return success(meterWorkMalfunctionAlarm);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkmalfunctionalarm: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);
+			  meterWorkMalfunctionAlarmService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/mapper/MeterWorkMalfunctionAlarmMapper.java

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

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/mapper/MeterWorkMalfunctionAlarmMapper.xml

@@ -0,0 +1,521 @@
+<?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.meterworkmalfunctionalarm.mapper.MeterWorkMalfunctionAlarmMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm">
+    <id column="ERROR_ALARM_ID" jdbcType="VARCHAR" property="errorAlarmId" />
+    <result column="SPOT_TYPE_NO" jdbcType="VARCHAR" property="spotTypeNo" />
+    <result column="SPOT_TYPE_NAME" jdbcType="VARCHAR" property="spotTypeName" />
+    <result column="ALARM_TYPE_NO" jdbcType="VARCHAR" property="alarmTypeNo" />
+    <result column="ALARM_TYPE_NAME" jdbcType="VARCHAR" property="alarmTypeName" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
+    <result column="MALFUNCTION_DETAIL" jdbcType="VARCHAR" property="malfunctionDetail" />
+    <result column="MALFUNCTION_TIME" jdbcType="TIMESTAMP" property="malfunctionTime" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="PROCESS_RESULT" jdbcType="VARCHAR" property="processResult" />
+  </resultMap>
+  <sql id="columns">
+    ERROR_ALARM_ID, SPOT_TYPE_NO, SPOT_TYPE_NAME, ALARM_TYPE_NO, ALARM_TYPE_NAME, CAR_NO, 
+    PREDICTION_NO, MALFUNCTION_DETAIL, MALFUNCTION_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO, PROCESS_RESULT
+  </sql>
+  <sql id="columns_alias">
+    t.ERROR_ALARM_ID, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.ALARM_TYPE_NO, t.ALARM_TYPE_NAME, 
+    t.CAR_NO, t.PREDICTION_NO, t.MALFUNCTION_DETAIL, t.MALFUNCTION_TIME, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.MEMO, t.PROCESS_RESULT
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_MALFUNCTION_ALARM
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_MALFUNCTION_ALARM t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="errorAlarmId != null and errorAlarmId != ''">
+        and ERROR_ALARM_ID = #{errorAlarmId}
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="alarmTypeNo != null and alarmTypeNo != ''">
+        and ALARM_TYPE_NO = #{alarmTypeNo}
+      </if>
+      <if test="alarmTypeName != null and alarmTypeName != ''">
+        and ALARM_TYPE_NAME = #{alarmTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="malfunctionDetail != null and malfunctionDetail != ''">
+        and MALFUNCTION_DETAIL = #{malfunctionDetail}
+      </if>
+      <if test="malfunctionTime != null">
+        and TO_CHAR(MALFUNCTION_TIME,'yyyy-MM-dd') = #{malfunctionTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="processResult != null and processResult != ''">
+        and PROCESS_RESULT = #{processResult}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="errorAlarmId != null and errorAlarmId != ''">
+        and ERROR_ALARM_ID LIKE '%${errorAlarmId}%'
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO LIKE '%${spotTypeNo}%'
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME LIKE '%${spotTypeName}%'
+      </if>
+      <if test="alarmTypeNo != null and alarmTypeNo != ''">
+        and ALARM_TYPE_NO LIKE '%${alarmTypeNo}%'
+      </if>
+      <if test="alarmTypeName != null and alarmTypeName != ''">
+        and ALARM_TYPE_NAME LIKE '%${alarmTypeName}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="malfunctionDetail != null and malfunctionDetail != ''">
+        and MALFUNCTION_DETAIL LIKE '%${malfunctionDetail}%'
+      </if>
+      <if test="malfunctionTime != null">
+        and TO_CHAR(MALFUNCTION_TIME,'yyyy-MM-dd') = #{malfunctionTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="processResult != null and processResult != ''">
+        and PROCESS_RESULT LIKE '%${processResult}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_MALFUNCTION_ALARM
+    where ERROR_ALARM_ID = #{errorAlarmId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_MALFUNCTION_ALARM
+    where 1!=1 
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        or SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        or SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="alarmTypeNo != null and alarmTypeNo != ''">
+        or ALARM_TYPE_NO = #{alarmTypeNo}
+      </if>
+      <if test="alarmTypeName != null and alarmTypeName != ''">
+        or ALARM_TYPE_NAME = #{alarmTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        or PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="malfunctionDetail != null and malfunctionDetail != ''">
+        or MALFUNCTION_DETAIL = #{malfunctionDetail}
+      </if>
+      <if test="malfunctionTime != null">
+        or TO_CHAR(MALFUNCTION_TIME,'yyyy-MM-dd') = '#{malfunctionTime}'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="processResult != null and processResult != ''">
+        or PROCESS_RESULT = #{processResult}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm">
+    insert into METER_WORK_MALFUNCTION_ALARM (ERROR_ALARM_ID, SPOT_TYPE_NO, SPOT_TYPE_NAME, 
+      ALARM_TYPE_NO, ALARM_TYPE_NAME, CAR_NO, 
+      PREDICTION_NO, MALFUNCTION_DETAIL, MALFUNCTION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, PROCESS_RESULT)
+    values (#{errorAlarmId,jdbcType=VARCHAR}, #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, 
+      #{alarmTypeNo,jdbcType=VARCHAR}, #{alarmTypeName,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{predictionNo,jdbcType=VARCHAR}, #{malfunctionDetail,jdbcType=VARCHAR}, #{malfunctionTime,jdbcType=TIMESTAMP}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR}, #{processResult,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm">
+    insert into METER_WORK_MALFUNCTION_ALARM
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="errorAlarmId != null">
+        ERROR_ALARM_ID,
+      </if>
+      <if test="spotTypeNo != null">
+        SPOT_TYPE_NO,
+      </if>
+      <if test="spotTypeName != null">
+        SPOT_TYPE_NAME,
+      </if>
+      <if test="alarmTypeNo != null">
+        ALARM_TYPE_NO,
+      </if>
+      <if test="alarmTypeName != null">
+        ALARM_TYPE_NAME,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO,
+      </if>
+      <if test="malfunctionDetail != null">
+        MALFUNCTION_DETAIL,
+      </if>
+      <if test="malfunctionTime != null">
+        MALFUNCTION_TIME,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="processResult != null">
+        PROCESS_RESULT,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="errorAlarmId != null">
+        #{errorAlarmId,jdbcType=VARCHAR},
+      </if>
+      <if test="spotTypeNo != null">
+        #{spotTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotTypeName != null">
+        #{spotTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmTypeNo != null">
+        #{alarmTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmTypeName != null">
+        #{alarmTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="malfunctionDetail != null">
+        #{malfunctionDetail,jdbcType=VARCHAR},
+      </if>
+      <if test="malfunctionTime != null">
+        #{malfunctionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="processResult != null">
+        #{processResult,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm">
+    update METER_WORK_MALFUNCTION_ALARM
+    set SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
+      SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
+      ALARM_TYPE_NO = #{alarmTypeNo,jdbcType=VARCHAR},
+      ALARM_TYPE_NAME = #{alarmTypeName,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      MALFUNCTION_DETAIL = #{malfunctionDetail,jdbcType=VARCHAR},
+      MALFUNCTION_TIME = #{malfunctionTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      PROCESS_RESULT = #{processResult,jdbcType=VARCHAR}
+    where ERROR_ALARM_ID = #{errorAlarmId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmalfunctionalarm.model.MeterWorkMalfunctionAlarm">
+    update METER_WORK_MALFUNCTION_ALARM
+    <set>
+      <if test="spotTypeNo != null">
+        SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotTypeName != null">
+        SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmTypeNo != null">
+        ALARM_TYPE_NO = #{alarmTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmTypeName != null">
+        ALARM_TYPE_NAME = #{alarmTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="malfunctionDetail != null">
+        MALFUNCTION_DETAIL = #{malfunctionDetail,jdbcType=VARCHAR},
+      </if>
+      <if test="malfunctionTime != null">
+        MALFUNCTION_TIME = #{malfunctionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="processResult != null">
+        PROCESS_RESULT = #{processResult,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ERROR_ALARM_ID = #{errorAlarmId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ERROR_ALARM_ID = #{errorAlarmId,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_MALFUNCTION_ALARM 
+      (ERROR_ALARM_ID, 
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, ALARM_TYPE_NO, 
+      ALARM_TYPE_NAME, CAR_NO, PREDICTION_NO, 
+      MALFUNCTION_DETAIL, MALFUNCTION_TIME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, PROCESS_RESULT)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.errorAlarmId,jdbcType=VARCHAR}, 
+      #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.alarmTypeNo,jdbcType=VARCHAR}, 
+      #{item.alarmTypeName,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.predictionNo,jdbcType=VARCHAR}, 
+      #{item.malfunctionDetail,jdbcType=VARCHAR}, #{item.malfunctionTime,jdbcType=TIMESTAMP}, 
+      #{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.memo,jdbcType=VARCHAR}, #{item.processResult,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_MALFUNCTION_ALARM
+     set
+       ERROR_ALARM_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.errorAlarmId,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.spotTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.spotTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,ALARM_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.alarmTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,ALARM_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.alarmTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,PREDICTION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MALFUNCTION_DETAIL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.malfunctionDetail,jdbcType=VARCHAR}
+       </foreach>
+       ,MALFUNCTION_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.malfunctionTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,PROCESS_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ERROR_ALARM_ID" close="end">
+          when #{item.errorAlarmId,jdbcType=VARCHAR} then #{item.processResult,jdbcType=VARCHAR}
+       </foreach>
+     where ERROR_ALARM_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.errorAlarmId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_MALFUNCTION_ALARM
+    where ERROR_ALARM_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/model/MeterWorkMalfunctionAlarm.java

@@ -0,0 +1,287 @@
+package com.steerinfo.meterwork.meterworkmalfunctionalarm.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="现场设备异常报警表")
+public class MeterWorkMalfunctionAlarm implements IBasePO<String> {
+    /**
+     * 主键(ERROR_ALARM_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String errorAlarmId;
+
+    /**
+     * 计量点编号(SPOT_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String spotTypeNo;
+
+    /**
+     * 计量点名称(SPOT_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量点名称",required=false)
+    private String spotTypeName;
+
+    /**
+     * 报警类型编码(ALARM_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="报警类型编码",required=false)
+    private String alarmTypeNo;
+
+    /**
+     * 报警类型名称(ALARM_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="报警类型名称",required=false)
+    private String alarmTypeName;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,25)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 委托编号(PREDICTION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="委托编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 报警内容(MALFUNCTION_DETAIL,VARCHAR,150)
+     */
+    @ApiModelProperty(value="报警内容",required=false)
+    private String malfunctionDetail;
+
+    /**
+     * 报警时间(MALFUNCTION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="报警时间",required=false)
+    private Date malfunctionTime;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(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_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="处理人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 处理人名称(UPDATE_MAN_NAME,VARCHAR,25)
+     */
+    @ApiModelProperty(value="处理人名称",required=false)
+    private String updateManName;
+
+    /**
+     * 处理时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="处理时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,120)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 处理结果(PROCESS_RESULT,VARCHAR,120)
+     */
+    @ApiModelProperty(value="处理结果",required=false)
+    private String processResult;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.errorAlarmId;
+    }
+
+    @Override
+    public void setId(String errorAlarmId) {
+        this.errorAlarmId = errorAlarmId == null ? null : errorAlarmId.trim();
+    }
+
+    public String getErrorAlarmId() {
+        return errorAlarmId;
+    }
+
+    public void setErrorAlarmId(String errorAlarmId) {
+        this.errorAlarmId = errorAlarmId == null ? null : errorAlarmId.trim();
+    }
+
+    public String getSpotTypeNo() {
+        return spotTypeNo;
+    }
+
+    public void setSpotTypeNo(String spotTypeNo) {
+        this.spotTypeNo = spotTypeNo == null ? null : spotTypeNo.trim();
+    }
+
+    public String getSpotTypeName() {
+        return spotTypeName;
+    }
+
+    public void setSpotTypeName(String spotTypeName) {
+        this.spotTypeName = spotTypeName == null ? null : spotTypeName.trim();
+    }
+
+    public String getAlarmTypeNo() {
+        return alarmTypeNo;
+    }
+
+    public void setAlarmTypeNo(String alarmTypeNo) {
+        this.alarmTypeNo = alarmTypeNo == null ? null : alarmTypeNo.trim();
+    }
+
+    public String getAlarmTypeName() {
+        return alarmTypeName;
+    }
+
+    public void setAlarmTypeName(String alarmTypeName) {
+        this.alarmTypeName = alarmTypeName == null ? null : alarmTypeName.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
+    }
+
+    public String getMalfunctionDetail() {
+        return malfunctionDetail;
+    }
+
+    public void setMalfunctionDetail(String malfunctionDetail) {
+        this.malfunctionDetail = malfunctionDetail == null ? null : malfunctionDetail.trim();
+    }
+
+    public Date getMalfunctionTime() {
+        return malfunctionTime;
+    }
+
+    public void setMalfunctionTime(Date malfunctionTime) {
+        this.malfunctionTime = malfunctionTime;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getProcessResult() {
+        return processResult;
+    }
+
+    public void setProcessResult(String processResult) {
+        this.processResult = processResult == null ? null : processResult.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", errorAlarmId=").append(errorAlarmId);
+        sb.append(", spotTypeNo=").append(spotTypeNo);
+        sb.append(", spotTypeName=").append(spotTypeName);
+        sb.append(", alarmTypeNo=").append(alarmTypeNo);
+        sb.append(", alarmTypeName=").append(alarmTypeName);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", predictionNo=").append(predictionNo);
+        sb.append(", malfunctionDetail=").append(malfunctionDetail);
+        sb.append(", malfunctionTime=").append(malfunctionTime);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", memo=").append(memo);
+        sb.append(", processResult=").append(processResult);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/service/IMeterWorkMalfunctionAlarmService.java

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

src/main/java/com/steerinfo/meterwork/meterworkmalfunctionalarm/service/impl/MeterWorkMalfunctionAlarmServiceImpl.java

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

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

@@ -286,6 +286,29 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "修改车号", notes = "根据MeterWorkRailwayActFirst对象修改车号")
+    @PostMapping(value = "/updateCar")
+    public RESTfulResult updateCar(@RequestBody MeterWorkRailwayActFirst model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkRailwayActFirstService.abolish(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("停用失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "停用", notes = "根据MeterWorkRailwayActFirst对象修改状态")
     @PostMapping(value = "/abolish")
     public RESTfulResult abolish(@RequestBody MeterWorkRailwayActFirst model) {

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

@@ -208,7 +208,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getValueFlag().equals(DbConstants.NET)) {
                 throw new MarkerMetException(500, "已结净的数据不可再废除!!");
             }
-            model.setValueFlag(DbConstants.INVALID);
+            model.setValueFlag("0");
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
@@ -239,7 +239,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getValueFlag().equals(DbConstants.NET)) {
                 throw new MarkerMetException(500, "该状态无法启用");
             }
-            model.setValueFlag(DbConstants.VALID);
+            if (model.getPredictionNo() != null && !"".equals(model.getPredictionNo())) {
+                model.setValueFlag("1");
+            } else {
+                model.setValueFlag("3");
+            }
+
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
 
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {

src/main/java/com/steerinfo/pretrack/prehookscale/controller/PreHookScaleController.java

@@ -1,11 +1,11 @@
-package com.steerinfo.meterwork.prehookscale.controller;
+package com.steerinfo.pretrack.prehookscale.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.prehookscale.model.PreHookScale;
-import com.steerinfo.meterwork.prehookscale.service.IPreHookScaleService;
+import com.steerinfo.pretrack.prehookscale.model.PreHookScale;
+import com.steerinfo.pretrack.prehookscale.service.IPreHookScaleService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -23,10 +23,10 @@ import java.math.BigDecimal;
 /**
  * PreHookScale RESTful接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-01-20 03:30
+ * @version 1.0-SNAPSHORT 2022-01-21 11:24
  * 类描述
  * 修订历史：
- * 日期：2022-01-20
+ * 日期：2022-01-21
  * 作者：generator
  * 参考：
  * 描述：PreHookScale RESTful接口

src/main/java/com/steerinfo/pretrack/prehookscale/mapper/PreHookScaleMapper.java

@@ -1,7 +1,7 @@
-package com.steerinfo.meterwork.prehookscale.mapper;
+package com.steerinfo.pretrack.prehookscale.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.meterwork.prehookscale.model.PreHookScale;
+import com.steerinfo.pretrack.prehookscale.model.PreHookScale;
 import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/steerinfo/pretrack/prehookscale/mapper/PreHookScaleMapper.xml

@@ -1,7 +1,7 @@
 <?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.prehookscale.mapper.PreHookScaleMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.prehookscale.model.PreHookScale">
+<mapper namespace="com.steerinfo.pretrack.prehookscale.mapper.PreHookScaleMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.pretrack.prehookscale.model.PreHookScale">
     <id column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
     <result column="NOTICE_NO" jdbcType="VARCHAR" property="noticeNo" />
     <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
@@ -597,7 +597,7 @@
         or STATION = #{station}
       </if>
   </delete>
-  <insert id="insert" parameterType="com.steerinfo.meterwork.prehookscale.model.PreHookScale">
+  <insert id="insert" parameterType="com.steerinfo.pretrack.prehookscale.model.PreHookScale">
     insert into PRE_HOOK_SCALE (PREDICTION_NO, NOTICE_NO, RAILWAY_NO, 
       RAILWAY_CARRIAGE_NO, MATTER_NO, MATTER_NAME, 
       CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
@@ -637,7 +637,7 @@
       #{railwayModelNo,jdbcType=VARCHAR}, #{railwayModelName,jdbcType=VARCHAR}, #{arrival,jdbcType=VARCHAR}, 
       #{station,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.prehookscale.model.PreHookScale">
+  <insert id="insertSelective" parameterType="com.steerinfo.pretrack.prehookscale.model.PreHookScale">
     insert into PRE_HOOK_SCALE
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="predictionNo != null">
@@ -974,7 +974,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.prehookscale.model.PreHookScale">
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.pretrack.prehookscale.model.PreHookScale">
     update PRE_HOOK_SCALE
     set NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
       RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
@@ -1032,7 +1032,7 @@
       STATION = #{station,jdbcType=VARCHAR}
     where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.prehookscale.model.PreHookScale">
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.pretrack.prehookscale.model.PreHookScale">
     update PRE_HOOK_SCALE
     <set>
       <if test="noticeNo != null">

src/main/java/com/steerinfo/pretrack/prehookscale/model/PreHookScale.java

@@ -1,4 +1,4 @@
-package com.steerinfo.meterwork.prehookscale.model;
+package com.steerinfo.pretrack.prehookscale.model;
 
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;

src/main/java/com/steerinfo/pretrack/prehookscale/service/IPreHookScaleService.java

@@ -1,17 +1,17 @@
-package com.steerinfo.meterwork.prehookscale.service;
+package com.steerinfo.pretrack.prehookscale.service;
 
 import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.meterwork.prehookscale.model.PreHookScale;
+import com.steerinfo.pretrack.prehookscale.model.PreHookScale;
 import java.util.Date;
 import java.math.BigDecimal;
 
 /**
  * PreHookScale服务接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-01-20 03:30
+ * @version 1.0-SNAPSHORT 2022-01-21 11:24
  * 类描述
  * 修订历史：
- * 日期：2022-01-20
+ * 日期：2022-01-21
  * 作者：generator
  * 参考：
  * 描述：PreHookScale服务接口

src/main/java/com/steerinfo/pretrack/prehookscale/service/impl/PreHookScaleServiceImpl.java

@@ -1,10 +1,10 @@
-package com.steerinfo.meterwork.prehookscale.service.impl;
+package com.steerinfo.pretrack.prehookscale.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.meterwork.prehookscale.model.PreHookScale;
-import com.steerinfo.meterwork.prehookscale.mapper.PreHookScaleMapper;
-import com.steerinfo.meterwork.prehookscale.service.IPreHookScaleService;
+import com.steerinfo.pretrack.prehookscale.model.PreHookScale;
+import com.steerinfo.pretrack.prehookscale.mapper.PreHookScaleMapper;
+import com.steerinfo.pretrack.prehookscale.service.IPreHookScaleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
@@ -13,10 +13,10 @@ import java.math.BigDecimal;
 /**
  * PreHookScale服务实现：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-01-20 03:30
+ * @version 1.0-SNAPSHORT 2022-01-21 11:24
  * 类描述
  * 修订历史：
- * 日期：2022-01-20
+ * 日期：2022-01-21
  * 作者：generator
  * 参考：
  * 描述：PreHookScale服务实现

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

@@ -219,9 +219,9 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         preTrackScaleMapper.insertSelective(model);
         //对预流程、预环节进行相应操作,配车的相应操作
         allocation(model);
-        //2021年5月3日对门岗核查信息及危化品进行处理
+        //2021年5月3日对门岗核查信息及危化品进行处理  2022.1.21注释创建预报新增车辆核查信息的语句
         if (StringUtils.isNotEmpty(model.getCarNo())) {
-            addCarCheckInfo(model);
+//            addCarCheckInfo(model);
         }
         return model;
     }
@@ -252,9 +252,9 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
             String no = preTrackScaleMapper.getNewID(sdf.format(new Date()));
             model.setPredictionNo(sdf.format(new Date()) + no);
         }
-        //2021年5月3日对门岗核查信息及危化品进行处理
+        //2021年5月3日对门岗核查信息及危化品进行处理  2022.1.21注释创建预报新增车辆核查信息的语句
         if (StringUtils.isNotEmpty(model.getCarNo())) {
-            addCarCheckInfo(model);
+//            addCarCheckInfo(model);
         }
 
         preTrackScaleMapper.insertSelective(model);