Преглед изворни кода

1.SSOUtil代码整合
2.增加独立车辆表和司机表

BourneCao пре 4 година
родитељ
комит
c296a2771b
16 измењених фајлова са 2486 додато и 227 уклоњено
  1. 104 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java
  2. 10 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java
  3. 600 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml
  4. 339 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/model/MeterBaseCar.java
  5. 23 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/service/IMeterBaseCarService.java
  6. 36 0
      src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java
  7. 93 227
      src/main/java/com/steerinfo/baseinfo/meterbasecussupcar/controller/MeterBaseCusSupCarController.java
  8. 110 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java
  9. 10 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java
  10. 496 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml
  11. 272 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/model/MeterBaseDriver.java
  12. 23 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/IMeterBaseDriverService.java
  13. 36 0
      src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/impl/MeterBaseDriverServiceImpl.java
  14. 26 0
      src/main/java/com/steerinfo/util/Configuration.java
  15. 76 0
      src/main/java/com/steerinfo/util/HttpsRequest.java
  16. 232 0
      src/main/java/com/steerinfo/util/SSOUtil.java

+ 104 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

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

+ 10 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

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

+ 600 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -0,0 +1,600 @@
+<?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.meterbasecar.mapper.MeterBaseCarMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    <id column="PK_NO" jdbcType="VARCHAR" property="pkNo" />
+    <id column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
+    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
+    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
+    <result column="CAR_TYPE_NO" jdbcType="VARCHAR" property="carTypeNo" />
+    <result column="CAR_TYPE_NAME" jdbcType="VARCHAR" property="carTypeName" />
+    <result column="CAR_CARRIER_WEIGHT" jdbcType="DECIMAL" property="carCarrierWeight" />
+    <result column="CAR_SELF_WEIGHT" jdbcType="DECIMAL" property="carSelfWeight" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <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_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" />
+  </resultMap>
+  <sql id="columns">
+    PK_NO, UPDATE_MAN_NO, CAR_NO, MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
+    CAR_TYPE_NO, CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, CAR_SELF_WEIGHT, MEMO, VALID_FLAG, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, 
+    DELETE_MAN_NAME, DELETE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.PK_NO, t.UPDATE_MAN_NO, t.CAR_NO, t.MNEMONIC_CODE, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, 
+    t.CAR_TYPE_NO, t.CAR_TYPE_NAME, t.CAR_CARRIER_WEIGHT, t.CAR_SELF_WEIGHT, t.MEMO, 
+    t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_CAR
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="pkNo != null and pkNo != ''">
+        and PK_NO = #{pkNo}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        and MNEMONIC_CODE = #{mnemonicCode}
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="carTypeNo != null and carTypeNo != ''">
+        and CAR_TYPE_NO = #{carTypeNo}
+      </if>
+      <if test="carTypeName != null and carTypeName != ''">
+        and CAR_TYPE_NAME = #{carTypeName}
+      </if>
+      <if test="carCarrierWeight != null">
+        and CAR_CARRIER_WEIGHT = #{carCarrierWeight}
+      </if>
+      <if test="carSelfWeight != null">
+        and CAR_SELF_WEIGHT = #{carSelfWeight}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </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="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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="pkNo != null and pkNo != ''">
+        and PK_NO LIKE '%${pkNo}%'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        and MNEMONIC_CODE LIKE '%${mnemonicCode}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="carTypeNo != null and carTypeNo != ''">
+        and CAR_TYPE_NO LIKE '%${carTypeNo}%'
+      </if>
+      <if test="carTypeName != null and carTypeName != ''">
+        and CAR_TYPE_NAME LIKE '%${carTypeName}%'
+      </if>
+      <if test="carCarrierWeight != null">
+        and CAR_CARRIER_WEIGHT = #{carCarrierWeight}
+      </if>
+      <if test="carSelfWeight != null">
+        and CAR_SELF_WEIGHT = #{carSelfWeight}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </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="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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    delete from METER_BASE_CAR
+    where PK_NO = #{pkNo,jdbcType=VARCHAR}
+      and UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_CAR
+    where 1!=1 
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="mnemonicCode != null and mnemonicCode != ''">
+        or MNEMONIC_CODE = #{mnemonicCode}
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="carTypeNo != null and carTypeNo != ''">
+        or CAR_TYPE_NO = #{carTypeNo}
+      </if>
+      <if test="carTypeName != null and carTypeName != ''">
+        or CAR_TYPE_NAME = #{carTypeName}
+      </if>
+      <if test="carCarrierWeight != null">
+        or CAR_CARRIER_WEIGHT = #{carCarrierWeight}
+      </if>
+      <if test="carSelfWeight != null">
+        or CAR_SELF_WEIGHT = #{carSelfWeight}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </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="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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    insert into METER_BASE_CAR (PK_NO, UPDATE_MAN_NO, CAR_NO, 
+      MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
+      CAR_TYPE_NO, CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, 
+      CAR_SELF_WEIGHT, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, 
+      DELETE_MAN_NAME, DELETE_TIME)
+    values (#{pkNo,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{mnemonicCode,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
+      #{carTypeNo,jdbcType=VARCHAR}, #{carTypeName,jdbcType=VARCHAR}, #{carCarrierWeight,jdbcType=DECIMAL}, 
+      #{carSelfWeight,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, 
+      #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    insert into METER_BASE_CAR
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="pkNo != null">
+        PK_NO,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="mnemonicCode != null">
+        MNEMONIC_CODE,
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO,
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME,
+      </if>
+      <if test="carTypeNo != null">
+        CAR_TYPE_NO,
+      </if>
+      <if test="carTypeName != null">
+        CAR_TYPE_NAME,
+      </if>
+      <if test="carCarrierWeight != null">
+        CAR_CARRIER_WEIGHT,
+      </if>
+      <if test="carSelfWeight != null">
+        CAR_SELF_WEIGHT,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </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="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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="pkNo != null">
+        #{pkNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonicCode != null">
+        #{mnemonicCode,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeNo != null">
+        #{carTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeName != null">
+        #{carTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carCarrierWeight != null">
+        #{carCarrierWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="carSelfWeight != null">
+        #{carSelfWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="memo != null">
+        #{memo,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="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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    update METER_BASE_CAR
+    set CAR_NO = #{carNo,jdbcType=VARCHAR},
+      MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      CAR_TYPE_NO = #{carTypeNo,jdbcType=VARCHAR},
+      CAR_TYPE_NAME = #{carTypeName,jdbcType=VARCHAR},
+      CAR_CARRIER_WEIGHT = #{carCarrierWeight,jdbcType=DECIMAL},
+      CAR_SELF_WEIGHT = #{carSelfWeight,jdbcType=DECIMAL},
+      MEMO = #{memo,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_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}
+    where PK_NO = #{pkNo,jdbcType=VARCHAR}
+      and UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    update METER_BASE_CAR
+    <set>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonicCode != null">
+        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeNo != null">
+        CAR_TYPE_NO = #{carTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeName != null">
+        CAR_TYPE_NAME = #{carTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carCarrierWeight != null">
+        CAR_CARRIER_WEIGHT = #{carCarrierWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="carSelfWeight != null">
+        CAR_SELF_WEIGHT = #{carSelfWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,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="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>
+    </set>
+    where PK_NO = #{pkNo,jdbcType=VARCHAR}
+      and UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where PK_NO = #{pkNo,jdbcType=VARCHAR}
+      and UPDATE_MAN_NO = #{updateManNo,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_CAR 
+      (PK_NO, 
+      UPDATE_MAN_NO, CAR_NO, MNEMONIC_CODE, 
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
+      CAR_TYPE_NO, CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, 
+      CAR_SELF_WEIGHT, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.pkNo,jdbcType=VARCHAR}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, 
+      #{item.customerSupplierNo,jdbcType=VARCHAR}, #{item.customerSupplierName,jdbcType=VARCHAR}, 
+      #{item.carTypeNo,jdbcType=VARCHAR}, #{item.carTypeName,jdbcType=VARCHAR}, #{item.carCarrierWeight,jdbcType=DECIMAL}, 
+      #{item.carSelfWeight,jdbcType=DECIMAL}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
+      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_CAR
+     set
+       PK_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.pkNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MNEMONIC_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.carTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.carTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_CARRIER_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.carCarrierWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,CAR_SELF_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.carSelfWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+    where (PK_NO,UPDATE_MAN_NO) in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+     (#{item.pkNo, jdbcType=VARCHAR},#{item.updateManNo, jdbcType=VARCHAR})
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_CAR
+    where (PK_NO,UPDATE_MAN_NO) in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+     ( #{item.pkNo, jdbcType=VARCHAR}, #{item.updateManNo, jdbcType=VARCHAR})
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 339 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/model/MeterBaseCar.java

@@ -0,0 +1,339 @@
+package com.steerinfo.baseinfo.meterbasecar.model;
+
+import com.steerinfo.framework.model.ICBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@ApiModel(value="null")
+public class MeterBaseCar implements ICBasePO<MeterBaseCar> {
+    /**
+     * 主键编号(YYYYMMDD+4位流水)(PK_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键编号(YYYYMMDD+4位流水)",required=true)
+    private String pkNo;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=true)
+    private String updateManNo;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=true)
+    private String carNo;
+
+    /**
+     * 挂号(MNEMONIC_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="挂号",required=false)
+    private String mnemonicCode;
+
+    /**
+     * 客商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="客商编号",required=false)
+    private String customerSupplierNo;
+
+    /**
+     * 客商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="客商名称",required=false)
+    private String customerSupplierName;
+
+    /**
+     * 车辆类型编号(CAR_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车辆类型编号",required=false)
+    private String carTypeNo;
+
+    /**
+     * 车辆类型名称(CAR_TYPE_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="车辆类型名称",required=false)
+    private String carTypeName;
+
+    /**
+     * 车辆载重(CAR_CARRIER_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="车辆载重",required=false)
+    private BigDecimal carCarrierWeight;
+
+    /**
+     * 车辆自重(CAR_SELF_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="车辆自重",required=false)
+    private Long carSelfWeight;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:服役;1:停役;2:删除)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:服役;1:停役;2:删除)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
+     */
+    @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_NAME,VARCHAR,100)
+     */
+    @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,100)
+     */
+    @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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Map<String, Object> getId() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("pkNo",this.pkNo);
+        params.put("updateManNo",this.updateManNo);
+        return params;
+    }
+
+    @Override
+    public void setId(MeterBaseCar meterBaseCar) {
+        this.pkNo = meterBaseCar.getPkNo();
+        this.updateManNo = meterBaseCar.getUpdateManNo();
+    }
+
+    public String getPkNo() {
+        return pkNo;
+    }
+
+    public void setPkNo(String pkNo) {
+        this.pkNo = pkNo == null ? null : pkNo.trim();
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public String getMnemonicCode() {
+        return mnemonicCode;
+    }
+
+    public void setMnemonicCode(String mnemonicCode) {
+        this.mnemonicCode = mnemonicCode == null ? null : mnemonicCode.trim();
+    }
+
+    public String getCustomerSupplierNo() {
+        return customerSupplierNo;
+    }
+
+    public void setCustomerSupplierNo(String customerSupplierNo) {
+        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
+    }
+
+    public String getCustomerSupplierName() {
+        return customerSupplierName;
+    }
+
+    public void setCustomerSupplierName(String customerSupplierName) {
+        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
+    }
+
+    public String getCarTypeNo() {
+        return carTypeNo;
+    }
+
+    public void setCarTypeNo(String carTypeNo) {
+        this.carTypeNo = carTypeNo == null ? null : carTypeNo.trim();
+    }
+
+    public String getCarTypeName() {
+        return carTypeName;
+    }
+
+    public void setCarTypeName(String carTypeName) {
+        this.carTypeName = carTypeName == null ? null : carTypeName.trim();
+    }
+
+    public BigDecimal getCarCarrierWeight() {
+        return carCarrierWeight;
+    }
+
+    public void setCarCarrierWeight(BigDecimal carCarrierWeight) {
+        this.carCarrierWeight = carCarrierWeight;
+    }
+
+    public Long getCarSelfWeight() {
+        return carSelfWeight;
+    }
+
+    public void setCarSelfWeight(Long carSelfWeight) {
+        this.carSelfWeight = carSelfWeight;
+    }
+
+    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();
+    }
+
+    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 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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", pkNo=").append(pkNo);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", mnemonicCode=").append(mnemonicCode);
+        sb.append(", customerSupplierNo=").append(customerSupplierNo);
+        sb.append(", customerSupplierName=").append(customerSupplierName);
+        sb.append(", carTypeNo=").append(carTypeNo);
+        sb.append(", carTypeName=").append(carTypeName);
+        sb.append(", carCarrierWeight=").append(carCarrierWeight);
+        sb.append(", carSelfWeight=").append(carSelfWeight);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/service/IMeterBaseCarService.java

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

+ 36 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

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

+ 93 - 227
src/main/java/com/steerinfo/baseinfo/meterbasecussupcar/controller/MeterBaseCusSupCarController.java

@@ -230,93 +230,44 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
     public RESTfulResult appregister(@RequestBody HashMap params) {
         try {
             String msg = "";
+            // sso注册
+            SSOUtil ssoUtil = new SSOUtil();
+            msg = ssoUtil.ssoRegister(params);
 
-            // 拆分司机list,新增客商车辆表
-            List<MeterBaseCusSupCar> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseCusSupCar.class);
-            // 循环新增车辆
-            for (MeterBaseCusSupCar car: driverList) {
-                // 检查车辆 + 司机是否存在
-                HashMap query = new HashMap();
-                query.put("cusSupCarNo", params.get("cusSupCarNo").toString());
-                query.put("telNum", car.getTelNum());
-                query.put("validFlag", "0");
-
-                List<MeterBaseCusSupCar> list = meterBaseCusSupCarService.query(query);
-                if(list.size() == 0){
-                    // 将车辆类型,载重信息加入实体
-                    car.setCusSupCarNo(params.get("cusSupCarNo").toString());
-
-                    car.setCarTypeNo(params.get("carTypeNo").toString());
-                    car.setCarTypeName(params.get("carTypeName").toString());
-                    car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
-
-                    car.setCreateManNo("admin");
-                    car.setCreateManName("admins");
-                    car.setCreateTime(new Date());
-
-                    msg = meterBaseCusSupCarService.checkandadd(car);
+            // sso注册成功时,增加车辆表
+            if (StringUtils.isNotEmpty(msg) && !msg.equals("账号已被注册")) {
+                return failed(null, msg);
+            }
+            else {
+                // 拆分司机list,新增客商车辆表
+                List<MeterBaseCusSupCar> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseCusSupCar.class);
+                // 循环新增车辆
+                for (MeterBaseCusSupCar car: driverList) {
+                    // 检查车辆 + 司机是否存在
+                    HashMap query = new HashMap();
+                    query.put("cusSupCarNo", params.get("cusSupCarNo").toString());
+                    query.put("telNum", car.getTelNum());
+                    query.put("validFlag", "0");
+
+                    List<MeterBaseCusSupCar> list = meterBaseCusSupCarService.query(query);
+                    if(list.size() == 0){
+                        // 将车辆类型,载重信息加入实体
+                        car.setCusSupCarNo(params.get("cusSupCarNo").toString());
 
+                        car.setCarTypeNo(params.get("carTypeNo").toString());
+                        car.setCarTypeName(params.get("carTypeName").toString());
+                        car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
 
-                }
+                        car.setCreateManNo("admin");
+                        car.setCreateManName("admins");
+                        car.setCreateTime(new Date());
 
-                if(StringUtils.isNotEmpty(msg)){
-                    break;
-                }
-            }
+                        msg = meterBaseCusSupCarService.checkandadd(car);
+                    }
 
-            // *将司机注册sso账户*
-            // 使用默认账号登录sso
-            // 默认账户密码加密
-            String shaPass = SHAUtil.shaEncode(ssoPassword);
-            // 获取sso token
-            // https://jgwzjl.jiugang.com/icore.icp.web/pass/auth/login   post请求, 参数类型content-type: application/x-www-form-urlencoded
-            // loginName=admin&password=fb94871a1c3c7c38330a3a434a0ee28f0deea30b&app_code=web
-            Map<String, String> loginMap = new HashMap<>();
-            loginMap.put("loginName", ssoAppUser);
-            loginMap.put("password", shaPass);
-
-
-            String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
-            // ssomsg1转JSONObject
-            JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
-            //如果成功,读取accessToken
-            String accessToken = "";
-            if(jsonObject1.get("code").toString().equals("0")){
-                String tempData = jsonObject1.get("data").toString();
-                JSONObject tempObject = JSONObject.parseObject(tempData);
-                accessToken = tempObject.get("accessToken").toString();
-
-                // 新增车辆SSO账号
-                Map<String, String> userMap = new HashMap<>();
-                userMap.put("userCode", params.get("cusSupCarNo").toString());
-                userMap.put("userName", params.get("cusSupCarNo").toString());
-                userMap.put("orgCode", "123456789");
-                userMap.put("orgName", "测试机构");
-                userMap.put("groupData", "506514577756917769");
-                userMap.put("companyData", "713710108567277568");
-                userMap.put("groupId", "506514577756917769");
-                userMap.put("companyId", "713710108567277568");
-                userMap.put("orgId", "925357747573231616");
-                userMap.put("loginStatus", "1");
-                String ssomsg2 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/", userMap, accessToken);
-
-                JSONObject jsonObject2 = JSONObject.parseObject(ssomsg2);
-
-                if(jsonObject2.get("code").toString().equals("0")) {
-                    String tempData2 = jsonObject2.get("data").toString();
-                    JSONObject tempObject2 = JSONObject.parseObject(tempData2);
-
-                    // 修改用户密码,参数生成
-                    Map<String, String> pwdMap = new HashMap<>();
-                    pwdMap.put("userid", tempObject2.get("userId").toString());
-                    pwdMap.put("prepassword", "123456");
-                    pwdMap.put("newpassword", params.get("password").toString());
-                    pwdMap.put("againNewpassword", params.get("password").toString());
-
-                    // 修改用户密码
-                    String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
-
-                    JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
+                    if(StringUtils.isNotEmpty(msg)){
+                        break;
+                    }
                 }
             }
 
@@ -354,28 +305,37 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
                 // 判断车号,司机手机号是否存在
                 List<MeterBaseCusSupCar> list = meterBaseCusSupCarService.query(params);
                 if(list.size() >= 1){
-                    // sso登录
-                    // 密码加密
-                    String shaPass = SHAUtil.shaEncode(params.get("password").toString());
-
-                    Map<String, String> loginMap = new HashMap<>();
-                    loginMap.put("loginName", params.get("cusSupCarNo").toString());
-                    loginMap.put("password", shaPass);
-
-                    String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
-                    // ssomsg1转JSONObject
-                    JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
-                    //如果成功,读取accessToken
-                    String accessToken = "";
-                    if(jsonObject1.get("code").toString().equals("0")) {
-                        // 返回sso返回的data
-                        ssodata = jsonObject1.get("data");
+//                    // sso登录
+//                    // 密码加密
+//                    String shaPass = SHAUtil.shaEncode(params.get("password").toString());
+//
+//                    Map<String, String> loginMap = new HashMap<>();
+//                    loginMap.put("loginName", params.get("cusSupCarNo").toString());
+//                    loginMap.put("password", shaPass);
+//
+//                    String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+//                    // ssomsg1转JSONObject
+//                    JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
+//                    //如果成功,读取accessToken
+//                    String accessToken = "";
+//                    if(jsonObject1.get("code").toString().equals("0")) {
+//                        // 返回sso返回的data
+//                        ssodata = jsonObject1.get("data");
+//                    }
+//                    else{
+//                        msg = jsonObject1.get("message").toString();
+//                    }
+
+                    SSOUtil ssoUtil = new SSOUtil();
+                    HashMap map = ssoUtil.ssoLogin(params, "");
+
+                    if(map.get("code").toString().equals("0")){
+                        ssodata = map.get("data").toString();
                     }
-                    else{
-                        msg = jsonObject1.get("message").toString();
+                    else {
+                        msg = map.get("msg").toString();
                     }
 
-
                 }
                 else {
                     msg = "没有此车号或手机号";
@@ -401,7 +361,6 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
     public RESTfulResult appchangepwd(@RequestBody HashMap params) {
 
         String msg = "";
-        Object ssodata = "";
 
         try {
             if(params.get("cusSupCarNo") == null || StringUtils.isEmpty(params.get("cusSupCarNo").toString())) {
@@ -417,50 +376,15 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
                 // 判断车号,司机手机号是否存在
                 List<MeterBaseCusSupCar> list = meterBaseCusSupCarService.query(params);
                 if(list.size() >= 1){
-                    // sso登录
-                    // 密码加密
-                    String shaPass = SHAUtil.shaEncode(params.get("oldpassword").toString());
-
-                    Map<String, String> loginMap = new HashMap<>();
-                    loginMap.put("loginName", params.get("cusSupCarNo").toString());
-                    loginMap.put("password", shaPass);
-
-                    String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
-                    // ssomsg1转JSONObject
-                    JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
-                    //如果成功,读取accessToken
-                    String accessToken = "";
-                    if(jsonObject1.get("code").toString().equals("0")) {
-                        String tempData1 = jsonObject1.get("data").toString();
-                        JSONObject tempObject1 = JSONObject.parseObject(tempData1);
-                        accessToken = tempObject1.get("accessToken").toString();
-
-                        // 读取用户信息
-                        JSONObject tempObject2 = JSONObject.parseObject(tempObject1.get("user").toString());
-                        // 修改用户密码,参数生成
-                        Map<String, String> pwdMap = new HashMap<>();
-                        pwdMap.put("userid", tempObject2.get("userId").toString());
-                        pwdMap.put("prepassword", params.get("oldpassword").toString());
-                        pwdMap.put("newpassword", params.get("newpassword").toString());
-                        pwdMap.put("againNewpassword", params.get("newpassword").toString());
-
-                        // 修改用户密码
-                        String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
-
-                        JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
-
-                        if(jsonObject3.get("code").toString().equals("0")) {
-
-                        }
-                        else {
-                            msg = jsonObject3.get("message").toString();
-                        }
+                    // SSO修改密码
+                    SSOUtil ssoUtil = new SSOUtil();
+                    HashMap map = ssoUtil.ssoChangePwd(params);
+
+                    if(map.get("code").toString().equals("0")){
                     }
-                    else{
-                        msg = jsonObject1.get("message").toString();
+                    else {
+                        msg = map.get("msg").toString();
                     }
-
-
                 }
                 else {
                     msg = "没有此车号或手机号";
@@ -494,86 +418,35 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
 
             List<MeterBaseCusSupCar> list = meterBaseCusSupCarService.query(query);
             if(list.size() == 0){
-                MeterBaseCusSupCar car = new MeterBaseCusSupCar();
-                // 将车辆类型,载重信息加入实体
-                car.setCusSupCarNo(params.get("cusSupCarNo").toString());
-
-                car.setCarTypeNo(params.get("carTypeNo").toString());
-                car.setCarTypeName(params.get("carTypeName").toString());
-                if(params.get("carCarrierWeight") != null){
-                    car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
+                // sso注册
+                SSOUtil ssoUtil = new SSOUtil();
+                msg = ssoUtil.ssoRegister(params);
+
+                // sso注册成功时,增加车辆表
+                if (StringUtils.isNotEmpty(msg) && !msg.equals("账号已被注册")) {
+                    return failed(null, msg);
                 }
+                else {
+                    MeterBaseCusSupCar car = new MeterBaseCusSupCar();
+                    // 将车辆类型,载重信息加入实体
+                    car.setCusSupCarNo(params.get("cusSupCarNo").toString());
 
-                car.setCreateManNo("admin");
-                car.setCreateManName("admins");
-                car.setCreateTime(new Date());
+                    car.setCarTypeNo(params.get("carTypeNo").toString());
+                    car.setCarTypeName(params.get("carTypeName").toString());
+                    if(params.get("carCarrierWeight") != null){
+                        car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
+                    }
 
-                msg = meterBaseCusSupCarService.checkandadd(car);
-            }
+                    car.setCreateManNo("admin");
+                    car.setCreateManName("admins");
+                    car.setCreateTime(new Date());
 
-            // *将司机注册sso账户*
-            // 使用默认账号登录sso
-            // 默认账户密码加密
-            String shaPass = SHAUtil.shaEncode(ssoPassword);
-            // 获取sso token
-            // https://jgwzjl.jiugang.com/icore.icp.web/pass/auth/login   post请求, 参数类型content-type: application/x-www-form-urlencoded
-            // loginName=admin&password=fb94871a1c3c7c38330a3a434a0ee28f0deea30b&app_code=web
-            Map<String, String> loginMap = new HashMap<>();
-            loginMap.put("loginName", ssoAppUser);
-            loginMap.put("password", shaPass);
-
-
-            String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
-            // ssomsg1转JSONObject
-            JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
-            //如果成功,读取accessToken
-            String accessToken = "";
-            if(jsonObject1.get("code").toString().equals("0")){
-                String tempData = jsonObject1.get("data").toString();
-                JSONObject tempObject = JSONObject.parseObject(tempData);
-                accessToken = tempObject.get("accessToken").toString();
-
-                // 新增车辆SSO账号
-                Map<String, String> userMap = new HashMap<>();
-                userMap.put("userCode", params.get("cusSupCarNo").toString());
-                userMap.put("userName", params.get("cusSupCarNo").toString());
-                userMap.put("orgCode", "123456789");
-                userMap.put("orgName", "测试机构");
-                userMap.put("groupData", "506514577756917769");
-                userMap.put("companyData", "713710108567277568");
-                userMap.put("groupId", "506514577756917769");
-                userMap.put("companyId", "713710108567277568");
-                userMap.put("orgId", "925357747573231616");
-                userMap.put("loginStatus", "1");
-                String ssomsg2 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/", userMap, accessToken);
-
-                JSONObject jsonObject2 = JSONObject.parseObject(ssomsg2);
-
-                if(jsonObject2.get("code").toString().equals("0")) {
-                    String tempData2 = jsonObject2.get("data").toString();
-                    JSONObject tempObject2 = JSONObject.parseObject(tempData2);
-
-                    // 修改用户密码,参数生成
-                    Map<String, String> pwdMap = new HashMap<>();
-                    pwdMap.put("userid", tempObject2.get("userId").toString());
-                    pwdMap.put("prepassword", "123456");
-                    pwdMap.put("newpassword", params.get("password").toString());
-                    pwdMap.put("againNewpassword", params.get("password").toString());
-
-                    // 修改用户密码
-                    String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
-
-                    JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
-
-                    if(!jsonObject3.get("code").toString().equals("0")) {
-                        msg = jsonObject3.get("resultMessage").toString();
-                    }
-                }
-                else {
-                    msg = jsonObject2.get("resultMessage").toString();
+                    msg = meterBaseCusSupCarService.checkandadd(car);
                 }
             }
-
+            else {
+                msg = "车辆已存在";
+            }
 
             if (StringUtils.isNotEmpty(msg)) {
                 return failed(null, msg);
@@ -684,15 +557,6 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
                     msg = "不存在相关司机信息";
                 }
 
-                // 移除司机完成后,检查此车号是否还有司机记录
-                // 如果没有,移除SSO账户信息
-                query.remove("driverName");
-                query.remove("telNum");
-                List<MeterBaseCusSupCar> list2 = meterBaseCusSupCarService.query(query);
-                if(list2.size() == 0){
-                    // 移除sso账户信息
-                }
-
                 if(StringUtils.isNotEmpty(msg)){
                     break;
                 }
@@ -709,4 +573,6 @@ public class MeterBaseCusSupCarController extends BaseRESTfulController {
         }
         return success();
     }
+
+
 }

+ 110 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

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

+ 10 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

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

+ 496 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

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

+ 272 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/model/MeterBaseDriver.java

@@ -0,0 +1,272 @@
+package com.steerinfo.baseinfo.meterbasedriver.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 MeterBaseDriver implements IBasePO<String> {
+    /**
+     * 主键编号(YYYYMMDD+4位流水)(DRIVER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键编号(YYYYMMDD+4位流水)",required=true)
+    private String driverNo;
+
+    /**
+     * 司机姓名(DRIVER_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="司机姓名",required=false)
+    private String driverName;
+
+    /**
+     * 身份证号(ID_NUM,VARCHAR,40)
+     */
+    @ApiModelProperty(value="身份证号",required=false)
+    private String idNum;
+
+    /**
+     * 联系电话(TEL_NUM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String telNum;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:服役;1:停役;2:删除)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:服役;1:停役;2:删除)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
+     */
+    @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,100)
+     */
+    @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,100)
+     */
+    @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;
+
+    /**
+     * 车辆外键ID(CAR_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车辆外键ID",required=false)
+    private String carId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.driverNo;
+    }
+
+    @Override
+    public void setId(String driverNo) {
+        this.driverNo = driverNo == null ? null : driverNo.trim();
+    }
+
+    public String getDriverNo() {
+        return driverNo;
+    }
+
+    public void setDriverNo(String driverNo) {
+        this.driverNo = driverNo == null ? null : driverNo.trim();
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName == null ? null : driverName.trim();
+    }
+
+    public String getIdNum() {
+        return idNum;
+    }
+
+    public void setIdNum(String idNum) {
+        this.idNum = idNum == null ? null : idNum.trim();
+    }
+
+    public String getTelNum() {
+        return telNum;
+    }
+
+    public void setTelNum(String telNum) {
+        this.telNum = telNum == null ? null : telNum.trim();
+    }
+
+    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();
+    }
+
+    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 getCarId() {
+        return carId;
+    }
+
+    public void setCarId(String carId) {
+        this.carId = carId == null ? null : carId.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", driverNo=").append(driverNo);
+        sb.append(", driverName=").append(driverName);
+        sb.append(", idNum=").append(idNum);
+        sb.append(", telNum=").append(telNum);
+        sb.append(", memo=").append(memo);
+        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(", carId=").append(carId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/IMeterBaseDriverService.java

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

+ 36 - 0
src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/impl/MeterBaseDriverServiceImpl.java

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

+ 26 - 0
src/main/java/com/steerinfo/util/Configuration.java

@@ -0,0 +1,26 @@
+package com.steerinfo.util;
+
+import java.util.ResourceBundle;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-01-08 15:01
+ */
+public class Configuration {
+    /**
+     * 读取配置文件信息
+     *
+     * @param name 读取节点名
+     * @param fileName 文件名
+     * @return 读取的节点值
+     */
+    public static String readConfigString(String name, String fileName) {
+        String result = "";
+        try {
+            ResourceBundle rb = ResourceBundle.getBundle(fileName);
+            result = rb.getString(name);
+        } catch (Exception e) {
+        }
+        return result;
+    }
+}

+ 76 - 0
src/main/java/com/steerinfo/util/HttpsRequest.java

@@ -271,4 +271,80 @@ public class HttpsRequest {
         }
         return result.toString();
     }
+
+    /**
+     * 向指定 URL 发送DELETE方法的请求
+     *
+     * @param url
+     *            发送请求的 URL
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendDelete(String url, String token) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new StringBuilder();
+        try {
+
+            // 创建SSLContext对象,并使用我们指定的信任管理器初始化
+            TrustManager[] tm = { new MyX509TrustManager() };
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+            // 打开和URL之间的连接
+            URL realUrl = new URL(url);
+            HttpsURLConnection conn = (HttpsURLConnection) realUrl.openConnection();
+            conn.setSSLSocketFactory(ssf);
+
+            // POST方法
+            conn.setRequestMethod("DELETE");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded");
+            conn.setRequestProperty("authorization",
+                    "Bearer " + token);
+            conn.connect();
+
+
+            // 获取URLConnection对象对应的输出流
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            System.out.println("-----result-----"+result);
+        } catch (Exception e) {
+            System.out.println("发送 DELETE 请求出现异常!"+e);
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally{
+            try{
+                if(out!=null){
+                    out.close();
+                }
+                if(in!=null){
+                    in.close();
+                }
+            }
+            catch(IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+    }
 }

+ 232 - 0
src/main/java/com/steerinfo/util/SSOUtil.java

@@ -0,0 +1,232 @@
+package com.steerinfo.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Bourne.Cao
+ * 操作SSO工具类
+ * @date 2022-01-08 11:47
+ */
+@Component
+public class SSOUtil {
+
+    // sso注册用户
+    public String ssoRegister(HashMap params) throws Exception {
+        String msg = "";
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
+        // *将司机注册sso账户*
+        // 使用默认账号登录sso
+        String accessToken = ssoDefaultLogin();
+
+        // 如果拿不到默认账户token,报错
+        if(!StringUtils.isEmpty(accessToken)){
+            // 新增车辆SSO账号
+            Map<String, String> userMap = new HashMap<>();
+            userMap.put("userCode", params.get("cusSupCarNo").toString());
+            userMap.put("userName", params.get("cusSupCarNo").toString());
+            userMap.put("orgCode", "123456789");
+            userMap.put("orgName", "测试机构");
+            userMap.put("groupData", "506514577756917769");
+            userMap.put("companyData", "713710108567277568");
+            userMap.put("groupId", "506514577756917769");
+            userMap.put("companyId", "713710108567277568");
+            userMap.put("orgId", "925357747573231616");
+            userMap.put("loginStatus", "1");
+            String ssomsg2 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/", userMap, accessToken);
+
+            JSONObject jsonObject2 = JSONObject.parseObject(ssomsg2);
+
+            if(jsonObject2.get("code").toString().equals("0")) {
+                String tempData2 = jsonObject2.get("data").toString();
+                JSONObject tempObject2 = JSONObject.parseObject(tempData2);
+
+                // 修改用户密码,参数生成
+                Map<String, String> pwdMap = new HashMap<>();
+                pwdMap.put("userid", tempObject2.get("userId").toString());
+                pwdMap.put("prepassword", "123456");
+                pwdMap.put("newpassword", params.get("password").toString());
+                pwdMap.put("againNewpassword", params.get("password").toString());
+
+                // 修改用户密码
+                String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
+
+                JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
+
+                if(!jsonObject3.get("code").toString().equals("0")) {
+                    ssoDeleter(tempObject2.get("userId").toString(),accessToken);
+
+                    msg = jsonObject3.get("resultMessage").toString();
+                }
+            }
+            else {
+                msg = jsonObject2.get("resultMessage").toString();
+            }
+        }
+        else {
+            msg = "没有SSO默认账户,请联系系统管理员";
+        }
+
+        return msg;
+    }
+
+    /**
+     *
+     * @param id sso用户id
+     * @param accessToken 可以为空
+     * @return
+     */
+    public String ssoDeleter(String id, String accessToken) throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
+        // 不传token时,自行获取默认账户的token
+        if(StringUtils.isEmpty(accessToken)){
+            accessToken = ssoDefaultLogin();
+        }
+
+        String ssomsg4 = HttpsRequest.sendDelete(ssoUrl + "/v1/sysusers/"+id, accessToken);
+
+        JSONObject jsonObject = JSONObject.parseObject(ssomsg4);
+
+        return jsonObject.get("resultMessage").toString();
+    }
+
+    /**
+     * sso默认账户登录,用于获取token
+     * @return
+     */
+    public String ssoDefaultLogin() throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+        String ssoPassword = Configuration.readConfigString("sso.password", "application");
+        String ssoAppUser = Configuration.readConfigString("sso.appuser", "application");
+        // 使用默认账号登录sso
+        // 默认账户密码加密
+        String shaPass = SHAUtil.shaEncode(ssoPassword);
+        // 获取sso token
+        // https://jgwzjl.jiugang.com/icore.icp.web/pass/auth/login   post请求, 参数类型content-type: application/x-www-form-urlencoded
+        // loginName=admin&password=fb94871a1c3c7c38330a3a434a0ee28f0deea30b&app_code=web
+        Map<String, String> loginMap = new HashMap<>();
+        loginMap.put("loginName", ssoAppUser);
+        loginMap.put("password", shaPass);
+
+
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        // ssomsg1转JSONObject
+        JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
+        //如果成功,读取accessToken
+        String accessToken = "";
+        if(jsonObject1.get("code").toString().equals("0")){
+            String tempData = jsonObject1.get("data").toString();
+            JSONObject tempObject = JSONObject.parseObject(tempData);
+            accessToken = tempObject.get("accessToken").toString();
+        }
+
+        return accessToken;
+    }
+
+    /**
+     * sso登录
+     * @param params
+     * @param accessToken
+     * @return
+     */
+    public HashMap ssoLogin(HashMap params, String accessToken) throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
+        HashMap<String, String> map = new HashMap<>();
+
+        // 不传token时,自行获取默认账户的token
+        if(StringUtils.isEmpty(accessToken)){
+            accessToken = ssoDefaultLogin();
+        }
+
+        // sso登录
+        // 密码加密
+        String shaPass = SHAUtil.shaEncode(params.get("password").toString());
+
+        Map<String, String> loginMap = new HashMap<>();
+        loginMap.put("loginName", params.get("cusSupCarNo").toString());
+        loginMap.put("password", shaPass);
+
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        // ssomsg1转JSONObject
+        JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
+
+        if(jsonObject1.get("code").toString().equals("0")) {
+            // 返回sso返回的data
+            map.put("code", "0");
+            map.put("data", jsonObject1.get("data").toString());
+        }
+        else{
+            map.put("code", "1");
+            map.put("msg", jsonObject1.get("message").toString());
+        }
+
+        return map;
+    }
+
+    /**
+     * sso登录
+     * @param params
+     * @return
+     */
+    public HashMap ssoChangePwd(HashMap params) throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
+        HashMap<String, String> map = new HashMap<>();
+
+        // sso登录
+        // 密码加密
+        String shaPass = SHAUtil.shaEncode(params.get("oldpassword").toString());
+
+        Map<String, String> loginMap = new HashMap<>();
+        loginMap.put("loginName", params.get("cusSupCarNo").toString());
+        loginMap.put("password", shaPass);
+
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        // ssomsg1转JSONObject
+        JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
+        //如果成功,读取accessToken
+        String accessToken = "";
+        if(jsonObject1.get("code").toString().equals("0")) {
+            String tempData1 = jsonObject1.get("data").toString();
+            JSONObject tempObject1 = JSONObject.parseObject(tempData1);
+            accessToken = tempObject1.get("accessToken").toString();
+
+            // 读取用户信息
+            JSONObject tempObject2 = JSONObject.parseObject(tempObject1.get("user").toString());
+            // 修改用户密码,参数生成
+            Map<String, String> pwdMap = new HashMap<>();
+            pwdMap.put("userid", tempObject2.get("userId").toString());
+            pwdMap.put("prepassword", params.get("oldpassword").toString());
+            pwdMap.put("newpassword", params.get("newpassword").toString());
+            pwdMap.put("againNewpassword", params.get("newpassword").toString());
+
+            // 修改用户密码
+            String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
+
+            JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
+
+            if(jsonObject3.get("code").toString().equals("0")) {
+                map.put("code", "0");
+            }
+            else {
+                map.put("code", "1");
+                map.put("msg", jsonObject1.get("message").toString());
+            }
+        }
+        else{
+            map.put("code", "1");
+            map.put("msg", jsonObject1.get("message").toString());
+        }
+
+        return map;
+    }
+}