feat: 0516优化

src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java

@@ -28,7 +28,7 @@ public interface DeviceInfoMapper extends BaseMapperPlus<DeviceInfoMapper,Device
 
     List<DeviceInfoVo> listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status);
 
-    List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status);
+    List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") List<DeviceStatusEnum> status);
 }
 
 

src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java

@@ -214,4 +214,10 @@ public class DeviceRepairApplyDetailEntity {
      */
     @TableField(value = "updateTime")
     private LocalDateTime updateTime;
+
+    /**
+     * 报修现场照片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
 }

src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java

@@ -264,4 +264,17 @@ public class DeviceRepairEntity {
      */
     @TableField(value = "updateTime")
     private LocalDateTime updateTime;
+
+    /**
+     * 报修现场照片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
+
+
+    /**
+     * 维修后现场图片
+     */
+    @TableField(value = "serviceLivePath")
+    private String serviceLivePath;
 }

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java

@@ -1,6 +1,7 @@
 package com.glxp.api.req.dev;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceInfoEntity;
 import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
@@ -18,10 +19,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Data
@@ -54,6 +52,12 @@ public class DeviceRepairApplyAddParam {
         @NotBlank(message = "问题描述不能为空")
         String description;
 
+        /**
+         * 报修现场照片
+         */
+        @TableField(value = "livePath")
+        private String livePath;
+
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
@@ -90,7 +94,9 @@ public class DeviceRepairApplyAddParam {
     }
 
     public List<DeviceRepairApplyDetailEntity> getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) {
-        List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL);
+        List<DeviceStatusEnum> enums = new ArrayList<>();
+        enums.add( DeviceStatusEnum.NORMAL);
+        List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), enums);
         if (list.size() != details.size()) {
             throw new JsonException("设备状态异常或信息不符，请确认");
         }
@@ -101,6 +107,7 @@ public class DeviceRepairApplyAddParam {
                     .applyId(applyId)
                     .description(d.getDescription())
                     .status(DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS)
+                    .livePath(d.getLivePath())
                     .build();
             BeanUtil.copyProperties(info, build,"status");
             return build;

src/main/java/com/glxp/api/service/dev/DeviceInfoService.java

@@ -96,7 +96,7 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
 
     List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status);
 
-    List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, DeviceStatusEnum status);
+    List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status);
 
     boolean exitOrder(Long orderId, String deviceCode);
 

src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java

@@ -138,9 +138,11 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
             deviceCheckDetailService.saveBatch(checkDetailList);
             if (CollectionUtil.isNotEmpty(checkDetailItemList)) {
                 deviceCheckDetailItemService.saveBatch(checkDetailItemList);
+            }else {
+                throw new JsonException(String.format("没有配置巡检项目,无法生成巡检单"));
             }
         } else {
-            throw new JsonException(String.format("没有配置巡检项目 或者 没有找到处于[%s]状态的设备，无法生成巡检单", DeviceStatusEnum.NORMAL.getDesc()));
+            throw new JsonException(String.format("没有找到处于[%s]状态的设备，无法生成巡检单", DeviceStatusEnum.NORMAL.getDesc()));
         }
     }
 

src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java

@@ -190,7 +190,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     }
 
     @Override
-    public List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, DeviceStatusEnum status) {
+    public List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status) {
 
         List<DeviceInfoVo> list = super.baseMapper.listVoByCodes(deviceCodes, deptCode, status);
         return list;

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java

@@ -82,6 +82,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
                 .set(DeviceRepairEntity::getConfirmDeptName, user.getDeptName())
                 .set(DeviceRepairEntity::getConfirmTime, LocalDateTime.now())
                 .set(DeviceRepairEntity::getRepairDescription, deviceRepairEntity.getRepairDescription())
+                .set(DeviceRepairEntity::getServiceLivePath, deviceRepairEntity.getServiceLivePath())
                 .set(DeviceRepairEntity::getUpdateTime,LocalDateTime.now())
                 .eq(DeviceRepairEntity::getId, repairId)
                 .eq(DeviceRepairEntity::getCreateUserId, user.getId())

src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java

@@ -146,9 +146,11 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
             deviceUpkeepDetailService.saveBatch(upkeepDetailList);
             if (CollectionUtil.isNotEmpty(upkeepDetailItemList)) {
                 deviceUpkeepDetailItemService.saveBatch(upkeepDetailItemList);
+            }else {
+                throw new JsonException(String.format("没有配置巡检项目,无法生成巡检单"));
             }
         } else {
-            throw new JsonException(String.format("没有配置保养项目 或者 没有找到处于[%s]状态的设备，无法生成保养单", DeviceStatusEnum.NORMAL.getDesc()));
+            throw new JsonException(String.format("没有找到处于[%s]状态的设备，无法生成保养单", DeviceStatusEnum.NORMAL.getDesc()));
         }
     }
 

src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml

@@ -125,8 +125,11 @@
             <if test="deptCode!=null and deptCode!=''">
                 and info.deptCode = #{deptCode}
             </if>
-            <if test="status!=null">
-                and info.status = #{status}
+            <if test="status != null and status.size() > 0">
+                and  info.status in
+                <foreach collection="status" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
         order by info.deptCode, info.deviceCode

src/main/resources/schemas/schema_v2.4.sql

@@ -3339,3 +3339,13 @@ INSERT IGNORE INTO  auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`,
 INSERT IGNORE INTO  auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`,
                        `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
                        `update_time`, `remark`) VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL);
+
+CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath',
+                         'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_repair', 'livePath',
+                         'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''报修现场照片''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_repair', 'serviceLivePath',
+                         'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修后现场照片''',
+                         1);