后端修改

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

@@ -506,47 +506,56 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 rm.setMessage("验证码不能为空！！");
                 return rm;
             } else {
-                //通过手机获取验证码列表
-                AppVerificationCode modelTemp =  appVerificationCodeMapper.selectByPhone(telNum);
-                if(modelTemp!=null){
-                    //当前时间是否在过期时间之内
-                    Date date = new Date();
-                    //验证码是否过期
-                    int flag = date.compareTo(modelTemp.getExpirationTime());
-                    if(flag > 0 || modelTemp.getValueFlag().equals("0")){
-                        rm.setMessage("验证码已过期，请重新发送验证码！！");
-                        modelTemp.setValueFlag("0");
-                        appVerificationCodeMapper.updateByPrimaryKey(modelTemp);
-                        return rm;
-                    }
-                    //验证码没过期且相等
-                    if(modelTemp.getCode().equals(passCode) && modelTemp.getValueFlag().equals("1")){
-                        modelTemp.setValueFlag("0");
-                        appVerificationCodeMapper.updateByPrimaryKey(modelTemp);
-                        // 判断车号，司机手机号是否存在
-                        List<MeterBaseDriver> list = meterBaseDriverService.query(params);
-                        if (list.size() >= 1) {
-                            // 获取车辆SSO ID
-                            HashMap queryMap = new HashMap();
-                            queryMap.put("carNo", params.get("carNo").toString());
-
-                            MeterBaseCar car = meterBaseCarService.getByParams(queryMap);
-
-                            // 通过车辆SSO ID重置密码
-                            if (car != null) {
-                                // SSO重置密码
-                                SSOUtil ssoUtil = new SSOUtil();
-                                rm.setMessage(ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), ""));
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("carNo", carNo);
+                map.put("telNum", telNum);
+                List<MeterBaseDriver> driverModel = meterBaseDriverMapper.selectByParameters(map);
+                if(driverModel.size() >= 1){
+                    //通过手机获取验证码列表
+                    AppVerificationCode modelTemp =  appVerificationCodeMapper.selectByPhone(telNum);
+                    if(modelTemp!=null){
+                        //当前时间是否在过期时间之内
+                        Date date = new Date();
+                        //验证码是否过期
+                        int flag = date.compareTo(modelTemp.getExpirationTime());
+                        if(flag > 0 || modelTemp.getValueFlag().equals("0")){
+                            rm.setMessage("验证码已过期，请重新发送验证码！！");
+                            modelTemp.setValueFlag("0");
+                            appVerificationCodeMapper.updateByPrimaryKey(modelTemp);
+                            return rm;
+                        }
+                        //验证码没过期且相等
+                        if(modelTemp.getCode().equals(passCode) && modelTemp.getValueFlag().equals("1")){
+                            modelTemp.setValueFlag("0");
+                            appVerificationCodeMapper.updateByPrimaryKey(modelTemp);
+                            // 判断车号，司机手机号是否存在
+                            List<MeterBaseDriver> list = meterBaseDriverService.query(params);
+                            if (list.size() >= 1) {
+                                // 获取车辆SSO ID
+                                HashMap queryMap = new HashMap();
+                                queryMap.put("carNo", params.get("carNo").toString());
+
+                                MeterBaseCar car = meterBaseCarService.getByParams(queryMap);
+
+                                // 通过车辆SSO ID重置密码
+                                if (car != null) {
+                                    // SSO重置密码
+                                    SSOUtil ssoUtil = new SSOUtil();
+                                    rm.setMessage(ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), ""));
+                                }
+                            } else {
+                                rm.setMessage("没有此车号或手机号");
                             }
-                        } else {
-                            rm.setMessage("没有此车号或手机号");
                         }
+                        if (com.steerinfo.util.StringUtils.isNotEmpty(rm.getMessage())) {
+                            return failed(null, rm.getMessage());
+                        }
+                    }else{
+                        rm.setMessage("验证码有误！！");
+                        return rm;
                     }
-                    if (com.steerinfo.util.StringUtils.isNotEmpty(rm.getMessage())) {
-                        return failed(null, rm.getMessage());
-                    }
-                }else{
-                    rm.setMessage("验证码有误！！");
+                }else {
+                    rm.setMessage("重置密码失败，根据手机号和车号未查询到相应的账号！！");
                     return rm;
                 }
             }

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/controller/MeterBaseUserSpotController.java

@@ -0,0 +1,126 @@
+package com.steerinfo.baseinfo.meterbaseuserspot.controller;
+
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
+import com.steerinfo.baseinfo.meterbaseuserspot.service.IMeterBaseUserSpotService;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseUserSpot RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-31 04:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-31
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseUserSpot RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaseuserspots")
+public class MeterBaseUserSpotController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseUserSpotService meterBaseUserSpotService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseuserspot:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUserSpot> list = meterBaseUserSpotService.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("meterbaseuserspot:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUserSpot> list = meterBaseUserSpotService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseUserSpot对象创建")
+    @ApiImplicitParam(name = "meterBaseUserSpot", value = "详细实体meterBaseUserSpot", required = true, dataType = "MeterBaseUserSpot")
+    //@RequiresPermissions("meterbaseuserspot:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseUserSpot model){
+        MeterBaseUserSpot meterBaseUserSpot = meterBaseUserSpotService.add(model);
+        return success(meterBaseUserSpot);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseuserspot:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseUserSpot meterBaseUserSpot = meterBaseUserSpotService.getById(id);
+        return success(meterBaseUserSpot);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseUserSpot信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseUserSpot", value = "详细实体meterBaseUserSpot", required = true, dataType = "MeterBaseUserSpot")
+    })
+    //@RequiresPermissions("meterbaseuserspot:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseUserSpot model){
+        model.setId(id);
+        MeterBaseUserSpot meterBaseUserSpot = meterBaseUserSpotService.modify(model);
+        return success(meterBaseUserSpot);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseuserspot: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);
+			  meterBaseUserSpotService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据用户和计量点ID创建对象", notes="根据sso.sys_user表和meter_base_spot_info表的id创建MeterBaseUserSpot对象")
+    @PostMapping(value = "/checkAdd")
+    public RESTfulResult checkAdd(@RequestBody HashMap params){
+        RESTfulResult rm = failed();
+
+        try{
+            List<String> userIdList = (ArrayList) params.get("userIdList");
+            List<String> spotIdList = (ArrayList) params.get("spotIdList");
+            if(userIdList.size() >= 1 || spotIdList.size() >= 1){
+                rm.setMessage("操作失败，用户和计量点必须至少包含一条信息");
+            }
+            rm = meterBaseUserSpotService.checkAdd(userIdList, spotIdList);
+            return success(rm);
+        }catch(Exception e){
+            e.printStackTrace();
+            return rm;
+        }
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/mapper/MeterBaseUserSpotMapper.java

@@ -0,0 +1,11 @@
+package com.steerinfo.baseinfo.meterbaseuserspot.mapper;
+
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import feign.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseUserSpotMapper extends IBaseMapper<MeterBaseUserSpot, String> {
+    String getNewID(@Param(value = "afl") String afl);
+}

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/mapper/MeterBaseUserSpotMapper.xml

@@ -0,0 +1,319 @@
+<?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.meterbaseuserspot.mapper.MeterBaseUserSpotMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="USER_ID" jdbcType="VARCHAR" property="userId" />
+    <result column="USER_CODE" jdbcType="VARCHAR" property="userCode" />
+    <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    ID, USER_ID, USER_CODE, USER_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    CREATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.ID, t.USER_ID, t.USER_CODE, t.USER_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_USER_SPOT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_USER_SPOT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID = #{id}
+      </if>
+      <if test="userId != null and userId != ''">
+        and USER_ID = #{userId}
+      </if>
+      <if test="userCode != null and userCode != ''">
+        and USER_CODE = #{userCode}
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME = #{userName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID LIKE '%${id}%'
+      </if>
+      <if test="userId != null and userId != ''">
+        and USER_ID LIKE '%${userId}%'
+      </if>
+      <if test="userCode != null and userCode != ''">
+        and USER_CODE LIKE '%${userCode}%'
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME LIKE '%${userName}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_USER_SPOT
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_USER_SPOT
+    where 1!=1 
+      <if test="userId != null and userId != ''">
+        or USER_ID = #{userId}
+      </if>
+      <if test="userCode != null and userCode != ''">
+        or USER_CODE = #{userCode}
+      </if>
+      <if test="userName != null and userName != ''">
+        or USER_NAME = #{userName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot">
+    insert into METER_BASE_USER_SPOT (ID, USER_ID, USER_CODE, 
+      USER_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
+      )
+    values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{userCode,jdbcType=VARCHAR}, 
+      #{userName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot">
+    insert into METER_BASE_USER_SPOT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="userId != null">
+        USER_ID,
+      </if>
+      <if test="userCode != null">
+        USER_CODE,
+      </if>
+      <if test="userName != null">
+        USER_NAME,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userCode != null">
+        #{userCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot">
+    update METER_BASE_USER_SPOT
+    set USER_ID = #{userId,jdbcType=VARCHAR},
+      USER_CODE = #{userCode,jdbcType=VARCHAR},
+      USER_NAME = #{userName,jdbcType=VARCHAR},
+      BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot">
+    update METER_BASE_USER_SPOT
+    <set>
+      <if test="userId != null">
+        USER_ID = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userCode != null">
+        USER_CODE = #{userCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,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>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ID = #{id,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_USER_SPOT 
+      (ID, 
+      USER_ID, USER_CODE, USER_NAME, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.id,jdbcType=VARCHAR}, 
+      #{item.userId,jdbcType=VARCHAR}, #{item.userCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_USER_SPOT
+     set
+       ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.userId,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.userCode,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.userName,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.id,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_USER_SPOT
+    where ID 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(id, LENGTH(id) - 3))),0) + 1,4,'0') id
+    FROM meter_base_user_spot where instr(id,#{afl,jdbcType=VARCHAR})>0
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/model/MeterBaseUserSpot.java

@@ -0,0 +1,158 @@
+package com.steerinfo.baseinfo.meterbaseuserspot.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="用户和计量点映射表")
+public class MeterBaseUserSpot implements IBasePO<String> {
+    /**
+     * 用户计量点映射Id(ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="用户计量点映射Id",required=true)
+    private String id;
+
+    /**
+     * 用户ID(USER_ID,VARCHAR,40)
+     */
+    @ApiModelProperty(value="用户ID",required=false)
+    private String userId;
+
+    /**
+     * 用户编号(USER_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="用户编号",required=false)
+    private String userCode;
+
+    /**
+     * 用户姓名(USER_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="用户姓名",required=false)
+    private String userName;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称",required=false)
+    private String baseSpotName;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人名称",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode == null ? null : userCode.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    public String 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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", userCode=").append(userCode);
+        sb.append(", userName=").append(userName);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/service/IMeterBaseUserSpotService.java

@@ -0,0 +1,26 @@
+package com.steerinfo.baseinfo.meterbaseuserspot.service;
+
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * MeterBaseUserSpot服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-31 04:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-31
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseUserSpot服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseUserSpotService extends IBaseService<MeterBaseUserSpot, String>{
+    RESTfulResult checkAdd(List<String> userIdList, List<String> spotIdList);
+
+}

src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/service/impl/MeterBaseUserSpotServiceImpl.java

@@ -0,0 +1,61 @@
+package com.steerinfo.baseinfo.meterbaseuserspot.service.impl;
+
+import com.alibaba.druid.pool.ha.selector.RandomDataSourceRecoverThread;
+import com.steerinfo.baseinfo.meterbaseuserspot.mapper.MeterBaseUserSpotMapper;
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
+import com.steerinfo.baseinfo.meterbaseuserspot.service.IMeterBaseUserSpotService;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.util.SSOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MeterBaseUserSpot服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-31 04:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-31
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseUserSpot服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseUserSpotService")
+public class MeterBaseUserSpotServiceImpl extends BaseServiceImpl<MeterBaseUserSpot, String> implements IMeterBaseUserSpotService {
+
+    @Autowired
+    private MeterBaseUserSpotMapper meterBaseUserSpotMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseUserSpot, String> getMapper() {
+        return meterBaseUserSpotMapper;
+    }
+
+    @Override
+    public RESTfulResult checkAdd(List<String> userIdList, List<String> spotIdList) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        for(String userId: userIdList) {
+            SSOUtil ssoUtil = new SSOUtil();
+            //MeterBaseUserSpot sysUser= ssoUtil..selectByPrimaryKey(userId);
+            for (String spotId: spotIdList) {
+
+            }
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String afl = sdf.format(new Date());
+        String actualFirstNo = sdf.format(new Date()) + meterBaseUserSpotMapper.getNewID(afl);
+
+
+        return null;
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornote/controller/MeterMonitorNoteController.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.metermonitor.metermonitornote.service.IMeterMonitorNoteService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -205,4 +206,15 @@ public class MeterMonitorNoteController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "获取列表", notes = "不分页模糊查询最新前100条记录")
+    @GetMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestParam HashMap parmas) {
+        try {
+            List<MeterMonitorNote> list = meterMonitorNoteService.queryLikeNoPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.java

@@ -2,9 +2,11 @@ package com.steerinfo.metermonitor.metermonitornote.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -17,4 +19,6 @@ public interface MeterMonitorNoteMapper extends IBaseMapper<MeterMonitorNote, St
     String getNewID(@Param(value = "afl") String afl);
 
     List<MeterMonitorNote> selectByType(Map<String, Object> parmas);
+
+    List<MeterMonitorNote> queryLikeNoPage(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.xml

@@ -644,4 +644,13 @@
       where t1.spot_type_no = #{spotTypeNo})
     </where>
   </select>
+
+  <select id="queryLikeNoPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from (
+    <include refid="select" />
+    <include refid="where" />
+    order by operation_time desc
+    )
+    where rownum &lt;= 100
+  </select>
 </mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/IMeterMonitorNoteService.java

@@ -3,8 +3,10 @@ package com.steerinfo.metermonitor.metermonitornote.service;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,4 +32,6 @@ public interface IMeterMonitorNoteService extends IBaseService<MeterMonitorNote,
 
     PageList<MeterMonitorNote> selectByType(HashMap parmas, Integer pageNum, Integer pageSize);
 
+    List<MeterMonitorNote> queryLikeNoPage(HashMap<String, Object> params);
+
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/impl/MeterMonitorNoteServiceImpl.java

@@ -8,6 +8,7 @@ import com.steerinfo.metermonitor.metermonitornote.mapper.MeterMonitorNoteMapper
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.metermonitor.metermonitornote.service.IMeterMonitorNoteService;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -90,4 +91,10 @@ public class MeterMonitorNoteServiceImpl extends BaseServiceImpl<MeterMonitorNot
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public List<MeterMonitorNote> queryLikeNoPage(HashMap<String, Object> params) {
+        List<MeterMonitorNote> monitors = meterMonitorNoteMapper.queryLikeNoPage(params);
+        return monitors;
+    }
 }

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

@@ -101,6 +101,22 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeByValueFlag/")
+    public RESTfulResult likeByValueFlag(@RequestBody HashMap params, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByValueFlag(params, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java

@@ -54,5 +54,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
 
     MeterWorkCarActual selectActual(String actualFirstNo);
 
+    List<MeterWorkCarActual> likeByValueFlag(Map<String, Object> params);
+
 
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3421,4 +3421,10 @@
   <select id="getCarActual" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select * from METER_WORK_CAR_ACTUAL WHERE CAR_NO IN (select CAR_NO from METER_BASE_CAR where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo} and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName})
   </select>
+
+  <select id="likeByValueFlag" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+    and value_flag != '0'
+  </select>
 </mapper>

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

@@ -89,4 +89,6 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     MeterWorkCarActual clientClean(MeterWorkCarActualFirst first, MeterWorkCarActual net);
     //根据实绩id获取一次计量信息和委托信息
     RESTfulResult firstAndEntrustById(String actualNo);
+
+    PageList<MeterWorkCarActual> likeByValueFlag(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

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

@@ -882,6 +882,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return null;
     }
 
+    @Override
+    public PageList<MeterWorkCarActual> likeByValueFlag(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkCarActual> rows = meterWorkCarActualMapper.likeByValueFlag(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkCarActual matchPrediction (String actualNo, String predictionNo, String note) throws MarkerMetException {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -1954,11 +1954,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
-  <select id="likeByValueFlag" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    and value_flag != '0'
-  </select>
+
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_CAR_ACTUAL_FIRST 
       (ACTUAL_FIRST_NO, 
@@ -2829,4 +2825,9 @@
             #{item}
         </foreach>
   </select>
+  <select id="likeByValueFlag" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+    and value_flag != '0'
+  </select>
 </mapper>

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

@@ -986,6 +986,13 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         String no = meterWorkCarActualFirstMapper.getNewID(afl);
         oci.setActualFirstNo(formatter.format(new Date()) + no);
         oci.setValueFlag("1");
+        /*//
+        if(oci.getWeightType().equals("0")){
+
+        }
+        if(oci.getWeightType().equals("1")){
+
+        }*/
         meterWorkCarActualFirstMapper.insert(oci);
 
         //2、存储历史皮重及历史皮重明细信息
@@ -1766,10 +1773,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         MeterWorkMonitor mwm = meterWorkMonitorMapper.selectByPrimaryKey(baseSpotNo);
         MeterWorkOnline mwo = meterWorkOnlineMapper.selectByPrimaryKey(mwm.getUserNo());
         //修改计量监控
-        mwm.setUserNo("");
+        /*mwm.setUserNo("");
         meterWorkMonitorMapper.updateByPrimaryKeyNotUserNo(mwm);
         //修改在线状态
-        /*if (mwo != null) {
+        if (mwo != null) {
             mwo.setWorkFlag("0");//未接管
             meterWorkOnlineMapper.updateByPrimaryKey(mwo);
         }*/

src/main/java/com/steerinfo/meterwork/meterworkmonitor/controller/MeterWorkMonitorController.java

@@ -72,18 +72,6 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "获取列表", notes = "不分页模糊查询最新前100条记录")
-    @GetMapping(value = "/noPage")
-    public RESTfulResult noPage(@RequestParam HashMap parmas) {
-        try {
-            List<MeterWorkMonitor> list = meterWorkMonitorService.queryLikeNoPage(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
     @ApiOperation(value = "创建", notes = "根据MeterWorkMonitor对象创建")
     @ApiImplicitParam(name = "meterWorkMonitor", value = "详细实体meterWorkMonitor", required = true, dataType = "MeterWorkMonitor")
     //@RequiresPermissions("meterworkmonitor:create")

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.java

@@ -2,8 +2,10 @@ package com.steerinfo.meterwork.meterworkmonitor.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
+import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
 
 @Mapper
@@ -19,4 +21,5 @@ public interface MeterWorkMonitorMapper extends IBaseMapper<MeterWorkMonitor, St
     int batchUpdateSelective(List<MeterWorkMonitor> list);
 
     int UpdateUserNo(List<MeterWorkMonitor> list);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -1525,4 +1525,6 @@
       #{item.pointNo,jdbcType=VARCHAR}
     </foreach>
   </update>
+
+
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/IMeterWorkMonitorService.java

@@ -28,5 +28,5 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
 
     void AutomaticAllocation();
 
-    List<MeterWorkMonitor> queryLikeNoPage(HashMap<String, Object> parmas);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -109,10 +109,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         System.out.println("DATASOURCE = " + dataSource  );
     }
 
-    @Override
-    public List<MeterWorkMonitor> queryLikeNoPage(HashMap<String, Object> parmas) {
-        return null;
-    }
+
 
     private void RandomAssign() {
         List<MeterWorkMonitor> list2 = meterWorkMonitorMapper.selectForAss();

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

@@ -678,11 +678,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             BeanUtils.copyProperties(first3,mwcaf3);
             MeterWorkRailwayActFirst first4 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo3, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf4);
-            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
-            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo2, actualNo1, predictionNo1);
-            BeanUtils.copyProperties(mwca1, actualRow1);
-            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualNo3, actualNo2, predictionNo2);
-            BeanUtils.copyProperties(mwca2,actualRow2);
 
             //更新预报数据
             PreRailwayScale scale = new PreRailwayScale();
@@ -690,7 +685,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("二次计量洁净更新");
+            scale.setUpdateManName("混装洁净更新");
+            scale.setPredictionType("7");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale.setUploadFlag("1");
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
 
@@ -699,7 +696,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
             scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("二次计量洁净更新");
+            scale1.setUpdateManName("混装洁净更新");
+            scale1.setPredictionType("7");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale1.setUploadFlag("1");
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
 
@@ -707,16 +706,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新第一次皮重数据
             mwcaf1.setValueFlag(DbConstants.NET);
             mwcaf1.setUpdateManName("system");
-            mwcaf1.setUpdateManName("二次计量洁净更新");
+            mwcaf1.setUpdateManName("混装洁净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreSacale("1");
+            mwcaf1.setPredictionNo(predictionNo1);
+            mwcaf1.setPredictionType("7");
+            mwcaf1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次毛重数据
             mwcaf2.setValueFlag(DbConstants.NET);
             mwcaf2.setUpdateManName("system");
-            mwcaf2.setUpdateManName("二次计量洁净更新");
+            mwcaf2.setUpdateManName("混装洁净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreSacale("1");
+            mwcaf2.setPredictionNo(predictionNo1);
+            mwcaf2.setPredictionType("7");
+            mwcaf2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf2);
             //添加第二次皮重数据
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -725,29 +730,43 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf3.setActualFirstNo(actualFirstNo);
             mwcaf3.setValueFlag(DbConstants.NET);
             mwcaf3.setUpdateManName("system");
-            mwcaf3.setUpdateManName("二次计量洁净更新");
+            mwcaf3.setUpdateManName("混装洁净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreSacale("1");
+            mwcaf3.setPredictionNo(predictionNo2);
+            mwcaf3.setPredictionType("7");
+            mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
             mwcaf4.setUpdateManName("system");
-            mwcaf4.setUpdateManName("二次计量洁净更新");
+            mwcaf4.setUpdateManName("混装洁净更新");
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreSacale("1");
+            mwcaf4.setPredictionNo(predictionNo2);
+            mwcaf4.setPredictionType("7");
+            mwcaf4.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf4);
 
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo2, actualNo1, predictionNo1);
+            BeanUtils.copyProperties(mwca1, actualRow1);
+            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualNo3, actualFirstNo, predictionNo2);
+            BeanUtils.copyProperties(mwca2,actualRow2);
             //添加结净数据
             String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
             actualRow1.setActualNo(sdf.format(new Date()) + no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("混装结净");
+            actualRow1.setNote("混装匹配结净");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreSacale("1");
-            actualRow1.setValueFlag("2");
+            actualRow1.setValueFlag("1");
             actualRow1.setCreateTime(new Date());
-            actualRow1.setCreateManName("洁净");
+            actualRow1.setCreateManName("混装匹配结净");
+            actualRow1.setPredictionType("7");
+            actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf2.getMeterWeight().subtract(mwcaf1.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
@@ -755,12 +774,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setActualNo(sdf.format(new Date()) + no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("混装结净");
+            actualRow2.setNote("混装匹配结净");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreSacale("1");
-            actualRow2.setValueFlag("2");
+            actualRow2.setValueFlag("1");
             actualRow2.setCreateTime(new Date());
-            actualRow2.setCreateManName("洁净");
+            actualRow2.setCreateManName("混装匹配结净");
+            actualRow2.setPredictionType("7");
+            actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf4.getMeterWeight().subtract(mwcaf3.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
         }
@@ -786,7 +808,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             MeterWorkRailwayActual actualRow1 = new MeterWorkRailwayActual();
             MeterWorkRailwayActual actualRow2 = new MeterWorkRailwayActual();
             //判断是否为混装逻辑
-            if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 || mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 || mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
+            if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 ||
+                    mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 ||
+                    mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "不为混卸逻辑！！";
             }
             //判断一次数据是否存在
@@ -794,7 +818,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 return "未查询到相应的一次数据！！";
             }
             //判断一次数据是否已结净
-            if (mwcaf1.getValueFlag().equals("2") || mwcaf2.getValueFlag().equals("2") || mwcaf3.getValueFlag().equals("2") || mwcaf4.getValueFlag().equals("2")) {
+            if (mwcaf1.getValueFlag().equals("2") || mwcaf2.getValueFlag().equals("2") ||
+                    mwcaf3.getValueFlag().equals("2") || mwcaf4.getValueFlag().equals("2")) {
                 return "存在已结净的一次数据！！";
             }
             //判断委托数据是否存在
@@ -814,11 +839,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             BeanUtils.copyProperties(first3,mwcaf3);
             MeterWorkRailwayActFirst first4 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo3, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf4);
-            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
-            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
-            BeanUtils.copyProperties(mwca1, actualRow1);
-            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualNo2, actualNo3, predictionNo2);
-            BeanUtils.copyProperties(mwca2,actualRow2);
 
             //更新预报数据
             PreRailwayScale scale = new PreRailwayScale();
@@ -826,8 +846,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("二次计量洁净更新");
+            scale.setUpdateManName("混卸洁净更新");
             scale.setUploadFlag("1");
+            scale.setValueFlag("2");
+            //预报类型：双委托（5）、预报组合：A预报，B预报
+            scale.setPredictionType("6");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
 
             PreRailwayScale scale1 = new PreRailwayScale();
@@ -835,24 +859,33 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
             scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("二次计量洁净更新");
+            scale1.setUpdateManName("混卸洁净更新");
             scale1.setUploadFlag("1");
+            scale1.setValueFlag("2");
+            scale1.setPredictionType("6");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
 
             //更新一次数据
             //更新第一次毛重数据
             mwcaf1.setValueFlag(DbConstants.NET);
             mwcaf1.setUpdateManNo("system");
-            mwcaf1.setUpdateManName("二次计量洁净更新");
+            mwcaf1.setUpdateManName("混卸洁净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreSacale("1");
+            mwcaf1.setPredictionNo(predictionNo1);
+            mwcaf1.setPredictionType("6");
+            mwcaf1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次皮重数据
             mwcaf2.setValueFlag(DbConstants.NET);
             mwcaf2.setUpdateManNo("system");
-            mwcaf2.setUpdateManName("二次计量洁净更新");
+            mwcaf2.setUpdateManName("混卸洁净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreSacale("1");
+            mwcaf2.setPredictionNo(predictionNo1);
+            mwcaf2.setPredictionType("6");
+            mwcaf2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf2);
             //添加第二次毛重数据
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -860,30 +893,44 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
             mwcaf3.setActualFirstNo(actualFirstNo);
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManNo("system");
-            mwcaf3.setUpdateManName("二次计量洁净更新");
+            mwcaf3.setUpdateManName("混卸洁净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreSacale("1");
+            mwcaf3.setPredictionNo(predictionNo2);
+            mwcaf3.setPredictionType("6");
+            mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次皮重数据
             mwcaf4.setValueFlag(DbConstants.NET);
             mwcaf4.setUpdateManNo("system");
-            mwcaf4.setUpdateManName("二次计量洁净更新");
-            mwcaf4.setUpdateTime(new Date());
-            mwcaf4.setIsPreSacale("1");
+            mwcaf3.setUpdateManName("混卸洁净更新");
+            mwcaf3.setUpdateTime(new Date());
+            mwcaf3.setIsPreSacale("1");
+            mwcaf3.setPredictionNo(predictionNo2);
+            mwcaf3.setPredictionType("6");
+            mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf4);
 
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
+            BeanUtils.copyProperties(mwca1, actualRow1);
+            MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAddPre(actualFirstNo, actualNo3, predictionNo2);
+            BeanUtils.copyProperties(mwca2,actualRow2);
+
             //添加结净数据
             String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
             actualRow1.setActualNo(sdf.format(new Date()) + no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("混装结净");
+            actualRow1.setNote("混卸匹配结净");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreSacale("1");
-            actualRow1.setValueFlag("2");
-            actualRow1.setCreateManName("洁净");
+            actualRow1.setValueFlag("1");
+            actualRow1.setCreateManName("混卸匹配结净");
             actualRow1.setCreateTime(new Date());
+            actualRow1.setPredictionType("6");
+            actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
@@ -891,12 +938,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setActualNo(sdf.format(new Date()) + no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("混装结净");
+            actualRow2.setNote("混卸匹配结净");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreSacale("1");
-            actualRow2.setValueFlag("2");
-            actualRow2.setCreateManName("洁净");
+            actualRow2.setValueFlag("1");
+            actualRow2.setCreateManName("混卸匹配结净");
             actualRow2.setCreateTime(new Date());
+            actualRow2.setPredictionType("6");
+            actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf3.getMeterWeight().subtract(mwcaf4.getMeterWeight()));
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
         }