Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -26,10 +26,12 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.alarm.IotAlarmSettingDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.ly.LyDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.alarm.IotAlarmSettingMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.ly.LyDeviceMapper;
 import cn.iocoder.yudao.module.pms.enums.common.IotDeviceStatusEnum;
 import cn.iocoder.yudao.module.pms.oa.OaFlow;
 import cn.iocoder.yudao.module.pms.service.DeviceServiceImpl;
@@ -119,6 +121,8 @@ public class IotDeviceController {
     private IotAlarmSettingMapper iotAlarmSettingMapper;
     @Autowired
     private RestTemplate restTemplate;
+    @Autowired
+    private LyDeviceMapper lyDeviceMapper;
 
     @GetMapping(value = {"/company"})
     @Operation(summary = "获取设备属于哪个公司", description = "获取设备属于哪个公司")
@@ -540,6 +544,10 @@ public class IotDeviceController {
             list.stream().filter(e -> e.getSerialNumber().equals(iotDeviceRespVO.getDeviceCode())).findFirst().ifPresent(e ->{
                 iotDeviceRespVO.setMqttUrl("/"+e.getProductId()+"/"+iotDeviceRespVO.getDeviceCode()+"/property/post");
             });
+            List<LyDeviceDO> deviceId = lyDeviceMapper.selectList("device_id", iotDeviceRespVO.getId());
+            if (CollUtil.isNotEmpty(deviceId)) {
+                iotDeviceRespVO.setOtherName(deviceId.get(0).getOtherName());
+            }
         }
 
         return success(result);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/ly/controller/LyDeviceController.java

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.pms.controller.admin.ly.controller;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDeviceRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.ly.LyDeviceDO;
+import cn.iocoder.yudao.module.pms.service.ly.LyDeviceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - 连油设备信息")
+@RestController
+@RequestMapping("/rq/ly-device")
+@Validated
+public class LyDeviceController {
+
+    @Resource
+    private LyDeviceService lyDeviceService;
+
+
+    @PostMapping("/create")
+    @Operation(summary = "创建连油设备信息")
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:create')")
+    public CommonResult<Long> createLyDevice(@Valid @RequestBody LyDeviceSaveReqVO createReqVO) {
+        return success(lyDeviceService.createLyDevice(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新连油设备信息")
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:update')")
+    public CommonResult<Boolean> updateLyDevice(@Valid @RequestBody LyDeviceSaveReqVO updateReqVO) {
+        lyDeviceService.updateLyDevice(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除连油设备信息")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:delete')")
+    public CommonResult<Boolean> deleteLyDevice(@RequestParam("id") Long id) {
+        lyDeviceService.deleteLyDevice(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得连油设备信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:query')")
+    public CommonResult<LyDeviceRespVO> getLyDevice(@RequestParam("id") Long id) {
+        LyDeviceDO lyDevice = lyDeviceService.getLyDevice(id);
+        return success(BeanUtils.toBean(lyDevice, LyDeviceRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得连油设备信息分页")
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:query')")
+    public CommonResult<PageResult<LyDeviceRespVO>> getLyDevicePage(@Valid LyDevicePageReqVO pageReqVO) {
+        PageResult<LyDeviceDO> pageResult = lyDeviceService.getLyDevicePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, LyDeviceRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出连油设备信息 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:ly-device:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportLyDeviceExcel(@Valid LyDevicePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<LyDeviceDO> list = lyDeviceService.getLyDevicePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "连油设备信息.xls", "数据", LyDeviceRespVO.class,
+                        BeanUtils.toBean(list, LyDeviceRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/ly/vo/LyDevicePageReqVO.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.pms.controller.admin.ly.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 连油设备信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class LyDevicePageReqVO extends PageParam {
+
+    @Schema(description = "设备id", example = "19197")
+    private Long deviceId;
+
+    @Schema(description = "部门id", example = "8641")
+    private Long deptId;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", example = "赵六")
+    private String deviceName;
+
+    @Schema(description = "其他修改后的名称", example = "李四")
+    private String otherName;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/ly/vo/LyDeviceRespVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.pms.controller.admin.ly.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 连油设备信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class LyDeviceRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20578")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "设备id", example = "19197")
+    @ExcelProperty("设备id")
+    private Long deviceId;
+
+    @Schema(description = "部门id", example = "8641")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "其他修改后的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("其他修改后的名称")
+    private String otherName;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/ly/vo/LyDeviceSaveReqVO.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.pms.controller.admin.ly.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 连油设备信息新增/修改 Request VO")
+@Data
+public class LyDeviceSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20578")
+    private Long id;
+
+    @Schema(description = "设备id", example = "19197")
+    @NotEmpty(message = "设备信息不能为空")
+    private Long deviceId;
+
+    @Schema(description = "部门id", example = "8641")
+    private Long deptId;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "设备编码不能为空")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @Schema(description = "其他修改后的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotEmpty(message = "其他修改后的名称不能为空")
+    private String otherName;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceRespVO.java

@@ -270,4 +270,6 @@ public class IotDeviceRespVO {
     private String currency;
 
     private String mqttUrl;
+
+    private String otherName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/ly/LyDeviceDO.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.ly;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 连油设备信息 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_ly_device")
+@KeySequence("rq_ly_device_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LyDeviceDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 其他修改后的名称
+     */
+    private String otherName;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/ly/LyDeviceMapper.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.ly;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.ly.LyDeviceDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 连油设备信息 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface LyDeviceMapper extends BaseMapperX<LyDeviceDO> {
+
+    default PageResult<LyDeviceDO> selectPage(LyDevicePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<LyDeviceDO>()
+                .eqIfPresent(LyDeviceDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(LyDeviceDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(LyDeviceDO::getDeviceCode, reqVO.getDeviceCode())
+                .likeIfPresent(LyDeviceDO::getDeviceName, reqVO.getDeviceName())
+                .likeIfPresent(LyDeviceDO::getOtherName, reqVO.getOtherName())
+                .eqIfPresent(LyDeviceDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(LyDeviceDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(LyDeviceDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/ly/LyDeviceService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.ly;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.ly.LyDeviceDO;
+
+import javax.validation.Valid;
+
+/**
+ * 连油设备信息 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface LyDeviceService {
+
+    /**
+     * 创建连油设备信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createLyDevice(@Valid LyDeviceSaveReqVO createReqVO);
+
+    /**
+     * 更新连油设备信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateLyDevice(@Valid LyDeviceSaveReqVO updateReqVO);
+
+    /**
+     * 删除连油设备信息
+     *
+     * @param id 编号
+     */
+    void deleteLyDevice(Long id);
+
+    /**
+     * 获得连油设备信息
+     *
+     * @param id 编号
+     * @return 连油设备信息
+     */
+    LyDeviceDO getLyDevice(Long id);
+
+    /**
+     * 获得连油设备信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 连油设备信息分页
+     */
+    PageResult<LyDeviceDO> getLyDevicePage(LyDevicePageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/ly/LyDeviceServiceImpl.java

@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.pms.service.ly;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.ly.vo.LyDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.ly.LyDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.ly.LyDeviceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 连油设备信息 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class LyDeviceServiceImpl implements LyDeviceService {
+
+    @Resource
+    private LyDeviceMapper lyDeviceMapper;
+    @Autowired
+    private IotDeviceMapper iotDeviceMapper;
+
+    @Override
+    public Long createLyDevice(LyDeviceSaveReqVO createReqVO) {
+        // 插入
+        LyDeviceDO lyDevice = BeanUtils.toBean(createReqVO, LyDeviceDO.class);
+        lyDevice.setDeleted(false);
+        lyDeviceMapper.insert(lyDevice);
+        // 返回
+        return lyDevice.getId();
+    }
+
+    @Override
+    public void updateLyDevice(LyDeviceSaveReqVO updateReqVO) {
+        // 校验存在
+        validateLyDeviceExists(updateReqVO.getId());
+        // 更新
+        LyDeviceDO updateObj = BeanUtils.toBean(updateReqVO, LyDeviceDO.class);
+        lyDeviceMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteLyDevice(Long id) {
+        // 校验存在
+        validateLyDeviceExists(id);
+        // 删除
+        lyDeviceMapper.deleteById(id);
+    }
+
+    private void validateLyDeviceExists(Long id) {
+        if (lyDeviceMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(1, "不存在"));
+        }
+    }
+
+    @Override
+    public LyDeviceDO getLyDevice(Long id) {
+        return lyDeviceMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<LyDeviceDO> getLyDevicePage(LyDevicePageReqVO pageReqVO) {
+        return lyDeviceMapper.selectPage(pageReqVO);
+    }
+
+}