厨房设备前后台对接问题处理

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceUsageController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.canteen.core.kitchen.dto.KitchenDeviceListDTO;
+import com.bonus.canteen.core.kitchen.dto.KitchenDeviceUsageListDTO;
 import com.bonus.canteen.core.kitchen.vo.KitchenDeviceUsageListVO;
 import com.bonus.common.log.enums.OperaType;
 //import com.bonus.canteen.core.kitchen.common.annotation.PreventRepeatSubmit;
@@ -46,7 +47,7 @@ public class KitchenDeviceUsageController extends BaseController {
     @ApiOperation(value = "查询厨房设备使用记录列表")
     //@RequiresPermissions("kitchen:usage:list")
     @GetMapping("/list")
-    public TableDataInfo list(KitchenDeviceListDTO kitchenDeviceUsage) {
+    public TableDataInfo list(KitchenDeviceUsageListDTO kitchenDeviceUsage) {
         startPage();
         List<KitchenDeviceUsageListVO> list = kitchenDeviceUsageService.selectKitchenDeviceUsageList(kitchenDeviceUsage);
         return getDataTable(list);
@@ -60,7 +61,7 @@ public class KitchenDeviceUsageController extends BaseController {
     //@RequiresPermissions("kitchen:usage:export")
     @SysLog(title = "厨房设备使用记录", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出厨房设备使用记录")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, KitchenDeviceListDTO kitchenDeviceUsage) {
+    public void export(HttpServletResponse response, KitchenDeviceUsageListDTO kitchenDeviceUsage) {
         List<KitchenDeviceUsageListVO> list = kitchenDeviceUsageService.selectKitchenDeviceUsageList(kitchenDeviceUsage);
         ExcelUtil<KitchenDeviceUsageListVO> util = new ExcelUtil<KitchenDeviceUsageListVO>(KitchenDeviceUsageListVO.class);
         util.exportExcel(response, list, "厨房设备使用记录数据");

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/KitchenDeviceListDTO.java

@@ -70,4 +70,6 @@ public class KitchenDeviceListDTO  {
 
     private String canteenName;
 
+    private String keyWord;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/KitchenDeviceUsageListDTO.java

@@ -52,6 +52,8 @@ public class KitchenDeviceUsageListDTO  {
 
 
 
+    private String keyWord;
+
 
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenDeviceUsageMapper.java

@@ -3,6 +3,7 @@ package com.bonus.canteen.core.kitchen.mapper;
 import java.util.List;
 import com.bonus.canteen.core.kitchen.domain.KitchenDeviceUsage;
 import com.bonus.canteen.core.kitchen.dto.KitchenDeviceListDTO;
+import com.bonus.canteen.core.kitchen.dto.KitchenDeviceUsageListDTO;
 import com.bonus.canteen.core.kitchen.vo.KitchenDeviceUsageListVO;
 
 /**
@@ -26,7 +27,7 @@ public interface KitchenDeviceUsageMapper {
      * @param kitchenDeviceUsage 厨房设备使用记录
      * @return 厨房设备使用记录集合
      */
-    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceListDTO kitchenDeviceUsage);
+    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceUsageListDTO kitchenDeviceUsage);
 
     /**
      * 新增厨房设备使用记录

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceUsageService.java

@@ -3,6 +3,7 @@ package com.bonus.canteen.core.kitchen.service;
 import java.util.List;
 import com.bonus.canteen.core.kitchen.domain.KitchenDeviceUsage;
 import com.bonus.canteen.core.kitchen.dto.KitchenDeviceListDTO;
+import com.bonus.canteen.core.kitchen.dto.KitchenDeviceUsageListDTO;
 import com.bonus.canteen.core.kitchen.vo.KitchenDeviceUsageListVO;
 
 /**
@@ -26,7 +27,7 @@ public interface IKitchenDeviceUsageService {
      * @param kitchenDeviceUsage 厨房设备使用记录
      * @return 厨房设备使用记录集合
      */
-    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceListDTO kitchenDeviceUsage);
+    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceUsageListDTO kitchenDeviceUsage);
 
     /**
      * 新增厨房设备使用记录

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java

@@ -210,7 +210,7 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl<KitchenDeviceInfoM
                         .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceNo()), KitchenDeviceInfo::getDeviceNo, kitchenDeviceInfo.getDeviceNo())
                         .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceSn()), KitchenDeviceInfo::getDeviceSn, kitchenDeviceInfo.getDeviceSn())
                         .eq(kitchenDeviceInfo.getDeviceType() != 0, KitchenDeviceInfo::getDeviceType, kitchenDeviceInfo.getDeviceType())
-                        .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_TRUE.key()) // 仅查询未删除的设备
+                        .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_FALSE.key()) // 仅查询未删除的设备
         );
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceUsageServiceImpl.java

@@ -3,6 +3,7 @@ package com.bonus.canteen.core.kitchen.service.impl;
 import java.util.List;
 
 import com.bonus.canteen.core.kitchen.dto.KitchenDeviceListDTO;
+import com.bonus.canteen.core.kitchen.dto.KitchenDeviceUsageListDTO;
 import com.bonus.canteen.core.kitchen.vo.KitchenDeviceUsageListVO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
@@ -41,7 +42,7 @@ public class KitchenDeviceUsageServiceImpl implements IKitchenDeviceUsageService
      * @return 厨房设备使用记录
      */
     @Override
-    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceListDTO kitchenDeviceUsage) {
+    public List<KitchenDeviceUsageListVO> selectKitchenDeviceUsageList(KitchenDeviceUsageListDTO kitchenDeviceUsage) {
         return kitchenDeviceUsageMapper.selectKitchenDeviceUsageList(kitchenDeviceUsage);
     }
 

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceInfoMapper.xml

@@ -74,15 +74,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectKitchenDeviceInfoList" parameterType="com.bonus.canteen.core.kitchen.dto.KitchenDeviceListDTO" resultMap="KitchenDeviceInfoResult">
         <include refid="selectKitchenDeviceInfoVo"/>
         <where>
-            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            and del_flag = '0'
-            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
+            <if test="keyWord != null and keyWord !=''">
-            <if test="areaId != null "> and area_id = #{areaId}</if>
+            and (
-            <if test="deviceType != null "> and device_type = #{deviceType}</if>
+                device_no like concat('%', #{keyWord}, '%')
-            <if test="deviceCategory != null "> and device_category = #{deviceCategory}</if>
+                or device_name like concat('%', #{keyWord}, '%')
-            <if test="deviceSize != null  and deviceSize != ''"> and device_size = #{deviceSize}</if>
+                or device_sn like concat('%', #{keyWord}, '%')
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+                or sub_place like concat('%', #{keyWord}, '%')
-            <if test="deviceSn != null  and deviceSn != ''"> and device_sn = #{deviceSn}</if>
+            )
-            <if test="subPlace != null  and subPlace != ''"> and sub_place = #{subPlace}</if>
+            </if>
             <if test="deviceNetworkState != null "> and device_network_state = #{deviceNetworkState}</if>
         </where>
     </select>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceUsageMapper.xml

@@ -22,40 +22,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectKitchenDeviceUsageVo">
         SELECT
             usage_id,
-            device_no,
+            kdu.device_no,
-            device_id,
+            kdu.device_id,
-            device_type,
+            kdu.device_type,
-            area_id,
+            kdu.area_id,
-            canteen_id,
+            kdu.canteen_id,
-        work_state,
+            kdi.device_name,
-<!--            CASE-->
+            work_state,
-<!--                WHEN kdu.work_state = 1 THEN '工作中'-->
-<!--                WHEN kdu.work_state = 0 THEN '离线'-->
-<!--                ELSE '未知状态'-->
-<!--                END as work_state,-->
             start_use_time,
             end_use_time,
             use_time,
             end_tag,
-            create_by,
+            kdu.create_by,
-            create_time,
+            kdu.create_time,
-            update_by,
+            kdu.update_by,
-            update_time,
+            kdu.update_time,
             vac.vAreaName as areaName,
             vac.vCanteenName as canteenName
         FROM
             kitchen_device_usage kdu
                 LEFT JOIN v_area_canteen vac on kdu.canteen_id = vac.vCanteenId  and kdu.area_id = vac.vAreaId
+                LEFT JOIN kitchen_device_info kdi  on kdi.device_id = kdu.device_id
     </sql>
 
     <select id="selectKitchenDeviceUsageList" parameterType="com.bonus.canteen.core.kitchen.dto.KitchenDeviceUsageListDTO" resultMap="KitchenDeviceUsageResult">
         <include refid="selectKitchenDeviceUsageVo"/>
         <where>
-            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            and kdi.del_flag = '0'
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="keyWord !=null and keyWord !=''">
-            <if test="deviceType != null "> and device_type = #{deviceType}</if>
+                and (kdi.device_no like concat('%', #{keyWord}, '%')
-            <if test="areaId != null "> and area_id = #{areaId}</if>
+                or kdi.device_name like concat('%', #{keyWord}, '%')
-            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
+                or kdi.device_sn like concat('%', #{keyWord}, '%')
+                )
+            </if>
+            <if test="deviceType != null "> and kdi.device_type = #{deviceType}</if>
+            <if test="areaId != null "> and kdi.area_id = #{areaId}</if>
+            <if test="canteenId != null "> and kdi.canteen_id = #{canteenId}</if>
         </where>
     </select>