新增了“承运单位名称表直接录入”接口

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/controller/MeterBaseUnitDirectController.java

@@ -0,0 +1,127 @@
+package com.steerinfo.baseinfo.meterbaseunitdirect.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.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.baseinfo.meterbaseunitdirect.service.IMeterBaseUnitDirectService;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * MeterBaseUnitDirect RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-02-14 11:33
+ * 类描述
+ * 修订历史：
+ * 日期：2022-02-14
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseUnitDirect RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaseunitdirects")
+@Api(value = "/${api.version}/meterbasematterinfodirects", tags = "承运单位名称表直接录入 - MeterBaseUnitDirectController")
+public class MeterBaseUnitDirectController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseUnitDirectService meterBaseUnitDirectService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseunitdirect:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUnitDirect> list = meterBaseUnitDirectService.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("meterbaseunitdirect:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUnitDirect> list = meterBaseUnitDirectService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseUnitDirect对象创建")
+    @ApiImplicitParam(name = "meterBaseUnitDirect", value = "详细实体meterBaseUnitDirect", required = true, dataType = "MeterBaseUnitDirect")
+    //@RequiresPermissions("meterbaseunitdirect:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody MeterBaseUnitDirect model){
+        try{
+            String msg = meterBaseUnitDirectService.checkandadd(model);
+            if (msg != "" && !msg.equals("")) {
+                return  failed(null,msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseunitdirect:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseUnitDirect meterBaseUnitDirect = meterBaseUnitDirectService.getById(id);
+        return success(meterBaseUnitDirect);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseUnitDirect信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseUnitDirect", value = "详细实体meterBaseUnitDirect", required = true, dataType = "MeterBaseUnitDirect")
+    })
+    //@RequiresPermissions("meterbaseunitdirect:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseUnitDirect model){
+        try {
+            String msg = meterBaseUnitDirectService.checkandupdate(id,model);
+            if (msg != "" && !msg.equals("")){
+                return failed(null,msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseunitdirect: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);
+			  meterBaseUnitDirectService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/mapper/MeterBaseUnitDirectMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.baseinfo.meterbaseunitdirect.mapper;
+
+import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
+import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseUnitDirectMapper extends IBaseMapper<MeterBaseUnitDirect, String> {
+    String GetNewID();
+
+    List<MeterBaseUnitDirect> selectForUpdate(Map<String, Object> parameters);
+}

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/mapper/MeterBaseUnitDirectMapper.xml

@@ -0,0 +1,459 @@
+<?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.meterbaseunitdirect.mapper.MeterBaseUnitDirectMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect">
+    <id column="CARRIER_UNIT_NO" jdbcType="VARCHAR" property="carrierUnitNo" />
+    <result column="CARRIER_UNIT_NAME" jdbcType="VARCHAR" property="carrierUnitName" />
+    <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
+    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="UNIT_TYPE" jdbcType="VARCHAR" property="unitType" />
+  </resultMap>
+  <sql id="columns">
+    CARRIER_UNIT_NO, CARRIER_UNIT_NAME, MNEMONIC_CODE, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, 
+    DELETE_TIME, UNIT_TYPE
+  </sql>
+  <sql id="columns_alias">
+    t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.MNEMONIC_CODE, t.VALID_FLAG, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.UNIT_TYPE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_UNIT_DIRECT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_UNIT_DIRECT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO = #{carrierUnitNo}
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME = #{carrierUnitName}
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        and MNEMONIC_CODE = #{mnemonicCode}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="unitType != null and unitType != ''">
+        and UNIT_TYPE = #{unitType}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        and MNEMONIC_CODE LIKE '%${mnemonicCode}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="unitType != null and unitType != ''">
+        and UNIT_TYPE LIKE '%${unitType}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_UNIT_DIRECT
+    where CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_UNIT_DIRECT
+    where 1!=1 
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        or CARRIER_UNIT_NAME = #{carrierUnitName}
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        or MNEMONIC_CODE = #{mnemonicCode}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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="deleteManNo != null and deleteManNo != ''">
+        or DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        or DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="unitType != null and unitType != ''">
+        or UNIT_TYPE = #{unitType}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect">
+    insert into METER_BASE_UNIT_DIRECT (CARRIER_UNIT_NO, CARRIER_UNIT_NAME, MNEMONIC_CODE, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, 
+      DELETE_TIME, UNIT_TYPE)
+    values (#{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, #{mnemonicCode,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, 
+      #{deleteTime,jdbcType=TIMESTAMP}, #{unitType,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect">
+    insert into METER_BASE_UNIT_DIRECT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="carrierUnitNo != null">
+        CARRIER_UNIT_NO,
+      </if>
+      <if test="carrierUnitName != null">
+        CARRIER_UNIT_NAME,
+      </if>
+      <if test="mnemonicCode != null">
+        MNEMONIC_CODE,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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="deleteManNo != null">
+        DELETE_MAN_NO,
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="unitType != null">
+        UNIT_TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="carrierUnitNo != null">
+        #{carrierUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierUnitName != null">
+        #{carrierUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonicCode != null">
+        #{mnemonicCode,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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="deleteManNo != null">
+        #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitType != null">
+        #{unitType,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect">
+    update METER_BASE_UNIT_DIRECT
+    set CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
+      MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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},
+      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      UNIT_TYPE = #{unitType,jdbcType=VARCHAR}
+    where CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect">
+    update METER_BASE_UNIT_DIRECT
+    <set>
+      <if test="carrierUnitName != null">
+        CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonicCode != null">
+        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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="deleteManNo != null">
+        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitType != null">
+        UNIT_TYPE = #{unitType,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_UNIT_DIRECT 
+      (CARRIER_UNIT_NO, 
+      CARRIER_UNIT_NAME, MNEMONIC_CODE, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, 
+      DELETE_TIME, UNIT_TYPE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carrierUnitNo,jdbcType=VARCHAR}, 
+      #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, 
+      #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, 
+      #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.unitType,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_UNIT_DIRECT
+     set
+       CARRIER_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,MNEMONIC_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UNIT_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIER_UNIT_NO" close="end">
+          when #{item.carrierUnitNo,jdbcType=VARCHAR} then #{item.unitType,jdbcType=VARCHAR}
+       </foreach>
+     where CARRIER_UNIT_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.carrierUnitNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_UNIT_DIRECT
+    where CARRIER_UNIT_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+  SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(CARRIER_UNIT_NO, LENGTH(CARRIER_UNIT_NO) -3))),0) + 1,4,'0') CARRIER_UNIT_NO
+  FROM METER_BASE_UNIT_DIRECT where instr(CARRIER_UNIT_NO, to_char(sysdate, 'yyyyMMdd')) > 0
+  </select>
+
+  <select id="selectForUpdate" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO != #{carrierUnitNo}
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME = #{carrierUnitName}
+      </if>
+    </where>
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/model/MeterBaseUnitDirect.java

@@ -0,0 +1,242 @@
+package com.steerinfo.baseinfo.meterbaseunitdirect.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterBaseUnitDirect implements IBasePO<String> {
+    /**
+     * 承运单位编号(YYYYMMDD+4位流水)(CARRIER_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="承运单位编号(YYYYMMDD+4位流水)",required=true)
+    private String carrierUnitNo;
+
+    /**
+     * 承运单位名称(CARRIER_UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="承运单位名称",required=true)
+    private String carrierUnitName;
+
+    /**
+     * 助记码(MNEMONIC_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="助记码",required=false)
+    private String mnemonicCode;
+
+    /**
+     * 状态(	0：无效；1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(	0：无效；1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间(YYYY-MM-DD HH:mm:SS)(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date deleteTime;
+
+    /**
+     * 单位类型(1.发货单位，2.收货单位维护，3.录入单位)(UNIT_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="单位类型(1.发货单位，2.收货单位维护，3.录入单位)",required=true)
+    private String unitType;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.carrierUnitNo;
+    }
+
+    @Override
+    public void setId(String carrierUnitNo) {
+        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
+    }
+
+    public String getCarrierUnitNo() {
+        return carrierUnitNo;
+    }
+
+    public void setCarrierUnitNo(String carrierUnitNo) {
+        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
+    }
+
+    public String getCarrierUnitName() {
+        return carrierUnitName;
+    }
+
+    public void setCarrierUnitName(String carrierUnitName) {
+        this.carrierUnitName = carrierUnitName == null ? null : carrierUnitName.trim();
+    }
+
+    public String getMnemonicCode() {
+        return mnemonicCode;
+    }
+
+    public void setMnemonicCode(String mnemonicCode) {
+        this.mnemonicCode = mnemonicCode == null ? null : mnemonicCode.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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 getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public String getUnitType() {
+        return unitType;
+    }
+
+    public void setUnitType(String unitType) {
+        this.unitType = unitType == null ? null : unitType.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", carrierUnitNo=").append(carrierUnitNo);
+        sb.append(", carrierUnitName=").append(carrierUnitName);
+        sb.append(", mnemonicCode=").append(mnemonicCode);
+        sb.append(", validFlag=").append(validFlag);
+        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(", deleteManNo=").append(deleteManNo);
+        sb.append(", deleteManName=").append(deleteManName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", unitType=").append(unitType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/service/IMeterBaseUnitDirectService.java

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

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/service/impl/MeterBaseUnitDirectServiceImpl.java

@@ -0,0 +1,88 @@
+package com.steerinfo.baseinfo.meterbaseunitdirect.service.impl;
+
+import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
+import com.steerinfo.baseinfo.meterbasematterinfodirect.model.MeterBaseMatterInfoDirect;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.baseinfo.meterbaseunitdirect.mapper.MeterBaseUnitDirectMapper;
+import com.steerinfo.baseinfo.meterbaseunitdirect.service.IMeterBaseUnitDirectService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseUnitDirect服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-02-14 11:33
+ * 类描述
+ * 修订历史：
+ * 日期：2022-02-14
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseUnitDirect服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseUnitDirectService")
+public class MeterBaseUnitDirectServiceImpl extends BaseServiceImpl<MeterBaseUnitDirect, String> implements IMeterBaseUnitDirectService {
+
+    @Autowired
+    private MeterBaseUnitDirectMapper meterBaseUnitDirectMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseUnitDirect, String> getMapper() {
+        return meterBaseUnitDirectMapper;
+    }
+
+    @Override
+    public String checkandadd(MeterBaseUnitDirect model) {
+        if (StringUtils.isEmpty(model.getCarrierUnitName())) {
+            return "承运单位名称不能为空";
+        }
+        if (StringUtils.isEmpty(model.getUnitType())){
+            return "单位类型不能为空";
+        }
+        HashMap<String, Object> obj1 = new HashMap<>();
+        obj1.put("carrierUnitName", model.getCarrierUnitName());
+        List<MeterBaseUnitDirect> com1 = meterBaseUnitDirectMapper.selectByParameters(obj1);
+        if (!com1.isEmpty()) {
+            return "该承运单位名称已存在";
+        }
+        String no = meterBaseUnitDirectMapper.GetNewID();
+        model.setCarrierUnitNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+        model.setCreateTime(new Date());
+        model.setValidFlag("1");//有效
+        meterBaseUnitDirectMapper.insert(model);
+        return "";
+    }
+
+    @Override
+    public String checkandupdate(String id, MeterBaseUnitDirect model) {
+        if (model.getCarrierUnitName() == null || model.getCarrierUnitName().equals("")) {
+            return "承运单位名称不能为空";
+        }
+        if (StringUtils.isEmpty(model.getUnitType())){
+            return "单位类型不能为空";
+        }
+        HashMap<String, Object> obj1 = new HashMap<>();
+        obj1.put("carrierUnitName", model.getCarrierUnitName());
+        obj1.put("carrierUnitNo", id);
+        List<MeterBaseUnitDirect> com = meterBaseUnitDirectMapper.selectForUpdate(obj1);
+        if (!com.isEmpty() && com.size() > 1) {
+            return "该承运单位名称已存在！";
+        }
+        if (!com.isEmpty() && com.size() == 1 && !com.get(0).getCarrierUnitNo().equals(id)) {
+            return "该承运单位名称已存在！";
+        }
+        model.setUpdateTime(new Date());
+        meterBaseUnitDirectMapper.updateByPrimaryKey(model);
+        return "";
+    }
+}