设备管理

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
+import com.bonus.material.ma.domain.Type;
 import com.bonus.material.ma.vo.MachineVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,6 +53,17 @@ public class MachineController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询机具设备管理列表
+     */
+    @ApiOperation(value = "查询机具设备管理列表")
+    @RequiresPermissions("ma:machine:list")
+    @GetMapping("/list")
+    public AjaxResult list(Type type)
+    {
+        return machineService.selectByTypeList(type);
+    }
+
     /**
      * 导出机具设备管理列表
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java

@@ -1,7 +1,10 @@
 package com.bonus.material.ma.mapper;
 
 import java.util.List;
+
+import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.ma.domain.Machine;
+import com.bonus.material.ma.domain.Type;
 import com.bonus.material.ma.vo.MachineVo;
 
 /**
@@ -59,4 +62,11 @@ public interface MachineMapper
      * @return 结果
      */
     public int deleteMachineByMaIds(Long[] maIds);
+
+    /**
+     * 查询机具设备管理列表
+     * @param type
+     * @return
+     */
+    List<Type> selectByTypeList(Type type);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.ma.domain.Machine;
+import com.bonus.material.ma.domain.Type;
 import com.bonus.material.ma.vo.MachineVo;
 
 /**
@@ -61,4 +62,11 @@ public interface IMachineService
      * @return 结果
      */
     public AjaxResult deleteMachineByMaId(Long maId);
+
+    /**
+     * 根据类型查询机具设备管理列表
+     * @param type
+     * @return
+     */
+    AjaxResult selectByTypeList(Type type);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.bonus.common.biz.enums.HttpCodeEnum;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.material.ma.domain.Type;
 import com.bonus.material.ma.vo.MachineVo;
 import org.springframework.stereotype.Service;
 import com.bonus.material.ma.mapper.MachineMapper;
@@ -106,4 +107,15 @@ public class MachineServiceImpl implements IMachineService
         }
         return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
     }
+
+    /**
+     * 根据类型查询
+     * @param type
+     * @return
+     */
+    @Override
+    public AjaxResult selectByTypeList(Type type) {
+        List<Type> typeList = machineMapper.selectByTypeList(type);
+        return AjaxResult.success(typeList);
+    }
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml

@@ -158,6 +158,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ma.ma_id = #{maId}
     </select>
 
+    <select id="selectByTypeList" resultType="com.bonus.material.ma.domain.Type">
+        SELECT
+            type_id as typeId,
+            type_name as typeName,
+            parent_id as parentId,
+            storage_num as storageNum,
+            type_code as typeCode,
+            level as level
+        FROM
+            ma_type
+        WHERE del_flag = '0'
+        <if test="level != null and level != ''">
+            and level = #{level}
+        </if>
+    </select>
+
     <insert id="insertMachine" parameterType="com.bonus.material.ma.domain.Machine" useGeneratedKeys="true" keyProperty="maId">
         insert into ma_machine
         <trim prefix="(" suffix=")" suffixOverrides=",">