Browse Source

前端机器接口

pangjl 5 years ago
parent
commit
c265e2ab4f

+ 32 - 0
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();
+    }
 }

+ 21 - 0
src/main/java/com/minpay/db/table/own/mapper/MachineManageMapper.java

@@ -0,0 +1,21 @@
+package com.minpay.db.table.own.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+
+public interface MachineManageMapper extends  IMINMybatisEntityMapper{
+
+	List<Map<String, String>> machineInf(Map<String, String> map, MINRowBounds rows);
+
+	List<Map<String, String>> machineInf(Map<String, String> map);
+
+
+    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);
+}

+ 232 - 0
src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -0,0 +1,232 @@
+package com.minpay.shouhuo.equmentaction;
+
+import com.min.util.CommonUtil;
+import com.minpay.common.bean.User;
+import com.minpay.common.format.IFormatService;
+import com.minpay.common.util.DateUtil;
+import com.minpay.db.table.mapper.VmEquipmentInfMapper;
+import com.minpay.db.table.mapper.VmProEquRelMapper;
+import com.minpay.db.table.model.VmEquipmentInf;
+import com.minpay.db.table.model.VmProEquRel;
+import com.minpay.db.table.model.VmProEquRelExample;
+import com.minpay.db.table.own.mapper.MachineManageMapper;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.constant.IMINTransactionEnum;
+import com.startup.minpay.frame.data.format.MINCopyFormat;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备管理
+ * @author pangjl
+ *  20190325
+ */
+@MINComponent
+public class MachineManageAction implements IMINAction {
+
+    /**
+     * 查询设备中商品
+     */
+    public final static String QUERY_PROEQUREL = "queryProEquRel";
+    /**
+     * 查询设备列表
+     */
+    public final static String QUERY_EQUIPMENT_LINE = "queryEquipmentLine";
+    /**
+     * 关闭音乐
+     */
+    public final static String CLOSE_SONG = "closeSong";
+
+    /**一键补货*/
+    public final static String	ADD_PROEQUREL_NUM			= "addProEquRelNum";
+
+    private boolean contains;
+
+
+    /**
+     * 查询设备中商品
+     *
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = QUERY_PROEQUREL)
+    public MINActionResult queryProEquRel(
+            @MINParam(key = "equId") String equId,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+
+        User user = session.getUser();
+        //渠道
+        String channel = user.getChannel();
+        // 查询条件
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("channel", "V01");
+        map.put("equId", equId);
+        List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(MachineManageMapper.class)
+                .queryProEquRel(map);
+        //格式化时间和状态
+        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 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);
+        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 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("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;
+    }
+    /**
+     * 一键补货
+     * @param equId		设备id
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = ADD_PROEQUREL_NUM, transaction = IMINTransactionEnum.CMT)
+    public MINActionResult addProEquRelNum(
+            @MINParam(key = "equId") String equId,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+        //当前时间
+        String dateTime = DateUtil.getCurrentDateTimeString();
+        User user = session.getUser();
+        //操作员id
+        String userId = user.getId();
+        //渠道
+        String channel = user.getChannel();
+        //校验设备是否正常
+        VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmEquipmentInfMapper.class)
+                .selectByPrimaryKey(equId);
+        if(equipmentInf == null){
+            throw new MINBusinessException("该设备不存在!");
+        }else if(equipmentInf.getState().equals("03")){
+            throw new MINBusinessException("该设备已销毁!");
+        }
+        //查询设备中的商品
+        VmProEquRelExample proEquRelExample = new VmProEquRelExample();
+        proEquRelExample.createCriteria().andEquipmentIdEqualTo(equId)
+                .andChannelEqualTo("V01")
+                .andExeitStateEqualTo("00");
+        List<VmProEquRel> list2 = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmProEquRelMapper.class)
+                .selectByExample(proEquRelExample);
+        for (int i = 0; i < list2.size(); i++) {
+            VmProEquRel equRel = list2.get(i);
+            equRel.setProductNums(equRel.getCargoWayNums());		//商品余量修改为货道容量
+            equRel.setModifyUser(userId);							//最后修改人
+            equRel.setModifyTime(dateTime);							//最后修改时间
+            Service.lookup(IMINDataBaseService.class)
+                    .getMybatisMapper(VmProEquRelMapper.class)
+                    .updateByPrimaryKeySelective(equRel);
+        }
+        return res;
+    }
+}

+ 215 - 0
src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.minpay.db.table.own.mapper.MachineManageMapper">
+	<select id="machineInf" resultType="hashmap" parameterType="java.util.Map">
+    	SELECT
+			p.VEQ_ID        	'id',
+			p.VEQ_CHANNEL      	'channel',
+			p.VEQ_NAME      'name',
+			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',
+		p.VEQ_EQU_IMG          'equImg',
+		p.VEQ_WC_ACCOUNT          'wcAccount',
+		p.VEQ_ZFB_ACCOUNT          'zfbAccount',
+		p.VEQ_CHARGE          'charge',
+		p.VEQ_CREDIT_CHANNEL          'creditChannel',
+		p.VEQ_PAYEE_NO          'payeeNo',
+		p.VEQ_PAYMENT          'payment',
+		p.VEQ_PAYMENT_TYPE          'paymentType',
+		p.VEQ_BACKGROUND_ONE          'backgroundOne',
+		p.VEQ_BACKGROUND_TWO          'backgroundTwo',
+		p.VEQ_EXCHANGE_RATE          'exchangeRate',
+		p.VEQ_SUPPORT_BALANCE          'supportBalance',
+		p.VEQ_REMARKS          'remarks',
+		p.VEQ_CREATE_TIME          'createTime',
+		p.VEQ_MODIFY_TIME          'modifyTime',
+		p.VEQ_IMEI_ADDR          'imeiAddr',
+		p.VEQ_HEART_RATES          'heartRates',
+		p.VEQ_STATE          'state',
+		p.VEQ_MACHINE_NO          'machineNo',
+		p.VEQ_PROGRAM_EDITION          'programEdition',
+		p.VEQ_TEMPERATURE          'temperature',
+		p.VEQ_SIGNAL          'signal',
+		p.VEQ_BRANCHID          'branchid',
+		u.USR_NAME 				'createUser',
+		e.USR_NAME				'modifyUser',
+		p.VEQ_ROWS				'temRow',
+		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
+     	WHERE 1=1
+     	AND p.VEQ_STATE = '00'
+		<if test="dates!=null and dates!= ''">
+	    	AND SUBSTR(p.MEI_CREATE_TIME,1,8) BETWEEN SUBSTR((#{dates, jdbcType=VARCHAR}),1,8)
+	       		AND SUBSTR((#{dates, jdbcType=VARCHAR}),12,19)
+	    </if>
+		<if test="id!=null and id!= ''">
+			AND p.VEQ_MACHINE_NO LIKE CONCAT("%",#{id, jdbcType = VARCHAR},"%")
+		</if>
+      	ORDER BY p.VEQ_CREATE_TIME  DESC
+	</select>
+	<select id="queryProEquRel" resultType="hashmap"
+			parameterType="java.util.Map">
+		SELECT
+		rel.VCI_ID 					'perId',
+		rel.VCI_PRODUCT_ID 		    'proId',
+		pro.PRT_NAME 					'proName',
+		pro.PRT_FMPIC 				'proFmpic',
+		IFNULL(rel.VCI_AISLE,'') 		'aisle',
+		rel.VCI_CARGO_WAY_ROW 		'perRow',
+		rel.VCI_CARGO_WAY_LINE 		'perLine',
+		rel.VCI_CARGO_WAY_NUMS 		'perNum',
+		rel.VCI_PRODUCT_NUMS 			'numbers',
+		rel.VCI_USER_Id 				'userId',
+		rel.VCI_SALL_PRICE 			'sallPrice',
+		rel.VCI_GAME_PRICE 			'gamePrice',
+		rel.VCI_COST_PRICE 			'costPrice',
+		rel.VCI_IS_PROMOTION 			'isPromotton',
+		rel.VCI_PROMOTION_PRICE 		'promottonPrice',
+		rel.VCI_IS_FRAGILE 			'isFragile',
+		rel.VCI_REMARKS 				'perRemarks',
+		rel.VCI_GAME_TYPE 			'type',
+		us1.USR_NAME 					'createUser',
+		rel.VCI_CREATE_TIME 			'createTime',
+		us2.USR_NAME 					'modifyUser',
+		rel.VCI_MODIFY_TIME 			'modifyTime',
+		rel.VCI_EXEIT_STATE 			'perState'
+		FROM
+		vm_pro_equ_rel rel
+		LEFT JOIN vm_equipment_inf equ
+		ON equ.VEQ_ID = rel.VCI_EQUIPMENT_ID
+		AND equ.VEQ_CHANNEL = rel.VCI_CHANNEL
+		LEFT JOIN vm_product_inf pro
+		ON pro.PRT_ID = rel.VCI_PRODUCT_ID
+		AND pro.PRT_CHANNEL = rel.VCI_CHANNEL
+		AND pro.PRT_STATE != '2'
+		LEFT JOIN im_user us1
+		ON us1.USR_ID = rel.VCI_CREATE_USER
+		AND us1.USR_CHANNEL = rel.VCI_CHANNEL
+		LEFT JOIN im_user us2
+		ON us2.USR_ID = rel.VCI_MODIFY_USER
+		AND us2.USR_CHANNEL = rel.VCI_CHANNEL
+		WHERE  rel.VCI_CHANNEL = #{channel, jdbcType = VARCHAR}
+		AND rel.VCI_EXEIT_STATE !='02'
+		<if test="equId != null and equId != ''">
+			AND rel.VCI_EQUIPMENT_ID = #{equId, jdbcType = VARCHAR}
+		</if>
+		<if test="perId != null and perId != ''">
+			AND rel.VCI_ID = #{perId, jdbcType = VARCHAR}
+		</if>
+		ORDER BY rel.VCI_CARGO_WAY_ROW DESC, rel.VCI_CARGO_WAY_LINE DESC
+	</select>
+	<select id="queryProductz" resultType="hashmap" parameterType="java.util.Map">
+		SELECT
+		p.PRT_ID        	'id',
+		p.PRT_NAME      	'name',
+		p.PRT_DESCRIBE      'discribe',
+		p.PRT_STATE         'state',
+		p.PRT_SORT          'sort',
+		p.PRT_PICLIST       'picList',
+		p.PRT_FMPIC          'fmPic',
+		p.PRT_MASTER_MAP    'masterMap',
+		p.PRT_CATEGORY_ID   'categoryId',
+		c.VCI_NAME          'categoryName',
+		p.PRT_CREATE_USER	'userId',
+		u.USR_NAME          'createUser',
+		p.PRT_CREATE_TIME   'createTime',
+		e.USR_NAME          'modifyUser',
+		p.PRT_MODIFY_TIME   'modifyTime'
+		FROM vm_product_inf  p
+		LEFT JOIN 	im_user u ON u.USR_ID = p.PRT_CREATE_USER
+		AND u.USR_CHANNEL = p.PRT_CHANNEL
+		LEFT JOIN im_user e on e.USR_ID = p.PRT_MODIFY_USER
+		AND e.USR_CHANNEL = p.PRT_CHANNEL
+		LEFT JOIN vm_category_inf c ON c.VCI_ID = p.PRT_CATEGORY_ID
+		AND c.VCI_CHANNEL = p.PRT_CHANNEL
+		WHERE p.PRT_CHANNEL =  #{channel,jdbcType=VARCHAR}
+		AND  p.PRT_STATE = "0"
+		<if test="category != null and category != ''">
+			AND c.VCI_ID = #{category,jdbcType=VARCHAR}
+		</if>
+		<if test="name != null and name != ''">
+			AND p.PRT_NAME like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test="state!= null and state!= ''">
+			AND p.PRT_STATE = #{state,jdbcType=VARCHAR}
+		</if>
+		<if test="createUser != null and createUser != ''">
+			AND u.USR_NAME like CONCAT('%', #{createUser,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test=" userId != null and userId != ''">
+			AND p.PRT_CREATE_USER = #{userId,jdbcType=VARCHAR}
+		</if>
+		<if test="dates!=null and dates!= ''">
+			AND SUBSTR(p.PRT_CREATE_TIME,1,8) BETWEEN SUBSTR((#{dates, jdbcType=VARCHAR}),1,8)
+			AND SUBSTR((#{dates, jdbcType=VARCHAR}),12,19)
+		</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>