后端提交

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

@@ -120,6 +120,19 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "远程-获取列表", notes = "分页模糊查询")
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc01(@RequestParam HashMap params,Integer pageNum, Integer pageSize) {
+        try {
+            params.put("carNo",params.get("memo1")==null? "": params.get("memo1").toString());
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -826,19 +826,21 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次毛重、清空一次皮重委托信息
-                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
-                        if(firstGross.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst1No());
+//                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+//                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
+                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
+                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
                         }
-                        if(firstTare != null){
-                            firstTare.setValueFlag(DbConstants.VALID);
-                            firstTare.setUpdateManName("system");
-                            firstTare.setUpdateManName("混装解除更新");
-                            firstTare.setNote(model.getNote());
-                            firstTare.setUpdateTime(new Date());
-                            firstTare.setIsPreScale("0");
-                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
+                        if(firstGross != null){
+                            firstGross.setValueFlag(DbConstants.VALID);
+                            firstGross.setUpdateManName("system");
+                            firstGross.setUpdateManName("混装解除更新");
+                            firstGross.setNote(model.getNote());
+                            firstGross.setUpdateTime(new Date());
+                            firstGross.setIsPreScale("0");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         // 删洁净
                         model.setUploadFlag("1");
@@ -886,7 +888,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         model.setUploadFlag("1");
                         model.setValueFlag("0");
                         meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+//                      meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();

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

@@ -2840,6 +2840,7 @@
             #{item}
         </foreach>
   </select>
+
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>

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

@@ -61,6 +61,7 @@
     <result column="WEIGHT_STATUS" jdbcType="VARCHAR" property="weightStatus" />
     <result column="FERROALLOY_CONFIRM" jdbcType="VARCHAR" property="ferroalloyConfirm" />
     <result column="FERROALLOY_RESULT" jdbcType="VARCHAR" property="ferroalloyResult" />
+    <result column="ZERO_STATE" jdbcType="VARCHAR" property="zeroState" />
   </resultMap>
   <sql id="columns">
     POINT_NO, POINT_NAME, VALID_WGT, VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL, 
@@ -72,7 +73,7 @@
     IS_OPEN_SCANNING, VALID_IS_PRE, USER_IP, POWER_STATE, DVR_STATE, MOXA_STATE, PLC_STATE, 
     LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, LAMP_STATE, SPOT_TYPE_NO, 
     RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, RFID_STATE, 
-    VALID_AREA, WEIGHT_STATUS, FERROALLOY_CONFIRM, FERROALLOY_RESULT
+    VALID_AREA, WEIGHT_STATUS, FERROALLOY_CONFIRM, FERROALLOY_RESULT, ZERO_STATE
   </sql>
   <sql id="columns_alias">
     t.POINT_NO, t.POINT_NAME, t.VALID_WGT, t.VALID_CARNO, t.VALID_TARE_TIME, t.VALID_TIME_INTERVAL, 
@@ -85,7 +86,7 @@
     t.POWER_STATE, t.DVR_STATE, t.MOXA_STATE, t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, 
     t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE, t.LAMP_STATE, t.SPOT_TYPE_NO, t.RED_GREEN_LIGHT_STATE, 
     t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE, t.RFID_STATE, t.VALID_AREA, 
-    t.WEIGHT_STATUS, t.FERROALLOY_CONFIRM, t.FERROALLOY_RESULT
+    t.WEIGHT_STATUS, t.FERROALLOY_CONFIRM, t.FERROALLOY_RESULT, t.ZERO_STATE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_MONITOR
@@ -272,6 +273,9 @@
       <if test="ferroalloyResult != null and ferroalloyResult != ''">
         and FERROALLOY_RESULT = #{ferroalloyResult}
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        and ZERO_STATE = #{zeroState}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -453,6 +457,9 @@
       <if test="ferroalloyResult != null and ferroalloyResult != ''">
         and FERROALLOY_RESULT LIKE '%${ferroalloyResult}%'
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        and ZERO_STATE LIKE '%${zeroState}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -636,6 +643,9 @@
       <if test="ferroalloyResult != null and ferroalloyResult != ''">
         or FERROALLOY_RESULT = #{ferroalloyResult}
       </if>
+      <if test="zeroState != null and zeroState != ''">
+        or ZERO_STATE = #{zeroState}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR (POINT_NO, POINT_NAME, VALID_WGT, 
@@ -657,8 +667,8 @@
       AMPLIFIER_STATE, LAMP_STATE, SPOT_TYPE_NO, 
       RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, 
       REAR_INFRARED_RAY_STATE, RFID_STATE, VALID_AREA, 
-      WEIGHT_STATUS, FERROALLOY_CONFIRM, FERROALLOY_RESULT
-      )
+      WEIGHT_STATUS, FERROALLOY_CONFIRM, FERROALLOY_RESULT, 
+      ZERO_STATE)
     values (#{pointNo,jdbcType=VARCHAR}, #{pointName,jdbcType=VARCHAR}, #{validWgt,jdbcType=VARCHAR}, 
       #{validCarno,jdbcType=VARCHAR}, #{validTareTime,jdbcType=VARCHAR}, #{validTimeInterval,jdbcType=VARCHAR}, 
       #{validParkStatus,jdbcType=VARCHAR}, #{validExceedWgt,jdbcType=VARCHAR}, #{validPredictionDiff,jdbcType=VARCHAR}, 
@@ -678,8 +688,8 @@
       #{amplifierState,jdbcType=VARCHAR}, #{lampState,jdbcType=VARCHAR}, #{spotTypeNo,jdbcType=VARCHAR}, 
       #{redGreenLightState,jdbcType=VARCHAR}, #{frontInfraredRayState,jdbcType=VARCHAR}, 
       #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{validArea,jdbcType=VARCHAR}, 
-      #{weightStatus,jdbcType=VARCHAR}, #{ferroalloyConfirm,jdbcType=VARCHAR}, #{ferroalloyResult,jdbcType=VARCHAR}
-      )
+      #{weightStatus,jdbcType=VARCHAR}, #{ferroalloyConfirm,jdbcType=VARCHAR}, #{ferroalloyResult,jdbcType=VARCHAR}, 
+      #{zeroState,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR
@@ -861,6 +871,9 @@
       <if test="ferroalloyResult != null">
         FERROALLOY_RESULT,
       </if>
+      <if test="zeroState != null">
+        ZERO_STATE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pointNo != null">
@@ -1040,6 +1053,9 @@
       <if test="ferroalloyResult != null">
         #{ferroalloyResult,jdbcType=VARCHAR},
       </if>
+      <if test="zeroState != null">
+        #{zeroState,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1101,7 +1117,8 @@
       VALID_AREA = #{validArea,jdbcType=VARCHAR},
       WEIGHT_STATUS = #{weightStatus,jdbcType=VARCHAR},
       FERROALLOY_CONFIRM = #{ferroalloyConfirm,jdbcType=VARCHAR},
-      FERROALLOY_RESULT = #{ferroalloyResult,jdbcType=VARCHAR}
+      FERROALLOY_RESULT = #{ferroalloyResult,jdbcType=VARCHAR},
+      ZERO_STATE = #{zeroState,jdbcType=VARCHAR}
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1281,6 +1298,9 @@
       <if test="ferroalloyResult != null">
         FERROALLOY_RESULT = #{ferroalloyResult,jdbcType=VARCHAR},
       </if>
+      <if test="zeroState != null">
+        ZERO_STATE = #{zeroState,jdbcType=VARCHAR},
+      </if>
     </set>
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
@@ -1320,8 +1340,8 @@
       LAMP_STATE, SPOT_TYPE_NO, RED_GREEN_LIGHT_STATE, 
       FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
       RFID_STATE, VALID_AREA, WEIGHT_STATUS, 
-      FERROALLOY_CONFIRM, FERROALLOY_RESULT
-      )
+      FERROALLOY_CONFIRM, FERROALLOY_RESULT, 
+      ZERO_STATE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.pointNo,jdbcType=VARCHAR}, 
@@ -1346,8 +1366,8 @@
       #{item.lampState,jdbcType=VARCHAR}, #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.redGreenLightState,jdbcType=VARCHAR}, 
       #{item.frontInfraredRayState,jdbcType=VARCHAR}, #{item.rearInfraredRayState,jdbcType=VARCHAR}, 
       #{item.rfidState,jdbcType=VARCHAR}, #{item.validArea,jdbcType=VARCHAR}, #{item.weightStatus,jdbcType=VARCHAR}, 
-      #{item.ferroalloyConfirm,jdbcType=VARCHAR}, #{item.ferroalloyResult,jdbcType=VARCHAR}
-       from dual  
+      #{item.ferroalloyConfirm,jdbcType=VARCHAR}, #{item.ferroalloyResult,jdbcType=VARCHAR}, 
+      #{item.zeroState,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1589,6 +1609,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
           when #{item.pointNo,jdbcType=VARCHAR} then #{item.ferroalloyResult,jdbcType=VARCHAR}
        </foreach>
+       ,ZERO_STATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+          when #{item.pointNo,jdbcType=VARCHAR} then #{item.zeroState,jdbcType=VARCHAR}
+       </foreach>
      where POINT_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.pointNo,jdbcType=VARCHAR}
@@ -2014,5 +2038,5 @@
       or EDIT_CAR = #{editCar}
     </if>
   </select>
-  
+
 </mapper>

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

@@ -362,6 +362,12 @@ public class MeterWorkMonitor implements IBasePO<String> {
     @ApiModelProperty(value="铁合金确认结果",required=false)
     private String ferroalloyResult;
 
+    /**
+     * 零点报警         0不报警  1报警(ZERO_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="零点报警         0不报警  1报警",required=false)
+    private String zeroState;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -846,6 +852,14 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.ferroalloyResult = ferroalloyResult == null ? null : ferroalloyResult.trim();
     }
 
+    public String getZeroState() {
+        return zeroState;
+    }
+
+    public void setZeroState(String zeroState) {
+        this.zeroState = zeroState == null ? null : zeroState.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -911,6 +925,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         sb.append(", weightStatus=").append(weightStatus);
         sb.append(", ferroalloyConfirm=").append(ferroalloyConfirm);
         sb.append(", ferroalloyResult=").append(ferroalloyResult);
+        sb.append(", zeroState=").append(zeroState);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -1955,19 +1955,19 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次毛重、清空一次皮重委托信息
-                        MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
-                        if(firstGross.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst1No());
+                        MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
+                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
+                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
                         }
-                        if(firstTare != null){
-                            firstTare.setValueFlag(DbConstants.VALID);
-                            firstTare.setUpdateManName("system");
-                            firstTare.setUpdateManName("混装解除更新");
-                            firstTare.setNote(model.getNote());
-                            firstTare.setUpdateTime(new Date());
-                            firstTare.setIsPreSacale("0");
-                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
+                        if(firstGross != null){
+                            firstGross.setValueFlag(DbConstants.VALID);
+                            firstGross.setUpdateManName("system");
+                            firstGross.setUpdateManName("混装解除更新");
+                            firstGross.setNote(model.getNote());
+                            firstGross.setUpdateTime(new Date());
+                            firstGross.setIsPreSacale("0");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         // 删洁净
                         meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());