后端提交

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

@@ -65,6 +65,7 @@
     <result column="ZERO_WEIGHT" jdbcType="DECIMAL" property="zeroWeight" />
     <result column="IS_ZERO_STATE" jdbcType="VARCHAR" property="isZeroState" />
     <result column="IS_VALID_SCAN" jdbcType="VARCHAR" property="isValidScan" />
+    <result column="IS_ENABLE_SOUND" jdbcType="VARCHAR" property="isEnableSound" />
   </resultMap>
   <sql id="columns">
     POINT_NO, POINT_NAME, VALID_WGT, VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL, 
@@ -77,7 +78,7 @@
     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, ZERO_STATE, ZERO_WEIGHT, 
-    IS_ZERO_STATE, IS_VALID_SCAN
+    IS_ZERO_STATE, IS_VALID_SCAN, IS_ENABLE_SOUND
   </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, 
@@ -91,7 +92,7 @@
     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.ZERO_STATE, t.ZERO_WEIGHT, 
-    t.IS_ZERO_STATE, t.IS_VALID_SCAN
+    t.IS_ZERO_STATE, t.IS_VALID_SCAN, t.IS_ENABLE_SOUND
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_MONITOR
@@ -290,6 +291,9 @@
       <if test="isValidScan != null and isValidScan != ''">
         and IS_VALID_SCAN = #{isValidScan}
       </if>
+      <if test="isEnableSound != null and isEnableSound != ''">
+        and IS_ENABLE_SOUND = #{isEnableSound}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -483,6 +487,9 @@
       <if test="isValidScan != null and isValidScan != ''">
         and IS_VALID_SCAN LIKE '%${isValidScan}%'
       </if>
+      <if test="isEnableSound != null and isEnableSound != ''">
+        and IS_ENABLE_SOUND LIKE '%${isEnableSound}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -678,6 +685,9 @@
       <if test="isValidScan != null and isValidScan != ''">
         or IS_VALID_SCAN = #{isValidScan}
       </if>
+      <if test="isEnableSound != null and isEnableSound != ''">
+        or IS_ENABLE_SOUND = #{isEnableSound}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR (POINT_NO, POINT_NAME, VALID_WGT, 
@@ -701,7 +711,7 @@
       REAR_INFRARED_RAY_STATE, RFID_STATE, VALID_AREA, 
       WEIGHT_STATUS, FERROALLOY_CONFIRM, FERROALLOY_RESULT, 
       ZERO_STATE, ZERO_WEIGHT, IS_ZERO_STATE, 
-      IS_VALID_SCAN)
+      IS_VALID_SCAN, IS_ENABLE_SOUND)
     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}, 
@@ -723,7 +733,7 @@
       #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{validArea,jdbcType=VARCHAR}, 
       #{weightStatus,jdbcType=VARCHAR}, #{ferroalloyConfirm,jdbcType=VARCHAR}, #{ferroalloyResult,jdbcType=VARCHAR}, 
       #{zeroState,jdbcType=VARCHAR}, #{zeroWeight,jdbcType=DECIMAL}, #{isZeroState,jdbcType=VARCHAR}, 
-      #{isValidScan,jdbcType=VARCHAR})
+      #{isValidScan,jdbcType=VARCHAR}, #{isEnableSound,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR
@@ -917,6 +927,9 @@
       <if test="isValidScan != null">
         IS_VALID_SCAN,
       </if>
+      <if test="isEnableSound != null">
+        IS_ENABLE_SOUND,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pointNo != null">
@@ -1108,6 +1121,9 @@
       <if test="isValidScan != null">
         #{isValidScan,jdbcType=VARCHAR},
       </if>
+      <if test="isEnableSound != null">
+        #{isEnableSound,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1173,7 +1189,8 @@
       ZERO_STATE = #{zeroState,jdbcType=VARCHAR},
       ZERO_WEIGHT = #{zeroWeight,jdbcType=DECIMAL},
       IS_ZERO_STATE = #{isZeroState,jdbcType=VARCHAR},
-      IS_VALID_SCAN = #{isValidScan,jdbcType=VARCHAR}
+      IS_VALID_SCAN = #{isValidScan,jdbcType=VARCHAR},
+      IS_ENABLE_SOUND = #{isEnableSound,jdbcType=VARCHAR}
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1365,6 +1382,9 @@
       <if test="isValidScan != null">
         IS_VALID_SCAN = #{isValidScan,jdbcType=VARCHAR},
       </if>
+      <if test="isEnableSound != null">
+        IS_ENABLE_SOUND = #{isEnableSound,jdbcType=VARCHAR},
+      </if>
     </set>
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
@@ -1406,7 +1426,7 @@
       RFID_STATE, VALID_AREA, WEIGHT_STATUS, 
       FERROALLOY_CONFIRM, FERROALLOY_RESULT, 
       ZERO_STATE, ZERO_WEIGHT, IS_ZERO_STATE, 
-      IS_VALID_SCAN)
+      IS_VALID_SCAN, IS_ENABLE_SOUND)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.pointNo,jdbcType=VARCHAR}, 
@@ -1433,7 +1453,7 @@
       #{item.rfidState,jdbcType=VARCHAR}, #{item.validArea,jdbcType=VARCHAR}, #{item.weightStatus,jdbcType=VARCHAR}, 
       #{item.ferroalloyConfirm,jdbcType=VARCHAR}, #{item.ferroalloyResult,jdbcType=VARCHAR}, 
       #{item.zeroState,jdbcType=VARCHAR}, #{item.zeroWeight,jdbcType=DECIMAL}, #{item.isZeroState,jdbcType=VARCHAR}, 
-      #{item.isValidScan,jdbcType=VARCHAR} from dual  
+      #{item.isValidScan,jdbcType=VARCHAR}, #{item.isEnableSound,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1691,6 +1711,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
           when #{item.pointNo,jdbcType=VARCHAR} then #{item.isValidScan,jdbcType=VARCHAR}
        </foreach>
+       ,IS_ENABLE_SOUND=
+       <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+          when #{item.pointNo,jdbcType=VARCHAR} then #{item.isEnableSound,jdbcType=VARCHAR}
+       </foreach>
      where POINT_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.pointNo,jdbcType=VARCHAR}
@@ -2116,5 +2140,4 @@
       or EDIT_CAR = #{editCar}
     </if>
   </select>
-  
 </mapper>

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

@@ -386,6 +386,12 @@ public class MeterWorkMonitor implements IBasePO<String> {
     @ApiModelProperty(value="允许扫码计量（0：允许；1：不允许，数据库默认为1）",required=false)
     private String isValidScan;
 
+    /**
+     * 是否播放声音（0：不播放；1：播放）(IS_ENABLE_SOUND,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否播放声音（0：不播放；1：播放）",required=false)
+    private String isEnableSound;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -902,11 +908,19 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.isValidScan = isValidScan == null ? null : isValidScan.trim();
     }
 
+    public String getIsEnableSound() {
+        return isEnableSound;
+    }
+
+    public void setIsEnableSound(String isEnableSound) {
+        this.isEnableSound = isEnableSound == null ? null : isEnableSound.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, short zeroWeight, String isZeroState, String isvalidScan) {
+    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, short zeroWeight, String isZeroState, String isEnableSound) {
         this.pointNo = pointNo;
         this.pointName = pointName;
         this.validWgt = validWgt;
@@ -969,7 +983,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.zeroState = zeroState;
         this.zeroWeight = zeroWeight;
         this.isZeroState = isZeroState;
-        this.isValidScan = isvalidScan;
+        this.isEnableSound = isEnableSound;
     }
 
     public MeterWorkMonitor(MeterWorkMonitor meterWorkMonitor) {
@@ -1035,7 +1049,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.zeroState = meterWorkMonitor.zeroState;
         this.zeroWeight = meterWorkMonitor.zeroWeight;
         this.isZeroState = meterWorkMonitor.isZeroState;
-        this.isValidScan = meterWorkMonitor.isValidScan;
+        this.isEnableSound = meterWorkMonitor.isEnableSound;
     }
 
     @Override
@@ -1107,6 +1121,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         sb.append(", zeroWeight=").append(zeroWeight);
         sb.append(", isZeroState=").append(isZeroState);
         sb.append(", isValidScan=").append(isValidScan);
+        sb.append(", isEnableSound=").append(isEnableSound);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();