refactor(dms): 恢复设备大类 设备类型 设备信息的接口与方法

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceCategoryController.java

@@ -73,38 +73,38 @@ public class BaseDeviceCategoryController extends BaseController {
     /**
      * 新增设备大类信息
      */
-/*    @SaCheckPermission("dms:baseDeviceCategory:add")
+    @SaCheckPermission("dms:baseDeviceCategory:add")
     @Log(title = "设备大类信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseDeviceCategoryBo bo) {
         return toAjax(baseDeviceCategoryService.insertByBo(bo));
-    }*/
+    }
+
 
     /**
      * 修改设备大类信息
      */
-/*    @SaCheckPermission("dms:baseDeviceCategory:edit")
+    @SaCheckPermission("dms:baseDeviceCategory:edit")
     @Log(title = "设备大类信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseDeviceCategoryBo bo) {
         return toAjax(baseDeviceCategoryService.updateByBo(bo));
-    }*/
+    }
 
     /**
      * 删除设备大类信息
      *
      * @param deviceCategoryIds 主键串
      */
-/*    @SaCheckPermission("dms:baseDeviceCategory:remove")
+    @SaCheckPermission("dms:baseDeviceCategory:remove")
     @Log(title = "设备大类信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deviceCategoryIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] deviceCategoryIds) {
         return toAjax(baseDeviceCategoryService.deleteWithValidByIds(List.of(deviceCategoryIds), true));
-    }*/
-
+    }
 
     /**
      * 下拉框查询设备大类信息列表

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseDeviceTypeController.java

@@ -2,10 +2,14 @@ package org.dromara.dms.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -70,43 +74,42 @@ public class BaseDeviceTypeController extends BaseController {
     /**
      * 新增设备类型信息
      */
-/*    @SaCheckPermission("dms:baseDeviceType:add")
+    @SaCheckPermission("dms:baseDeviceType:add")
     @Log(title = "设备类型信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseDeviceTypeBo bo) {
         return toAjax(baseDeviceTypeService.insertByBo(bo));
-    }*/
+    }
 
     /**
      * 修改设备类型信息
      */
-/*    @SaCheckPermission("dms:baseDeviceType:edit")
+    @SaCheckPermission("dms:baseDeviceType:edit")
     @Log(title = "设备类型信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseDeviceTypeBo bo) {
         return toAjax(baseDeviceTypeService.updateByBo(bo));
-    }*/
+    }
 
     /**
      * 删除设备类型信息
      *
      * @param deviceTypeIds 主键串
      */
-/*    @SaCheckPermission("dms:baseDeviceType:remove")
+    @SaCheckPermission("dms:baseDeviceType:remove")
     @Log(title = "设备类型信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deviceTypeIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] deviceTypeIds) {
         return toAjax(baseDeviceTypeService.deleteWithValidByIds(List.of(deviceTypeIds), true));
-    }*/
+    }
 
 
     /**
      * 下拉框查询设备类型信息列表
      */
-
     @GetMapping("/getBaseDeviceTypeList")
     public R<List<BaseDeviceTypeVo>> getBaseDeviceTypeList(BaseDeviceTypeBo bo) {
         List<BaseDeviceTypeVo> list = baseDeviceTypeService.queryList(bo);

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.java

@@ -73,37 +73,31 @@ public class DmsBaseMachineInfoController extends BaseController {
     /**
      * 新增设备信息
      */
-/*    @SaCheckPermission("dms:dmsBaseMachineInfo:add")
+    @SaCheckPermission("dms:dmsBaseMachineInfo:add")
     @Log(title = "设备信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
         return toAjax(dmsBaseMachineInfoService.insertByBo(bo));
-    }*/
+    }
 
-    /**
-     * 修改设备信息
-     */
-/*    @SaCheckPermission("dms:dmsBaseMachineInfo:edit")
+
+    @SaCheckPermission("dms:dmsBaseMachineInfo:edit")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
         return toAjax(dmsBaseMachineInfoService.updateByBo(bo));
-    }*/
+    }
 
-    /**
-     * 删除设备信息
-     *
-     * @param machineIds 主键串
-     */
-/*    @SaCheckPermission("dms:dmsBaseMachineInfo:remove")
+
+    @SaCheckPermission("dms:dmsBaseMachineInfo:remove")
     @Log(title = "设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{machineIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] machineIds) {
         return toAjax(dmsBaseMachineInfoService.deleteWithValidByIds(List.of(machineIds), true));
-    }*/
+    }
 
 
     /**

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceCategoryService.java

@@ -47,7 +47,7 @@ public interface IBaseDeviceCategoryService {
      * @param bo 设备大类信息
      * @return 是否新增成功
      */
-/*    Boolean insertByBo(BaseDeviceCategoryBo bo);*/
+    Boolean insertByBo(BaseDeviceCategoryBo bo);
 
     /**
      * 修改设备大类信息
@@ -55,7 +55,7 @@ public interface IBaseDeviceCategoryService {
      * @param bo 设备大类信息
      * @return 是否修改成功
      */
-/*    Boolean updateByBo(BaseDeviceCategoryBo bo);*/
+    Boolean updateByBo(BaseDeviceCategoryBo bo);
 
     /**
      * 校验并批量删除设备大类信息信息
@@ -64,5 +64,5 @@ public interface IBaseDeviceCategoryService {
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-/*    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);*/
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseDeviceTypeService.java

@@ -6,6 +6,7 @@ import org.dromara.dms.domain.DmsBaseDeviceType;
 import org.dromara.dms.domain.bo.BaseDeviceTypeBo;
 import org.dromara.dms.domain.vo.BaseDeviceTypeVo;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -47,7 +48,7 @@ public interface IBaseDeviceTypeService {
      * @param bo 设备类型信息
      * @return 是否新增成功
      */
-//    Boolean insertByBo(BaseDeviceTypeBo bo);
+    Boolean insertByBo(BaseDeviceTypeBo bo);
 
     /**
      * 修改设备类型信息
@@ -55,7 +56,7 @@ public interface IBaseDeviceTypeService {
      * @param bo 设备类型信息
      * @return 是否修改成功
      */
-//    Boolean updateByBo(BaseDeviceTypeBo bo);
+    Boolean updateByBo(BaseDeviceTypeBo bo);
 
     /**
      * 校验并批量删除设备类型信息信息
@@ -64,7 +65,7 @@ public interface IBaseDeviceTypeService {
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-//    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 
     public List<DmsBaseDeviceType> selectDevicetypeByDeviceId(Long deviceId);

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.java

@@ -42,46 +42,36 @@ public interface IDmsBaseMachineInfoService {
      */
     List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo);
 
-    /**
-     * 查询设备台账信息
-     *
-     * @param
-     * @return 设备台账信息
-     */
-//    public DmsBaseMachineInfoVo selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode);
-
-    List<DmsBaseMachineInfoVo> likeDeviceName(String deviceName);
-
     /**
      * 根据设备名称模糊查询，返回 PDA 端格式数据
-     * 
+     *
      * @param deviceName 设备名称
      * @return PDA 端设备信息列表
      */
     List<DeviceBeen> likeDeviceNameForPda(String deviceName);
 
-    /*    *//**
+    /**
      * 新增设备信息
      *
      * @param bo 设备信息
      * @return 是否新增成功
-     *//*
+     */
     Boolean insertByBo(DmsBaseMachineInfoBo bo);
 
-    *//**
+    /**
      * 修改设备信息
      *
      * @param bo 设备信息
      * @return 是否修改成功
-     *//*
+     */
     Boolean updateByBo(DmsBaseMachineInfoBo bo);
 
-    *//**
+    /**
      * 校验并批量删除设备信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
-     *//*
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);*/
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceCategoryServiceImpl.java

@@ -89,7 +89,7 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService
      * @param bo 设备大类信息
      * @return 是否新增成功
      */
-/*    @Override
+    @Override
     public Boolean insertByBo(BaseDeviceCategoryBo bo) {
         BaseDeviceCategory add = MapstructUtils.convert(bo, BaseDeviceCategory.class);
         validEntityBeforeSave(add);
@@ -98,7 +98,7 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService
             bo.setDeviceCategoryId(add.getDeviceCategoryId());
         }
         return flag;
-    }*/
+    }
 
     /**
      * 修改设备大类信息
@@ -106,12 +106,12 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService
      * @param bo 设备大类信息
      * @return 是否修改成功
      */
-/*    @Override
+    @Override
     public Boolean updateByBo(BaseDeviceCategoryBo bo) {
         BaseDeviceCategory update = MapstructUtils.convert(bo, BaseDeviceCategory.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
-    }*/
+    }
 
     /**
      * 保存前的数据校验
@@ -154,11 +154,11 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-/*    @Override
+    @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
-    }*/
+    }
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseDeviceTypeServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -16,6 +18,7 @@ import org.dromara.dms.mapper.BaseDeviceTypeMapper;
 import org.dromara.dms.service.IBaseDeviceTypeService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -94,7 +97,6 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
      * @param bo 设备类型信息
      * @return 是否新增成功
      */
-/*
     @Override
     public Boolean insertByBo(BaseDeviceTypeBo bo) {
         BaseDeviceType add = MapstructUtils.convert(bo, BaseDeviceType.class);
@@ -114,7 +116,6 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
         }
         return flag;
     }
-*/
 
     /**
      * 修改设备类型信息
@@ -122,12 +123,12 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
      * @param bo 设备类型信息
      * @return 是否修改成功
      */
-/*    @Override
+    @Override
     public Boolean updateByBo(BaseDeviceTypeBo bo) {
         BaseDeviceType update = MapstructUtils.convert(bo, BaseDeviceType.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
-    }*/
+    }
 
     /**
      * 保存前的数据校验
@@ -143,13 +144,13 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-/*    @Override
+    @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
-    }*/
+    }
 
     @Override
     public List<DmsBaseDeviceType> selectDevicetypeByDeviceId(Long deviceId) {

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java

@@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dms.domain.DmsBaseDeviceCategory;
+import org.dromara.dms.domain.DmsBaseDeviceType;
 import org.dromara.dms.domain.DmsBaseMachineInfo;
 import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
 import org.dromara.dms.domain.mobile.DeviceBeen;
@@ -15,6 +19,7 @@ import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
 import org.dromara.dms.service.IDmsBaseMachineInfoService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -88,6 +93,9 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
             .select(ProdBaseDeviceMode::getDeviceModeName)
             .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
             .leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/
+
+            .select(DmsBaseDeviceType::getDeviceTypeName)
+            .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType)
             .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
             .like(StringUtils.isNotBlank(bo.getMachineCode()), DmsBaseMachineInfo::getMachineCode, bo.getMachineCode())
             .like(StringUtils.isNotBlank(bo.getMachineName()), DmsBaseMachineInfo::getMachineName, bo.getMachineName())
@@ -101,26 +109,6 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         return lqw;
     }
 
-    /**
-     * 查询设备台账信息
-     *
-     * @param deviceCode 设备Code
-     * @return 设备台账信息
-     */
-//    @Override
-//    public DmsBaseMachineInfoVo selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode) {
-//        DmsBaseMachineInfoVo dmsBaseDeviceLedger = baseMapper.selectDmsBaseDeviceLedgerByDeviceCode(deviceCode);
-//        if (dmsBaseDeviceLedger == null) {
-//            throw new ServiceException("无此设备");
-//        }
-//        return dmsBaseDeviceLedger;
-//    }
-
-    @Override
-    public List<DmsBaseMachineInfoVo> likeDeviceName(String deviceName) {
-        List<DmsBaseMachineInfoVo> list = baseMapper.likeDeviceName(deviceName);
-        return list;
-    }
 
     /**
      * 根据设备名称模糊查询，返回 PDA 端格式数据
@@ -131,12 +119,12 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         return baseMapper.likeDeviceNameForPda(deviceName);
     }
 
-/*    *//**
+    /**
      * 新增设备信息
      *
      * @param bo 设备信息
      * @return 是否新增成功
-     *//*
+     */
     @Override
     public Boolean insertByBo(DmsBaseMachineInfoBo bo) {
         DmsBaseMachineInfo add = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
@@ -148,23 +136,22 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         return flag;
     }
 
-    *//**
+    /**
      * 修改设备信息
      *
      * @param bo 设备信息
      * @return 是否修改成功
-     *//*
+     */
     @Override
     public Boolean updateByBo(DmsBaseMachineInfoBo bo) {
         DmsBaseMachineInfo update = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
         validEntityBeforeSave(update);
-
         return baseMapper.updateById(update) > 0;
     }
 
-    *//**
+    /**
      * 保存前的数据校验
-     *//*
+     */
     private void validEntityBeforeSave(DmsBaseMachineInfo entity) {
         //TODO 做一些数据校验,如唯一约束
         if (StringUtils.isNotBlank(entity.getMachineCode())) {
@@ -179,18 +166,18 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         }
     }
 
-    *//**
+    /**
      * 校验并批量删除设备信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
-     *//*
+     */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
-    }*/
+    }
 }