机器设备修改

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

@@ -284,6 +284,14 @@ public class VmEquipmentInf extends AbstractMINBean {
     private String lines;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_equipment_inf.VEQ_SONG_STATUS
+     *
+     * @mbggenerated
+     */
+    private String songStatus;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_equipment_inf.VEQ_ID
      *
@@ -1122,4 +1130,28 @@ public class VmEquipmentInf extends AbstractMINBean {
     public void setLines(String lines) {
         this.lines = lines == null ? null : lines.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_equipment_inf.VEQ_SONG_STATUS
+     *
+     * @return the value of vm_equipment_inf.VEQ_SONG_STATUS
+     *
+     * @mbggenerated
+     */
+    public String getSongStatus() {
+        return songStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_equipment_inf.VEQ_SONG_STATUS
+     *
+     * @param songStatus the value for vm_equipment_inf.VEQ_SONG_STATUS
+     *
+     * @mbggenerated
+     */
+    public void setSongStatus(String songStatus) {
+        this.songStatus = songStatus == null ? null : songStatus.trim();
+    }
 }

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

@@ -2919,6 +2919,84 @@ public class VmEquipmentInfExample {
             addCriterion("VEQ_LINES not between", value1, value2, "lines");
             return (Criteria) this;
         }
+
+        public Criteria andSongStatusIsNull() {
+            addCriterion("VEQ_SONG_STATUS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusIsNotNull() {
+            addCriterion("VEQ_SONG_STATUS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusEqualTo(String value) {
+            if(value == null ){
+                andSongStatusIsNull();
+            } else {
+                addCriterion("VEQ_SONG_STATUS =", value, "songStatus");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusNotEqualTo(String value) {
+            if(value == null ){
+                andSongStatusIsNotNull();
+            } else {
+                addCriterion("VEQ_SONG_STATUS <>", value, "songStatus");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusGreaterThan(String value) {
+            addCriterion("VEQ_SONG_STATUS >", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("VEQ_SONG_STATUS >=", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusLessThan(String value) {
+            addCriterion("VEQ_SONG_STATUS <", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusLessThanOrEqualTo(String value) {
+            addCriterion("VEQ_SONG_STATUS <=", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusLike(String value) {
+            addCriterion("VEQ_SONG_STATUS like", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusNotLike(String value) {
+            addCriterion("VEQ_SONG_STATUS not like", value, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusIn(List<String> values) {
+            addCriterion("VEQ_SONG_STATUS in", values, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusNotIn(List<String> values) {
+            addCriterion("VEQ_SONG_STATUS not in", values, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusBetween(String value1, String value2) {
+            addCriterion("VEQ_SONG_STATUS between", value1, value2, "songStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSongStatusNotBetween(String value1, String value2) {
+            addCriterion("VEQ_SONG_STATUS not between", value1, value2, "songStatus");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/db/table/own/mapper/MachineManageMapper.java

@@ -16,4 +16,6 @@ public interface MachineManageMapper extends  IMINMybatisEntityMapper{
     List<Map<String, Object>> queryProEquRel(Map<String, String> map);
 
 	List<Map<String, String>> queryProductz(Map<String, String> map, MINRowBounds rows);
+
+	List<Map<String, Object>> queryEquipment(Map<String, String> map, MINRowBounds rows);
 }

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

@@ -40,35 +40,69 @@ import java.util.Map;
 @MINComponent
 public class MachineManageAction implements IMINAction {
 
-    /**查看设备*/
+    /**
+     * 查看设备
+     */
     public final static String QUERY_EQUMENT_INF = "queryEqumentInf";
-    /** 添加设备*/
+    /**
+     * 添加设备
+     */
     public final static String ADD_PRODUCT_INF = "addProductInf";
-    /** 修改设备*/
+    /**
+     * 修改设备
+     */
     public final static String MODIFY_PRODUCT_INF = "modifyProductInf";
-    /** 更改设备状态*/
+    /**
+     * 更改设备状态
+     */
     public final static String MODIFY_PRODUCT_STATE = "modifyProductState";
-    /**查询设备中商品*/
-    public final static String	QUERY_PROEQUREL				= "queryProEquRel";
-    /**查看正常状态商品*/
+    /**
+     * 查询设备中商品
+     */
+    public final static String QUERY_PROEQUREL = "queryProEquRel";
+    /**
+     * 查看正常状态商品
+     */
     public final static String QUERY_PRODUCTZ = "queryProductz";
-    /**设备添加商品*/
-    public final static String	ADD_PROEQUREL				= "addProEquRel";
-    /**修改设备商品*/
-    public final static String	EDIT_PROEQUREL				= "editProEquRel";
-    /**查询编辑设备中商品*/
-    public final static String	QUERY_PROEQU				= "queryProEqu";
-    /**删除货道*/
-    public final static String	DEL_EQUPRO					= "delEquPro";
-    /**删除设备中商品*/
-    public final static String	DEL_PROEQU					= "delProEqu";
+    /**
+     * 设备添加商品
+     */
+    public final static String ADD_PROEQUREL = "addProEquRel";
+    /**
+     * 修改设备商品
+     */
+    public final static String EDIT_PROEQUREL = "editProEquRel";
+    /**
+     * 查询编辑设备中商品
+     */
+    public final static String QUERY_PROEQU = "queryProEqu";
+    /**
+     * 删除货道
+     */
+    public final static String DEL_EQUPRO = "delEquPro";
+    /**
+     * 删除设备中商品
+     */
+    public final static String DEL_PROEQU = "delProEqu";
+    /**
+     * 查询设备列表
+     */
+    public final static String QUERY_EQUIPMENT_LINE = "queryEquipmentLine";
+    /**
+     * 多选设备复制商品
+     */
+    public final static String ADD_PROEQURELALL_COPY = "addProEquRelAllCopy";
+    /**
+     * 关闭音乐
+     */
+    public final static String CLOSE_SONG = "closeSong";
     private boolean contains;
 
 
     /**
      * 查看设备
-     * @param createUser		添加人
-
+     *
+     * @param createUser 添加人
      * @param page
      * @param limit
      * @return
@@ -76,7 +110,7 @@ public class MachineManageAction implements IMINAction {
      */
     @MINAction(value = QUERY_EQUMENT_INF)
     public MINActionResult queryEqumentInf(
-            @MINParam(key = "machineId")String machineId,
+            @MINParam(key = "machineId") String machineId,
             @MINParam(key = "state") String state,
             @MINParam(key = "createUser") String createUser,
             @MINParam(key = "page", defaultValue = "1") int page,
@@ -88,8 +122,8 @@ public class MachineManageAction implements IMINAction {
         String passwardKey = Service.lookup(IPropertiesService.class)
                 .getSystemProperties().get("WALLET_TO_METTING_PASSWORD_KEY").getKey();
         Map<String, String> map = new HashMap<String, String>();
-        map.put("id",machineId);
-        map.put("createUser",createUser);
+        map.put("id", machineId);
+        map.put("createUser", createUser);
         map.put("channel", user.getChannel());//渠道号
         //验证操作员权限
         MINRowBounds rows = new MINRowBounds(page, limit);
@@ -98,22 +132,23 @@ public class MachineManageAction implements IMINAction {
                 .getMybatisMapper(MachineManageMapper.class)
                 .machineInf(map, rows);
         //格式化时间和状态
-        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
-        list = new MINCopyFormat("{state:'stateDesc'}").format(list);
-        list = Service.lookup(IFormatService.class).formatEnum(list,"{stateDesc:'MEI_STATE'}");
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
+        list = new MINCopyFormat("{state:'stateDesc',equType :'equTypeDesc'}").format(list);
+        list = Service.lookup(IFormatService.class).formatEnum(list, "{stateDesc:'EQUIPMENT_STATE',equTypeDesc:'EQUIPMENT_TYPE'}");
         //返回数据
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
-        res.set(IMINBusinessConstant.F_PAGING_COUNT,rows.getMaxRows());
+        res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
         return res;
     }
 
     /**
      * 添加设备
+     *
      * @param session
      * @return
      * @throws MINBusinessException
      */
-    @MINAction(value = ADD_PRODUCT_INF,transaction = IMINTransactionEnum.CMT)
+    @MINAction(value = ADD_PRODUCT_INF, transaction = IMINTransactionEnum.CMT)
     public MINActionResult addMachine(
             @MINParam(key = "equCode") String equCode,
             @MINParam(key = "account") String account,
@@ -126,16 +161,16 @@ public class MachineManageAction implements IMINAction {
         String nowTime = DateUtil.getCurrentDateTimeString();
         // 获取操作员信息
         User user = session.getUser();
-        if (CommonUtil.isEmpty(equCode)){
+        if (CommonUtil.isEmpty(equCode)) {
             throw new MINBusinessException("起始机台号为空");
         }
-        if (CommonUtil.isEmpty(account)){
+        if (CommonUtil.isEmpty(account)) {
             throw new MINBusinessException("生成数量为空");
         }
-        if (CommonUtil.isEmpty(temLine)){
+        if (CommonUtil.isEmpty(temLine)) {
             throw new MINBusinessException("生成货道行数量为空");
         }
-        if (CommonUtil.isEmpty(temRow)){
+        if (CommonUtil.isEmpty(temRow)) {
             throw new MINBusinessException("生成货道列数量为空");
         }
         int size = Integer.parseInt(account);
@@ -144,17 +179,17 @@ public class MachineManageAction implements IMINAction {
         List<VmEquipmentInf> vmEquipmentInfList = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmEquipmentInfMapper.class)
                 .selectByExample(example);
-        if (vmEquipmentInfList.size()>0){
-            throw new MINBusinessException(equCode+"机台号已存在");
+        if (vmEquipmentInfList.size() > 0) {
+            throw new MINBusinessException(equCode + "机台号已存在");
         }
-        for (int j = 1; j<size;j++ ){
+        for (int j = 1; j < size; j++) {
             VmEquipmentInfExample examples = new VmEquipmentInfExample();
-            examples.createCriteria().andMachineNoEqualTo(CommonUtil.add(equCode,String.valueOf(j))).andStateEqualTo("00");
+            examples.createCriteria().andMachineNoEqualTo(CommonUtil.add(equCode, String.valueOf(j))).andStateEqualTo("00");
             List<VmEquipmentInf> vmEquipmentInfLists = Service.lookup(IMINDataBaseService.class)
                     .getMybatisMapper(VmEquipmentInfMapper.class)
                     .selectByExample(examples);
-            if (vmEquipmentInfLists.size()>0){
-                throw new MINBusinessException(equCode+"机台号已存在");
+            if (vmEquipmentInfLists.size() > 0) {
+                throw new MINBusinessException(equCode + "机台号已存在");
             }
 
         }
@@ -171,12 +206,12 @@ public class MachineManageAction implements IMINAction {
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(com.minpay.db.table.mapper.VmEquipmentInfMapper.class)
                 .insertSelective(pro);
-        for (int i = 1; i < size;i++ ){
+        for (int i = 1; i < size; i++) {
             String ids = Service.lookup(IPublicService.class).getSequence("EQU_MACHINE_NO");
             VmEquipmentInf pros = new VmEquipmentInf();
             pros.setId(ids);
             pros.setChannel("V01");
-            pros.setMachineNo(CommonUtil.add(equCode,String.valueOf(i)));
+            pros.setMachineNo(CommonUtil.add(equCode, String.valueOf(i)));
             pros.setState("00");
             pros.setCreateUser(user.getId());
             pros.setCreateTime(nowTime);
@@ -191,10 +226,10 @@ public class MachineManageAction implements IMINAction {
 		Service.lookup(ILogService.class).logging(session, logInfo);*/
         return res;
     }
+
     /**
      * 查询设备中商品
-     * @param temName		模版名称
-     * @param temState		状态
+     *
      * @param session
      * @return
      * @throws MINBusinessException
@@ -218,20 +253,22 @@ public class MachineManageAction implements IMINAction {
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryProEquRel(map);
         //格式化时间和状态
-        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
         list = new MINCopyFormat("{perState:'sttDesc',isPromotton:'isPromottonDesc',isFragile:'isFragileDesc'}").format(list);
         list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'PROEQUREL_STATE',isPromottonDesc:'IS_PROMOTION',isFragileDesc:'IS_FRAGILE'}");
         //传递数据
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
         return res;
     }
+
     /**
      * 查看商品
-     * @param name            	商品名称
-     * @param brandName		  	品牌名称
-     * @param model				商品型号
-     * @param createUser		添加人
-     * @param dates				添加时间
+     *
+     * @param name       商品名称
+     * @param brandName  品牌名称
+     * @param model      商品型号
+     * @param createUser 添加人
+     * @param dates      添加时间
      * @param page
      * @param limit
      * @return
@@ -241,7 +278,7 @@ public class MachineManageAction implements IMINAction {
     public MINActionResult queryProductz(
             @MINParam(key = "name") String name,
             @MINParam(key = "model") String model,
-            @MINParam(key = "dates")String dates,
+            @MINParam(key = "dates") String dates,
             @MINParam(key = "state") String state,
             @MINParam(key = "brandName") String brandName,
             @MINParam(key = "categoryId") String categoryId,
@@ -254,17 +291,17 @@ public class MachineManageAction implements IMINAction {
         User user = session.getUser();
         Map<String, String> map = new HashMap<String, String>();
         //按商品名称，商品品牌进行模糊查询
-        map.put("name", name);	//商品名称
+        map.put("name", name);    //商品名称
         map.put("state", state);//状态
-        map.put("model",model);
-        map.put("dates",dates);
-        map.put("brandName",brandName);
-        map.put("createUser",createUser);
+        map.put("model", model);
+        map.put("dates", dates);
+        map.put("brandName", brandName);
+        map.put("createUser", createUser);
         map.put("channel", "V01");//渠道号
         map.put("category", categoryId);//分类
         //验证操作员权限
-        if("00".equals(user.getIdentity())){
-            map.put("userId",user.getId());
+        if ("00".equals(user.getIdentity())) {
+            map.put("userId", user.getId());
         }
 /*		if("10000002".equals(user.getRoleId())){
 			map.put("userId",user.getId());
@@ -276,29 +313,31 @@ public class MachineManageAction implements IMINAction {
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryProductz(map, rows);
         //格式化时间和状态
-        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
         list = new MINCopyFormat("{history:'historyDesc',state:'stateDesc',source:'sourceDesc'}").format(list);
-        list = Service.lookup(IFormatService.class).formatEnum(list,"{historyDesc:'PRODUCT_HISTORY',stateDesc:'PRODUCT_STATE',sourceDesc:'PRODUCT_SOURCE'}");
+        list = Service.lookup(IFormatService.class).formatEnum(list, "{historyDesc:'PRODUCT_HISTORY',stateDesc:'PRODUCT_STATE',sourceDesc:'PRODUCT_SOURCE'}");
         //返回数据
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
-        res.set(IMINBusinessConstant.F_PAGING_COUNT,rows.getMaxRows());
+        res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
         return res;
     }
+
     /**
      * 设备添加商品
-     * @param perRow			货道层
-     * @param perLine			货道列
-     * @param perNum			货道容量
-     * @param numbers			商品余量
-     * @param sallPrice			售货价
-     * @param gamePrice			游戏价
-     * @param costPrice			成本价
-     * @param isPromotton		是否促销
-     * @param promottonPrice	促销价
-     * @param isFragile			是否易碎
-     * @param perRemarks		备注
-     * @param proId				商品id
-     * @param equId				设备id
+     *
+     * @param perRow         货道层
+     * @param perLine        货道列
+     * @param perNum         货道容量
+     * @param numbers        商品余量
+     * @param sallPrice      售货价
+     * @param gamePrice      游戏价
+     * @param costPrice      成本价
+     * @param isPromotton    是否促销
+     * @param promottonPrice 促销价
+     * @param isFragile      是否易碎
+     * @param perRemarks     备注
+     * @param proId          商品id
+     * @param equId          设备id
      * @param session
      * @return
      * @throws MINBusinessException
@@ -336,9 +375,9 @@ public class MachineManageAction implements IMINAction {
         VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmEquipmentInfMapper.class)
                 .selectByPrimaryKey(equId);
-        if(equipmentInf == null){
+        if (equipmentInf == null) {
             throw new MINBusinessException("该设备不存在!");
-        }else if(equipmentInf.getState().equals("03")){
+        } else if (equipmentInf.getState().equals("03")) {
             throw new MINBusinessException("该设备已销毁!");
         }
         int comcosAndsal = CommonUtil.compare(costPrice, sallPrice);
@@ -362,7 +401,7 @@ public class MachineManageAction implements IMINAction {
         if (comproAndsal == 1 || comproAndsal == 0) {
             throw new MINBusinessException("促销价不能大于或等于售货价！");
         }
-        if (comnumAndper == 1 ) {
+        if (comnumAndper == 1) {
             throw new MINBusinessException("商品余量不能大于货道容量！");
         }
         //校验商品是否正常
@@ -375,12 +414,12 @@ public class MachineManageAction implements IMINAction {
         //设备新增商品
         String id = Service.lookup(IPublicService.class).getSequence("VM_PROEQUREL_ID");
         VmProEquRel proEquRel = new VmProEquRel();
-        proEquRel.setId(id);								//设备商品关联表id
-        proEquRel.setProductId(proId);						//商品id
-        proEquRel.setEquipmentId(equId);					//设备id
+        proEquRel.setId(id);                                //设备商品关联表id
+        proEquRel.setProductId(proId);                        //商品id
+        proEquRel.setEquipmentId(equId);                    //设备id
 
         VmProEquRelExample example = new VmProEquRelExample();
-        if(CommonUtil.isEmpty(aisle)){
+        if (CommonUtil.isEmpty(aisle)) {
             example.createCriteria().andChannelEqualTo(channel)
                     .andEquipmentIdEqualTo(equId)
                     .andAisleEqualTo(perRow.concat(perLine))
@@ -388,11 +427,11 @@ public class MachineManageAction implements IMINAction {
             List<VmProEquRel> list = Service.lookup(IMINDataBaseService.class)
                     .getMybatisMapper(VmProEquRelMapper.class)
                     .selectByExample(example);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 throw new MINBusinessException("该设备默认货道指令已被使用！");
             }
-            proEquRel.setAisle(perRow.concat(perLine));			//货道指令
-        }else{
+            proEquRel.setAisle(perRow.concat(perLine));            //货道指令
+        } else {
             example.createCriteria().andChannelEqualTo(channel)
                     .andEquipmentIdEqualTo(equId)
                     .andAisleEqualTo(aisle)
@@ -400,53 +439,56 @@ public class MachineManageAction implements IMINAction {
             List<VmProEquRel> list = Service.lookup(IMINDataBaseService.class)
                     .getMybatisMapper(VmProEquRelMapper.class)
                     .selectByExample(example);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 throw new MINBusinessException("该设备货道指令已使用！");
             }
-            proEquRel.setAisle(aisle);							//货道指令
-        }
-        proEquRel.setCargoWayRow(perRow);					//货道层
-        proEquRel.setCargoWayLine(perLine);					//货道列
-        proEquRel.setCargoWayNums(perNum);					//货道容量
-        proEquRel.setProductNums(numbers);					//商品余量
-        proEquRel.setSallPrice(sallPrice);					//售货价
-        proEquRel.setGamePrice(gamePrice);					//游戏价
-        proEquRel.setCostPrice(costPrice);					//成本价
-        proEquRel.setIsPromotion(isPromotton);				//是否促销
-        proEquRel.setPromotionPrice(promottonPrice);		//促销价
+            proEquRel.setAisle(aisle);                            //货道指令
+        }
+        proEquRel.setCargoWayRow(perRow);                    //货道层
+        proEquRel.setCargoWayLine(perLine);                    //货道列
+        proEquRel.setCargoWayNums(perNum);                    //货道容量
+        proEquRel.setProductNums(numbers);                    //商品余量
+        proEquRel.setSallPrice(sallPrice);                    //售货价
+        proEquRel.setGamePrice(gamePrice);                    //游戏价
+        proEquRel.setCostPrice(costPrice);                    //成本价
+        proEquRel.setIsPromotion(isPromotton);                //是否促销
+        proEquRel.setPromotionPrice(promottonPrice);        //促销价
         /*		proEquRel.setIsFragile(isFragile);					//是否易碎
-         */		proEquRel.setUserId(uId);							//商户id
-        proEquRel.setRemarks(perRemarks);					//备注
-        proEquRel.setGameType(type);					    //游戏类型
-        proEquRel.setChannel(channel);						//渠道
-        proEquRel.setCreateUser(uId);						//创建人
-        proEquRel.setCreateTime(dateTime);					//创建时间
-        proEquRel.setModifyUser(uId);						//最后修改人
-        proEquRel.setModifyTime(dateTime);					//最后修改时间
-        proEquRel.setExeitState("00");	//状态 00正常
+         */
+        proEquRel.setUserId(uId);                            //商户id
+        proEquRel.setRemarks(perRemarks);                    //备注
+        proEquRel.setGameType(type);                        //游戏类型
+        proEquRel.setChannel(channel);                        //渠道
+        proEquRel.setCreateUser(uId);                        //创建人
+        proEquRel.setCreateTime(dateTime);                    //创建时间
+        proEquRel.setModifyUser(uId);                        //最后修改人
+        proEquRel.setModifyTime(dateTime);                    //最后修改时间
+        proEquRel.setExeitState("00");    //状态 00正常
 
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmProEquRelMapper.class)
                 .insertSelective(proEquRel);
         return res;
     }
+
     /**
      * 修改设备商品
-     * @param perId				设备商品关联id
-     * @param perRow			货道层
-     * @param perLine			货道列
-     * @param perNum			货道容量
-     * @param numbers			商品余量
-     * @param sallPrice			售货价
-     * @param gamePrice			游戏价
-     * @param costPrice			成本价
-     * @param isPromotton		是否促销
-     * @param promottonPrice	促销价
-     * @param isFragile			是否易碎
-     * @param perRemarks		备注
-     * @param proId				商品id
-     * @param equId				设备id
-     * @param perState			状态
+     *
+     * @param perId          设备商品关联id
+     * @param perRow         货道层
+     * @param perLine        货道列
+     * @param perNum         货道容量
+     * @param numbers        商品余量
+     * @param sallPrice      售货价
+     * @param gamePrice      游戏价
+     * @param costPrice      成本价
+     * @param isPromotton    是否促销
+     * @param promottonPrice 促销价
+     * @param isFragile      是否易碎
+     * @param perRemarks     备注
+     * @param proId          商品id
+     * @param equId          设备id
+     * @param perState       状态
      * @param session
      * @return
      * @throws MINBusinessException
@@ -486,9 +528,9 @@ public class MachineManageAction implements IMINAction {
         VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmEquipmentInfMapper.class)
                 .selectByPrimaryKey(equId);
-        if(equipmentInf == null){
+        if (equipmentInf == null) {
             throw new MINBusinessException("该设备不存在!");
-        }else if(equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)){
+        } else if (equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)) {
             throw new MINBusinessException("该设备已销毁!");
         }
         int comcosAndsal = CommonUtil.compare(costPrice, sallPrice);
@@ -512,7 +554,7 @@ public class MachineManageAction implements IMINAction {
         if (comproAndsal == 1 || comproAndsal == 0) {
             throw new MINBusinessException("促销价不能大于或等于售货价！");
         }
-        if (comnumAndper == 1 ) {
+        if (comnumAndper == 1) {
             throw new MINBusinessException("商品余量不能大于货道容量！");
         }
         //校验商品是否正常
@@ -526,13 +568,13 @@ public class MachineManageAction implements IMINAction {
 //			throw new BusinessCodeException("JINM0123");//商品信息异常
 //		}
         //修改设备新增商品
-        if(!CommonUtil.isEmpty(proId)){
-            proEquRel.setProductId(proId);						//商品id
+        if (!CommonUtil.isEmpty(proId)) {
+            proEquRel.setProductId(proId);                        //商品id
         }
-        if(!CommonUtil.isEmpty(equId)){
-            proEquRel.setEquipmentId(equId);					//设备id
+        if (!CommonUtil.isEmpty(equId)) {
+            proEquRel.setEquipmentId(equId);                    //设备id
         }
-        if(!CommonUtil.isEmpty(aisle)){
+        if (!CommonUtil.isEmpty(aisle)) {
             VmProEquRelExample example = new VmProEquRelExample();
             example.createCriteria().andChannelEqualTo(channel)
                     .andEquipmentIdEqualTo(equId)
@@ -542,49 +584,49 @@ public class MachineManageAction implements IMINAction {
             List<VmProEquRel> list = Service.lookup(IMINDataBaseService.class)
                     .getMybatisMapper(VmProEquRelMapper.class)
                     .selectByExample(example);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 throw new MINBusinessException("该设备货道指令已使用！");
             }
-            proEquRel.setAisle(aisle);							//货道指令
+            proEquRel.setAisle(aisle);                            //货道指令
         }
-        if(!CommonUtil.isEmpty(perRow)){
-            proEquRel.setCargoWayRow(perRow);					//货道层
+        if (!CommonUtil.isEmpty(perRow)) {
+            proEquRel.setCargoWayRow(perRow);                    //货道层
         }
-        if(!CommonUtil.isEmpty(perLine)){
-            proEquRel.setCargoWayLine(perLine);					//货道列
+        if (!CommonUtil.isEmpty(perLine)) {
+            proEquRel.setCargoWayLine(perLine);                    //货道列
         }
-        if(!CommonUtil.isEmpty(perNum)){
-            proEquRel.setCargoWayNums(perNum);					//货道容量
+        if (!CommonUtil.isEmpty(perNum)) {
+            proEquRel.setCargoWayNums(perNum);                    //货道容量
         }
-        if(!CommonUtil.isEmpty(numbers)){
-            proEquRel.setProductNums(numbers);					//商品余量
+        if (!CommonUtil.isEmpty(numbers)) {
+            proEquRel.setProductNums(numbers);                    //商品余量
         }
-        if(!CommonUtil.isEmpty(sallPrice)){
-            proEquRel.setSallPrice(sallPrice);					//售货价
+        if (!CommonUtil.isEmpty(sallPrice)) {
+            proEquRel.setSallPrice(sallPrice);                    //售货价
         }
-        if(!CommonUtil.isEmpty(gamePrice)){
-            proEquRel.setGamePrice(gamePrice);					//游戏价
+        if (!CommonUtil.isEmpty(gamePrice)) {
+            proEquRel.setGamePrice(gamePrice);                    //游戏价
         }
-        if(!CommonUtil.isEmpty(costPrice)){
-            proEquRel.setCostPrice(costPrice);					//成本价
+        if (!CommonUtil.isEmpty(costPrice)) {
+            proEquRel.setCostPrice(costPrice);                    //成本价
         }
-        if(!CommonUtil.isEmpty(isPromotton)){
-            proEquRel.setIsPromotion(isPromotton);				//是否促销
+        if (!CommonUtil.isEmpty(isPromotton)) {
+            proEquRel.setIsPromotion(isPromotton);                //是否促销
         }
-        if(!CommonUtil.isEmpty(promottonPrice)){
-            proEquRel.setPromotionPrice(promottonPrice);		//促销价
+        if (!CommonUtil.isEmpty(promottonPrice)) {
+            proEquRel.setPromotionPrice(promottonPrice);        //促销价
         }
 		/*if(!CommonUtil.isEmpty(isFragile)){
 			proEquRel.setIsFragile(isFragile);					//是否易碎
 		}*/
-        if(!CommonUtil.isEmpty(perRemarks)){
-            proEquRel.setRemarks(perRemarks);					//备注
+        if (!CommonUtil.isEmpty(perRemarks)) {
+            proEquRel.setRemarks(perRemarks);                    //备注
         }
-        proEquRel.setGameType(type);					    //游戏类型
-        proEquRel.setModifyUser(uId);						//最后修改人
-        proEquRel.setModifyTime(dateTime);					//最后修改时间
-        if(!CommonUtil.isEmpty(perState)){
-            proEquRel.setExeitState(perState);					//状态
+        proEquRel.setGameType(type);                        //游戏类型
+        proEquRel.setModifyUser(uId);                        //最后修改人
+        proEquRel.setModifyTime(dateTime);                    //最后修改时间
+        if (!CommonUtil.isEmpty(perState)) {
+            proEquRel.setExeitState(perState);                    //状态
         }
 
         Service.lookup(IMINDataBaseService.class)
@@ -592,10 +634,10 @@ public class MachineManageAction implements IMINAction {
                 .updateByPrimaryKeySelective(proEquRel);
         return res;
     }
+
     /**
      * 查询设备中商品
-     * @param temName		模版名称
-     * @param temState		状态
+     *
      * @param session
      * @return
      * @throws MINBusinessException
@@ -621,19 +663,19 @@ public class MachineManageAction implements IMINAction {
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryProEquRel(map);
         //格式化时间和状态
-        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
         list = new MINCopyFormat("{perState:'sttDesc',isPromotton:'isPromottonDesc',isFragile:'isFragileDesc'}").format(list);
         list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'PROEQUREL_STATE',isPromottonDesc:'IS_PROMOTION',isFragileDesc:'IS_FRAGILE'}");
         //传递数据
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
         return res;
     }
+
     /**
      * 删除货道
-     * @param perId				设备商品关联id
-     * @param proId				商品id
-     * @param equId				设备id
-     * @param perState			状态
+     *
+     * @param equId    设备id
+     * @param perState 状态
      * @param session
      * @return
      * @throws MINBusinessException
@@ -659,9 +701,9 @@ public class MachineManageAction implements IMINAction {
         VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmEquipmentInfMapper.class)
                 .selectByPrimaryKey(equId);
-        if(equipmentInf == null){
+        if (equipmentInf == null) {
             throw new MINBusinessException("该设备不存在!");
-        }else if(equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)){
+        } else if (equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)) {
             throw new MINBusinessException("该设备已销毁!");
         }
         VmProEquRelExample equRelExample = new VmProEquRelExample();
@@ -673,36 +715,36 @@ public class MachineManageAction implements IMINAction {
         List<VmProEquRel> list = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmProEquRelMapper.class)
                 .selectByExample(equRelExample);
-        if(list.size() != 0){
+        if (list.size() != 0) {
             throw new MINBusinessException("此货道无法删除!");
         }
         //删除货道
         String id = Service.lookup(IPublicService.class).getSequence("VM_PROEQUREL_ID");
         VmProEquRel proEquRel = new VmProEquRel();
-        proEquRel.setId(id);								//设备商品关联表id
-        proEquRel.setEquipmentId(equId);					//设备id
-        proEquRel.setCargoWayRow(perRow);					//货道层
-        proEquRel.setCargoWayLine(perLine);					//货道列
-        proEquRel.setUserId(uId);							//商户id
-        proEquRel.setRemarks("货道删除");						//备注
-        proEquRel.setChannel(channel);						//渠道
-        proEquRel.setCreateUser(uId);						//创建人
-        proEquRel.setCreateTime(dateTime);					//创建时间
-        proEquRel.setModifyUser(uId);						//最后修改人
-        proEquRel.setModifyTime(dateTime);					//最后修改时间
-        proEquRel.setExeitState(Constant.PROEQUREL_STT_01);	//状态 01货道删除
+        proEquRel.setId(id);                                //设备商品关联表id
+        proEquRel.setEquipmentId(equId);                    //设备id
+        proEquRel.setCargoWayRow(perRow);                    //货道层
+        proEquRel.setCargoWayLine(perLine);                    //货道列
+        proEquRel.setUserId(uId);                            //商户id
+        proEquRel.setRemarks("货道删除");                        //备注
+        proEquRel.setChannel(channel);                        //渠道
+        proEquRel.setCreateUser(uId);                        //创建人
+        proEquRel.setCreateTime(dateTime);                    //创建时间
+        proEquRel.setModifyUser(uId);                        //最后修改人
+        proEquRel.setModifyTime(dateTime);                    //最后修改时间
+        proEquRel.setExeitState(Constant.PROEQUREL_STT_01);    //状态 01货道删除
 
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmProEquRelMapper.class)
                 .insertSelective(proEquRel);
         return res;
     }
+
     /**
      * 删除
-     * @param perId				设备商品关联id
-     * @param proId				商品id
-     * @param equId				设备id
-     * @param perState			状态
+     *
+     * @param perId    设备商品关联id
+     * @param perState 状态
      * @param session
      * @return
      * @throws MINBusinessException
@@ -737,9 +779,9 @@ public class MachineManageAction implements IMINAction {
                 .selectByPrimaryKey(perId);
         //删除
         proEquRel.setId(perId);
-        proEquRel.setExeitState(Constant.PROEQUREL_STT_02);					//状态
-        proEquRel.setModifyUser(uId);										//最后修改人
-        proEquRel.setModifyTime(dateTime);									//最后修改时间
+        proEquRel.setExeitState(Constant.PROEQUREL_STT_02);                    //状态
+        proEquRel.setModifyUser(uId);                                        //最后修改人
+        proEquRel.setModifyTime(dateTime);                                    //最后修改时间
 
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmProEquRelMapper.class)
@@ -747,4 +789,256 @@ public class MachineManageAction implements IMINAction {
         return res;
     }
 
+    /**
+     * 查询设备列表
+     *
+     * @param equName  设备名称
+     * @param equState 状态
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = QUERY_EQUIPMENT_LINE)
+    public MINActionResult queryEquipmentLine(
+            @MINParam(key = "equName") String equName,
+            @MINParam(key = "machineNo") String machineNo,
+            @MINParam(key = "temId") String temId,
+            @MINParam(key = "userName") String userName,
+            @MINParam(key = "dates") String dates,
+            @MINParam(key = "equState") String equState,
+            @MINParam(key = "machineNomax") String machineNomax,
+            @MINParam(key = "machineNomin") String machineNomin,
+            @MINParam(key = "page", defaultValue = "1") int page,
+            @MINParam(key = "limit", defaultValue = "10") int limit,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+
+        MINRowBounds rows = new MINRowBounds(page, limit);
+
+        User user = session.getUser();
+        //操作员id
+        String uId = user.getId();
+        //渠道
+        String channel = user.getChannel();
+        // 查询条件
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("channel", "V01");
+        map.put("equName", equName);
+        map.put("equState", equState);
+        map.put("temId", temId);
+        map.put("userName", userName);
+        map.put("dates", dates);
+        map.put("machineNo", machineNo);
+        map.put("machineNomax", machineNomax);
+        map.put("machineNomin", machineNomin);
+//		if(user.getRoleId().equals("10000002")){
+//			map.put("userId", uId);
+//		}
+        if (user.getIdentity().equals("00")) {
+            map.put("userId", uId);
+        } else if (user.getIdentity().equals("91")) {
+            map.put("agentId", uId);
+        }
+        List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(MachineManageMapper.class)
+                .queryEquipment(map, rows);
+        //格式化时间和状态
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
+        list = new MINCopyFormat("{equState:'sttDesc',type:'typeDesc'}").format(list);
+        list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'EQUIPMENT_STATE','typeDesc':'GAME_TYPE'}");
+        //传递数据
+        res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+        res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
+        return res;
+    }
+
+    /**
+     * 多选设备复制商品
+     *
+     * @param equId     设备id
+     * @param copyEquId 复制设备id
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = ADD_PROEQURELALL_COPY, transaction = IMINTransactionEnum.CMT)
+    public MINActionResult addProEquRelAllCopy(
+            @MINParam(key = "equId") String equId,
+            @MINParam(key = "copyEquId") String copyEquId,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+
+
+        if (equId.indexOf(copyEquId) != -1) {
+            throw new MINBusinessException("不能选择相同设备!");
+        }
+        String[] equIdArr = equId.split(",");
+        for (int i = 0; i < equIdArr.length; i++) {
+            //当前时间
+            String dateTime = DateUtil.getCurrentDateTimeString();
+            User user = session.getUser();
+            //操作员id
+            String userId = user.getId();
+            //渠道
+            String channel = "V01";
+            //校验设备是否正常
+            VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
+                    .getMybatisMapper(VmEquipmentInfMapper.class)
+                    .selectByPrimaryKey(equIdArr[i]);
+            if (equipmentInf == null) {
+                throw new MINBusinessException("该设备不存在!");
+            } else if (equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)) {
+                throw new MINBusinessException("该设备已销毁!");
+            }
+            //查询设备中原有的商品
+            VmProEquRelExample proEquRelExample = new VmProEquRelExample();
+            proEquRelExample.createCriteria().andEquipmentIdEqualTo(equIdArr[i])
+                    .andChannelEqualTo(channel)
+                    .andExeitStateEqualTo(Constant.PROEQUREL_STT_00);
+            List<VmProEquRel> list = Service.lookup(IMINDataBaseService.class)
+                    .getMybatisMapper(VmProEquRelMapper.class)
+                    .selectByExample(proEquRelExample);
+
+            for (int j = 0; i < list.size(); j++) {
+                VmProEquRel equRel = list.get(j);
+                //设备新增商品
+                equRel.setExeitState(Constant.PROEQUREL_STT_02);        //状态
+                equRel.setModifyUser(userId);                            //最后修改人
+                equRel.setModifyTime(dateTime);                            //最后修改时间
+                Service.lookup(IMINDataBaseService.class)
+                        .getMybatisMapper(VmProEquRelMapper.class)
+                        .updateByPrimaryKeySelective(equRel);
+            }
+
+            //查询设备中的商品
+            VmProEquRelExample proEquRelExample2 = new VmProEquRelExample();
+            proEquRelExample2.createCriteria().andEquipmentIdEqualTo(copyEquId)
+                    .andChannelEqualTo(channel)
+                    .andExeitStateEqualTo(Constant.PROEQUREL_STT_00);
+            List<VmProEquRel> list2 = Service.lookup(IMINDataBaseService.class)
+                    .getMybatisMapper(VmProEquRelMapper.class)
+                    .selectByExample(proEquRelExample2);
+            for (int j = 0; j < list2.size(); j++) {
+
+                VmProEquRel equRel2 = list2.get(j);
+                //设备新增商品
+                String id = Service.lookup(IPublicService.class).getSequence("VM_PROEQUREL_ID");
+                equRel2.setId(id);                                        //设备商品关联id
+                equRel2.setEquipmentId(equIdArr[i]);                            //设备id
+                equRel2.setCreateUser(userId);                            //创建人
+                equRel2.setCreateTime(dateTime);                        //创建时间
+                equRel2.setModifyUser(userId);                            //最后修改人
+                equRel2.setModifyTime(dateTime);                        //最后修改时间
+                Service.lookup(IMINDataBaseService.class)
+                        .getMybatisMapper(VmProEquRelMapper.class)
+                        .insertSelective(equRel2);
+            }
+
+
+        }
+        return res;
+    }
+    /**
+     * 编辑设备
+     *
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = MODIFY_PRODUCT_INF, transaction = IMINTransactionEnum.CMT)
+    public MINActionResult modifyProductInf(
+            @MINParam(key = "id") String id,
+            @MINParam(key = "name") String name,
+            @MINParam(key = "ioiServicePrivider") String ioiServicePrivider,
+            @MINParam(key = "ioiCardNumber") String ioiCardNumber,
+            @MINParam(key = "address") String address,
+            @MINParam(key = "versionType") String versionType,
+            @MINParam(key = "equType") String equType,
+            @MINParam(key = "wcAccount") String wcAccount,
+            @MINParam(key = "zfbAccount") String zfbAccount,
+            @MINParam(key = "charge") String charge,
+            @MINParam(key = "payeeNo") String payeeNo,
+            @MINParam(key = "creditChannel") String creditChannel,
+            @MINParam(key = "payment") String payment,
+            @MINParam(key = "paymentType") String paymentType,
+            @MINParam(key = "exchangeRate") String exchangeRate,
+            @MINParam(key = "supportBalance") String supportBalance,
+            MINSession session) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+        //获取当前时间
+        String nowTime = DateUtil.getCurrentDateTimeString();
+        // 获取操作员信息
+        User user = session.getUser();
+        VmEquipmentInf pro = new VmEquipmentInf();
+        pro.setId(id);
+        if (CommonUtil.isEmpty(name)){
+            pro.setName("无人售货机");
+        }else{
+            pro.setName(name);
+        }
+        pro.setIotCardNumber(ioiCardNumber);
+        pro.setIotServiceProvider(ioiServicePrivider);
+        pro.setModifyUser(user.getId());
+        pro.setModifyTime(nowTime);
+        pro.setAddress(address);
+        pro.setEquType(equType);
+        pro.setWcAccount(wcAccount);
+        pro.setZfbAccount(zfbAccount);
+        pro.setCharge(charge);
+        pro.setPayeeNo(payeeNo);
+        pro.setCreditChannel(creditChannel);
+        pro.setPayment(payment);
+        pro.setPaymentType(paymentType);
+        pro.setExchangeRate(exchangeRate);
+        pro.setSupportBalance(supportBalance);
+        pro.setModifyUser(user.getId());
+        pro.setModifyTime(nowTime);
+        Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmEquipmentInfMapper.class)
+                .updateByPrimaryKeySelective(pro);
+		/*// 记录操作日志
+		String logInfo = "操作员:" + user.getName() + "添加商品，商品编号:" + id;
+		Service.lookup(ILogService.class).logging(session, logInfo);*/
+        return res;
+    }
+    /**
+     * 开启/关闭音乐
+     *
+     * @param id 机器id
+     * @return
+     * @throws Exception
+     */
+    @MINAction(value = CLOSE_SONG)
+    public MINActionResult closeSong(
+            @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("该设备不存在!");
+        } else if (equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)) {
+            throw new MINBusinessException("该设备已销毁!");
+        }
+        VmEquipmentInf pro = new VmEquipmentInf();
+        pro.setId(id);
+        pro.setSongStatus(status);//关闭
+        Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmEquipmentInfMapper.class)
+                .updateByPrimaryKeySelective(pro);
+        return res;
+    }
 }

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

@@ -41,6 +41,7 @@
     <result column="VEQ_BRANCHID" jdbcType="VARCHAR" property="branchid" />
     <result column="VEQ_ROWS" jdbcType="VARCHAR" property="rows" />
     <result column="VEQ_LINES" jdbcType="VARCHAR" property="lines" />
+    <result column="VEQ_SONG_STATUS" jdbcType="VARCHAR" property="songStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -119,7 +120,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_ROWS, VEQ_LINES, VEQ_SONG_STATUS
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmEquipmentInfExample" resultMap="BaseResultMap">
     <!--
@@ -183,7 +184,8 @@
       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_ROWS, VEQ_LINES, VEQ_SONG_STATUS
+      )
     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}, 
@@ -195,7 +197,8 @@
       #{modifyTime,jdbcType=VARCHAR}, #{imeiAddr,jdbcType=VARCHAR}, #{heartRates,jdbcType=VARCHAR}, 
       #{state,jdbcType=VARCHAR}, #{machineNo,jdbcType=VARCHAR}, #{programEdition,jdbcType=VARCHAR}, 
       #{temperature,jdbcType=VARCHAR}, #{signal,jdbcType=VARCHAR}, #{branchid,jdbcType=VARCHAR}, 
-      #{rows,jdbcType=VARCHAR}, #{lines,jdbcType=VARCHAR})
+      #{rows,jdbcType=VARCHAR}, #{lines,jdbcType=VARCHAR}, #{songStatus,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmEquipmentInf">
     <!--
@@ -309,6 +312,9 @@
       <if test="lines != null">
         VEQ_LINES,
       </if>
+      <if test="songStatus != null">
+        VEQ_SONG_STATUS,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -416,6 +422,9 @@
       <if test="lines != null">
         #{lines,jdbcType=VARCHAR},
       </if>
+      <if test="songStatus != null">
+        #{songStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmEquipmentInfExample" resultType="java.lang.Integer">
@@ -540,6 +549,9 @@
       <if test="record.lines != null">
         VEQ_LINES = #{record.lines,jdbcType=VARCHAR},
       </if>
+      <if test="record.songStatus != null">
+        VEQ_SONG_STATUS = #{record.songStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -585,7 +597,8 @@
       VEQ_SIGNAL = #{record.signal,jdbcType=VARCHAR},
       VEQ_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       VEQ_ROWS = #{record.rows,jdbcType=VARCHAR},
-      VEQ_LINES = #{record.lines,jdbcType=VARCHAR}
+      VEQ_LINES = #{record.lines,jdbcType=VARCHAR},
+      VEQ_SONG_STATUS = #{record.songStatus,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -699,6 +712,9 @@
       <if test="lines != null">
         VEQ_LINES = #{lines,jdbcType=VARCHAR},
       </if>
+      <if test="songStatus != null">
+        VEQ_SONG_STATUS = #{songStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where VEQ_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -741,7 +757,8 @@
       VEQ_SIGNAL = #{signal,jdbcType=VARCHAR},
       VEQ_BRANCHID = #{branchid,jdbcType=VARCHAR},
       VEQ_ROWS = #{rows,jdbcType=VARCHAR},
-      VEQ_LINES = #{lines,jdbcType=VARCHAR}
+      VEQ_LINES = #{lines,jdbcType=VARCHAR},
+      VEQ_SONG_STATUS = #{songStatus,jdbcType=VARCHAR}
     where VEQ_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -6,8 +6,8 @@
 			p.VEQ_ID        	'id',
 			p.VEQ_CHANNEL      	'channel',
 			p.VEQ_NAME      'name',
-			p.VEQ_IOT_SERVICE_PROVIDER     'iotServiceProvider',
-			p.VEQ_IOT_CARD_NUMBER          'iotCardNumber',
+			p.VEQ_IOT_SERVICE_PROVIDER     'ioiServicePrivider',
+			p.VEQ_IOT_CARD_NUMBER          'ioiCardNumber',
 			p.VEQ_VERSION_TYPE          'versionType',
 		p.VEQ_ADDRESS          'address',
 			p.VEQ_EQU_TYPE          'equType',
@@ -37,7 +37,8 @@
 		u.USR_NAME 				'createUser',
 		e.USR_NAME				'modifyUser',
 		p.VEQ_ROWS				'temRow',
-		p.VEQ_LINES				'temLine'
+		p.VEQ_LINES				'temLine',
+		p.VEQ_SONG_STATUS  		'songStatus'
      	FROM vm_equipment_inf  p
      		LEFT JOIN 	im_user u ON u.USR_ID = p.VEQ_CREATE_USER
      		LEFT JOIN im_user e on e.USR_ID = p.VEQ_MODIFY_USER
@@ -150,4 +151,65 @@
 		</if>
 		ORDER BY p.PRT_STATE ASC,p.PRT_CREATE_TIME  DESC
 	</select>
+	<select id="queryEquipment" resultType="hashmap"
+			parameterType="java.util.Map">
+		SELECT
+		equ.VEQ_ID 					'equId',
+		equ.VEQ_NAME 					'equName',
+		equ.VEQ_ROWS			'temRow',
+		equ.VEQ_LINES		'temLine',
+		equ.VEQ_ADDRESS 				'equAddress',
+		equ.VEQ_HEART_RATES 			'heartRates',
+		equ.VEQ_STATE 				'equState',
+		equ.VEQ_REMARKS 				'equRemarks',
+		us1.USR_NAME 					'createUser',
+		equ.VEQ_CREATE_TIME 			'createTime',
+		us2.USR_NAME 					'modifyUser',
+		equ.VEQ_MODIFY_TIME 			'modifyTime',
+		equ.VEQ_MACHINE_NO			'machineNo'
+		FROM vm_equipment_inf equ
+		LEFT JOIN im_user us1
+		ON us1.USR_ID = equ.VEQ_CREATE_USER
+		AND us1.USR_CHANNEL = equ.VEQ_CHANNEL
+		LEFT JOIN im_user us2
+		ON us2.USR_ID = equ.VEQ_MODIFY_USER
+		AND us2.USR_CHANNEL = equ.VEQ_CHANNEL
+		WHERE equ.VEQ_CHANNEL = 'V01'
+		AND equ.VEQ_STATE != '03' AND equ.VEQ_STATE != '02'
+		<if test="equName != null and equName != ''">
+			AND equ.VEQ_NAME LIKE CONCAT("%",#{equName, jdbcType = VARCHAR},"%")
+		</if>
+		<if test="equId != null and equId != ''">
+			AND equ.VEQ_ID LIKE CONCAT("%",#{equId, jdbcType = VARCHAR},"%")
+		</if>
+		<if test="equState != null and equState != ''">
+			AND equ.VEQ_STATE = #{equState, jdbcType = VARCHAR}
+		</if>
+		<if test="temId != null and temId != ''">
+			AND equ.VEQ_TEMPLATE_ID = #{temId, jdbcType = VARCHAR}
+		</if>
+		<if test="machineNo != null and machineNo != ''">
+			AND equ.VEQ_MACHINE_NO = #{machineNo, jdbcType = VARCHAR}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND cus.USR_NAME LIKE CONCAT("%",#{userName, jdbcType = VARCHAR},"%")
+		</if>
+		<if test="userId != null and userId != ''">
+			AND equ.VEQ_USER_ID = #{userId, jdbcType = VARCHAR}
+		</if>
+		<if test="agentId != null and agentId != ''">
+			AND cus.USR_PARENT_USER = #{agentId, jdbcType = VARCHAR}
+		</if>
+		<if test="dates!=null and dates!= ''">
+			AND SUBSTR(equ.VEQ_CREATE_TIME,1,8) BETWEEN SUBSTR((#{dates, jdbcType=VARCHAR}),1,8)
+			AND substr((#{dates, jdbcType=VARCHAR}),12,19)
+		</if>
+		<if test="machineNomin != null and machineNomin != ''">
+			AND equ.VEQ_MACHINE_NO  &gt;= #{machineNomin, jdbcType = VARCHAR}
+		</if>
+		<if test="machineNomax != null and machineNomax != ''">
+			AND equ.VEQ_MACHINE_NO &lt;= #{machineNomax, jdbcType = VARCHAR}
+		</if>
+		ORDER BY equ.VEQ_STATE ASC, equ.VEQ_CREATE_TIME DESC, equ.VEQ_MACHINE_NO DESC
+	</select>
 </mapper>

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

@@ -16,48 +16,126 @@
     </fieldset>
 
     <form class="layui-form" action="">
-		<div style="padding-bottom:60px; ">
+		<div style="padding-bottom:60px; " id="form">
              <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">*设备码:</label>
+                    <label class="layui-form-label">*机台号:</label>
                     <div class="layui-input-inline">
                         <input type="tel" name="machineNo" id = "machineNo" lay-verify="equCode"  placeholder="请输入机台号"autocomplete="off" class="layui-input">
                          <input type="hidden" name="id" id = "id" lay-verify="id"  placeholder="请输入设备码"autocomplete="off" class="layui-input">
                     </div>
                 </div>
+                 <div class="layui-inline">
+                     <label class="layui-form-label">名称:</label>
+                     <div class="layui-input-inline">
+                         <input type="tel" name="name" id = "name" lay-verify="name"  placeholder="请输入机器名称"autocomplete="off" class="layui-input">
+                     </div>
+                 </div>
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">名称:</label>
+                    <label class="layui-form-label">物联服务商:</label>
+                    <div class="layui-input-inline">
+                        <input type="tel" name="ioiServicePrivider" id = "ioiServicePrivider" lay-verify="name"  placeholder="请输入物联服务商"autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">物联卡号:</label>
                     <div class="layui-input-inline">
-                        <input type="tel" name="name" id = "name" lay-verify="name"  placeholder="请输入机器名称"autocomplete="off" class="layui-input">
+                        <input type="tel" name="ioiCardNumber" id = "ioiCardNumber" lay-verify="name"  placeholder="请输入物联卡号"autocomplete="off" class="layui-input">
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">物联服务商:</label>
+                    <label class="layui-form-label">机器地址:</label>
                     <div class="layui-input-inline">
-                        <input type="tel" name="ioiServicePrivider" id = "ioiServicePrivider" lay-verify="name"  placeholder="请输入物联服务商"autocomplete="off" class="layui-input">
+                        <input type="tel" name="address" id = "address" lay-verify="name"  placeholder="请输入机器地址"autocomplete="off" class="layui-input">
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
+                <label class="layui-form-label fap-form-item-require" >版本类型：</label>
+                <div class="layui-input-block">
+                    <input type="checkbox" name="versionType" title="直接购买" lay-skin="primary" value = "00" lay-verify="required">
+                    <input type="checkbox" name="versionType" title="幸运购" lay-skin="primary" value = "01" lay-verify="required">
+                    <input type="checkbox" name="versionType" title="游戏购" lay-skin="primary" value = "02" lay-verify="required">
+                    <input type="checkbox" name="versionType" title="10倍" lay-skin="primary" value = "03" lay-verify="required">
+                    <input type="checkbox" name="versionType" title="7件商品" lay-skin="primary" value = "04" lay-verify="required">
+                    <input type="checkbox" name="versionType" title="参与分配(超级菜单)" lay-skin="primary" value = "05" lay-verify="required">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label fap-form-item fap-form-item-require" >机器类型：</label>
+                <div class="layui-input-block" >
+                    <input type="radio" name="equType" value="00" title="支付盒子售货机" checked="" onclick="one(0)" lay-filter="sss">
+                    <input type="radio" name="equType" value="01" title="支付盒子存货机" onclick="one(1)" lay-filter="sss">
+                    <input type="radio" name="equType" value="02" title="便携式售货机" onclick="one(2)" lay-filter="sss">
+                </div>
+            </div>
+            <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">物联卡号:</label>
+                    <label class="layui-form-label">微信公众号:</label>
                     <div class="layui-input-inline">
-                        <input type="tel" name="ioiCardNumber" id = "ioiCardNumber" lay-verify="name"  placeholder="请输入物联卡号"autocomplete="off" class="layui-input">
+                        <input type="tel" name="wcAccount" id = "wcAccount" lay-verify="wcAccount"  placeholder="请输入微信公众号"autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">支付宝账号:</label>
+                    <div class="layui-input-inline">
+                        <input type="tel" name="zfbAccount" id = "zfbAccount" lay-verify="zfbAccount"  placeholder="请输入支付宝账号"autocomplete="off" class="layui-input">
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">机器地址:</label>
+                    <label class="layui-form-label">手续费:</label>
                     <div class="layui-input-inline">
-                        <input type="tel" name="address" id = "address" lay-verify="name"  placeholder="请输入机器地址"autocomplete="off" class="layui-input">
+                        <input type="tel" name="charge" id = "charge" lay-verify="charge"  placeholder="请输入手续费"autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">收款机构号/收款商户号:</label>
+                    <div class="layui-input-inline">
+                        <input type="tel" name="payeeNo" id = "payeeNo" lay-verify="payeeNo"  placeholder="请输入收款机构号/收款商户号"autocomplete="off" class="layui-input">
                     </div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label fap-form-item-require" >收款通道：</label>
+                <div class="layui-input-block">
+                    <input type="checkbox" name="creditChannel" title="富有扫呗" lay-skin="primary" value = "00" lay-verify="required">
+                    <input type="checkbox" name="creditChannel" title="合利宝" lay-skin="primary" value = "01" lay-verify="required">
+                    <input type="checkbox" name="creditChannel" title="收钱吧" lay-skin="primary" value = "02" lay-verify="required">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label" style = "width: 150px;">支付金额:</label>
+                <div class="layui-input-inline" id ="payment">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label fap-form-item fap-form-item-require" >支付金额类型：</label>
+                <div class="layui-input-block" >
+                    <input type="radio" name="paymentType" value="00" title="随机" checked="" onclick="one(0)" lay-filter="sss">
+                    <input type="radio" name="paymentType" value="01" title="固定" onclick="one(1)" lay-filter="sss">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">汇率:</label>
+                    <div class="layui-input-inline">
+                        <input type="tel" name="exchangeRate" id = "exchangeRate" lay-verify="exchangeRate"  placeholder="请输入汇率"autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label fap-form-item fap-form-item-require" >是否支持余额：</label>
+                <div class="layui-input-block" >
+                    <input type="radio" name="supportBalance" value="00" title="支持" checked="" onclick="one(0)" lay-filter="sss">
+                    <input type="radio" name="supportBalance" value="01" title="不支持" onclick="one(1)" lay-filter="sss">
+                </div>
+            </div>
             <div class="layui-form-item box-button" >
             <div class="layui-input-block">
                 <button class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>
@@ -72,16 +150,89 @@
 	    	  var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
 	     	 var rowData = layui.sessionData("ROW_DATA").NOW_ROW;
 	   	    layui.each(rowData, function(index, item){
-	    			   	$("#"+index+"").val(item);
-	   	    		form.render();
+                if(index=="payment"){
+                    initSelect('payment', "PAYMENT_AMT", "payment", item, true);
+                }
+                $("#"+index+"").val(item);
+                form.render();
 	   	    })
 	    		//监听取消
 	      	$('#cancel').on('click', function(){
 	      	    	 parent.layer.close(parent.layer.index); 
-	      	   		});
-	    	  
-	    	  
-    	});  
+            });
+            var channelCheckbox = $("form").find("input[name='equType']");
+            // 渠道
+            if (rowData.equType != null) {
+                if (rowData.equType == "00") {
+                    $(channelCheckbox[00]).attr("checked", true);
+                } else if (rowData.equType == "01") {
+                    $(channelCheckbox[01]).attr("checked", true);
+                } else if (rowData.equType == "02"){
+                    $(channelCheckbox[02]).attr("checked", true);
+                }
+                form.render();
+            }
+            var versionCheckbox = $("form").find("input[name='versionType']");
+            if ( rowData.versionType != null){
+                var version = rowData.versionType.split(',')
+                for(var i = 0;i<version.length;i++){
+                    var j = version[i];
+                    if (j == "00"){
+                        $(versionCheckbox[00]).attr("checked", true);
+                    }else if (j == "01"){
+                        $(versionCheckbox[01]).attr("checked", true);
+                    }else if (j == "02"){
+                        $(versionCheckbox[02]).attr("checked", true);
+                    }else if (j == "03"){
+                        $(versionCheckbox[03]).attr("checked", true);
+                    }else if (j == "04"){
+                        $(versionCheckbox[04]).attr("checked", true);
+                    }else if (j == "05"){
+                        $(versionCheckbox[05]).attr("checked", true);
+                    }else if (j == "06"){
+                        $(versionCheckbox[06]).attr("checked", true);
+                    }else {
+                        $(versionCheckbox[07]).attr("checked", true);
+                    }
+                }
+                form.render();
+            }
+            var creditCheckbox = $("form").find("input[name='creditChannel']");
+            if ( rowData.creditChannel != null){
+                var creditChannel = rowData.creditChannel.split(',')
+                for(var i = 0;i<creditChannel.length;i++){
+                    var j = creditChannel[i];
+                    if (j == "00"){
+                        $(creditCheckbox[00]).attr("checked", true);
+                    }else if (j == "01"){
+                        $(creditCheckbox[01]).attr("checked", true);
+                    }else if (j == "02"){
+                        $(creditCheckbox[02]).attr("checked", true);
+                    }
+                }
+                form.render();
+            }
+            var paymentCheckbox = $("form").find("input[name='paymentType']");
+            // 渠道
+            if (rowData.paymentType != null) {
+                if (rowData.paymentType == "00") {
+                    $(paymentCheckbox[00]).attr("checked", true);
+                } else if (rowData.paymentType == "01") {
+                    $(paymentCheckbox[01]).attr("checked", true);
+                }
+                form.render();
+            }
+            var supportCheckbox = $("form").find("input[name='paymentType']");
+            // 渠道
+            if (rowData.supportBalance != null) {
+                if (rowData.supportBalance == "00") {
+                    $(supportCheckbox[00]).attr("checked", true);
+                } else if (rowData.supportBalance == "01") {
+                    $(supportCheckbox[01]).attr("checked", true);
+                }
+                form.render();
+            }
+    	});
     
 	    	
         
@@ -159,10 +310,29 @@
                     
                 }					
             });
-           							/*  /^1[3|4|5|8][0-9]\d{4,8}$/ */
            
             //监听提交
 			form.on('submit(demo1)', function(data) {
+                var versionType = "";
+                //获取渠道
+                $("#form input:checkbox[name='versionType']:checked").each(function(i){
+                    if (versionType != "") {
+                        versionType += ("," + $(this).val());
+                    } else {
+                        versionType += $(this).val();
+                    }
+                });
+                data.field.versionType = versionType;
+                var creditChannel = "";
+                //获取渠道
+                $("#form input:checkbox[name='creditChannel']:checked").each(function(i){
+                    if (creditChannel != "") {
+                        creditChannel += ("," + $(this).val());
+                    } else {
+                        creditChannel += $(this).val();
+                    }
+                });
+                data.field.creditChannel = creditChannel;
 				$.request({
 					action : '../../MachineManageAction/modifyProductInf',
 					data :  data.field ,
@@ -188,7 +358,7 @@
             
             
         });
-        initSelect('stt', "IM_USER_STATE", "stt", '0', true);
+        initSelect('payment', "PAYMENT_AMT", "payment", '00', true);
     </script>
 
 </body>

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

@@ -138,7 +138,7 @@
 		   	      shade: 0.8,
 		   	      //maxmin: true, //开启最大化最小化按钮
 		   	      area: ['100%', '100%'],
-		   	      content: 'chooseEquipment.html?&equId='+rowData.equId
+		   	      content: 'chooseEquipment.html?&equId='+rowData.id
 			});
   	        return false;
   	    });

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

@@ -43,9 +43,14 @@
 
 <!--操作功能-->
 <script type="text/html" id="barDemo">
-	<a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
+	<a class="layui-btn layui-btn-xs" lay-event="detail">查看货道</a>
 	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-	<a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
+	{{#  if(d.songStatus == '00'){ }}
+		<a class="layui-btn layui-btn-xs" lay-event="close">关闭音乐</a>
+	{{#  } }}
+	{{#  if(d.songStatus == '01'){ }}
+	<a class="layui-btn layui-btn-xs" lay-event="open">开启音乐</a>
+	{{#  } }}
 </script>
 <script type="text/html" id="switchTwo">
 	<div style="width:90px;height:70px">
@@ -91,13 +96,14 @@
 			,where:{MINView:"JSON", token: 'sasasas'}
 			,page: true //开启分页
 			,cols: [[ //表头
-				{field:'num', title: '序号',width:'10%', type:'numbers', fixed: true}
-				,{field: 'machineNo', title: '机台号', width:"15%"}
+				 {type:'numbers', title: '序号',width:'5%', fixed: true, align: 'center'}
+				,{field: 'machineNo', title: '机台号', width:"15%", sort: true, fixed: 'left'}
 				,{field: 'name', title: '机器名称', width:"20%"}
-				,{field: 'statusDesc', title: '状态', width:"10%"}
+				,{field: 'stateDesc', title: '状态', width:"10%"}
 				,{field: 'payeeNo', title: '支付账号', width:"10%"}
 				,{field: 'equTypeDesc', title: '机器类型', width:"10%"}
-				,{field: 'operate', title: '操作', width: "15%", toolbar: '#barDemo'}
+				,{field: 'createTime', title: '创建时间', width:"15%"}
+				,{field: 'operate', title: '操作', width: "15%", toolbar: '#barDemo',fixed: 'right'}
 			]]
 			,done: function(res, curr, count){
 				//如果是异步请求数据方式，res即为你接口返回的信息。
@@ -118,12 +124,38 @@
 			var  id = data.id;
 			if(layEvent == 'detail'){ //查看
 				showDetail(data);
-			} else if(layEvent == 'del'){ //删除
-				layer.confirm('真的要删除吗', function(index){
+			} else if(layEvent == 'close'){ //关闭音乐
+				layer.confirm('真的要关闭音乐吗', function(index){
 					$.request({
-						action : '../../systemManageAction/deleteNewsInfo',
+						action : '../../MachineManageAction/closeSong',
 						data : {
-							id : id //用户名
+							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 == 'open'){ //开音乐
+				layer.confirm('真的要开启音乐吗', function(index){
+					$.request({
+						action : '../../MachineManageAction/closeSong',
+						data : {
+							id : id ,//机器名
+							status :"00"
 						},
 						success : function(data) {
 							//成功后刷新