提交修改

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

@@ -1,7 +1,9 @@
 package com.steerinfo.baseinfo.meterbasecar.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
 import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
+import com.steerinfo.baseinfo.meterbasedriver.mapper.MeterBaseDriverMapper;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.baseinfo.meterbasedriver.service.IMeterBaseDriverService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -50,6 +53,12 @@ public class MeterBaseCarController extends BaseRESTfulController {
     @Autowired
     IMeterBaseDriverService meterBaseDriverService;
 
+    @Autowired
+    MeterBaseCarMapper meterBaseCarMapper;
+
+    @Autowired
+    MeterBaseDriverMapper meterBaseDriverMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -169,7 +178,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
             HashMap ssoMap = ssoUtil.ssoRegister(params);
 
             // sso注册成功时，增加车辆表
-            if (ssoMap.get("code").equals("1")) {
+            if (ssoMap.get("code").equals("1") && !"账号已被注册".equals(ssoMap.get("msg").toString())) {
                 return failed(null, ssoMap.get("msg").toString());
             }
             else {
@@ -182,6 +191,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 queryCar.put("validFlag", "0");
                 List<MeterBaseCar> queryList = meterBaseCarService.query(queryCar);
 
+                meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
+
                 // 车辆表已存在时，跳过
                 if(queryList.size() == 0) {
                     // 新增车辆
@@ -203,7 +214,6 @@ public class MeterBaseCarController extends BaseRESTfulController {
 
                     meterBaseCarService.add(car);
                 }
-
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
                 // 循环新增司机
@@ -218,7 +228,10 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     // 司机表已存在时，跳过
                     if(list.size() == 0){
                         // 将司机信息加入实体
-                        // 司机号为车号+司机手机号
+                        // 主键改为日期主键
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                        String no = meterBaseDriverMapper.getNewID(sdf.format(new Date()));
+//                        driver.setId(sdf.format(new Date()) + no);
                         driver.setId(params.get("carNo").toString()+driver.getTelNum());
                         driver.setCarId(params.get("carNo").toString());
                         driver.setValidFlag("0");

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

@@ -6,6 +6,8 @@ import java.math.*;
 import java.util.List;
 import java.util.Map;
 
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -13,4 +15,6 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
     String GetNewID();
 
     List<MeterBaseCar> selectForUpdate(Map<String, Object> parameters);
+
+    void batchDeleteSelf(@Param(value = "carNo") String carNo);
 }

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

@@ -639,4 +639,10 @@
       </if>
     </where>
   </select>
+
+<!--  批量删除车辆对应司机信息-->
+  <delete id="batchDeleteSelf" parameterType="java.lang.String">
+    delete from METER_BASE_CAR
+    where car_no = #{carNo}
+  </delete>
 </mapper>

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

@@ -3,8 +3,13 @@ package com.steerinfo.baseinfo.meterbasedriver.mapper;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+
+import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, String> {
+    void batchDeleteSelf(@Param(value = "carId") String carId);
+
+    String getNewID(@org.apache.ibatis.annotations.Param(value="afl")String afl);
 }

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

@@ -492,5 +492,14 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <!--  批量删除车辆对应司机信息-->
+  <delete id="batchDeleteSelf" parameterType="java.lang.String">
+    delete from METER_BASE_DRIVER
+    where CAR_ID = #{carId}
+  </delete>
+
+  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(DRIVER_NO,9))),0) + 1,4,'0') DRIVER_NO
+    FROM METER_BASE_DRIVER where instr(DRIVER_NO,#{afl,jdbcType=VARCHAR})>0
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterfilerecord/controller/MeterFileRecordController.java

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

src/main/java/com/steerinfo/baseinfo/meterfilerecord/mapper/MeterFileRecordMapper.java

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

src/main/java/com/steerinfo/baseinfo/meterfilerecord/mapper/MeterFileRecordMapper.xml

@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterfilerecord.mapper.MeterFileRecordMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterfilerecord.model.MeterFileRecord">
+    <id column="FILE_RECORD_ID" jdbcType="VARCHAR" property="fileRecordId" />
+    <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
+    <result column="OPERATION_NAME" jdbcType="VARCHAR" property="operationName" />
+    <result column="OPERATION_MAN_NAME" jdbcType="VARCHAR" property="operationManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+  </resultMap>
+  <sql id="columns">
+    FILE_RECORD_ID, FILE_NAME, OPERATION_NAME, OPERATION_MAN_NAME, CREATE_TIME, MEMO
+  </sql>
+  <sql id="columns_alias">
+    t.FILE_RECORD_ID, t.FILE_NAME, t.OPERATION_NAME, t.OPERATION_MAN_NAME, t.CREATE_TIME, 
+    t.MEMO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_FILE_RECORD
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_FILE_RECORD t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="fileRecordId != null and fileRecordId != ''">
+        and FILE_RECORD_ID = #{fileRecordId}
+      </if>
+      <if test="fileName != null and fileName != ''">
+        and FILE_NAME = #{fileName}
+      </if>
+      <if test="operationName != null and operationName != ''">
+        and OPERATION_NAME = #{operationName}
+      </if>
+      <if test="operationManName != null and operationManName != ''">
+        and OPERATION_MAN_NAME = #{operationManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="fileRecordId != null and fileRecordId != ''">
+        and FILE_RECORD_ID LIKE '%${fileRecordId}%'
+      </if>
+      <if test="fileName != null and fileName != ''">
+        and FILE_NAME LIKE '%${fileName}%'
+      </if>
+      <if test="operationName != null and operationName != ''">
+        and OPERATION_NAME LIKE '%${operationName}%'
+      </if>
+      <if test="operationManName != null and operationManName != ''">
+        and OPERATION_MAN_NAME LIKE '%${operationManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_FILE_RECORD
+    where FILE_RECORD_ID = #{fileRecordId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_FILE_RECORD
+    where 1!=1 
+      <if test="fileName != null and fileName != ''">
+        or FILE_NAME = #{fileName}
+      </if>
+      <if test="operationName != null and operationName != ''">
+        or OPERATION_NAME = #{operationName}
+      </if>
+      <if test="operationManName != null and operationManName != ''">
+        or OPERATION_MAN_NAME = #{operationManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterfilerecord.model.MeterFileRecord">
+    insert into METER_FILE_RECORD (FILE_RECORD_ID, FILE_NAME, OPERATION_NAME, 
+      OPERATION_MAN_NAME, CREATE_TIME, MEMO
+      )
+    values (#{fileRecordId,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{operationName,jdbcType=VARCHAR}, 
+      #{operationManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterfilerecord.model.MeterFileRecord">
+    insert into METER_FILE_RECORD
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fileRecordId != null">
+        FILE_RECORD_ID,
+      </if>
+      <if test="fileName != null">
+        FILE_NAME,
+      </if>
+      <if test="operationName != null">
+        OPERATION_NAME,
+      </if>
+      <if test="operationManName != null">
+        OPERATION_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fileRecordId != null">
+        #{fileRecordId,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null">
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="operationName != null">
+        #{operationName,jdbcType=VARCHAR},
+      </if>
+      <if test="operationManName != null">
+        #{operationManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterfilerecord.model.MeterFileRecord">
+    update METER_FILE_RECORD
+    set FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      OPERATION_NAME = #{operationName,jdbcType=VARCHAR},
+      OPERATION_MAN_NAME = #{operationManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      MEMO = #{memo,jdbcType=VARCHAR}
+    where FILE_RECORD_ID = #{fileRecordId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterfilerecord.model.MeterFileRecord">
+    update METER_FILE_RECORD
+    <set>
+      <if test="fileName != null">
+        FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="operationName != null">
+        OPERATION_NAME = #{operationName,jdbcType=VARCHAR},
+      </if>
+      <if test="operationManName != null">
+        OPERATION_MAN_NAME = #{operationManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where FILE_RECORD_ID = #{fileRecordId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where FILE_RECORD_ID = #{fileRecordId,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_FILE_RECORD 
+      (FILE_RECORD_ID, 
+      FILE_NAME, OPERATION_NAME, OPERATION_MAN_NAME, 
+      CREATE_TIME, MEMO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.fileRecordId,jdbcType=VARCHAR}, 
+      #{item.fileName,jdbcType=VARCHAR}, #{item.operationName,jdbcType=VARCHAR}, #{item.operationManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.memo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_FILE_RECORD
+     set
+       FILE_RECORD_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.fileRecordId,jdbcType=VARCHAR}
+       </foreach>
+       ,FILE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.fileName,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.operationName,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.operationManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_RECORD_ID" close="end">
+          when #{item.fileRecordId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+     where FILE_RECORD_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.fileRecordId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_FILE_RECORD
+    where FILE_RECORD_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterfilerecord/model/MeterFileRecord.java

@@ -0,0 +1,122 @@
+package com.steerinfo.baseinfo.meterfilerecord.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 MeterFileRecord implements IBasePO<String> {
+    /**
+     * 主键(FILE_RECORD_ID,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String fileRecordId;
+
+    /**
+     * 文件名称(FILE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="文件名称",required=false)
+    private String fileName;
+
+    /**
+     * 操作功能名称(OPERATION_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="操作功能名称",required=false)
+    private String operationName;
+
+    /**
+     * 操作人名称(OPERATION_MAN_NAME,VARCHAR,35)
+     */
+    @ApiModelProperty(value="操作人名称",required=false)
+    private String operationManName;
+
+    /**
+     * 操作时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="操作时间",required=false)
+    private Date createTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.fileRecordId;
+    }
+
+    @Override
+    public void setId(String fileRecordId) {
+        this.fileRecordId = fileRecordId == null ? null : fileRecordId.trim();
+    }
+
+    public String getFileRecordId() {
+        return fileRecordId;
+    }
+
+    public void setFileRecordId(String fileRecordId) {
+        this.fileRecordId = fileRecordId == null ? null : fileRecordId.trim();
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName == null ? null : fileName.trim();
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName == null ? null : operationName.trim();
+    }
+
+    public String getOperationManName() {
+        return operationManName;
+    }
+
+    public void setOperationManName(String operationManName) {
+        this.operationManName = operationManName == null ? null : operationManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    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(", fileRecordId=").append(fileRecordId);
+        sb.append(", fileName=").append(fileName);
+        sb.append(", operationName=").append(operationName);
+        sb.append(", operationManName=").append(operationManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", memo=").append(memo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterfilerecord/service/IMeterFileRecordService.java

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

src/main/java/com/steerinfo/baseinfo/meterfilerecord/service/impl/MeterFileRecordServiceImpl.java

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

src/main/java/com/steerinfo/baseinfo/meterfilestorage/controller/MeterFileStorageController.java

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

src/main/java/com/steerinfo/baseinfo/meterfilestorage/mapper/MeterFileStorageMapper.java

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

src/main/java/com/steerinfo/baseinfo/meterfilestorage/mapper/MeterFileStorageMapper.xml

@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterfilestorage.mapper.MeterFileStorageMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterfilestorage.model.MeterFileStorage">
+    <id column="FILE_ID" jdbcType="VARCHAR" property="fileId" />
+    <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
+    <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
+    <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="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+  </resultMap>
+  <sql id="columns">
+    FILE_ID, FILE_NAME, FILE_PATH, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME, MEMO, VALID_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.FILE_ID, t.FILE_NAME, t.FILE_PATH, 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.VALID_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_FILE_STORAGE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_FILE_STORAGE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="fileId != null and fileId != ''">
+        and FILE_ID = #{fileId}
+      </if>
+      <if test="fileName != null and fileName != ''">
+        and FILE_NAME = #{fileName}
+      </if>
+      <if test="filePath != null and filePath != ''">
+        and FILE_PATH = #{filePath}
+      </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="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="fileId != null and fileId != ''">
+        and FILE_ID LIKE '%${fileId}%'
+      </if>
+      <if test="fileName != null and fileName != ''">
+        and FILE_NAME LIKE '%${fileName}%'
+      </if>
+      <if test="filePath != null and filePath != ''">
+        and FILE_PATH LIKE '%${filePath}%'
+      </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="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_FILE_STORAGE
+    where FILE_ID = #{fileId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_FILE_STORAGE
+    where 1!=1 
+      <if test="fileName != null and fileName != ''">
+        or FILE_NAME = #{fileName}
+      </if>
+      <if test="filePath != null and filePath != ''">
+        or FILE_PATH = #{filePath}
+      </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="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterfilestorage.model.MeterFileStorage">
+    insert into METER_FILE_STORAGE (FILE_ID, FILE_NAME, FILE_PATH, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, VALID_FLAG)
+    values (#{fileId,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterfilestorage.model.MeterFileStorage">
+    insert into METER_FILE_STORAGE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fileId != null">
+        FILE_ID,
+      </if>
+      <if test="fileName != null">
+        FILE_NAME,
+      </if>
+      <if test="filePath != null">
+        FILE_PATH,
+      </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="validFlag != null">
+        VALID_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fileId != null">
+        #{fileId,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null">
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null">
+        #{filePath,jdbcType=VARCHAR},
+      </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="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterfilestorage.model.MeterFileStorage">
+    update METER_FILE_STORAGE
+    set FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      FILE_PATH = #{filePath,jdbcType=VARCHAR},
+      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},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR}
+    where FILE_ID = #{fileId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterfilestorage.model.MeterFileStorage">
+    update METER_FILE_STORAGE
+    <set>
+      <if test="fileName != null">
+        FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null">
+        FILE_PATH = #{filePath,jdbcType=VARCHAR},
+      </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="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where FILE_ID = #{fileId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where FILE_ID = #{fileId,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_FILE_STORAGE 
+      (FILE_ID, 
+      FILE_NAME, FILE_PATH, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, VALID_FLAG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.fileId,jdbcType=VARCHAR}, 
+      #{item.fileName,jdbcType=VARCHAR}, #{item.filePath,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_FILE_STORAGE
+     set
+       FILE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.fileId,jdbcType=VARCHAR}
+       </foreach>
+       ,FILE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.fileName,jdbcType=VARCHAR}
+       </foreach>
+       ,FILE_PATH=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.filePath,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FILE_ID" close="end">
+          when #{item.fileId,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+     where FILE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.fileId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_FILE_STORAGE
+    where FILE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterfilestorage/model/MeterFileStorage.java

@@ -0,0 +1,197 @@
+package com.steerinfo.baseinfo.meterfilestorage.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 MeterFileStorage implements IBasePO<String> {
+    /**
+     * 主键(FILE_ID,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String fileId;
+
+    /**
+     * 文件名称(FILE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="文件名称",required=true)
+    private String fileName;
+
+    /**
+     * 文件路径(FILE_PATH,VARCHAR,50)
+     */
+    @ApiModelProperty(value="文件路径",required=false)
+    private String filePath;
+
+    /**
+     * 创建人编号(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,100)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 0为无效，1为有效(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="0为无效，1为有效",required=false)
+    private String validFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.fileId;
+    }
+
+    @Override
+    public void setId(String fileId) {
+        this.fileId = fileId == null ? null : fileId.trim();
+    }
+
+    public String getFileId() {
+        return fileId;
+    }
+
+    public void setFileId(String fileId) {
+        this.fileId = fileId == null ? null : fileId.trim();
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName == null ? null : fileName.trim();
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath == null ? null : filePath.trim();
+    }
+
+    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 getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", fileId=").append(fileId);
+        sb.append(", fileName=").append(fileName);
+        sb.append(", filePath=").append(filePath);
+        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(", validFlag=").append(validFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterfilestorage/service/IMeterFileStorageService.java

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

src/main/java/com/steerinfo/baseinfo/meterfilestorage/service/impl/MeterFileStorageServiceImpl.java

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

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

@@ -773,7 +773,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             model.setNetManNo(userId);
             model.setNetManName(userName);
             model.setNetWeight(model.getGrossWeight().subtract(model.getTareWeight()));
-            model.setActualNo(meterWorkCarActualMapper.getNewID(sdf.format(new Date())));
+            model.setActualNo(sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(sdf.format(new Date())));
         }
     }