修改了后端接口

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

@@ -8,6 +8,8 @@ import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.baseinfo.meterbasedriver.service.IMeterBaseDriverService;
 import com.steerinfo.baseinfo.meterbasetravellingmerchant.mapper.MeterBaseTravellingMerchantMapper;
 import com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant;
+import com.steerinfo.baseinfo.meterbaseverificationcode.mapper.MeterBaseVerificationCodeMapper;
+import com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -68,6 +70,9 @@ public class MeterBaseCarController extends BaseRESTfulController {
     @Autowired
     MeterBaseTravellingMerchantMapper meterBaseTravellingMerchantMapper;
 
+    @Autowired
+    MeterBaseVerificationCodeMapper meterBaseVerificationCodeMapper;
+
     @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -345,7 +350,6 @@ public class MeterBaseCarController extends BaseRESTfulController {
             List<MeterBaseTravellingMerchant> meterBaseTravellingMerchant = meterBaseTravellingMerchantMapper.selectByParameters(trave);
             if (meterBaseTravellingMerchant.size()>0){
                 userType = "2";
-                ssodata = meterBaseTravellingMerchant;
             }
 
             returnObj.put("ssodata",ssodata);
@@ -378,6 +382,17 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 // 状态（0：服役；1:停役;2:删除）
                 params.put("validFlag", "0");
 
+                //通过手机号获取验证码列表
+                List<MeterBaseVerificationCode> mbvc = meterBaseVerificationCodeMapper.getCode(params.get("telNum").toString());
+
+                //判断是否有未使用并且没过期的验证码
+                if (mbvc.size() <= 0){
+                    return failed(null, "验证码错误");
+                }
+
+                //修改验证码为已使用状态
+                meterBaseVerificationCodeMapper.updateVaild(mbvc.get(0).getVerificationCodeNo());
+
                 // 判断车号，司机手机号是否存在
                 List<MeterBaseCusSupCar> list = meterBaseDriverService.query(params);
                 if (list.size() >= 1) {

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

@@ -5,7 +5,7 @@
     <id column="PK_NO" jdbcType="VARCHAR" property="pkNo" />
     <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_NO" jdbcType="VARCHAR" property="batchDeleteSelf" />
     <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" />

src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

@@ -168,11 +168,11 @@ public class MeterBaseDriverController extends BaseRESTfulController {
     @ApiOperation(value = "获取该客商对应司机新信息", notes = "获取该客商对应车辆")
     //@RequiresPermissions("meterbasecar:view")
     @PostMapping(value = "/getCarBySup")
-    public RESTfulResult getCarBySup(@RequestBody String customerSupplierNo) {
+    public RESTfulResult getCarBySup(@RequestBody HashMap parma) {
         try {
             RESTfulResult rm = new RESTfulResult();
             rm.setCode("200");
-            List<MeterBaseDriver> list = meterBaseDriverMapper.getDirverBySup(customerSupplierNo);
+            List<MeterBaseDriver> list = meterBaseDriverMapper.getDirverBySup(parma.get("customerSupplierNo").toString());
             rm.setData(list);
             return rm;
         } catch (Exception ex) {

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

@@ -535,7 +535,7 @@
     </foreach>
   </update>
 
-  <select id="getDirverBySup" parameterType="java.lang.String">
+  <select id="getDirverBySup" parameterType="java.lang.String" resultMap="BaseResultMap">
     select * from METER_BASE_DRIVER where CAR_ID in (select CAR_NO from METER_BASE_CAR WHERE CUSTOMER_SUPPLIER_NO = #{customerSupplierNo})
   </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/controller/MeterBaseSystemMessageController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasesystemmessage.controller;
 
+import com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessageMapper;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -42,6 +43,9 @@ public class MeterBaseSystemMessageController extends BaseRESTfulController {
     @Autowired
     IMeterBaseSystemMessageService meterBaseSystemMessageService;
 
+    @Autowired
+    MeterBaseSystemMessageMapper meterBaseSystemMessageMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -129,4 +133,21 @@ public class MeterBaseSystemMessageController extends BaseRESTfulController {
     	}
       return success();
     }
+
+    @ApiOperation(value="系统消息已读", notes="系统消息已读")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "parma", value = "HashMap", required = true, dataType = "HashMap")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:update")
+    @PutMapping(value = "/updateIsRead", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateIsRead(@RequestBody HashMap parma){
+        try {
+            meterBaseSystemMessageMapper.updateIsRead(parma.get("systemMessageNo").toString());
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return  failed(null,"操作异常，请确认");
+        }
+        return success();
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.java

@@ -8,4 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MeterBaseSystemMessageMapper extends IBaseMapper<MeterBaseSystemMessage, String> {
     String GetNewID();
+
+    void updateIsRead(String systemMessageNo);
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.xml

@@ -16,16 +16,17 @@
     <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="IS_READ" jdbcType="VARCHAR" property="isRead" />
   </resultMap>
   <sql id="columns">
     SYSTEM_MESSAGE_NO, SYSTEM_MESSAGE_NAME, SYSTEM_MESSAGE_CONTENT, VAILD_FLAG, MEMO, 
     CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-    DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+    DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, IS_READ
   </sql>
   <sql id="columns_alias">
     t.SYSTEM_MESSAGE_NO, t.SYSTEM_MESSAGE_NAME, t.SYSTEM_MESSAGE_CONTENT, t.VAILD_FLAG, 
     t.MEMO, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
-    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.IS_READ
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_SYSTEM_MESSAGE
@@ -77,6 +78,9 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="isRead != null and isRead != ''">
+        and IS_READ = #{isRead}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -123,6 +127,9 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="isRead != null and isRead != ''">
+        and IS_READ LIKE '%${isRead}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -171,20 +178,23 @@
       <if test="deleteTime != null">
         or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
       </if>
+      <if test="isRead != null and isRead != ''">
+        or IS_READ = #{isRead}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
     insert into METER_BASE_SYSTEM_MESSAGE (SYSTEM_MESSAGE_NO, SYSTEM_MESSAGE_NAME, 
       SYSTEM_MESSAGE_CONTENT, VAILD_FLAG, MEMO, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      IS_READ)
     values (#{systemMessageNo,jdbcType=VARCHAR}, #{systemMessageName,jdbcType=VARCHAR}, 
       #{systemMessageContent,jdbcType=VARCHAR}, #{vaildFlag,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
-      )
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{isRead,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
     insert into METER_BASE_SYSTEM_MESSAGE
@@ -231,6 +241,9 @@
       <if test="deleteTime != null">
         DELETE_TIME,
       </if>
+      <if test="isRead != null">
+        IS_READ,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="systemMessageNo != null">
@@ -275,6 +288,9 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isRead != null">
+        #{isRead,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
@@ -291,7 +307,8 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      IS_READ = #{isRead,jdbcType=VARCHAR}
     where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
@@ -336,6 +353,9 @@
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isRead != null">
+        IS_READ = #{isRead,jdbcType=VARCHAR},
+      </if>
     </set>
     where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
   </update>
@@ -358,8 +378,8 @@
       VAILD_FLAG, MEMO, CREATE_MAN_NO, 
       CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      IS_READ)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.systemMessageNo,jdbcType=VARCHAR}, 
@@ -367,8 +387,8 @@
       #{item.vaildFlag,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
       #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
       #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.isRead,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -430,6 +450,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
           when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
+       ,IS_READ=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.isRead,jdbcType=VARCHAR}
+       </foreach>
      where SYSTEM_MESSAGE_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.systemMessageNo,jdbcType=VARCHAR}
@@ -444,10 +468,12 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(SYSTEM_MESSAGE_NO, LENGTH(SYSTEM_MESSAGE_NO) - 4))),0) + 1,5,'0') SYSTEM_MESSAGE_NO
     FROM METER_BASE_SYSTEM_MESSAGE
   </select>
+
+  <update id="updateIsRead" parameterType="java.lang.String">
+    update METER_BASE_SYSTEM_MESSAGE set IS_READ = '1' where SYSTEM_MESSAGE_NO = #{systemMessageNo}
+  </update>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/model/MeterBaseSystemMessage.java

@@ -91,6 +91,12 @@ public class MeterBaseSystemMessage implements IBasePO<String> {
     @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date deleteTime;
 
+    /**
+     * 是否已读（0:未读，1：已读）(IS_READ,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否已读（0:未读，1：已读）",required=false)
+    private String isRead;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -215,6 +221,14 @@ public class MeterBaseSystemMessage implements IBasePO<String> {
         this.deleteTime = deleteTime;
     }
 
+    public String getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(String isRead) {
+        this.isRead = isRead == null ? null : isRead.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -235,6 +249,7 @@ public class MeterBaseSystemMessage implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", isRead=").append(isRead);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/controller/MeterBaseTravellingMerchantController.java

@@ -1,11 +1,17 @@
 package com.steerinfo.baseinfo.meterbasetravellingmerchant.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
+import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
+import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
+import com.steerinfo.baseinfo.meterbasetravellingmerchant.mapper.MeterBaseTravellingMerchantMapper;
 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.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant;
 import com.steerinfo.baseinfo.meterbasetravellingmerchant.service.IMeterBaseTravellingMerchantService;
+import com.steerinfo.util.SSOUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -13,12 +19,11 @@ 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.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
 import java.math.BigDecimal;
 
 /**
@@ -42,6 +47,9 @@ public class MeterBaseTravellingMerchantController extends BaseRESTfulController
     @Autowired
     IMeterBaseTravellingMerchantService meterBaseTravellingMerchantService;
 
+    @Autowired
+    MeterBaseTravellingMerchantMapper meterBaseTravellingMerchantMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -111,6 +119,65 @@ public class MeterBaseTravellingMerchantController extends BaseRESTfulController
         return success(meterBaseTravellingMerchant);
     }
 
+    @ApiOperation(value = "客商注册", notes = "客商注册")
+    @Transactional
+    @PostMapping(value = "/register")
+    public RESTfulResult register(@RequestBody HashMap params) {
+        try {
+            String msg = "";
+            params.put("carNo",params.get("travellingMerchantName").toString());
+            params.put("password",params.get("travellingMerchantPossword").toString());
+            // sso注册
+            SSOUtil ssoUtil = new SSOUtil();
+            HashMap ssoMap = ssoUtil.ssoRegister(params);
+
+            // sso注册成功时，增加客商表
+            if (ssoMap.get("code").equals("1") && !"账号已被注册".equals(ssoMap.get("msg").toString())) {
+                return failed(null, ssoMap.get("msg").toString());
+            } else {
+                // 清除SSO"账号已被注册"
+                msg = "";
+
+                // 查询客商是否写入客商表
+                HashMap queryCar = new HashMap();
+                queryCar.put("travellingMerchantNo", params.get("travellingMerchantName").toString());
+                queryCar.put("validFlag", "0");
+                List<MeterBaseTravellingMerchant> queryList = meterBaseTravellingMerchantService.query(queryCar);
+
+                // 车辆表已存在时，跳过
+                if (queryList.size() == 0) {
+                    // 新增车辆
+                    MeterBaseTravellingMerchant mebl = new MeterBaseTravellingMerchant();
+                    mebl.setTravellingMerchantNo(meterBaseTravellingMerchantMapper.getNewID());
+                    mebl.setValidFlag("0");
+                    mebl.setTravellingMerchantName(params.get("travellingMerchantName").toString());
+                    mebl.setTravellingMerchantPossword(params.get("travellingMerchantPossword").toString());
+
+
+                    // 将sso id写入车辆表，便于以后删除和重置密码
+                    mebl.setSsoId(ssoMap.get("data").toString());
+
+                    mebl.setCreateManNo("admin");
+                    mebl.setCreateManName("admins");
+                    mebl.setCreateTime(new Date());
+
+                    meterBaseTravellingMerchantMapper.insertSelective(mebl);
+                }
+            }
+
+            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return failed(null, msg);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+        return success();
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterbasetravellingmerchant:delete")

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/mapper/MeterBaseTravellingMerchantMapper.xml

@@ -16,16 +16,18 @@
     <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="SSO_ID" jdbcType="VARCHAR" property="ssoId" />
   </resultMap>
   <sql id="columns">
     TRAVELLING_MERCHANT_NO, TRAVELLING_MERCHANT_NAME, TRAVELLING_MERCHANT_POSSWORD, 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
+    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, SSO_ID
   </sql>
   <sql id="columns_alias">
     t.TRAVELLING_MERCHANT_NO, t.TRAVELLING_MERCHANT_NAME, t.TRAVELLING_MERCHANT_POSSWORD, 
     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.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, 
+    t.SSO_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_TRAVELLING_MERCHANT
@@ -77,6 +79,9 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="ssoId != null and ssoId != ''">
+        and SSO_ID = #{ssoId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -123,6 +128,9 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="ssoId != null and ssoId != ''">
+        and SSO_ID LIKE '%${ssoId}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -171,20 +179,23 @@
       <if test="deleteTime != null">
         or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
       </if>
+      <if test="ssoId != null and ssoId != ''">
+        or SSO_ID = #{ssoId}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant">
     insert into METER_BASE_TRAVELLING_MERCHANT (TRAVELLING_MERCHANT_NO, TRAVELLING_MERCHANT_NAME, 
       TRAVELLING_MERCHANT_POSSWORD, 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
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      SSO_ID)
     values (#{travellingMerchantNo,jdbcType=VARCHAR}, #{travellingMerchantName,jdbcType=VARCHAR}, 
       #{travellingMerchantPossword,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}
-      )
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{ssoId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant">
     insert into METER_BASE_TRAVELLING_MERCHANT
@@ -231,6 +242,9 @@
       <if test="deleteTime != null">
         DELETE_TIME,
       </if>
+      <if test="ssoId != null">
+        SSO_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="travellingMerchantNo != null">
@@ -275,6 +289,9 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="ssoId != null">
+        #{ssoId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant">
@@ -291,7 +308,8 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      SSO_ID = #{ssoId,jdbcType=VARCHAR}
     where TRAVELLING_MERCHANT_NO = #{travellingMerchantNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant">
@@ -336,6 +354,9 @@
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="ssoId != null">
+        SSO_ID = #{ssoId,jdbcType=VARCHAR},
+      </if>
     </set>
     where TRAVELLING_MERCHANT_NO = #{travellingMerchantNo,jdbcType=VARCHAR}
   </update>
@@ -358,8 +379,8 @@
       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
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      SSO_ID)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.travellingMerchantNo,jdbcType=VARCHAR}, 
@@ -367,8 +388,8 @@
       #{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}
-       from dual  
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.ssoId,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -430,6 +451,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case TRAVELLING_MERCHANT_NO" close="end">
           when #{item.travellingMerchantNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
+       ,SSO_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TRAVELLING_MERCHANT_NO" close="end">
+          when #{item.travellingMerchantNo,jdbcType=VARCHAR} then #{item.ssoId,jdbcType=VARCHAR}
+       </foreach>
      where TRAVELLING_MERCHANT_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.travellingMerchantNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/model/MeterBaseTravellingMerchant.java

@@ -34,25 +34,25 @@ public class MeterBaseTravellingMerchant implements IBasePO<String> {
     /**
      * 状态（0：无效；1:有效）(VALID_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0：无效；1:有效）",required=true)
+    @ApiModelProperty(value="状态（0：无效；1:有效）",required=false)
     private String validFlag;
 
     /**
      * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="创建人编号",required=true)
+    @ApiModelProperty(value="创建人编号",required=false)
     private String createManNo;
 
     /**
      * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
      */
-    @ApiModelProperty(value="创建人姓名",required=true)
+    @ApiModelProperty(value="创建人姓名",required=false)
     private String createManName;
 
     /**
      * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date createTime;
 
     /**
@@ -91,6 +91,12 @@ public class MeterBaseTravellingMerchant implements IBasePO<String> {
     @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date deleteTime;
 
+    /**
+     * SSIID(SSO_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="SSIID",required=false)
+    private String ssoId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -215,6 +221,14 @@ public class MeterBaseTravellingMerchant implements IBasePO<String> {
         this.deleteTime = deleteTime;
     }
 
+    public String getSsoId() {
+        return ssoId;
+    }
+
+    public void setSsoId(String ssoId) {
+        this.ssoId = ssoId == null ? null : ssoId.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -235,6 +249,7 @@ public class MeterBaseTravellingMerchant implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", ssoId=").append(ssoId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/controller/MeterBaseVerificationCodeController.java

@@ -0,0 +1,125 @@
+package com.steerinfo.baseinfo.meterbaseverificationcode.controller;
+
+import com.steerinfo.baseinfo.meterbaseverificationcode.mapper.MeterBaseVerificationCodeMapper;
+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.meterbaseverificationcode.model.MeterBaseVerificationCode;
+import com.steerinfo.baseinfo.meterbaseverificationcode.service.IMeterBaseVerificationCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseVerificationCode RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-09 03:32
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-09
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVerificationCode RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaseverificationcodes")
+@Api(value = "/${api.version}/meterbaseverificationcodes", tags = "验证码信息 - MeterBaseVerificationCodeController")
+public class MeterBaseVerificationCodeController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseVerificationCodeService meterBaseVerificationCodeService;
+
+    @Autowired
+    MeterBaseVerificationCodeMapper meterBaseVerificationCodeMapper;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseverificationcode:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVerificationCode> list = meterBaseVerificationCodeService.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("meterbaseverificationcode:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVerificationCode> list = meterBaseVerificationCodeService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseVerificationCode对象创建")
+    @ApiImplicitParam(name = "meterBaseVerificationCode", value = "详细实体meterBaseVerificationCode", required = true, dataType = "MeterBaseVerificationCode")
+    //@RequiresPermissions("meterbaseverificationcode:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody HashMap parma){
+        //发送验证码
+
+
+        MeterBaseVerificationCode model = new MeterBaseVerificationCode();
+        String no = meterBaseVerificationCodeMapper.GetNewID();
+        model.setVerificationCodeNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+        model.setCreateTime(new Date());
+        model.setPhoneNumber(parma.get("phoneNumber").toString());
+        model.setValidFlag("0");
+        model.setVaildTime(new Date());
+        model.setVerificationCode("");
+        meterBaseVerificationCodeMapper.insertSelective(model);
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseverificationcode:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseVerificationCode meterBaseVerificationCode = meterBaseVerificationCodeService.getById(id);
+        return success(meterBaseVerificationCode);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseVerificationCode信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseVerificationCode", value = "详细实体meterBaseVerificationCode", required = true, dataType = "MeterBaseVerificationCode")
+    })
+    //@RequiresPermissions("meterbaseverificationcode:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseVerificationCode model){
+        model.setId(id);
+        MeterBaseVerificationCode meterBaseVerificationCode = meterBaseVerificationCodeService.modify(model);
+        return success(meterBaseVerificationCode);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseverificationcode: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);
+			  meterBaseVerificationCodeService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/mapper/MeterBaseVerificationCodeMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.baseinfo.meterbaseverificationcode.mapper;
+
+import com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseVerificationCodeMapper extends IBaseMapper<MeterBaseVerificationCode, String> {
+    String GetNewID();
+
+    List<MeterBaseVerificationCode> getCode(String phoneNumber);
+
+    void updateVaild(String verificationCodeNo);
+}

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/mapper/MeterBaseVerificationCodeMapper.xml

@@ -0,0 +1,277 @@
+<?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.meterbaseverificationcode.mapper.MeterBaseVerificationCodeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode">
+    <id column="VERIFICATION_CODE_NO" jdbcType="VARCHAR" property="verificationCodeNo" />
+    <result column="VERIFICATION_CODE" jdbcType="VARCHAR" property="verificationCode" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="VAILD_TIME" jdbcType="TIMESTAMP" property="vaildTime" />
+    <result column="PHONE_NUMBER" jdbcType="VARCHAR" property="phoneNumber" />
+  </resultMap>
+  <sql id="columns">
+    VERIFICATION_CODE_NO, VERIFICATION_CODE, MEMO, VALID_FLAG, CREATE_TIME, VAILD_TIME, 
+    PHONE_NUMBER
+  </sql>
+  <sql id="columns_alias">
+    t.VERIFICATION_CODE_NO, t.VERIFICATION_CODE, t.MEMO, t.VALID_FLAG, t.CREATE_TIME, 
+    t.VAILD_TIME, t.PHONE_NUMBER
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_VERIFICATION_CODE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_VERIFICATION_CODE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="verificationCodeNo != null and verificationCodeNo != ''">
+        and VERIFICATION_CODE_NO = #{verificationCodeNo}
+      </if>
+      <if test="verificationCode != null and verificationCode != ''">
+        and VERIFICATION_CODE = #{verificationCode}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="vaildTime != null">
+        and TO_CHAR(VAILD_TIME,'yyyy-MM-dd') = #{vaildTime}
+      </if>
+      <if test="phoneNumber != null and phoneNumber != ''">
+        and PHONE_NUMBER = #{phoneNumber}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="verificationCodeNo != null and verificationCodeNo != ''">
+        and VERIFICATION_CODE_NO LIKE '%${verificationCodeNo}%'
+      </if>
+      <if test="verificationCode != null and verificationCode != ''">
+        and VERIFICATION_CODE LIKE '%${verificationCode}%'
+      </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="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="vaildTime != null">
+        and TO_CHAR(VAILD_TIME,'yyyy-MM-dd') = #{vaildTime}
+      </if>
+      <if test="phoneNumber != null and phoneNumber != ''">
+        and PHONE_NUMBER LIKE '%${phoneNumber}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_VERIFICATION_CODE
+    where VERIFICATION_CODE_NO = #{verificationCodeNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_VERIFICATION_CODE
+    where 1!=1 
+      <if test="verificationCode != null and verificationCode != ''">
+        or VERIFICATION_CODE = #{verificationCode}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="vaildTime != null">
+        or TO_CHAR(VAILD_TIME,'yyyy-MM-dd') = '#{vaildTime}'
+      </if>
+      <if test="phoneNumber != null and phoneNumber != ''">
+        or PHONE_NUMBER = #{phoneNumber}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode">
+    insert into METER_BASE_VERIFICATION_CODE (VERIFICATION_CODE_NO, VERIFICATION_CODE, 
+      MEMO, VALID_FLAG, CREATE_TIME, 
+      VAILD_TIME, PHONE_NUMBER)
+    values (#{verificationCodeNo,jdbcType=VARCHAR}, #{verificationCode,jdbcType=VARCHAR}, 
+      #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{vaildTime,jdbcType=TIMESTAMP}, #{phoneNumber,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode">
+    insert into METER_BASE_VERIFICATION_CODE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="verificationCodeNo != null">
+        VERIFICATION_CODE_NO,
+      </if>
+      <if test="verificationCode != null">
+        VERIFICATION_CODE,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="vaildTime != null">
+        VAILD_TIME,
+      </if>
+      <if test="phoneNumber != null">
+        PHONE_NUMBER,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="verificationCodeNo != null">
+        #{verificationCodeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="verificationCode != null">
+        #{verificationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="vaildTime != null">
+        #{vaildTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="phoneNumber != null">
+        #{phoneNumber,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode">
+    update METER_BASE_VERIFICATION_CODE
+    set VERIFICATION_CODE = #{verificationCode,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      VAILD_TIME = #{vaildTime,jdbcType=TIMESTAMP},
+      PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR}
+    where VERIFICATION_CODE_NO = #{verificationCodeNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseverificationcode.model.MeterBaseVerificationCode">
+    update METER_BASE_VERIFICATION_CODE
+    <set>
+      <if test="verificationCode != null">
+        VERIFICATION_CODE = #{verificationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="vaildTime != null">
+        VAILD_TIME = #{vaildTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="phoneNumber != null">
+        PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VERIFICATION_CODE_NO = #{verificationCodeNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VERIFICATION_CODE_NO = #{verificationCodeNo,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_VERIFICATION_CODE 
+      (VERIFICATION_CODE_NO, 
+      VERIFICATION_CODE, MEMO, VALID_FLAG, 
+      CREATE_TIME, VAILD_TIME, PHONE_NUMBER
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.verificationCodeNo,jdbcType=VARCHAR}, 
+      #{item.verificationCode,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.vaildTime,jdbcType=TIMESTAMP}, #{item.phoneNumber,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_VERIFICATION_CODE
+     set
+       VERIFICATION_CODE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.verificationCodeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,VERIFICATION_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.verificationCode,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,VAILD_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.vaildTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,PHONE_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERIFICATION_CODE_NO" close="end">
+          when #{item.verificationCodeNo,jdbcType=VARCHAR} then #{item.phoneNumber,jdbcType=VARCHAR}
+       </foreach>
+     where VERIFICATION_CODE_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.verificationCodeNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_VERIFICATION_CODE
+    where VERIFICATION_CODE_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(VERIFICATION_CODE_NO, LENGTH(VERIFICATION_CODE_NO) - 4))),0) + 1,5,'0') VERIFICATION_CODE_NO
+    FROM METER_BASE_VERIFICATION_CODE
+  </select>
+
+  <select id="getCode" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select * from METER_BASE_VERIFICATION_CODE where PHONE_NUMBER = #{phoneNumber} AND VALID_FLAG = '0' AND VAILD_TIME > TO_DATE(sysdate,'yyyy-MM-dd HH24:mi:ss')
+  </select>
+
+  <update id="updateVaild">
+    update METER_BASE_VERIFICATION_CODE set VALID_FLAG = '1' where VERIFICATION_CODE_NO = #{verificationCodeNo}
+  </update>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/model/MeterBaseVerificationCode.java

@@ -0,0 +1,137 @@
+package com.steerinfo.baseinfo.meterbaseverificationcode.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 MeterBaseVerificationCode implements IBasePO<String> {
+    /**
+     * 主键编号(VERIFICATION_CODE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键编号",required=true)
+    private String verificationCodeNo;
+
+    /**
+     * 验证码(VERIFICATION_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="验证码",required=false)
+    private String verificationCode;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态（0:未使用;1:已使用）(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0:未使用;1:已使用）",required=false)
+    private String validFlag;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date createTime;
+
+    /**
+     * 有效时间（YYYY-MM-DD HH:mm:SS）(VAILD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="有效时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date vaildTime;
+
+    /**
+     * 手机号(PHONE_NUMBER,VARCHAR,11)
+     */
+    @ApiModelProperty(value="手机号",required=false)
+    private String phoneNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.verificationCodeNo;
+    }
+
+    @Override
+    public void setId(String verificationCodeNo) {
+        this.verificationCodeNo = verificationCodeNo == null ? null : verificationCodeNo.trim();
+    }
+
+    public String getVerificationCodeNo() {
+        return verificationCodeNo;
+    }
+
+    public void setVerificationCodeNo(String verificationCodeNo) {
+        this.verificationCodeNo = verificationCodeNo == null ? null : verificationCodeNo.trim();
+    }
+
+    public String getVerificationCode() {
+        return verificationCode;
+    }
+
+    public void setVerificationCode(String verificationCode) {
+        this.verificationCode = verificationCode == null ? null : verificationCode.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 Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getVaildTime() {
+        return vaildTime;
+    }
+
+    public void setVaildTime(Date vaildTime) {
+        this.vaildTime = vaildTime;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", verificationCodeNo=").append(verificationCodeNo);
+        sb.append(", verificationCode=").append(verificationCode);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", vaildTime=").append(vaildTime);
+        sb.append(", phoneNumber=").append(phoneNumber);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/service/IMeterBaseVerificationCodeService.java

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

src/main/java/com/steerinfo/baseinfo/meterbaseverificationcode/service/impl/MeterBaseVerificationCodeServiceImpl.java

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

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -864,4 +864,16 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "混装混卸", notes = "混装混卸")
+    //@RequiresPermissions("meterworkcaractual:view")
+    @PostMapping(value = "/mixedLoading")
+    public RESTfulResult mixedLoading(@RequestBody HashMap parmas) {
+        try {
+            return success();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -102,4 +102,6 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     //根据传入时间和车号，查询给定时间段去重车号
     List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource);
+
+    String mixedLoading(String actualNo1, String actualNo2,String actualNo3, String predictionNo1,String predictionNo2);
 }

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

@@ -2606,5 +2606,28 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     private void updatePreWeight(String CarNo) throws MarkerMetException{
         meterWorkPreWgttypeMapper.updatePreWeight(CarNo);
     }
+
+    @Override
+    public String mixedLoading(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String predictionNo2) {
+        //查询所有的一次数据
+        MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
+        MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
+        MeterWorkCarActualFirst mwcaf3 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo3);
+
+        //查询所有的委托数据
+        PreTrackScale pts1 = preTrackScaleMapper.selectByPrimaryKey(predictionNo1);
+        PreTrackScale pts2 = preTrackScaleMapper.selectByPrimaryKey(predictionNo2);
+
+        if (mwcaf1 == null) {
+            return "未查询到相应的一次数据！！";
+        }
+        if (mwcaf2 == null) {
+            return "未查询到相应的一次数据！！";
+        }
+        if (mwcaf3 == null) {
+            return "未查询到相应的一次数据！！";
+        }
+        return "";
+    }
 }