提供首页数据接口

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/domain/DmModbusDeviceStatus.java

@@ -0,0 +1,69 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.domain;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.persistence.*;
+import javax.validation.constraints.*;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import org.hibernate.annotations.*;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author wld
+* @date 2022-05-26
+**/
+@Entity
+@Data
+@Table(name="dm_modbus_device_status")
+public class DmModbusDeviceStatus implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @ApiModelProperty(value = "主键id")
+    @JSONField(serializeUsing = ToStringSerializer.class)
+    private Long id;
+
+    @Column(name = "device_id",nullable = false)
+    @NotNull
+    @ApiModelProperty(value = "设备id")
+    @JSONField(serializeUsing = ToStringSerializer.class)
+    private Long deviceId;
+
+    @Column(name = "device_status",nullable = false)
+    @NotNull
+    @ApiModelProperty(value = "设备状态")
+    private String deviceStatus;
+
+    @Column(name = "create_time",nullable = false)
+    @NotNull
+    @CreationTimestamp
+    @ApiModelProperty(value = "创建时间")
+    private Timestamp createTime;
+
+    public void copy(DmModbusDeviceStatus source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/repository/DmModbusDeviceStatusRepository.java

@@ -0,0 +1,28 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.repository;
+
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+* @website https://el-admin.vip
+* @author wld
+* @date 2022-05-26
+**/
+public interface DmModbusDeviceStatusRepository extends JpaRepository<DmModbusDeviceStatus, Long>, JpaSpecificationExecutor<DmModbusDeviceStatus> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/rest/DmModbusDeviceStatusController.java

@@ -0,0 +1,87 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.rest;
+
+import me.zhengjie.annotation.Log;
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.DmModbusDeviceStatusService;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @author wld
+* @date 2022-05-26
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "设备在线日志管理管理")
+@RequestMapping("/api/dmModbusDeviceStatus")
+public class DmModbusDeviceStatusController {
+
+    private final DmModbusDeviceStatusService dmModbusDeviceStatusService;
+
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
+    public void download(HttpServletResponse response, DmModbusDeviceStatusQueryCriteria criteria) throws IOException {
+        dmModbusDeviceStatusService.download(dmModbusDeviceStatusService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @Log("查询设备在线日志管理")
+    @ApiOperation("查询设备在线日志管理")
+    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
+    public ResponseEntity<Object> query(DmModbusDeviceStatusQueryCriteria criteria, Pageable pageable){
+        return new ResponseEntity<>(dmModbusDeviceStatusService.queryAll(criteria,pageable),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增设备在线日志管理")
+    @ApiOperation("新增设备在线日志管理")
+    @PreAuthorize("@el.check('dmModbusDeviceStatus:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody DmModbusDeviceStatus resources){
+        return new ResponseEntity<>(dmModbusDeviceStatusService.create(resources),HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改设备在线日志管理")
+    @ApiOperation("修改设备在线日志管理")
+    @PreAuthorize("@el.check('dmModbusDeviceStatus:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody DmModbusDeviceStatus resources){
+        dmModbusDeviceStatusService.update(resources);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除设备在线日志管理")
+    @ApiOperation("删除设备在线日志管理")
+    @PreAuthorize("@el.check('dmModbusDeviceStatus:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        dmModbusDeviceStatusService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/DmModbusDeviceStatusService.java

@@ -0,0 +1,83 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.service;
+
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusDto;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import java.util.Map;
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @description 服务接口
+* @author wld
+* @date 2022-05-26
+**/
+public interface DmModbusDeviceStatusService {
+
+    /**
+    * 查询数据分页
+    * @param criteria 条件
+    * @param pageable 分页参数
+    * @return Map<String,Object>
+    */
+    Map<String,Object> queryAll(DmModbusDeviceStatusQueryCriteria criteria, Pageable pageable);
+
+    /**
+    * 查询所有数据不分页
+    * @param criteria 条件参数
+    * @return List<DmModbusDeviceStatusDto>
+    */
+    List<DmModbusDeviceStatusDto> queryAll(DmModbusDeviceStatusQueryCriteria criteria);
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return DmModbusDeviceStatusDto
+     */
+    DmModbusDeviceStatusDto findById(Long id);
+
+    /**
+    * 创建
+    * @param resources /
+    * @return DmModbusDeviceStatusDto
+    */
+    DmModbusDeviceStatusDto create(DmModbusDeviceStatus resources);
+
+    /**
+    * 编辑
+    * @param resources /
+    */
+    void update(DmModbusDeviceStatus resources);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(Long[] ids);
+
+    /**
+    * 导出数据
+    * @param all 待导出的数据
+    * @param response /
+    * @throws IOException /
+    */
+    void download(List<DmModbusDeviceStatusDto> all, HttpServletResponse response) throws IOException;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/dto/DmModbusDeviceStatusDto.java

@@ -0,0 +1,46 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.service.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.io.Serializable;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author wld
+* @date 2022-05-26
+**/
+@Data
+public class DmModbusDeviceStatusDto implements Serializable {
+
+    /** 主键id */
+    /** 防止精度丢失 */
+    @JSONField(serializeUsing = ToStringSerializer.class)
+    private Long id;
+
+    /** 设备id */
+    private Long deviceId;
+
+    /** 设备状态 */
+    private String deviceStatus;
+
+    /** 创建时间 */
+    private Timestamp createTime;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/dto/DmModbusDeviceStatusQueryCriteria.java

@@ -0,0 +1,41 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.service.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.util.List;
+import me.zhengjie.annotation.Query;
+
+/**
+* @website https://el-admin.vip
+* @author wld
+* @date 2022-05-26
+**/
+@Data
+public class DmModbusDeviceStatusQueryCriteria{
+
+    /** 精确 */
+    @Query
+    private Long deviceId;
+
+    /** 精确 */
+    @Query
+    private Boolean deviceStatus;
+    /** BETWEEN */
+    @Query(type = Query.Type.BETWEEN)
+    private List<Timestamp> createTime;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/impl/DmModbusDeviceStatusServiceImpl.java

@@ -0,0 +1,110 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.service.impl;
+
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import me.zhengjie.utils.ValidationUtil;
+import me.zhengjie.utils.FileUtil;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.modules.dm.modbus.deviceStatus.repository.DmModbusDeviceStatusRepository;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.DmModbusDeviceStatusService;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusDto;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusQueryCriteria;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.mapstruct.DmModbusDeviceStatusMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+/**
+* @website https://el-admin.vip
+* @description 服务实现
+* @author wld
+* @date 2022-05-26
+**/
+@Service
+@RequiredArgsConstructor
+public class DmModbusDeviceStatusServiceImpl implements DmModbusDeviceStatusService {
+
+    private final DmModbusDeviceStatusRepository dmModbusDeviceStatusRepository;
+    private final DmModbusDeviceStatusMapper dmModbusDeviceStatusMapper;
+
+    @Override
+    public Map<String,Object> queryAll(DmModbusDeviceStatusQueryCriteria criteria, Pageable pageable){
+        Page<DmModbusDeviceStatus> page = dmModbusDeviceStatusRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(dmModbusDeviceStatusMapper::toDto));
+    }
+
+    @Override
+    public List<DmModbusDeviceStatusDto> queryAll(DmModbusDeviceStatusQueryCriteria criteria){
+        return dmModbusDeviceStatusMapper.toDto(dmModbusDeviceStatusRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    @Transactional
+    public DmModbusDeviceStatusDto findById(Long id) {
+        DmModbusDeviceStatus dmModbusDeviceStatus = dmModbusDeviceStatusRepository.findById(id).orElseGet(DmModbusDeviceStatus::new);
+        ValidationUtil.isNull(dmModbusDeviceStatus.getId(),"DmModbusDeviceStatus","id",id);
+        return dmModbusDeviceStatusMapper.toDto(dmModbusDeviceStatus);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public DmModbusDeviceStatusDto create(DmModbusDeviceStatus resources) {
+        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+        resources.setId(snowflake.nextId()); 
+        return dmModbusDeviceStatusMapper.toDto(dmModbusDeviceStatusRepository.save(resources));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DmModbusDeviceStatus resources) {
+        DmModbusDeviceStatus dmModbusDeviceStatus = dmModbusDeviceStatusRepository.findById(resources.getId()).orElseGet(DmModbusDeviceStatus::new);
+        ValidationUtil.isNull( dmModbusDeviceStatus.getId(),"DmModbusDeviceStatus","id",resources.getId());
+        dmModbusDeviceStatus.copy(resources);
+        dmModbusDeviceStatusRepository.save(dmModbusDeviceStatus);
+    }
+
+    @Override
+    public void deleteAll(Long[] ids) {
+        for (Long id : ids) {
+            dmModbusDeviceStatusRepository.deleteById(id);
+        }
+    }
+
+    @Override
+    public void download(List<DmModbusDeviceStatusDto> all, HttpServletResponse response) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (DmModbusDeviceStatusDto dmModbusDeviceStatus : all) {
+            Map<String,Object> map = new LinkedHashMap<>();
+            map.put("设备id", dmModbusDeviceStatus.getDeviceId());
+            map.put("设备状态", dmModbusDeviceStatus.getDeviceStatus());
+            map.put("创建时间", dmModbusDeviceStatus.getCreateTime());
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/mapstruct/DmModbusDeviceStatusMapper.java

@@ -0,0 +1,32 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.modbus.deviceStatus.service.mapstruct;
+
+import me.zhengjie.base.BaseMapper;
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.dto.DmModbusDeviceStatusDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+* @website https://el-admin.vip
+* @author wld
+* @date 2022-05-26
+**/
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DmModbusDeviceStatusMapper extends BaseMapper<DmModbusDeviceStatusDto, DmModbusDeviceStatus> {
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ModbusTask.java

@@ -37,6 +37,8 @@ import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.DmEnvHistoryW
 import me.zhengjie.modules.dm.modbus.channel.domain.DmModbusChannel;
 import me.zhengjie.modules.dm.modbus.data.domain.DmModbusData;
 import me.zhengjie.modules.dm.modbus.device.domain.DmModbusDevice;
+import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
+import me.zhengjie.modules.dm.modbus.deviceStatus.service.DmModbusDeviceStatusService;
 import me.zhengjie.modules.dm.modbus.drive.service.DmModbusDriveService;
 import me.zhengjie.modules.dm.modbus.drive.service.dto.DmModbusDriveDto;
 import me.zhengjie.modules.dm.modbus.group.domain.DmModbusGroup;
@@ -73,6 +75,8 @@ public class ModbusTask {
 
     private final DmEnvHistoryWarnService dmEnvHistoryWarnService;
 
+    private final DmModbusDeviceStatusService dmModbusDeviceStatusService;
+
     @Value("${modbusUrl}")
     private String modbusUrl; // modbus默认地址
     private final int modbusPort = 502; // modbus默认端口号
@@ -309,6 +313,12 @@ public class ModbusTask {
                                                   dmEnvHistoryModbusData.setCreateTime(new Date());
                                                   dmEnvHistoryModbusDataService.create(dmEnvHistoryModbusData);
                                                   log.info("添加的modbus的数据，{}" + JSONObject.toJSONString(dmEnvHistoryModbusData) );
+                                              }else {
+                                                   DmModbusDeviceStatus dmModbusDeviceStatus = new DmModbusDeviceStatus();
+                                                   dmModbusDeviceStatus.setDeviceId(Long.valueOf(F.get()));
+                                                   dmModbusDeviceStatus.setCreateTime(new Timestamp(System.currentTimeMillis()));
+                                                   dmModbusDeviceStatus.setDeviceStatus("0");
+                                                   dmModbusDeviceStatusService.create(dmModbusDeviceStatus);
                                               }
                                           }
                                      });