后端提交

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.xml

@@ -414,7 +414,7 @@
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="whereLike"/>d
+    <include refid="whereLike"/>
     order by  base_code desc
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
@@ -561,5 +561,8 @@
     <if test="pBaseCode != null and pBaseCode != ''">
       and p_base_code = #{pBaseCode, jdbcType=VARCHAR}
     </if>
+    <if test="validFlag != null and validFlag != ''">
+      and valid_flag = #{validFlag}
+    </if>
   </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/impl/ComBaseInfoServiceImpl.java

@@ -274,7 +274,7 @@ public class ComBaseInfoServiceImpl extends BaseServiceImpl<ComBaseInfo, String>
 
     @Override
     public List<ComBaseInfo> queryAll(Map<String, Object> parameters) {
-        return comBaseInfoMapper.selectByParameters(parameters);
+        return comBaseInfoMapper.selectLikeByParameters(parameters);
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasegroupspot.controller;
 
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -103,8 +104,6 @@ public class MeterBaseGroupSpotController extends BaseRESTfulController {
     //@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());
@@ -135,6 +134,40 @@ public class MeterBaseGroupSpotController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiOperation(value="查询", notes="根据group和spot相关参数查询")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @GetMapping(value = "/noPage")//String
+    public RESTfulResult noPage(@RequestParam HashMap<String,Object> map){
+        List<MeterBaseGroupSpot> list = meterBaseGroupSpotService.noPage(map);
+        return success(list);
+    }
+
+    @ApiOperation(value="根据用户和计量点ID创建对象", notes="根据meter_base_group_spot表和meter_base_spot_info表的id创建MeterBaseUserSpot对象")
+    @PostMapping(value = "/checkAdd")
+    public RESTfulResult checkAdd(@RequestBody List<MeterBaseGroupSpot> model){
+        RESTfulResult rm = failed();
+        try{
+            rm = meterBaseGroupSpotService.checkAdd(model);
+            return success(rm);
+        }catch(Exception e){
+            e.printStackTrace();
+            return rm;
+        }
+    }
+
+    @ApiOperation(value="根据List<MeterBaseUserSpot>解除对象", notes="根据List<MeterBaseUserSpot>对象解除分组站点信息")
+    @PostMapping(value = "/remove")
+    public RESTfulResult remove(@RequestBody List<MeterBaseGroupSpot> model){
+        RESTfulResult rm = failed();
+        try{
+            rm = meterBaseGroupSpotService.remove(model);
+            return success(rm);
+        }catch(Exception e){
+            e.printStackTrace();
+            return rm;
+        }
+    }
+
     @ApiOperation(value="逻辑删除", notes="逻辑删除")
     //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
     @PutMapping(value = "/deleteByLogic")//String

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

@@ -6,12 +6,13 @@ import java.math.*;
 import java.util.HashMap;
 import java.util.List;
 
+import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterBaseGroupSpotMapper extends IBaseMapper<MeterBaseGroupSpot, String> {
     //生成流水号
-    String GetNewID();
+    String GetNewID(@Param(value = "afl") String afl);
 
     //通过groupId、groupName、spotId、spotName
     List<MeterBaseGroupSpot> queryByGroupSpot(HashMap<String,Object> map);

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

@@ -392,10 +392,10 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <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 LPAD(NVL(MAX(TO_NUMBER(SUBSTR(GROUP_SPOT_ID, LENGTH(GROUP_SPOT_ID) - 4))),0) + 1,5,'0') GROUP_SPOT_ID
+    FROM METER_BASE_GROUP_SPOT where instr(GROUP_SPOT_ID,#{afl,jdbcType=VARCHAR})>0
   </select>
-  
+
   <select id="queryByGroupSpot" resultMap="BaseResultMap">
     select * from METER_BASE_GROUP_SPOT
     WHERE 1=1
@@ -403,16 +403,16 @@
       and VALUE_FLAG = #{valueFlag}
     </if>
     <if test="groupId != null and groupId != ''">
-      and GROUP_ID like '%#{groupId}%'
+      and GROUP_ID like '%${groupId}%'
     </if>
     <if test="groupName != null and groupName != ''">
-      and GROUP_ID like '%#{groupName}%'
+      and GROUP_ID like '%${groupName}%'
     </if>
     <if test="spotId != null and spotId != ''">
-      and SPOT_ID like '%#{spotId}%'
+      and SPOT_ID like '%${spotId}%'
     </if>
     <if test="spotName != null and spotName != ''">
-      and SPOT_NAME like '%#{spotName}%'
+      and SPOT_NAME like '%${spotName}%'
     </if>
     order by CREATE_TIME desc
   </select>

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

@@ -1,9 +1,11 @@
 package com.steerinfo.baseinfo.meterbasegroupspot.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseGroupSpot服务接口：
@@ -27,6 +29,9 @@ public interface IMeterBaseGroupSpotService extends IBaseService<MeterBaseGroupS
     String creatId();
 
     PageList<MeterBaseGroupSpot> queryByGroupSpotForPage(HashMap<String,Object>  map, Integer pageNum, Integer pageSize);
+    List<MeterBaseGroupSpot> noPage(HashMap<String,Object>  map);
+    RESTfulResult checkAdd(List<MeterBaseGroupSpot> models);
+    RESTfulResult remove(List<MeterBaseGroupSpot> models);
 
     void deleteByLogic(MeterBaseGroupSpot meterBaseRailwayCarriageWeight);
 

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

@@ -1,6 +1,8 @@
 package com.steerinfo.baseinfo.meterbasegroupspot.service.impl;
 
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.baseinfo.meterbaseuserspot.model.MeterBaseUserSpot;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasegroupspot.model.MeterBaseGroupSpot;
@@ -8,8 +10,13 @@ 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 com.steerinfo.framework.user.UserPayload;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -31,7 +38,7 @@ import java.util.List;
 @Service(value = "meterBaseGroupSpotService")
 public class MeterBaseGroupSpotServiceImpl extends BaseServiceImpl<MeterBaseGroupSpot, String> implements IMeterBaseGroupSpotService {
 
-    @Autowired
+    @Resource
     private MeterBaseGroupSpotMapper meterBaseGroupSpotMapper;
 
     @Override
@@ -41,7 +48,9 @@ public class MeterBaseGroupSpotServiceImpl extends BaseServiceImpl<MeterBaseGrou
 
     @Override
     public String creatId() {
-        return meterBaseGroupSpotMapper.GetNewID();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String afl = sdf.format(new Date());
+        return afl + meterBaseGroupSpotMapper.GetNewID(afl);
     }
 
     @Override
@@ -52,6 +61,78 @@ public class MeterBaseGroupSpotServiceImpl extends BaseServiceImpl<MeterBaseGrou
         return pageInfo;
     }
 
+    @Override
+    public List<MeterBaseGroupSpot> noPage(HashMap<String, Object> map) {
+        List<MeterBaseGroupSpot> rows = meterBaseGroupSpotMapper.queryByGroupSpot(map);
+        return rows;
+    }
+
+    @Override
+    public RESTfulResult checkAdd(List<MeterBaseGroupSpot> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("200");
+        UserPayload userPayload = UserPayload.getCurrUser();
+        String userId = userPayload.getUserCode();
+        String userName = userPayload.getUserName();
+        try{
+            int num = 0;
+            for(MeterBaseGroupSpot model: models) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                String afl = sdf.format(new Date());
+                HashMap<String, Object> obj = new HashMap<>();
+                obj.put("groupId", model.getGroupId());
+                obj.put("spotId", model.getSpotId());
+                List<MeterBaseGroupSpot> groupSpots =  meterBaseGroupSpotMapper.selectByParameters(obj);
+                if(groupSpots.size() < 1) {
+                    model.setGroupSpotId(sdf.format(new Date()) + meterBaseGroupSpotMapper.GetNewID(afl));
+                    model.setValueFlag("1");
+                    model.setCreateManNo(userId);
+                    model.setCreateManName(userName);
+                    model.setCreateTime(new Date());
+                    meterBaseGroupSpotMapper.insertSelective(model);
+                }else {
+                    groupSpots.get(0).setUpdateManNo(userId);
+                    groupSpots.get(0).setUpdateManName(userName);
+                    groupSpots.get(0).setUpdateTime(new Date());
+                    groupSpots.get(0).setValueFlag("1");
+                    meterBaseGroupSpotMapper.updateByPrimaryKeySelective(groupSpots.get(0));
+                }
+                num++;
+            }
+            rm.setData(num);
+            rm.setMessage("操作成功");
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            rm.setCode("500");
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult remove(List<MeterBaseGroupSpot> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("200");
+        try{
+            int num = 0;
+            for(MeterBaseGroupSpot model: models) {
+                meterBaseGroupSpotMapper.deleteByPrimaryKey(model.getGroupSpotId());
+                num++;
+            }
+            rm.setData(num);
+            rm.setMessage("操作成功");
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            rm.setCode("500");
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     public void deleteByLogic(MeterBaseGroupSpot meterBaseRailwayCarriageWeight) {
         meterBaseGroupSpotMapper.updateByPrimaryKeySelective(meterBaseRailwayCarriageWeight);

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.xml

@@ -57,6 +57,10 @@
     <result column="FRONT_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="frontInfraredRayState" />
     <result column="REAR_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="rearInfraredRayState" />
     <result column="RFID_STATE" jdbcType="VARCHAR" property="rfidState" />
+    <result column="ZERO_STATE" jdbcType="VARCHAR" property="zeroState" />
+    <result column="AUTOSCALE_IP" jdbcType="VARCHAR" property="autoscaleIp" />
+    <result column="PLC_IP" jdbcType="VARCHAR" property="plcIp" />
+    <result column="DVR_IP" jdbcType="VARCHAR" property="dvrIp" />
   </resultMap>
   <sql id="columns">
     SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, 
@@ -68,7 +72,7 @@
     DVR_STATE, MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, 
     AMPLIFIER_STATE, LAMP_STATE, ENTRUST_STATE, VERSION, SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
     VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
-    RFID_STATE
+    RFID_STATE, ZERO_STATE, AUTOSCALE_IP, PLC_IP, DVR_IP
   </sql>
   <sql id="columns_alias">
     t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL, 
@@ -81,7 +85,7 @@
     t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE, 
     t.LAMP_STATE, t.ENTRUST_STATE, t.VERSION, t.SCAN_CAR, t.MSG_INFO, t.STOP_OVER_TIME, 
     t.VALID_IS_PRE, t.RED_GREEN_LIGHT_STATE, t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE, 
-    t.RFID_STATE
+    t.RFID_STATE, t.ZERO_STATE, t.AUTOSCALE_IP, t.PLC_IP, t.DVR_IP
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_BASE_SCALE_POINT
@@ -256,6 +260,18 @@
       <if test="rfidState != null and rfidState != ''">
         and RFID_STATE = #{rfidState}
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        and ZERO_STATE = #{zeroState}
+      </if>
+      <if test="autoscaleIp != null and autoscaleIp != ''">
+        and AUTOSCALE_IP = #{autoscaleIp}
+      </if>
+      <if test="plcIp != null and plcIp != ''">
+        and PLC_IP = #{plcIp}
+      </if>
+      <if test="dvrIp != null and dvrIp != ''">
+        and DVR_IP = #{dvrIp}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -425,6 +441,18 @@
       <if test="rfidState != null and rfidState != ''">
         and RFID_STATE LIKE '%${rfidState}%'
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        and ZERO_STATE LIKE '%${zeroState}%'
+      </if>
+      <if test="autoscaleIp != null and autoscaleIp != ''">
+        and AUTOSCALE_IP LIKE '%${autoscaleIp}%'
+      </if>
+      <if test="plcIp != null and plcIp != ''">
+        and PLC_IP LIKE '%${plcIp}%'
+      </if>
+      <if test="dvrIp != null and dvrIp != ''">
+        and DVR_IP LIKE '%${dvrIp}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -596,6 +624,18 @@
       <if test="rfidState != null and rfidState != ''">
         or RFID_STATE = #{rfidState}
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        or ZERO_STATE = #{zeroState}
+      </if>
+      <if test="autoscaleIp != null and autoscaleIp != ''">
+        or AUTOSCALE_IP = #{autoscaleIp}
+      </if>
+      <if test="plcIp != null and plcIp != ''">
+        or PLC_IP = #{plcIp}
+      </if>
+      <if test="dvrIp != null and dvrIp != ''">
+        or DVR_IP = #{dvrIp}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, 
@@ -616,7 +656,9 @@
       LAMP_STATE, ENTRUST_STATE, VERSION, 
       SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
       VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, 
-      REAR_INFRARED_RAY_STATE, RFID_STATE)
+      REAR_INFRARED_RAY_STATE, RFID_STATE, ZERO_STATE, 
+      AUTOSCALE_IP, PLC_IP, DVR_IP
+      )
     values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
       #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR}, 
       #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
@@ -635,7 +677,9 @@
       #{lampState,jdbcType=VARCHAR}, #{entrustState,jdbcType=VARCHAR}, #{version,jdbcType=DECIMAL}, 
       #{scanCar,jdbcType=VARCHAR}, #{msgInfo,jdbcType=VARCHAR}, #{stopOverTime,jdbcType=VARCHAR}, 
       #{validIsPre,jdbcType=VARCHAR}, #{redGreenLightState,jdbcType=VARCHAR}, #{frontInfraredRayState,jdbcType=VARCHAR}, 
-      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR})
+      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{zeroState,jdbcType=VARCHAR}, 
+      #{autoscaleIp,jdbcType=VARCHAR}, #{plcIp,jdbcType=VARCHAR}, #{dvrIp,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     insert into METER_BASE_SCALE_POINT
@@ -805,6 +849,18 @@
       <if test="rfidState != null">
         RFID_STATE,
       </if>
+      <if test="zeroState != null">
+        ZERO_STATE,
+      </if>
+      <if test="autoscaleIp != null">
+        AUTOSCALE_IP,
+      </if>
+      <if test="plcIp != null">
+        PLC_IP,
+      </if>
+      <if test="dvrIp != null">
+        DVR_IP,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="scalePointNo != null">
@@ -972,6 +1028,18 @@
       <if test="rfidState != null">
         #{rfidState,jdbcType=VARCHAR},
       </if>
+      <if test="zeroState != null">
+        #{zeroState,jdbcType=VARCHAR},
+      </if>
+      <if test="autoscaleIp != null">
+        #{autoscaleIp,jdbcType=VARCHAR},
+      </if>
+      <if test="plcIp != null">
+        #{plcIp,jdbcType=VARCHAR},
+      </if>
+      <if test="dvrIp != null">
+        #{dvrIp,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -1029,7 +1097,11 @@
       RED_GREEN_LIGHT_STATE = #{redGreenLightState,jdbcType=VARCHAR},
       FRONT_INFRARED_RAY_STATE = #{frontInfraredRayState,jdbcType=VARCHAR},
       REAR_INFRARED_RAY_STATE = #{rearInfraredRayState,jdbcType=VARCHAR},
-      RFID_STATE = #{rfidState,jdbcType=VARCHAR}
+      RFID_STATE = #{rfidState,jdbcType=VARCHAR},
+      ZERO_STATE = #{zeroState,jdbcType=VARCHAR},
+      AUTOSCALE_IP = #{autoscaleIp,jdbcType=VARCHAR},
+      PLC_IP = #{plcIp,jdbcType=VARCHAR},
+      DVR_IP = #{dvrIp,jdbcType=VARCHAR}
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -1197,6 +1269,18 @@
       <if test="rfidState != null">
         RFID_STATE = #{rfidState,jdbcType=VARCHAR},
       </if>
+      <if test="zeroState != null">
+        ZERO_STATE = #{zeroState,jdbcType=VARCHAR},
+      </if>
+      <if test="autoscaleIp != null">
+        AUTOSCALE_IP = #{autoscaleIp,jdbcType=VARCHAR},
+      </if>
+      <if test="plcIp != null">
+        PLC_IP = #{plcIp,jdbcType=VARCHAR},
+      </if>
+      <if test="dvrIp != null">
+        DVR_IP = #{dvrIp,jdbcType=VARCHAR},
+      </if>
     </set>
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
@@ -1234,7 +1318,8 @@
       SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
       VALID_IS_PRE, RED_GREEN_LIGHT_STATE, 
       FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
-      RFID_STATE)
+      RFID_STATE, ZERO_STATE, AUTOSCALE_IP, 
+      PLC_IP, DVR_IP)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.scalePointNo,jdbcType=VARCHAR}, 
@@ -1257,7 +1342,8 @@
       #{item.scanCar,jdbcType=VARCHAR}, #{item.msgInfo,jdbcType=VARCHAR}, #{item.stopOverTime,jdbcType=VARCHAR}, 
       #{item.validIsPre,jdbcType=VARCHAR}, #{item.redGreenLightState,jdbcType=VARCHAR}, 
       #{item.frontInfraredRayState,jdbcType=VARCHAR}, #{item.rearInfraredRayState,jdbcType=VARCHAR}, 
-      #{item.rfidState,jdbcType=VARCHAR} from dual  
+      #{item.rfidState,jdbcType=VARCHAR}, #{item.zeroState,jdbcType=VARCHAR}, #{item.autoscaleIp,jdbcType=VARCHAR}, 
+      #{item.plcIp,jdbcType=VARCHAR}, #{item.dvrIp,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1483,6 +1569,22 @@
        <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
           when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.rfidState,jdbcType=VARCHAR}
        </foreach>
+       ,ZERO_STATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.zeroState,jdbcType=VARCHAR}
+       </foreach>
+       ,AUTOSCALE_IP=
+       <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.autoscaleIp,jdbcType=VARCHAR}
+       </foreach>
+       ,PLC_IP=
+       <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.plcIp,jdbcType=VARCHAR}
+       </foreach>
+       ,DVR_IP=
+       <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.dvrIp,jdbcType=VARCHAR}
+       </foreach>
      where SCALE_POINT_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.scalePointNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/model/MeterBaseScalePoint.java

@@ -274,9 +274,9 @@ public class MeterBaseScalePoint implements IBasePO<String> {
     private String amplifierState;
 
     /**
-     * 照明灯状态（0正常 1异常）(LAMP_STATE,VARCHAR,1)
+     * 照明灯状态（0关闭 1打开）(LAMP_STATE,VARCHAR,1)
      */
-    @ApiModelProperty(value="照明灯状态（0正常 1异常）",required=false)
+    @ApiModelProperty(value="照明灯状态（0关闭 1打开）",required=false)
     private String lampState;
 
     /**
@@ -339,6 +339,30 @@ public class MeterBaseScalePoint implements IBasePO<String> {
     @ApiModelProperty(value="rfid状态（0正常 1异常）",required=false)
     private String rfidState;
 
+    /**
+     * 零点报警         0不报警  1报警(ZERO_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="零点报警         0不报警  1报警",required=false)
+    private String zeroState;
+
+    /**
+     * 自助计量终端IP(AUTOSCALE_IP,VARCHAR,15)
+     */
+    @ApiModelProperty(value="自助计量终端IP",required=false)
+    private String autoscaleIp;
+
+    /**
+     * PLC    IP(PLC_IP,VARCHAR,15)
+     */
+    @ApiModelProperty(value="PLC    IP",required=false)
+    private String plcIp;
+
+    /**
+     * 硬盘录像机IP(DVR_IP,VARCHAR,15)
+     */
+    @ApiModelProperty(value="硬盘录像机IP",required=false)
+    private String dvrIp;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -791,6 +815,38 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         this.rfidState = rfidState == null ? null : rfidState.trim();
     }
 
+    public String getZeroState() {
+        return zeroState;
+    }
+
+    public void setZeroState(String zeroState) {
+        this.zeroState = zeroState == null ? null : zeroState.trim();
+    }
+
+    public String getAutoscaleIp() {
+        return autoscaleIp;
+    }
+
+    public void setAutoscaleIp(String autoscaleIp) {
+        this.autoscaleIp = autoscaleIp == null ? null : autoscaleIp.trim();
+    }
+
+    public String getPlcIp() {
+        return plcIp;
+    }
+
+    public void setPlcIp(String plcIp) {
+        this.plcIp = plcIp == null ? null : plcIp.trim();
+    }
+
+    public String getDvrIp() {
+        return dvrIp;
+    }
+
+    public void setDvrIp(String dvrIp) {
+        this.dvrIp = dvrIp == null ? null : dvrIp.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -852,6 +908,10 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         sb.append(", frontInfraredRayState=").append(frontInfraredRayState);
         sb.append(", rearInfraredRayState=").append(rearInfraredRayState);
         sb.append(", rfidState=").append(rfidState);
+        sb.append(", zeroState=").append(zeroState);
+        sb.append(", autoscaleIp=").append(autoscaleIp);
+        sb.append(", plcIp=").append(plcIp);
+        sb.append(", dvrIp=").append(dvrIp);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -361,6 +361,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
                 actualRow.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
+                scale.setMeasureStation(actualRow.getBaseSpot2No());
+                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }else if(StringUtils.isNotEmpty(mwcaf1.getPredictionNo()) || StringUtils.isNotEmpty(mwcaf2.getPredictionNo())){
                 String preNo = null;
                 if (StringUtils.isEmpty(mwcaf1.getPredictionNo()) && StringUtils.isNotEmpty(mwcaf2.getPredictionNo())){
@@ -423,6 +426,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
                         actualRow.setCreateTime(new Date());
                         meterWorkCarActualMapper.insertSelective(actualRow);
+
+                        scale.setMeasureStation(actualRow.getBaseSpot2No());
+                        scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                        preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     }else {
                         throw new MarkerMetException(500, "委托表不存在该"+ preNo + "委托编号信息！！");
                     }
@@ -1055,6 +1062,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwca.setUploadFlag("1");
             mwca.setNote(note);
             meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+
+            scale.setMeasureStation(mwca.getBaseSpot2No());
+            scale.setMeasureStationName(mwca.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             rm.setSucceed();
             rm.setCode("200");
             rm.setData(mwca);
@@ -1198,6 +1209,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setUploadFlag("1");
                 scale.setUpdateManNo("system");
                 scale.setUpdateManName("计量洁净数据洁净操作");
+                scale.setMeasureStation(mwca.getBaseSpot2No());
+                scale.setMeasureStationName(mwca.getBaseSpot2Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }
             return mwca;
@@ -1978,6 +1991,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setUploadFlag("1");
                 model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
+
+                preTrackScale.setMeasureStation(model.getBaseSpot2No());
+                preTrackScale.setMeasureStationName(model.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
                 num++;
             }
             return num;
@@ -2066,6 +2083,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualFirstNo, actualSecondNo, predictionNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
 
+                scale.setMeasureStation(actualRow.getBaseSpot2No());
+                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }else {
                 //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAdd(actualFirstNo, actualSecondNo);

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

@@ -826,6 +826,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             pre.setPredictionNo(model.getPredictionNo());
             pre.setValueFlag("4");
             pre.setUploadFlag("1");
+            pre.setMeasureStation(model.getBaseSpotNo());
+            pre.setMeasureStationName(model.getBaseSpotName());
             preTrackScaleMapper.updateByPrimaryKeySelective(pre);
         }
 
@@ -1174,6 +1176,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
+                preTrackScale.setMeasureStation(netDb.getBaseSpot2No());
+                preTrackScale.setMeasureStationName(netDb.getBaseSpot2Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
                 PreTrackScale pres = preTrackScaleMapper.selectBypredictionNo(netDb.getPredictionNo());
                 if(pres != null && pres.getReceiverRemark() != null && (pres.getReceiverRemark().equals("H01") || pres.getReceiverRemark().equals("H02"))){
@@ -1395,6 +1399,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale.setUploadFlag("1");
             scale.setPredictionType("7");
             scale.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
+            scale.setMeasureStation(netDb.getBaseSpot2No());
+            scale.setMeasureStationName(netDb.getBaseSpot2Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
             //4、存储历史皮重及历史皮重明细信息
@@ -1794,7 +1800,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                         PreTrackScale lyScale = new PreTrackScale();
                         lyScale.setPredictionNo(secondDb.getPredictionNo());
                         lyScale.setValueFlag("4");
-                        ptsU.setUploadFlag("1");
+                        lyScale.setUploadFlag("1");
+                        lyScale.setMeasureStation(secondDb.getBaseSpotNo());
+                        lyScale.setMeasureStationName(secondDb.getBaseSpotName());
                         preTrackScaleMapper.updateByPrimaryKeySelective(lyScale);
 
                         //查找到的上个毛重写为结净
@@ -1825,6 +1833,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                         //已经是最后一个预报的最后一次洁净了
                         ptsU.setValueFlag("2"); //修改预报状态
                         ptsU.setUploadFlag("1");
+                        ptsU.setMeasureStation(lmwaf.get(0).getBaseSpotNo());
+                        ptsU.setMeasureStationName(lmwaf.get(0).getBaseSpotName());
                         preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
                     }
                 } else {
@@ -1893,6 +1903,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
                     ptsU.setValueFlag("2"); //修改当前预报状态
                     ptsU.setUploadFlag("1");
+                    ptsU.setMeasureStation(mwaf.getBaseSpotNo());
+                    ptsU.setMeasureStationName(mwaf.getBaseSpotName());
                     preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
 
                     //查找到的上个毛重写为结净
@@ -2927,7 +2939,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
 
                 meterWorkCarActualMapper.insertSelective(actualRow);
-
+                scale.setMeasureStation(actualRow.getBaseSpot2No());
+                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             } else if (first02.getWeightType().equals("1")) {         //混卸
                 //修改委托状态
                 //将委托中的编号和收发货的等数据拷贝进一次数据中
@@ -2995,6 +3009,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setPredictionType("6");
                 actualRow.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
                 meterWorkCarActualMapper.insertSelective(actualRow);
+                scale.setMeasureStation(actualRow.getBaseSpot2No());
+                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }
 
             //存储当前计量的数据
@@ -3188,6 +3205,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow1.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
+            scale01.setMeasureStation(actualRow1.getBaseSpot2No());
+            scale01.setMeasureStationName(actualRow1.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale01);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3214,7 +3234,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow2.setNetWeight(model03.getMeterWeight().subtract(model04.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
-
+            scale02.setMeasureStation(actualRow2.getBaseSpot2No());
+            scale02.setMeasureStationName(actualRow2.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale02);
             //11、修改计量监控
             updateMonitor(one.getBaseSpotNo());
             //12、当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
@@ -3401,6 +3423,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf2.getMeterWeight().subtract(mwcaf1.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
+            scale.setMeasureStation(actualRow1.getBaseSpot2No());
+            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3421,6 +3446,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf4.getMeterWeight().subtract(mwcaf3.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
+            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
+            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -3591,7 +3619,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
-
+            scale.setMeasureStation(actualRow1.getBaseSpot2No());
+            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
 
@@ -3611,6 +3641,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf3.getMeterWeight().subtract(mwcaf4.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
+            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
+            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -3803,6 +3836,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
             actualRow1.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow1);
+            scale.setMeasureStation(actualRow1.getBaseSpot2No());
+            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3821,6 +3857,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
             actualRow2.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow2);
+            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
+            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
             rm.setSucceed();
             rm.setMessage("操作成功!!");
@@ -4310,6 +4349,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
+                preTrackScale.setMeasureStation(firstUpdate.getBaseSpotNo());
+                preTrackScale.setMeasureStationName(firstUpdate.getBaseSpotName());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
             }
 
@@ -4511,6 +4552,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
                 model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
+                scale.setMeasureStation(model.getBaseSpot2No());
+                scale.setMeasureStationName(model.getBaseSpot2Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             } else {
                 rm.setMessage("委托信息编号不能为空，请确认！！");
                 return rm;

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/impl/MeterWorkPreWgttypeServiceImpl.java

@@ -177,7 +177,7 @@ public class MeterWorkPreWgttypeServiceImpl extends BaseServiceImpl<MeterWorkPre
                     if (scales.size() >= 1) {
                         for(PreTrackScale scale: scales){
                             scale.setLineDesc("0");
-                            preTrackScaleMapper.updateByPrimaryKey(scale);
+                            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                     }
                 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayscheduledhelp/controller/MeterWorkRailwayScheduledHelpController.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
 import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.service.IMeterWorkRailwayScheduledHelpService;
 import com.steerinfo.util.StringUtils;
@@ -77,9 +78,23 @@ public class MeterWorkRailwayScheduledHelpController extends BaseRESTfulControll
     @ApiImplicitParam(name = "meterWorkRailwayScheduledHelp", value = "详细实体meterWorkRailwayScheduledHelp", required = true, dataType = "MeterWorkRailwayScheduledHelp")
     //@RequiresPermissions("meterworkrailwayscheduledhelp:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkRailwayScheduledHelp model){
-        MeterWorkRailwayScheduledHelp meterWorkRailwayScheduledHelp = meterWorkRailwayScheduledHelpService.add(model);
-        return success(meterWorkRailwayScheduledHelp);
+    public RESTfulResult add(@RequestBody MeterWorkRailwayScheduledHelp model){
+        RESTfulResult rm = failed();
+        try {
+            RESTfulResult res = meterWorkRailwayScheduledHelpService.checkAdd(model);
+            return res;
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+//        MeterWorkRailwayScheduledHelp meterWorkRailwayScheduledHelp = meterWorkRailwayScheduledHelpService.add(model);
+//        return success(meterWorkRailwayScheduledHelp);
     }
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
@@ -121,12 +136,14 @@ public class MeterWorkRailwayScheduledHelpController extends BaseRESTfulControll
     @PostMapping(value = "/scheduledHelp")
     public RESTfulResult scheduledHelp(@RequestBody HashMap<String, Object> param) {
         RESTfulResult rm = failed();
-        String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
+        String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
         String baseSpotNo = param.get("baseSpotNo") == null ? "" : param.get("baseSpotNo").toString();
         String baseSpotName = param.get("baseSpotName") == null ? "" : param.get("baseSpotName").toString();
         String helpContent = param.get("helpContent") == null ? "" : param.get("helpContent").toString();
+        String warmType = param.get("warmType") == null ? "" : param.get("warmType").toString();
+        String warmTypeName = param.get("warmTypeName") == null ? "" : param.get("warmTypeName").toString();
         try{
-            if(com.steerinfo.util.StringUtils.isEmpty(carNo)){
+            if(com.steerinfo.util.StringUtils.isEmpty(railwayNo)){
                 rm.setMessage("车号不能为空，请确认！！");
                 return rm;
             }else if(com.steerinfo.util.StringUtils.isEmpty(baseSpotNo)){
@@ -138,8 +155,14 @@ public class MeterWorkRailwayScheduledHelpController extends BaseRESTfulControll
             }else if(StringUtils.isEmpty(helpContent)) {
                 rm.setMessage("报警信息不能为空，请确认！！");
                 return rm;
+            }else if(StringUtils.isEmpty(warmType)) {
+                rm.setMessage("报警类型不能为空，请确认！！");
+                return rm;
+            }else if(StringUtils.isEmpty(warmTypeName)) {
+                rm.setMessage("报警类型名称不能为空，请确认！！");
+                return rm;
             }else {
-                rm = meterWorkRailwayScheduledHelpService.scheduledHelp(carNo, baseSpotNo, baseSpotName, helpContent);
+                rm = meterWorkRailwayScheduledHelpService.scheduledHelp(railwayNo, baseSpotNo, baseSpotName, helpContent, warmType, warmTypeName);
             }
         }catch(Exception e){
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayscheduledhelp/service/IMeterWorkRailwayScheduledHelpService.java

@@ -24,7 +24,7 @@ import java.util.Map;
  */
 public interface IMeterWorkRailwayScheduledHelpService extends IBaseService<MeterWorkRailwayScheduledHelp, String>{
     PageList<MeterWorkRailwayScheduledHelp> likeByDesc(HashMap<String, Object> var1, Integer var2, Integer var3);
-    RESTfulResult scheduledHelp(String carNo, String baseSpotNo, String baseSpotName, String helpContent);
+    RESTfulResult scheduledHelp(String railwayNo, String baseSpotNo, String baseSpotName, String helpContent, String warmType, String warmTypeName);
     RESTfulResult scheduledHelpConfirm(String id, String createNo, String createName, String result);
     RESTfulResult checkAdd(MeterWorkRailwayScheduledHelp model);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayscheduledhelp/service/impl/MeterWorkRailwayScheduledHelpServiceImpl.java

@@ -53,13 +53,13 @@ public class MeterWorkRailwayScheduledHelpServiceImpl extends BaseServiceImpl<Me
     }
 
     @Override
-    public RESTfulResult scheduledHelp(String carNo, String baseSpotNo, String baseSpotName, String helpContent) {
+    public RESTfulResult scheduledHelp(String railwayNo, String baseSpotNo, String baseSpotName, String helpContent, String warmType, String warmTypeName) {
         RESTfulResult rm = new RESTfulResult();
         //新建AppPhoneHelp类存储远程救助信息
         MeterWorkRailwayScheduledHelp helpModel = new MeterWorkRailwayScheduledHelp();
         //根据车号、电话、司机姓名获取远程求助信息
         HashMap<String, Object> map = new HashMap<>();
-        map.put("carNo", carNo);
+        map.put("railwayNo", railwayNo);
         map.put("baseSpotNo", baseSpotNo);
         map.put("baseSpotName", baseSpotName);
         List<MeterWorkRailwayScheduledHelp> model = meterWorkRailwayScheduledHelpMapper.selectByParameters(map);
@@ -67,10 +67,12 @@ public class MeterWorkRailwayScheduledHelpServiceImpl extends BaseServiceImpl<Me
         if(model.size() >= 1){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
             helpModel.setHelpId(sdf.format(new Date()));
-            helpModel.setRailwayNo(carNo);
+            helpModel.setRailwayNo(railwayNo);
             helpModel.setBaseSpotNo(baseSpotNo);
             helpModel.setBaseSpotName(baseSpotName);
             helpModel.setHelpContent(helpContent);
+            helpModel.setWarmType(warmType);
+            helpModel.setWarmTypeName(warmTypeName);
             helpModel.setCreateTime(new Date());
             helpModel.setValueFlag("0");
             int i = meterWorkRailwayScheduledHelpMapper.insertSelective(helpModel);