调整机器

src/main/java/com/minpay/db/table/model/VmEquipmentInf.java

@@ -300,6 +300,14 @@ public class VmEquipmentInf extends AbstractMINBean {
     private String urlCode;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_equipment_inf.VEQ_APPLYSTATE
+     *
+     * @mbggenerated
+     */
+    private String applystate;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_equipment_inf.VEQ_ID
      *
@@ -1186,4 +1194,28 @@ public class VmEquipmentInf extends AbstractMINBean {
     public void setUrlCode(String urlCode) {
         this.urlCode = urlCode == null ? null : urlCode.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_equipment_inf.VEQ_APPLYSTATE
+     *
+     * @return the value of vm_equipment_inf.VEQ_APPLYSTATE
+     *
+     * @mbggenerated
+     */
+    public String getApplystate() {
+        return applystate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_equipment_inf.VEQ_APPLYSTATE
+     *
+     * @param applystate the value for vm_equipment_inf.VEQ_APPLYSTATE
+     *
+     * @mbggenerated
+     */
+    public void setApplystate(String applystate) {
+        this.applystate = applystate == null ? null : applystate.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmEquipmentInfExample.java

@@ -3075,6 +3075,84 @@ public class VmEquipmentInfExample {
             addCriterion("VEQ_URL_CODE not between", value1, value2, "urlCode");
             return (Criteria) this;
         }
+
+        public Criteria andApplystateIsNull() {
+            addCriterion("VEQ_APPLYSTATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateIsNotNull() {
+            addCriterion("VEQ_APPLYSTATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateEqualTo(String value) {
+            if(value == null ){
+                andApplystateIsNull();
+            } else {
+                addCriterion("VEQ_APPLYSTATE =", value, "applystate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateNotEqualTo(String value) {
+            if(value == null ){
+                andApplystateIsNotNull();
+            } else {
+                addCriterion("VEQ_APPLYSTATE <>", value, "applystate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateGreaterThan(String value) {
+            addCriterion("VEQ_APPLYSTATE >", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateGreaterThanOrEqualTo(String value) {
+            addCriterion("VEQ_APPLYSTATE >=", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateLessThan(String value) {
+            addCriterion("VEQ_APPLYSTATE <", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateLessThanOrEqualTo(String value) {
+            addCriterion("VEQ_APPLYSTATE <=", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateLike(String value) {
+            addCriterion("VEQ_APPLYSTATE like", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateNotLike(String value) {
+            addCriterion("VEQ_APPLYSTATE not like", value, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateIn(List<String> values) {
+            addCriterion("VEQ_APPLYSTATE in", values, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateNotIn(List<String> values) {
+            addCriterion("VEQ_APPLYSTATE not in", values, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateBetween(String value1, String value2) {
+            addCriterion("VEQ_APPLYSTATE between", value1, value2, "applystate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplystateNotBetween(String value1, String value2) {
+            addCriterion("VEQ_APPLYSTATE not between", value1, value2, "applystate");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -139,6 +139,8 @@ public class MachineManageAction implements IMINAction {
     public final static String QUERY_BRANCH = "queryBranch";
     /** 绑定商户号 */
     public final static String BIND_BRANCH = "bindBranch";
+    /** 绑定商户号 */
+    public final static String STOP_MACHINE = "stopMachine";
 
 
     private boolean contains;
@@ -1877,4 +1879,39 @@ public class MachineManageAction implements IMINAction {
         }
         return item;
     }
+
+    /**
+     * 开启/关闭音乐
+     *
+     * @param id 机器id
+     * @return
+     * @throws Exception
+     */
+    @MINAction(value = STOP_MACHINE)
+    public MINActionResult stopMachine(
+            @MINParam(key = "id") String id,
+            @MINParam(key = "status") String status,
+            MINSession session) throws Exception {
+
+        MINActionResult res = new MINActionResult();
+        User user = session.getUser();
+        if (CommonUtil.isEmpty(id)){
+            throw new MINBusinessException("机器id上送为空!");
+        }
+        //校验设备是否正常
+        VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmEquipmentInfMapper.class)
+                .selectByPrimaryKey(id);
+        if (equipmentInf == null) {
+            throw new MINBusinessException("该设备不存在!");
+        }
+        VmEquipmentInf pro = new VmEquipmentInf();
+        pro.setId(id);
+        pro.setApplystate(status);
+        Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmEquipmentInfMapper.class)
+                .updateByPrimaryKeySelective(pro);
+        return res;
+    }
+
 }

src/main/resources/com/minpay/db/table/mapper/VmEquipmentInfMapper.xml

@@ -43,6 +43,7 @@
     <result column="VEQ_LINES" jdbcType="VARCHAR" property="lines" />
     <result column="VEQ_SONG_STATUS" jdbcType="VARCHAR" property="songStatus" />
     <result column="VEQ_URL_CODE" jdbcType="VARCHAR" property="urlCode" />
+    <result column="VEQ_APPLYSTATE" jdbcType="VARCHAR" property="applystate" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -121,7 +122,7 @@
     VEQ_BACKGROUND_TWO, VEQ_EXCHANGE_RATE, VEQ_SUPPORT_BALANCE, VEQ_REMARKS, VEQ_CREATE_USER, 
     VEQ_CREATE_TIME, VEQ_MODIFY_USER, VEQ_MODIFY_TIME, VEQ_IMEI_ADDR, VEQ_HEART_RATES, 
     VEQ_STATE, VEQ_MACHINE_NO, VEQ_PROGRAM_EDITION, VEQ_TEMPERATURE, VEQ_SIGNAL, VEQ_BRANCHID, 
-    VEQ_ROWS, VEQ_LINES, VEQ_SONG_STATUS, VEQ_URL_CODE
+    VEQ_ROWS, VEQ_LINES, VEQ_SONG_STATUS, VEQ_URL_CODE, VEQ_APPLYSTATE
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmEquipmentInfExample" resultMap="BaseResultMap">
     <!--
@@ -186,7 +187,7 @@
       VEQ_STATE, VEQ_MACHINE_NO, VEQ_PROGRAM_EDITION, 
       VEQ_TEMPERATURE, VEQ_SIGNAL, VEQ_BRANCHID, 
       VEQ_ROWS, VEQ_LINES, VEQ_SONG_STATUS, 
-      VEQ_URL_CODE)
+      VEQ_URL_CODE, VEQ_APPLYSTATE)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{iotServiceProvider,jdbcType=VARCHAR}, #{iotCardNumber,jdbcType=VARCHAR}, #{versionType,jdbcType=VARCHAR}, 
       #{address,jdbcType=VARCHAR}, #{equType,jdbcType=VARCHAR}, #{equImg,jdbcType=VARCHAR}, 
@@ -199,7 +200,7 @@
       #{state,jdbcType=VARCHAR}, #{machineNo,jdbcType=VARCHAR}, #{programEdition,jdbcType=VARCHAR}, 
       #{temperature,jdbcType=VARCHAR}, #{signal,jdbcType=VARCHAR}, #{branchid,jdbcType=VARCHAR}, 
       #{rows,jdbcType=VARCHAR}, #{lines,jdbcType=VARCHAR}, #{songStatus,jdbcType=VARCHAR}, 
-      #{urlCode,jdbcType=VARCHAR})
+      #{urlCode,jdbcType=VARCHAR}, #{applystate,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmEquipmentInf">
     <!--
@@ -319,6 +320,9 @@
       <if test="urlCode != null">
         VEQ_URL_CODE,
       </if>
+      <if test="applystate != null">
+        VEQ_APPLYSTATE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -432,6 +436,9 @@
       <if test="urlCode != null">
         #{urlCode,jdbcType=VARCHAR},
       </if>
+      <if test="applystate != null">
+        #{applystate,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmEquipmentInfExample" resultType="java.lang.Integer">
@@ -562,6 +569,9 @@
       <if test="record.urlCode != null">
         VEQ_URL_CODE = #{record.urlCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.applystate != null">
+        VEQ_APPLYSTATE = #{record.applystate,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -609,7 +619,8 @@
       VEQ_ROWS = #{record.rows,jdbcType=VARCHAR},
       VEQ_LINES = #{record.lines,jdbcType=VARCHAR},
       VEQ_SONG_STATUS = #{record.songStatus,jdbcType=VARCHAR},
-      VEQ_URL_CODE = #{record.urlCode,jdbcType=VARCHAR}
+      VEQ_URL_CODE = #{record.urlCode,jdbcType=VARCHAR},
+      VEQ_APPLYSTATE = #{record.applystate,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -729,6 +740,9 @@
       <if test="urlCode != null">
         VEQ_URL_CODE = #{urlCode,jdbcType=VARCHAR},
       </if>
+      <if test="applystate != null">
+        VEQ_APPLYSTATE = #{applystate,jdbcType=VARCHAR},
+      </if>
     </set>
     where VEQ_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -773,7 +787,8 @@
       VEQ_ROWS = #{rows,jdbcType=VARCHAR},
       VEQ_LINES = #{lines,jdbcType=VARCHAR},
       VEQ_SONG_STATUS = #{songStatus,jdbcType=VARCHAR},
-      VEQ_URL_CODE = #{urlCode,jdbcType=VARCHAR}
+      VEQ_URL_CODE = #{urlCode,jdbcType=VARCHAR},
+      VEQ_APPLYSTATE = #{applystate,jdbcType=VARCHAR}
     where VEQ_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -4,6 +4,7 @@
 	<select id="machineInf" resultType="hashmap" parameterType="java.util.Map">
     	SELECT
 			p.VEQ_ID        	'id',
+			p.VEQ_APPLYSTATE        	'applystate',
 			p.VEQ_CHANNEL      	'channel',
 			p.VEQ_NAME      'name',
 			p.VEQ_IOT_SERVICE_PROVIDER     'ioiServicePrivider',

src/main/webapp/admin/machineManage/machineManage.html

@@ -74,6 +74,12 @@
 	{{#  if(d.songStatus == '01'){ }}
 	<a class="layui-btn layui-btn-xs" lay-event="open">开启音乐</a>
 	{{#  } }}
+	{{#  if(d.applystate == '00'){ }}
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="stopMachine">停用</a>
+	{{#  } }}
+	{{#  if(d.applystate == '01'){ }}
+	<a class="layui-btn layui-btn-xs" lay-event="openMachine">启用</a>
+	{{#  } }}
 	<a class="layui-btn layui-btn-xs" lay-event="bangding">绑定商户</a>
 </script>
 <script type="text/html" id="switchTwo">
@@ -141,6 +147,7 @@
 			,cols: [[ //表头
 				 {type:'numbers', title: '序号',width:'5%', fixed: true, align: 'center'}
 				,{field: 'machineNo', title: '机台号', width:"8%", sort: true, fixed: 'left'}
+				,{field: 'applystate', title: '使用状态', width:"8%"}
 				,{field: 'name', title: '机器名称', width:"10%"}
 				,{field: 'branchName', title: '所属商户', width:"10%"}
 				,{field: 'creditChannels', title: '收款通道', width:"10%"}
@@ -150,7 +157,7 @@
 				,{field: 'equTypeDesc', title: '机器类型', width:"5%"}
 				,{field: 'ioiCardNumber', title: '物联卡号', width:"5%"}
 				,{field: 'createTime', title: '创建时间', width:"10%"}
-				,{field: 'operate', title: '操作', width: "30%", toolbar: '#barDemo',fixed: 'right'}
+				,{field: 'operate', title: '操作', width: "35%", toolbar: '#barDemo',fixed: 'right'}
 			]]
 			,done: function(res, curr, count){
 				//如果是异步请求数据方式，res即为你接口返回的信息。
@@ -242,6 +249,56 @@
 
 			}else if(layEvent == 'bangding'){ //编辑
 				checkmchnt(data);
+			}else if(layEvent == 'stopMachine'){ //关闭机器
+				layer.confirm('真的要停用吗', function(index){
+					$.request({
+						action : '../../MachineManageAction/stopMachine',
+						data : {
+							id : id ,//机器名
+							status :"01"
+						},
+						success : function(data) {
+							//成功后刷新
+							var btn=$(".layui-laypage-btn")[0];
+							btn.click();
+							layer.alert('操作成功!', {
+								icon: 6,
+								title: "提示"
+							});
+						},
+						error : function(data) {
+							layer.alert('操作失败!', {
+								icon: 5,
+								title: "提示"
+							});
+						}
+					});
+				});
+			}else if(layEvent == 'openMachine'){ //开启
+				layer.confirm('真的要启用吗', function(index){
+					$.request({
+						action : '../../MachineManageAction/stopMachine',
+						data : {
+							id : id ,//机器名
+							status :"00"
+						},
+						success : function(data) {
+							//成功后刷新
+							var btn=$(".layui-laypage-btn")[0];
+							btn.click();
+							layer.alert('操作成功!', {
+								icon: 6,
+								title: "提示"
+							});
+						},
+						error : function(data) {
+							layer.alert('操作失败!', {
+								icon: 5,
+								title: "提示"
+							});
+						}
+					});
+				});
 			}
 
 		});