设备联网、故障完成

device-api-service/src/main/java/com/xy/entity/DeviceErrorsRecord.java

@@ -0,0 +1,53 @@
+package com.xy.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 机器-故障表
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DeviceErrorsRecord对象", description="机器-故障表")
+public class DeviceErrorsRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "设备编号")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "故障类型")
+    private Integer errorType;
+
+    @ApiModelProperty(value = "故障描述")
+    private String errorDescript;
+
+    @ApiModelProperty(value = "上位机版本号")
+    private String appUpmVersion;
+
+    @ApiModelProperty(value = "下位机版本号")
+    private String appDownmVersion;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+
+}

device-api-service/src/main/java/com/xy/entity/DeviceNetRecord.java

@@ -0,0 +1,59 @@
+package com.xy.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 机器-联网记录
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DeviceNetRecord对象", description="机器-联网记录")
+public class DeviceNetRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "机器编号")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer netStatus;
+
+    @ApiModelProperty(value = "联网方式;WIFI,网线，2G，4G..")
+    private Integer netType;
+
+    @ApiModelProperty(value = "ICCID卡号")
+    private String simIccid;
+
+    @ApiModelProperty(value = "信号值")
+    private Integer simDbm;
+
+    @ApiModelProperty(value = "信号类型")
+    private String simSignalType;
+
+    @ApiModelProperty(value = "上位版本号")
+    private String appUpmVerion;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+
+}

device-api-service/src/main/java/com/xy/mapper/DeviceErrorsRecordMapper.java

@@ -0,0 +1,16 @@
+package com.xy.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xy.entity.DeviceErrorsRecord;
+
+/**
+ * <p>
+ * 机器-故障表 Mapper 接口
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+public interface DeviceErrorsRecordMapper extends BaseMapper<DeviceErrorsRecord> {
+
+}

device-api-service/src/main/java/com/xy/mapper/DeviceNetRecordMapper.java

@@ -0,0 +1,16 @@
+package com.xy.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xy.entity.DeviceNetRecord;
+
+/**
+ * <p>
+ * 机器-联网记录 Mapper 接口
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+public interface DeviceNetRecordMapper extends BaseMapper<DeviceNetRecord> {
+
+}

device-api-service/src/main/java/com/xy/service/DeviceErrorsRecordServiceImpl.java

@@ -0,0 +1,59 @@
+package com.xy.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.dto.DeviceErrorsRecordDto;
+import com.xy.entity.DeviceErrorsRecord;
+import com.xy.mapper.DeviceErrorsRecordMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
+
+/**
+ * <p>
+ * 机器-故障表 服务实现类
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@Service
+@AllArgsConstructor
+@Api(tags = "机器-故障表")
+public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecordMapper, DeviceErrorsRecord> implements DeviceErrorsRecordService {
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    private R<PageBean<DeviceErrorsRecordDto.Vo>> page(@RequestBody DeviceErrorsRecordDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaQueryWrapper<DeviceErrorsRecord> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceErrorsRecord.class)
+                .ge(DeviceErrorsRecord::getCreateTime, page.getBeginCreateTime())
+                .le(DeviceErrorsRecord::getCreateTime, page.getEndCreateTime())
+                .build()
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceErrorsRecord::getCreateTime);
+        IPage<DeviceErrorsRecord> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
+        return R.ok(toPageBean(DeviceErrorsRecordDto.Vo.class, iPage));
+    }
+
+    @PostMapping("save")
+    @ApiOperation("添加")
+    public R save(@RequestBody @Validated DeviceErrorsRecordDto.Save save) {
+        DeviceErrorsRecord deviceErrorsRecord = copy(DeviceErrorsRecord.class, save);
+        save(deviceErrorsRecord);
+        return R.ok();
+    }
+
+}

device-api-service/src/main/java/com/xy/service/DeviceNetRecordServiceImpl.java

@@ -0,0 +1,59 @@
+package com.xy.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.dto.DeviceNetRecordDto;
+import com.xy.entity.DeviceNetRecord;
+import com.xy.mapper.DeviceNetRecordMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
+
+/**
+ * <p>
+ * 机器-联网记录 服务实现类
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@Service
+@AllArgsConstructor
+@Api(tags = "机器-联网记录")
+public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMapper, DeviceNetRecord> implements DeviceNetRecordService {
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<DeviceNetRecordDto.Vo>> page(@RequestBody DeviceNetRecordDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaQueryWrapper<DeviceNetRecord> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceNetRecord.class)
+                .ge(DeviceNetRecord::getCreateTime, page.getBeginCreateTime())
+                .le(DeviceNetRecord::getCreateTime, page.getEndCreateTime())
+                .build()
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceNetRecord::getCreateTime);
+        IPage<DeviceNetRecord> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
+        return R.ok(toPageBean(DeviceNetRecordDto.Vo.class, iPage));
+    }
+
+    @PostMapping("save")
+    @ApiOperation("添加")
+    public R save(@RequestBody @Validated DeviceNetRecordDto.Save save) {
+        DeviceNetRecord deviceNetRecord = copy(DeviceNetRecord.class, save);
+        save(deviceNetRecord);
+        return R.ok();
+    }
+
+}

device-api-service/src/main/java/com/xy/service/DeviceQualityServiceImpl.java

@@ -48,7 +48,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
                 .ge(DeviceQuality::getUpdateTime, page.getBeginUpdateTime())
                 .le(DeviceQuality::getUpdateTime, page.getEndUpdateTime())
                 .build()
-                .orderByDesc(Emptys.check(pageBean.getOrders()), DeviceQuality::getCreateTime);
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceQuality::getCreateTime);
         IPage<DeviceQuality> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         return R.ok(toPageBean(DeviceQualityDto.Vo.class, iPage));
     }

device-api-service/src/main/java/com/xy/ztest/Test.java

@@ -0,0 +1,13 @@
+package com.xy.ztest;
+
+import com.xy.utils.MybatisGenerator;
+
+public class Test {
+
+    public static void main(String[] args) {
+        MybatisGenerator.Generator.builder()
+                .author("lijin")
+                .build().create();
+    }
+
+}

device-api/src/main/java/com/xy/dto/DeviceErrorsRecordDto.java

@@ -0,0 +1,86 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 机器-故障表
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+public class DeviceErrorsRecordDto {
+
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty(value = "分页对象", required = true)
+        private PageBean page;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+
+        public LocalDateTime getBeginCreateTime() {
+            return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
+        }
+
+        public LocalDateTime getEndCreateTime() {
+            return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
+        }
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Save extends Vo {
+
+        @NotNull(message = "deviceId不能为空")
+        @ApiModelProperty(value = "设备编号", required = true)
+        private Long deviceId;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty(value = "id")
+        private Integer id;
+
+        @ApiModelProperty(value = "设备编号")
+        private Long deviceId;
+
+        @ApiModelProperty(value = "故障类型")
+        private Integer errorType;
+
+        @ApiModelProperty(value = "故障描述")
+        private String errorDescript;
+
+        @ApiModelProperty(value = "上位机版本号")
+        private String appUpmVersion;
+
+        @ApiModelProperty(value = "下位机版本号")
+        private String appDownmVersion;
+
+        @ApiModelProperty(value = "创建时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime createTime;
+
+
+    }
+
+}

device-api/src/main/java/com/xy/dto/DeviceNetRecordDto.java

@@ -0,0 +1,91 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 机器-联网记录
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+public class DeviceNetRecordDto {
+
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty(value = "分页对象", required = true)
+        private PageBean page;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+
+        public LocalDateTime getBeginCreateTime() {
+            return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
+        }
+
+        public LocalDateTime getEndCreateTime() {
+            return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
+        }
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Save extends Vo {
+
+        @NotNull(message = "deviceId不能为空")
+        @ApiModelProperty(value = "机器编号", required = true)
+        private Long deviceId;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty(value = "id")
+        private Integer id;
+
+        @ApiModelProperty(value = "机器编号")
+        private Long deviceId;
+
+        @ApiModelProperty(value = "状态")
+        private Integer netStatus;
+
+        @ApiModelProperty(value = "联网方式;WIFI,网线，2G，4G..")
+        private Integer netType;
+
+        @ApiModelProperty(value = "ICCID卡号")
+        private String simIccid;
+
+        @ApiModelProperty(value = "信号值")
+        private Integer simDbm;
+
+        @ApiModelProperty(value = "信号类型")
+        private String simSignalType;
+
+        @ApiModelProperty(value = "上位版本号")
+        private String appUpmVerion;
+
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "创建时间")
+        private LocalDateTime createTime;
+
+    }
+
+}

device-api/src/main/java/com/xy/dto/DeviceQualityDto.java

@@ -93,11 +93,11 @@ public class DeviceQualityDto {
         private Integer settingState;
 
         @ApiModelProperty("更新时间")
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
         @ApiModelProperty("创建时间")
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
         @ApiModelProperty("显示状态")

device-api/src/main/java/com/xy/service/DeviceErrorsRecordService.java

@@ -0,0 +1,16 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+
+/**
+ * <p>
+ * 机器-故障表 服务类
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@RestMappingController("/device-errors-record")
+public interface DeviceErrorsRecordService {
+
+}

device-api/src/main/java/com/xy/service/DeviceNetRecordService.java

@@ -0,0 +1,16 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+
+/**
+ * <p>
+ * 机器-联网记录 服务类
+ * </p>
+ *
+ * @author lijin
+ * @since 2023-01-09
+ */
+@RestMappingController("/device-net-record")
+public interface DeviceNetRecordService {
+
+}