后端修改

src/main/java/com/steerinfo/baseinfo/combaseinfo/controller/ComBaseInfoController.java

@@ -280,4 +280,5 @@ public class ComBaseInfoController extends BaseRESTfulController {
         }
         return rm;
     }
+
 }

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/IComBaseInfoService.java

@@ -47,4 +47,5 @@ public interface IComBaseInfoService extends IBaseService<ComBaseInfo, String>{
      * @return
      */
     String doUpdateWf(ComBaseInfo model);
+
 }

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/controller/MeterBaseGroupSpotController.java

@@ -0,0 +1,151 @@
+package com.steerinfo.baseinfo.meterbasegroupspot.controller;
+
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
+import com.steerinfo.baseinfo.meterbasegroupspot.service.IMeterBaseGroupSpotService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseGroupSpot RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-29 11:35
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-29
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseGroupSpot RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasegroupspots")
+public class MeterBaseGroupSpotController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseGroupSpotService meterBaseGroupSpotService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasegroupspot:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseGroupSpot> list = meterBaseGroupSpotService.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("meterbasegroupspot:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseGroupSpot> list = meterBaseGroupSpotService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseGroupSpot对象创建")
+    @ApiImplicitParam(name = "meterBaseGroupSpot", value = "详细实体meterBaseGroupSpot", required = true, dataType = "MeterBaseGroupSpot")
+    //@RequiresPermissions("meterbasegroupspot:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseGroupSpot model){
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("groupId",model.getSpotId());
+        map.put("spotId",model.getSpotId());
+        map.put("valueFlag","1");
+        if (meterBaseGroupSpotService.getByParams(map) != null){
+            return failed(null,"已存在对应的数据");
+        }
+
+        model.setGroupSpotId(meterBaseGroupSpotService.creatId());
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setCreateManNo(payload.getUserCode());
+        model.setCreateManName(payload.getUserName());
+        model.setCreateTime(new Date());
+        model.setValueFlag("1");
+        MeterBaseGroupSpot meterBaseGroupSpot = meterBaseGroupSpotService.add(model);
+        return success(meterBaseGroupSpot);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasegroupspot:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseGroupSpot meterBaseGroupSpot = meterBaseGroupSpotService.getById(id);
+        return success(meterBaseGroupSpot);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseGroupSpot信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseGroupSpot", value = "详细实体meterBaseGroupSpot", required = true, dataType = "MeterBaseGroupSpot")
+    })
+    //@RequiresPermissions("meterbasegroupspot:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseGroupSpot model){
+
+
+        model.setId(id);
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setUpdateManNo(payload.getUserCode());
+        model.setUpdateManName(payload.getUserName());
+        model.setUpdateTime(new Date());
+        MeterBaseGroupSpot meterBaseGroupSpot = meterBaseGroupSpotService.modify(model);
+        return success(meterBaseGroupSpot);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasegroupspot: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);
+			  meterBaseGroupSpotService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="查询", notes="根据group和spot相关参数查询")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @GetMapping(value = "/queryByGroupSpot")//String
+    public RESTfulResult queryByGroupSpot(@RequestParam HashMap<String,Object> map,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseGroupSpot> list = meterBaseGroupSpotService.queryByGroupSpotForPage(map,pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="逻辑删除", notes="逻辑删除")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @PutMapping(value = "/deleteByLogic")//String
+    public RESTfulResult deleteByLogic(@RequestParam String id){
+        //判断主键是否存在
+        MeterBaseGroupSpot meterBaseGroupSpot = meterBaseGroupSpotService.queryById(id);
+        if (meterBaseGroupSpot == null){
+            return failed(null,"找不到主键对应的值");
+        }
+        meterBaseGroupSpot.setValueFlag("0");
+        meterBaseGroupSpotService.deleteByLogic(meterBaseGroupSpot);
+        return success(null,"删除成功");
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/mapper/MeterBaseGroupSpotMapper.java

@@ -0,0 +1,18 @@
+package com.steerinfo.baseinfo.meterbasegroupspot.mapper;
+
+import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseGroupSpotMapper extends IBaseMapper<MeterBaseGroupSpot, String> {
+    //生成流水号
+    String GetNewID();
+
+    //通过groupId、groupName、spotId、spotName
+    List<MeterBaseGroupSpot> queryByGroupSpot(HashMap<String,Object> map);
+}

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/mapper/MeterBaseGroupSpotMapper.xml

@@ -0,0 +1,420 @@
+<?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.meterbasegroupspot.mapper.MeterBaseGroupSpotMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot">
+    <id column="GROUP_SPOT_ID" jdbcType="VARCHAR" property="groupSpotId" />
+    <result column="GROUP_ID" jdbcType="VARCHAR" property="groupId" />
+    <result column="GROUP_NAME" jdbcType="VARCHAR" property="groupName" />
+    <result column="SPOT_ID" jdbcType="VARCHAR" property="spotId" />
+    <result column="SPOT_NAME" jdbcType="VARCHAR" property="spotName" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="columns">
+    GROUP_SPOT_ID, GROUP_ID, GROUP_NAME, SPOT_ID, SPOT_NAME, VALUE_FLAG, CREATE_MAN_NO, 
+    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.GROUP_SPOT_ID, t.GROUP_ID, t.GROUP_NAME, t.SPOT_ID, t.SPOT_NAME, t.VALUE_FLAG, 
+    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_BASE_GROUP_SPOT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_GROUP_SPOT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="groupSpotId != null and groupSpotId != ''">
+        and GROUP_SPOT_ID = #{groupSpotId}
+      </if>
+      <if test="groupId != null and groupId != ''">
+        and GROUP_ID = #{groupId}
+      </if>
+      <if test="groupName != null and groupName != ''">
+        and GROUP_NAME = #{groupName}
+      </if>
+      <if test="spotId != null and spotId != ''">
+        and SPOT_ID = #{spotId}
+      </if>
+      <if test="spotName != null and spotName != ''">
+        and SPOT_NAME = #{spotName}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="groupSpotId != null and groupSpotId != ''">
+        and GROUP_SPOT_ID LIKE '%${groupSpotId}%'
+      </if>
+      <if test="groupId != null and groupId != ''">
+        and GROUP_ID LIKE '%${groupId}%'
+      </if>
+      <if test="groupName != null and groupName != ''">
+        and GROUP_NAME LIKE '%${groupName}%'
+      </if>
+      <if test="spotId != null and spotId != ''">
+        and SPOT_ID LIKE '%${spotId}%'
+      </if>
+      <if test="spotName != null and spotName != ''">
+        and SPOT_NAME LIKE '%${spotName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_GROUP_SPOT
+    where GROUP_SPOT_ID = #{groupSpotId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_GROUP_SPOT
+    where 1!=1 
+      <if test="groupId != null and groupId != ''">
+        or GROUP_ID = #{groupId}
+      </if>
+      <if test="groupName != null and groupName != ''">
+        or GROUP_NAME = #{groupName}
+      </if>
+      <if test="spotId != null and spotId != ''">
+        or SPOT_ID = #{spotId}
+      </if>
+      <if test="spotName != null and spotName != ''">
+        or SPOT_NAME = #{spotName}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot">
+    insert into METER_BASE_GROUP_SPOT (GROUP_SPOT_ID, GROUP_ID, GROUP_NAME, 
+      SPOT_ID, SPOT_NAME, VALUE_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    values (#{groupSpotId,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, 
+      #{spotId,jdbcType=VARCHAR}, #{spotName,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot">
+    insert into METER_BASE_GROUP_SPOT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="groupSpotId != null">
+        GROUP_SPOT_ID,
+      </if>
+      <if test="groupId != null">
+        GROUP_ID,
+      </if>
+      <if test="groupName != null">
+        GROUP_NAME,
+      </if>
+      <if test="spotId != null">
+        SPOT_ID,
+      </if>
+      <if test="spotName != null">
+        SPOT_NAME,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="groupSpotId != null">
+        #{groupSpotId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null">
+        #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="spotId != null">
+        #{spotId,jdbcType=VARCHAR},
+      </if>
+      <if test="spotName != null">
+        #{spotName,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot">
+    update METER_BASE_GROUP_SPOT
+    set GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      GROUP_NAME = #{groupName,jdbcType=VARCHAR},
+      SPOT_ID = #{spotId,jdbcType=VARCHAR},
+      SPOT_NAME = #{spotName,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where GROUP_SPOT_ID = #{groupSpotId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot">
+    update METER_BASE_GROUP_SPOT
+    <set>
+      <if test="groupId != null">
+        GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null">
+        GROUP_NAME = #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="spotId != null">
+        SPOT_ID = #{spotId,jdbcType=VARCHAR},
+      </if>
+      <if test="spotName != null">
+        SPOT_NAME = #{spotName,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where GROUP_SPOT_ID = #{groupSpotId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where GROUP_SPOT_ID = #{groupSpotId,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_GROUP_SPOT 
+      (GROUP_SPOT_ID, 
+      GROUP_ID, GROUP_NAME, SPOT_ID, 
+      SPOT_NAME, VALUE_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.groupSpotId,jdbcType=VARCHAR}, 
+      #{item.groupId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.spotId,jdbcType=VARCHAR}, 
+      #{item.spotName,jdbcType=VARCHAR}, #{item.valueFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_GROUP_SPOT
+     set
+       GROUP_SPOT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.groupSpotId,jdbcType=VARCHAR}
+       </foreach>
+       ,GROUP_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.groupId,jdbcType=VARCHAR}
+       </foreach>
+       ,GROUP_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.groupName,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.spotId,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.spotName,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case GROUP_SPOT_ID" separator=" ">
+          when #{item.groupSpotId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where GROUP_SPOT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.groupSpotId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_GROUP_SPOT
+    where GROUP_SPOT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(GROUP_SPOT_ID, LENGTH(GROUP_SPOT_ID) - 4))),0) + 1,5,'0') CARRIAGE_WEIGHT_NO
+    FROM METER_BASE_GROUP_SPOT
+  </select>
+  
+  <select id="queryByGroupSpot" resultMap="BaseResultMap">
+    select * from METER_BASE_GROUP_SPOT
+    WHERE 1=1
+    <if test="valueFlag != null and valueFlag != ''" >
+      and VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="groupId != null and groupId != ''">
+      and GROUP_ID like '%#{groupId}%'
+    </if>
+    <if test="groupName != null and groupName != ''">
+      and GROUP_ID like '%#{groupName}%'
+    </if>
+    <if test="spotId != null and spotId != ''">
+      and SPOT_ID like '%#{spotId}%'
+    </if>
+    <if test="spotName != null and spotName != ''">
+      and SPOT_NAME like '%#{spotName}%'
+    </if>
+    order by CREATE_TIME desc
+  </select>
+
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/model/MeterBaseGroupSpot.java

@@ -0,0 +1,212 @@
+package com.steerinfo.baseinfo.meterbasegroupspot.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 MeterBaseGroupSpot implements IBasePO<String> {
+    /**
+     * 主键(GROUP_SPOT_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String groupSpotId;
+
+    /**
+     * 分组编号(GROUP_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="分组编号",required=false)
+    private String groupId;
+
+    /**
+     * 分组名(GROUP_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="分组名",required=false)
+    private String groupName;
+
+    /**
+     * 站点编号(SPOT_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="站点编号",required=false)
+    private String spotId;
+
+    /**
+     * 站点名(SPOT_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="站点名",required=false)
+    private String spotName;
+
+    /**
+     * 状态(1:有效 0:无效)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(1:有效 0:无效)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(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;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.groupSpotId;
+    }
+
+    @Override
+    public void setId(String groupSpotId) {
+        this.groupSpotId = groupSpotId == null ? null : groupSpotId.trim();
+    }
+
+    public String getGroupSpotId() {
+        return groupSpotId;
+    }
+
+    public void setGroupSpotId(String groupSpotId) {
+        this.groupSpotId = groupSpotId == null ? null : groupSpotId.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName == null ? null : groupName.trim();
+    }
+
+    public String getSpotId() {
+        return spotId;
+    }
+
+    public void setSpotId(String spotId) {
+        this.spotId = spotId == null ? null : spotId.trim();
+    }
+
+    public String getSpotName() {
+        return spotName;
+    }
+
+    public void setSpotName(String spotName) {
+        this.spotName = spotName == null ? null : spotName.trim();
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", groupSpotId=").append(groupSpotId);
+        sb.append(", groupId=").append(groupId);
+        sb.append(", groupName=").append(groupName);
+        sb.append(", spotId=").append(spotId);
+        sb.append(", spotName=").append(spotName);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/service/IMeterBaseGroupSpotService.java

@@ -0,0 +1,34 @@
+package com.steerinfo.baseinfo.meterbasegroupspot.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import java.util.HashMap;
+
+/**
+ * MeterBaseGroupSpot服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-29 11:35
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-29
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseGroupSpot服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseGroupSpotService extends IBaseService<MeterBaseGroupSpot, String>{
+
+    /**
+     * 创建主键
+     * @return 返回主键
+     */
+    String creatId();
+
+    PageList<MeterBaseGroupSpot> queryByGroupSpotForPage(HashMap<String,Object>  map, Integer pageNum, Integer pageSize);
+
+    void deleteByLogic(MeterBaseGroupSpot meterBaseRailwayCarriageWeight);
+
+    MeterBaseGroupSpot queryById(String id);
+}

src/main/java/com/steerinfo/baseinfo/meterbasegroupspot/service/impl/MeterBaseGroupSpotServiceImpl.java

@@ -0,0 +1,64 @@
+package com.steerinfo.baseinfo.meterbasegroupspot.service.impl;
+
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
+import com.steerinfo.baseinfo.meterbasegroupspot.mapper.MeterBaseGroupSpotMapper;
+import com.steerinfo.baseinfo.meterbasegroupspot.service.IMeterBaseGroupSpotService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseGroupSpot服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-29 11:35
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-29
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseGroupSpot服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseGroupSpotService")
+public class MeterBaseGroupSpotServiceImpl extends BaseServiceImpl<MeterBaseGroupSpot, String> implements IMeterBaseGroupSpotService {
+
+    @Autowired
+    private MeterBaseGroupSpotMapper meterBaseGroupSpotMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseGroupSpot, String> getMapper() {
+        return meterBaseGroupSpotMapper;
+    }
+
+    @Override
+    public String creatId() {
+        return meterBaseGroupSpotMapper.GetNewID();
+    }
+
+    @Override
+    public PageList<MeterBaseGroupSpot> queryByGroupSpotForPage(HashMap<String, Object> map, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseGroupSpot> rows = meterBaseGroupSpotMapper.queryByGroupSpot(map);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public void deleteByLogic(MeterBaseGroupSpot meterBaseRailwayCarriageWeight) {
+        meterBaseGroupSpotMapper.updateByPrimaryKeySelective(meterBaseRailwayCarriageWeight);
+    }
+
+    @Override
+    public MeterBaseGroupSpot queryById(String id) {
+        return meterBaseGroupSpotMapper.selectByPrimaryKey(id);
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/controller/MeterBaseRailwayCarriageWeightController.java

@@ -66,11 +66,18 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
     //@RequiresPermissions("meterbaserailwaycarriageweight:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody MeterBaseRailwayCarriageWeight model){
+        //判断code是否唯一
+
+        if (meterBaseRailwayCarriageWeightService.getByProperty("carriageCode",model.getCarriageCode()) != null){
+            return failed(null,"存在相同Code");
+        }
+
         model.setCarriageWeightNo(meterBaseRailwayCarriageWeightService.creatId());
         UserPayload payload = UserPayload.getCurrUser();
         model.setCreateManNo(payload.getUserCode());
         model.setCreateManName(payload.getUserName());
         model.setCreateTime(new Date());
+        model.setValueFlag("1");
         MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.add(model);
         return success(meterBaseRailwayCarriageWeight);
     }
@@ -122,16 +129,24 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
         return success(list);
     }
 
+    @ApiOperation(value="查询")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @GetMapping(value = "/queryList")
+    public RESTfulResult queryList(@RequestParam HashMap<String,Object> map){
+        List<MeterBaseRailwayCarriageWeight> list = meterBaseRailwayCarriageWeightService.queryList(map);
+        return success(list);
+    }
+
     @ApiOperation(value="逻辑删除", notes="逻辑删除")
     //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
     @PutMapping(value = "/deleteByLogic")//String
     public RESTfulResult deleteByLogic(@RequestParam String id){
         //判断主键是否存在
-        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.queryByById(id);
+        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.queryById(id);
         if (meterBaseRailwayCarriageWeight == null){
             return failed(null,"找不到主键对应的值");
         }
-        meterBaseRailwayCarriageWeight.setValueFlag("1");
+        meterBaseRailwayCarriageWeight.setValueFlag("0");
         meterBaseRailwayCarriageWeightService.deleteByLogic(meterBaseRailwayCarriageWeight);
         return success(null,"删除成功");
     }

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/mapper/MeterBaseRailwayCarriageWeightMapper.xml

@@ -13,27 +13,24 @@
     <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="CARRIAGE_NAME" jdbcType="VARCHAR" property="carriageName" />
-    <result column="SPOT_NO" jdbcType="VARCHAR" property="spotNo" />
-    <result column="SPOT_NAME" jdbcType="VARCHAR" property="spotName" />
   </resultMap>
   <sql id="columns">
-    CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
-    SPOT_NAME
+    CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CARRIAGE_NAME
   </sql>
   <sql id="columns_alias">
-    t.CARRIAGE_WEIGHT_NO, t.CARRIAGE_CODE, t.CARRIAGE_WEIGHT, t.VALUE_FLAG, t.CREATE_MAN_NO, 
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
-    t.CARRIAGE_NAME, t.SPOT_NO, t.SPOT_NAME
+    t.CARRIAGE_WEIGHT_NO, t.CARRIAGE_CODE, t.CARRIAGE_WEIGHT, t.VALUE_FLAG, t.CREATE_MAN_NO,
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
+    t.CARRIAGE_NAME
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    SELECT <include refid="columns" /> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT t
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="carriageWeightNo != null and carriageWeightNo != ''">
         and CARRIAGE_WEIGHT_NO = #{carriageWeightNo}
       </if>
@@ -67,16 +64,10 @@
       <if test="carriageName != null and carriageName != ''">
         and CARRIAGE_NAME = #{carriageName}
       </if>
-      <if test="spotNo != null and spotNo != ''">
-        and SPOT_NO = #{spotNo}
-      </if>
-      <if test="spotName != null and spotName != ''">
-        and SPOT_NAME = #{spotName}
-      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="carriageWeightNo != null and carriageWeightNo != ''">
         and CARRIAGE_WEIGHT_NO LIKE '%${carriageWeightNo}%'
       </if>
@@ -110,12 +101,6 @@
       <if test="carriageName != null and carriageName != ''">
         and CARRIAGE_NAME LIKE '%${carriageName}%'
       </if>
-      <if test="spotNo != null and spotNo != ''">
-        and SPOT_NO LIKE '%${spotNo}%'
-      </if>
-      <if test="spotName != null and spotName != ''">
-        and SPOT_NAME LIKE '%${spotName}%'
-      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -124,55 +109,47 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_RAILWAY_CARRIAGE_WEIGHT
-    where 1!=1 
-      <if test="carriageCode != null and carriageCode != ''">
-        or CARRIAGE_CODE = #{carriageCode}
-      </if>
-      <if test="carriageWeight != null">
-        or CARRIAGE_WEIGHT = #{carriageWeight}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        or VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        or CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        or CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        or UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        or UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="carriageName != null and carriageName != ''">
-        or CARRIAGE_NAME = #{carriageName}
-      </if>
-      <if test="spotNo != null and spotNo != ''">
-        or SPOT_NO = #{spotNo}
-      </if>
-      <if test="spotName != null and spotName != ''">
-        or SPOT_NAME = #{spotName}
-      </if>
+    where 1!=1
+    <if test="carriageCode != null and carriageCode != ''">
+      or CARRIAGE_CODE = #{carriageCode}
+    </if>
+    <if test="carriageWeight != null">
+      or CARRIAGE_WEIGHT = #{carriageWeight}
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      or VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="createManNo != null and createManNo != ''">
+      or CREATE_MAN_NO = #{createManNo}
+    </if>
+    <if test="createManName != null and createManName != ''">
+      or CREATE_MAN_NAME = #{createManName}
+    </if>
+    <if test="createTime != null">
+      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+    </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      or UPDATE_MAN_NO = #{updateManNo}
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      or UPDATE_MAN_NAME = #{updateManName}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="carriageName != null and carriageName != ''">
+      or CARRIAGE_NAME = #{carriageName}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
-    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT (CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT, 
-      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
-      SPOT_NAME)
-    values (#{carriageWeightNo,jdbcType=VARCHAR}, #{carriageCode,jdbcType=VARCHAR}, #{carriageWeight,jdbcType=DECIMAL}, 
-      #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{carriageName,jdbcType=VARCHAR}, #{spotNo,jdbcType=VARCHAR}, 
-      #{spotName,jdbcType=VARCHAR})
+    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT (CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT,
+                                                    VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+                                                    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+                                                    UPDATE_TIME, CARRIAGE_NAME)
+    values (#{carriageWeightNo,jdbcType=VARCHAR}, #{carriageCode,jdbcType=VARCHAR}, #{carriageWeight,jdbcType=DECIMAL},
+            #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{carriageName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
     insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT
@@ -210,12 +187,6 @@
       <if test="carriageName != null">
         CARRIAGE_NAME,
       </if>
-      <if test="spotNo != null">
-        SPOT_NO,
-      </if>
-      <if test="spotName != null">
-        SPOT_NAME,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="carriageWeightNo != null">
@@ -251,28 +222,20 @@
       <if test="carriageName != null">
         #{carriageName,jdbcType=VARCHAR},
       </if>
-      <if test="spotNo != null">
-        #{spotNo,jdbcType=VARCHAR},
-      </if>
-      <if test="spotName != null">
-        #{spotName,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
     update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
     set CARRIAGE_CODE = #{carriageCode,jdbcType=VARCHAR},
-      CARRIAGE_WEIGHT = #{carriageWeight,jdbcType=DECIMAL},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      CARRIAGE_NAME = #{carriageName,jdbcType=VARCHAR},
-      SPOT_NO = #{spotNo,jdbcType=VARCHAR},
-      SPOT_NAME = #{spotName,jdbcType=VARCHAR}
+        CARRIAGE_WEIGHT = #{carriageWeight,jdbcType=DECIMAL},
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        CARRIAGE_NAME = #{carriageName,jdbcType=VARCHAR}
     where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
@@ -308,109 +271,93 @@
       <if test="carriageName != null">
         CARRIAGE_NAME = #{carriageName,jdbcType=VARCHAR},
       </if>
-      <if test="spotNo != null">
-        SPOT_NO = #{spotNo,jdbcType=VARCHAR},
-      </if>
-      <if test="spotName != null">
-        SPOT_NAME = #{spotName,jdbcType=VARCHAR},
-      </if>
     </set>
     where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT 
-      (CARRIAGE_WEIGHT_NO, 
-      CARRIAGE_CODE, CARRIAGE_WEIGHT, 
-      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
-      SPOT_NAME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.carriageWeightNo,jdbcType=VARCHAR}, 
-      #{item.carriageCode,jdbcType=VARCHAR}, #{item.carriageWeight,jdbcType=DECIMAL}, 
-      #{item.valueFlag,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.carriageName,jdbcType=VARCHAR}, #{item.spotNo,jdbcType=VARCHAR}, 
-      #{item.spotName,jdbcType=VARCHAR} from dual  
-   </foreach> )
+    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    (CARRIAGE_WEIGHT_NO,
+    CARRIAGE_CODE, CARRIAGE_WEIGHT,
+    VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+    UPDATE_TIME, CARRIAGE_NAME)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.carriageWeightNo,jdbcType=VARCHAR},
+    #{item.carriageCode,jdbcType=VARCHAR}, #{item.carriageWeight,jdbcType=DECIMAL},
+    #{item.valueFlag,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.carriageName,jdbcType=VARCHAR} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
-     set
-       CARRIAGE_WEIGHT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeightNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CARRIAGE_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageCode,jdbcType=VARCHAR}
-       </foreach>
-       ,CARRIAGE_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CARRIAGE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageName,jdbcType=VARCHAR}
-       </foreach>
-       ,SPOT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.spotNo,jdbcType=VARCHAR}
-       </foreach>
-       ,SPOT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
-          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.spotName,jdbcType=VARCHAR}
-       </foreach>
-     where CARRIAGE_WEIGHT_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.carriageWeightNo,jdbcType=VARCHAR}
-     </foreach> 
+    update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    set
+    CARRIAGE_WEIGHT_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeightNo,jdbcType=VARCHAR}
+    </foreach>
+    ,CARRIAGE_CODE=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageCode,jdbcType=VARCHAR}
+    </foreach>
+    ,CARRIAGE_WEIGHT=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,VALUE_FLAG=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_MAN_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_MAN_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_MAN_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_MAN_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,CARRIAGE_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CARRIAGE_WEIGHT_NO" separator=" ">
+      when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageName,jdbcType=VARCHAR}
+    </foreach>
+    where CARRIAGE_WEIGHT_NO in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.carriageWeightNo,jdbcType=VARCHAR}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_RAILWAY_CARRIAGE_WEIGHT
-    where CARRIAGE_WEIGHT_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    where CARRIAGE_WEIGHT_NO in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -418,26 +365,19 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(carriage_weight_no, LENGTH(carriage_weight_no) - 4))),0) + 1,5,'0') carriage_weight_no
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(CARRIAGE_WEIGHT_NO, LENGTH(CARRIAGE_WEIGHT_NO) - 4))),0) + 1,5,'0') CARRIAGE_WEIGHT_NO
     FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
   </select>
 
-
   <select id="queryByTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     SELECT * FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
     WHERE 1=1
-    <if test="(beginTime != null and beginTime !='') or (endTime != null and endTime !='')">
+    <if test="(beginTime != null and beginTime !='') and (endTime != null and endTime !='')">
      and   CREATE_TIME BETWEEN to_date(#{beginTime},'YYYY-MM-DD hh24:mi:ss') and to_date(#{endTime},'YYYY-MM-DD hh24:mi:ss')
     </if>
     <if test="valueFlag != null and valueFlag != ''" >
       and VALUE_FLAG = #{valueFlag}
     </if>
-    <if test="spotNo != null and spotNo != ''" >
-      and SPOT_NO = #{spotNo}
-    </if>
-    <if test="spotName != null and spotName != ''" >
-      and SPOT_NAME = #{spotName}
-    </if>
     <if test="carriageCode != null and carriageCode != ''" >
       and CARRIAGE_CODE like '%${carriageCode}%'
     </if>

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/model/MeterBaseRailwayCarriageWeight.java

@@ -73,17 +73,6 @@ public class MeterBaseRailwayCarriageWeight implements IBasePO<String> {
     @ApiModelProperty(value="车厢名称",required=false)
     private String carriageName;
 
-    /**
-     * 计量站点编号(SPOT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="计量站点编号",required=false)
-    private String spotNo;
-
-    /**
-     * 计量站点名称(SPOT_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量站点名称",required=false)
-    private String spotName;
 
     private static final long serialVersionUID = 1L;
 
@@ -185,21 +174,6 @@ public class MeterBaseRailwayCarriageWeight implements IBasePO<String> {
         this.carriageName = carriageName == null ? null : carriageName.trim();
     }
 
-    public String getSpotNo() {
-        return spotNo;
-    }
-
-    public void setSpotNo(String spotNo) {
-        this.spotNo = spotNo == null ? null : spotNo.trim();
-    }
-
-    public String getSpotName() {
-        return spotName;
-    }
-
-    public void setSpotName(String spotName) {
-        this.spotName = spotName == null ? null : spotName.trim();
-    }
 
     @Override
     public String toString() {
@@ -218,8 +192,6 @@ public class MeterBaseRailwayCarriageWeight implements IBasePO<String> {
         sb.append(", updateManName=").append(updateManName);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", carriageName=").append(carriageName);
-        sb.append(", spotNo=").append(spotNo);
-        sb.append(", spotName=").append(spotName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/service/IMeterBaseRailwayCarriageWeightService.java

@@ -3,10 +3,8 @@ package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.framework.service.pagehelper.PageList;
-
-import java.util.Date;
-import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseRailwayCarriageWeight服务接口：
@@ -33,5 +31,7 @@ public interface IMeterBaseRailwayCarriageWeightService extends IBaseService<Met
 
     void deleteByLogic(MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight);
 
-    MeterBaseRailwayCarriageWeight queryByById(String id);
+    MeterBaseRailwayCarriageWeight queryById(String id);
+
+    List<MeterBaseRailwayCarriageWeight> queryList(HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/service/impl/MeterBaseRailwayCarriageWeightServiceImpl.java

@@ -63,10 +63,13 @@ public class MeterBaseRailwayCarriageWeightServiceImpl extends BaseServiceImpl<M
     }
 
     @Override
-    public MeterBaseRailwayCarriageWeight queryByById(String id) {
-       return meterBaseRailwayCarriageWeightMapper.selectByPrimaryKey(id);
+    public MeterBaseRailwayCarriageWeight queryById(String id) {
+        return meterBaseRailwayCarriageWeightMapper.selectByPrimaryKey(id);
     }
 
-
+    @Override
+    public List<MeterBaseRailwayCarriageWeight> queryList(HashMap<String, Object> map) {
+        return meterBaseRailwayCarriageWeightMapper.queryByTime(map);
+    }
 
 }

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

@@ -3884,6 +3884,9 @@
     <if test="flag != null and flag != ''">
       and value_flag != '0'
     </if>
+    <if test="groupId != null and groupId != ''">
+      and NET_SPOT3_NO in (SELECT METER_BASE_GROUP_SPOT.SPOT_ID FROM METER_BASE_GROUP_SPOT WHERE METER_BASE_GROUP_SPOT.GROUP_ID = #{groupId})
+    </if>
     order by net_time desc
   </select>
 

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

@@ -2852,6 +2852,9 @@
             and (is_pre_scale = '0' or is_pre_scale is null)
           ))
     </if>
+    <if test="groupId != null and groupId != ''">
+      and BASE_SPOT_NO in (SELECT METER_BASE_GROUP_SPOT.SPOT_ID FROM METER_BASE_GROUP_SPOT WHERE METER_BASE_GROUP_SPOT.GROUP_ID = #{groupId})
+    </if>
     order by create_time desc
   </select>
 

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/controller/MeterWorkCompareSpotController.java

@@ -44,15 +44,8 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
     //@RequiresPermissions("meterworkcomparespot:view")
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryForPage(parmas, pageNum, pageSize);
-        List list1 = (List) list;
-        Collections.sort(list1, new Comparator<MeterBaseRailwayCarriageWeight>() {
-            @Override
-            public int compare(MeterBaseRailwayCarriageWeight o1, MeterBaseRailwayCarriageWeight o2) {
-                return o1.getCreateTime().compareTo(o2.getCreateTime());
-            }
-        });
-        return success(list1);
+        PageList<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryDESCForPage(parmas, pageNum, pageSize);
+        return success(list);
     }
 
     @ApiOperation(value="获取列表", notes="分页模糊查询")
@@ -271,7 +264,7 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
         return success(null,"提交成功");
     }
 
-    @ApiOperation(value="提交结果", notes="提交断差结果")
+    @ApiOperation(value="查询结果", notes="查询断差结果")
     @GetMapping(value = "/queryByComparetype/{type}")
     public RESTfulResult queryByComparetype(@PathVariable String type){
         if ("0".equals(type)){

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
 
 @Mapper
@@ -22,4 +23,6 @@ public interface MeterWorkCompareSpotMapper extends IBaseMapper<MeterWorkCompare
     List<MeterWorkCompareSpot> queryAll();
 
     List<MeterWorkCompareSpot> queryByCompareType(String type);
+
+    List<MeterWorkCompareSpot> selectByParametersDESC(HashMap parmas);
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.xml

@@ -894,5 +894,11 @@
   <select id="queryByCompareType" parameterType="java.lang.String" resultMap="BaseResultMap">
     select * from METER_WORK_COMPARE_SPOT where COMPARE_TYPE = #{type}  ORDER BY CREATE_TIME desc
   </select>
-  
+
+  <select id="selectByParametersDESC" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+    order by CREATE_TIME desc
+  </select>
+
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/IMeterWorkCompareSpotService.java

@@ -1,9 +1,11 @@
 package com.steerinfo.meterwork.meterworkcomparespot.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -57,4 +59,6 @@ public interface IMeterWorkCompareSpotService extends IBaseService<MeterWorkComp
     List<MeterWorkCompareSpot> queryAll();
 
     List<MeterWorkCompareSpot> queryByCompareType(String type);
+
+    PageList<MeterWorkCompareSpot> queryDESCForPage(HashMap parmas, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/impl/MeterWorkCompareSpotServiceImpl.java

@@ -2,6 +2,8 @@ package com.steerinfo.meterwork.meterworkcomparespot.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespot.mapper.MeterWorkCompareSpotMapper;
 import com.steerinfo.meterwork.meterworkcomparespot.service.IMeterWorkCompareSpotService;
@@ -14,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * MeterWorkCompareSpot服务实现：
@@ -81,4 +85,12 @@ public class MeterWorkCompareSpotServiceImpl extends BaseServiceImpl<MeterWorkCo
         return meterWorkCompareSpotMapper.queryByCompareType(type);
     }
 
+    @Override
+    public PageList<MeterWorkCompareSpot> queryDESCForPage(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkCompareSpot> rows = this.meterWorkCompareSpotMapper.selectByParametersDESC(parmas);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import com.steerinfo.meterwork.meterworkmonitor.service.IMeterWorkMonitorService;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,9 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * MeterWorkMonitor RESTful接口：
@@ -48,7 +48,30 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
     public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         try {
             PageList<MeterWorkMonitor> list = meterWorkMonitorService.queryForPage(parmas, pageNum, pageSize);
-            return success(list);
+            List<MeterWorkMonitorDto> resultList = new ArrayList<>();
+            for (Object object : list.getList()){
+                MeterWorkMonitor meterWorkMonitor = (MeterWorkMonitor) object;
+                long time = 30*1000;//30秒
+                Date now = new Date();
+                Date beforeDate = new Date(now.getTime() - time);//30秒前的时间
+                MeterWorkMonitorDto meterWorkMonitorDto = null;
+                if (meterWorkMonitor.getLastTime() != null){
+                    boolean before = meterWorkMonitor.getLastTime().before(beforeDate);
+                    if (before){
+                        meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"N");
+                    }else{
+                        meterWorkMonitorDto =  new MeterWorkMonitorDto(meterWorkMonitor,"Y");
+                    }
+
+
+                }else {
+                    meterWorkMonitorDto = new MeterWorkMonitorDto(meterWorkMonitor,"N");
+
+                }
+                resultList.add(meterWorkMonitorDto);
+            }
+
+            return success(resultList);
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new MarkerMetException(500, "操作异常！！");

src/main/java/com/steerinfo/meterwork/meterworkmonitor/dto/MeterWorkMonitorDto.java

@@ -0,0 +1,24 @@
+package com.steerinfo.meterwork.meterworkmonitor.dto;
+
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
+
+public class MeterWorkMonitorDto extends MeterWorkMonitor {
+
+    private String  isOnline;
+
+    public MeterWorkMonitorDto() {
+
+    }
+    public MeterWorkMonitorDto(MeterWorkMonitor  meterWorkMonitor,String isOnline) {
+        super(meterWorkMonitor);
+        this.isOnline = isOnline;
+    }
+
+    public String getIsOnline() {
+        return isOnline;
+    }
+
+    public void setIsOnline(String isOnline) {
+        this.isOnline = isOnline;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -860,6 +860,135 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.zeroState = zeroState == null ? null : zeroState.trim();
     }
 
+    public MeterWorkMonitor(){
+
+    }
+
+    public MeterWorkMonitor(String pointNo, String pointName, String validWgt, String validCarno, String validTareTime, String validTimeInterval, String validParkStatus, String validExceedWgt, String validPredictionDiff, String validFlag, String validMatTime, String carMonitor, Short carMonitorLvl, String isHelp, String isTakeOver, String ledWriter, Short printNum, String collectionCode, String isOverWgt, String userNo, String monitorUserNo, String setCar, String ledKeep, String rfidCar, String photoCar, String scanCar, String editCar, String carErr, String wgtErr, Date lastTime, String stopOverTime, String msgInfo, Long wgt, String isRemote, String weighInstrumentModel, String weighInstrumentParam, String moxaIp, String moxaPort, String validLianda, String isOpenScanning, String validIsPre, String userIp, String powerState, String dvrState, String moxaState, String plcState, String leftInfraredRayState, String rightInfraredRayState, String amplifierState, String lampState, String spotTypeNo, String redGreenLightState, String frontInfraredRayState, String rearInfraredRayState, String rfidState, String validArea, String weightStatus, String ferroalloyConfirm, String ferroalloyResult, String zeroState) {
+        this.pointNo = pointNo;
+        this.pointName = pointName;
+        this.validWgt = validWgt;
+        this.validCarno = validCarno;
+        this.validTareTime = validTareTime;
+        this.validTimeInterval = validTimeInterval;
+        this.validParkStatus = validParkStatus;
+        this.validExceedWgt = validExceedWgt;
+        this.validPredictionDiff = validPredictionDiff;
+        this.validFlag = validFlag;
+        this.validMatTime = validMatTime;
+        this.carMonitor = carMonitor;
+        this.carMonitorLvl = carMonitorLvl;
+        this.isHelp = isHelp;
+        this.isTakeOver = isTakeOver;
+        this.ledWriter = ledWriter;
+        this.printNum = printNum;
+        this.collectionCode = collectionCode;
+        this.isOverWgt = isOverWgt;
+        this.userNo = userNo;
+        this.monitorUserNo = monitorUserNo;
+        this.setCar = setCar;
+        this.ledKeep = ledKeep;
+        this.rfidCar = rfidCar;
+        this.photoCar = photoCar;
+        this.scanCar = scanCar;
+        this.editCar = editCar;
+        this.carErr = carErr;
+        this.wgtErr = wgtErr;
+        this.lastTime = lastTime;
+        this.stopOverTime = stopOverTime;
+        this.msgInfo = msgInfo;
+        this.wgt = wgt;
+        this.isRemote = isRemote;
+        this.weighInstrumentModel = weighInstrumentModel;
+        this.weighInstrumentParam = weighInstrumentParam;
+        this.moxaIp = moxaIp;
+        this.moxaPort = moxaPort;
+        this.validLianda = validLianda;
+        this.isOpenScanning = isOpenScanning;
+        this.validIsPre = validIsPre;
+        this.userIp = userIp;
+        this.powerState = powerState;
+        this.dvrState = dvrState;
+        this.moxaState = moxaState;
+        this.plcState = plcState;
+        this.leftInfraredRayState = leftInfraredRayState;
+        this.rightInfraredRayState = rightInfraredRayState;
+        this.amplifierState = amplifierState;
+        this.lampState = lampState;
+        this.spotTypeNo = spotTypeNo;
+        this.redGreenLightState = redGreenLightState;
+        this.frontInfraredRayState = frontInfraredRayState;
+        this.rearInfraredRayState = rearInfraredRayState;
+        this.rfidState = rfidState;
+        this.validArea = validArea;
+        this.weightStatus = weightStatus;
+        this.ferroalloyConfirm = ferroalloyConfirm;
+        this.ferroalloyResult = ferroalloyResult;
+        this.zeroState = zeroState;
+    }
+
+    public MeterWorkMonitor(MeterWorkMonitor meterWorkMonitor) {
+        this.pointNo = meterWorkMonitor.pointNo;
+        this.pointName = meterWorkMonitor.pointName;
+        this.validWgt = meterWorkMonitor.validWgt;
+        this.validCarno = meterWorkMonitor.validCarno;
+        this.validTareTime = meterWorkMonitor.validTareTime;
+        this.validTimeInterval = meterWorkMonitor.validTimeInterval;
+        this.validParkStatus = meterWorkMonitor.validParkStatus;
+        this.validExceedWgt = meterWorkMonitor.validExceedWgt;
+        this.validPredictionDiff = meterWorkMonitor.validPredictionDiff;
+        this.validFlag = meterWorkMonitor.validFlag;
+        this.validMatTime = meterWorkMonitor.validMatTime;
+        this.carMonitor = meterWorkMonitor.carMonitor;
+        this.carMonitorLvl = meterWorkMonitor.carMonitorLvl;
+        this.isHelp = meterWorkMonitor.isHelp;
+        this.isTakeOver = meterWorkMonitor.isTakeOver;
+        this.ledWriter = meterWorkMonitor.ledWriter;
+        this.printNum = meterWorkMonitor.printNum;
+        this.collectionCode = meterWorkMonitor.collectionCode;
+        this.isOverWgt = meterWorkMonitor.isOverWgt;
+        this.userNo = meterWorkMonitor.userNo;
+        this.monitorUserNo = meterWorkMonitor.monitorUserNo;
+        this.setCar = meterWorkMonitor.setCar;
+        this.ledKeep = meterWorkMonitor.ledKeep;
+        this.rfidCar = meterWorkMonitor.rfidCar;
+        this.photoCar = meterWorkMonitor.photoCar;
+        this.scanCar = meterWorkMonitor.scanCar;
+        this.editCar = meterWorkMonitor.editCar;
+        this.carErr = meterWorkMonitor.carErr;
+        this.wgtErr = meterWorkMonitor.wgtErr;
+        this.lastTime = meterWorkMonitor.lastTime;
+        this.stopOverTime = meterWorkMonitor.stopOverTime;
+        this.msgInfo = meterWorkMonitor.msgInfo;
+        this.wgt = wgt;
+        this.isRemote = meterWorkMonitor.isRemote;
+        this.weighInstrumentModel = meterWorkMonitor.weighInstrumentModel;
+        this.weighInstrumentParam = meterWorkMonitor.weighInstrumentParam;
+        this.moxaIp = meterWorkMonitor.moxaIp;
+        this.moxaPort = meterWorkMonitor.moxaPort;
+        this.validLianda = meterWorkMonitor.validLianda;
+        this.isOpenScanning = meterWorkMonitor.isOpenScanning;
+        this.validIsPre = meterWorkMonitor.validIsPre;
+        this.userIp = meterWorkMonitor.userIp;
+        this.powerState = meterWorkMonitor.powerState;
+        this.dvrState = meterWorkMonitor.dvrState;
+        this.moxaState = meterWorkMonitor.moxaState;
+        this.plcState = meterWorkMonitor.plcState;
+        this.leftInfraredRayState = meterWorkMonitor.leftInfraredRayState;
+        this.rightInfraredRayState = meterWorkMonitor.rightInfraredRayState;
+        this.amplifierState = meterWorkMonitor.amplifierState;
+        this.lampState = meterWorkMonitor.lampState;
+        this.spotTypeNo = meterWorkMonitor.spotTypeNo;
+        this.redGreenLightState = meterWorkMonitor.redGreenLightState;
+        this.frontInfraredRayState = meterWorkMonitor.frontInfraredRayState;
+        this.rearInfraredRayState = meterWorkMonitor.rearInfraredRayState;
+        this.rfidState = meterWorkMonitor.rfidState;
+        this.validArea = meterWorkMonitor.validArea;
+        this.weightStatus = meterWorkMonitor.weightStatus;
+        this.ferroalloyConfirm = meterWorkMonitor.ferroalloyConfirm;
+        this.ferroalloyResult = meterWorkMonitor.ferroalloyResult;
+        this.zeroState = meterWorkMonitor.zeroState;
+    }
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.controller;
 
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -1171,7 +1172,7 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配洁净保存")
     @PostMapping(value = "/doAddNetWeight")
-    public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayWeight,MeterWorkRailwayMotorialReceived, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+    public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayCarriageWeight,MeterWorkRailwayMotorialReceived, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
         try {
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service;
 
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
@@ -113,7 +114,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
     RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels);
     RESTfulResult doAddNetInnerWf(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayAiweight tareModel);
-    RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayWeight tareModel);
+    RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayCarriageWeight tareModel);
 
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);

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

@@ -5,6 +5,7 @@ import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredetail.mapper.MeterBaseRailwayHisTareDetailMapper;
@@ -1035,6 +1036,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     firstCopy.setCreateTime(new Date());
                     meterWorkRailwayActFirstMapper.insertSelective(firstCopy);
                     selectedFirsts.add(firstCopy);
+                    newFirsts.add(firstCopy);
                 }
 
                 for (int i = 0; i < scales.size(); i++) {
@@ -1093,9 +1095,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 }
                 meterWorkRailwayActFirstMapper.batchUpdate(addFirsts);
                 meterWorkRailwayActFirstMapper.batchUpdate(selectedFirsts);
-                newFirsts.addAll(selectedFirsts);
+                newFirsts.addAll(addFirsts);
             }
-
             map.put("firsts", newFirsts);
             map.put("actuals", newActuals);
             rm.setSucceed();
@@ -4405,7 +4406,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayWeight first) {
+    public RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayCarriageWeight first01) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
@@ -4420,6 +4421,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 userId = "admin";
                 userName = "admins";
             }
+            MeterWorkRailwayActFirst first = new MeterWorkRailwayActFirst();
+            BeanUtils.copyProperties(first, received);
 
             Assert.isTrue(received.getRailwayNo().equals(first.getRailwayNo()), "车号不一致,请重新选择！");
             //两个车号一样则匹配，否则则不匹配
@@ -4432,14 +4435,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
                 AIFirst.setActualFirstNo(firstNo);
                 AIFirst.setValueFlag("2");
-                AIFirst.setRailwayNo(first.getRailwayNo());
-                AIFirst.setMeterWeight(first.getRailwayWeight());
-                AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
-                AIFirst.setRailwayTypeName(first.getRailwayTypeName());
-                AIFirst.setCreateManNo(first.getCreateManNo());
-                AIFirst.setCreateManName(first.getCreateManName());
-                AIFirst.setCreateTime(first.getCreateTime());
-                AIFirst.setConveyanceType(first.getRailwayType());
+//                AIFirst.setRailwayNo(first.getRailwayNo());
+                AIFirst.setMeterWeight(new BigDecimal(first01.getCarriageWeight()));
+//                AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
+//                AIFirst.setRailwayTypeName(first.getRailwayTypeName());
+//                AIFirst.setCreateManNo(first.getCreateManNo());
+//                AIFirst.setCreateManName(first.getCreateManName());
+//                AIFirst.setCreateTime(first.getCreateTime());
+                AIFirst.setConveyanceType(first01.getCarriageCode());
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
 
                 //新增一条毛重信息

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -11,6 +11,7 @@ import com.steerinfo.meterwork.meterworkrailwayreceived.service.IMeterWorkRailwa
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -33,7 +34,7 @@ import java.util.List;
 @Service(value = "meterWorkRailwayReceivedService")
 public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWorkRailwayReceived, String> implements IMeterWorkRailwayReceivedService {
 
-    @Autowired
+    @Resource
     private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
 
     @Override
@@ -47,10 +48,10 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             RESTfulResult rm = new RESTfulResult();
             rm.setCode("200");
             rm.setData(model.getActualFirstNo());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String afl = sdf.format(new Date());
-            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
-            model.setActualFirstNo(sdf.format(new Date()) + no);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//            String afl = sdf.format(new Date());
+//            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
+//            model.setActualFirstNo(sdf.format(new Date()) + no);
             meterWorkRailwayReceivedMapper.insertSelective(model);
             rm.setMessage("成功");
             return rm;