Commit aa7286f0 authored by 王蔡翾's avatar 王蔡翾
Browse files

优化

parent f2f9d720
...@@ -28,7 +28,12 @@ public class OperationDoController extends BaseController { ...@@ -28,7 +28,12 @@ public class OperationDoController extends BaseController {
} }
@PostMapping("/save") @PostMapping("/save")
public Result save(@RequestBody OperationDoDTO operationDoDTO) { public Result save(@RequestBody OperationDoDTO operationDoDTO) {
// 判断 operationType 长度是否超过10
if (operationDoDTO.getOperationType() != null && operationDoDTO.getOperationType().length() > 10) {
return Result.fail("长度超过10,请重新输入");
}
return toAjax(operationDoService.save(operationDoDTO)); return toAjax(operationDoService.save(operationDoDTO));
} }
@PutMapping @PutMapping
public Result<OperationDoEntity> update(@RequestBody OperationDoDTO operationDoDTO) { public Result<OperationDoEntity> update(@RequestBody OperationDoDTO operationDoDTO) {
......
...@@ -2,6 +2,7 @@ package com.example.operation_platform.controller; ...@@ -2,6 +2,7 @@ package com.example.operation_platform.controller;
import com.example.operation_platform.model.dto.OperationItemDTO; import com.example.operation_platform.model.dto.OperationItemDTO;
import com.example.operation_platform.model.entity.OperationItem; import com.example.operation_platform.model.entity.OperationItem;
import com.example.operation_platform.model.vo.OperationItemVO;
import com.example.operation_platform.service.OperationItemService; import com.example.operation_platform.service.OperationItemService;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
...@@ -9,6 +10,8 @@ import com.platform.page.TableDataInfo; ...@@ -9,6 +10,8 @@ import com.platform.page.TableDataInfo;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@RestController @RestController
@RequestMapping("/Item") @RequestMapping("/Item")
public class OperationItemController extends BaseController { public class OperationItemController extends BaseController {
...@@ -36,9 +39,9 @@ public class OperationItemController extends BaseController { ...@@ -36,9 +39,9 @@ public class OperationItemController extends BaseController {
return Result.data(null); return Result.data(null);
} }
@GetMapping()//项目详情 @GetMapping()//项目详情
public Result<OperationItem> queryById(@RequestParam(name = "itemId") String itemId) { public Result<List<OperationItemVO>> queryById(@RequestParam(name = "itemId") String itemIdList) {
OperationItem operationItem = operationItemService.getById(itemId);
return Result.data(operationItem); return Result.data(operationItemService.queryByItemId(itemIdList));
} }
} }
package com.example.operation_platform.controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class Test {
@GetMapping("/test")
public String test() {
return "test";
}
}
...@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Objects;
@RestController @RestController
@RequestMapping("/worker") @RequestMapping("/worker")
...@@ -80,7 +81,7 @@ public class WorkerController extends BaseController { ...@@ -80,7 +81,7 @@ public class WorkerController extends BaseController {
if(workerEntity == null){ if(workerEntity == null){
return Result.fail("用户信息不存在"); return Result.fail("用户信息不存在");
} }
if(workerEntity.getPassword().equals(workerDTO.getOldPassword())){ if (!Objects.equals(workerEntity.getPassword(), workerDTO.getOldPassword())) {
return Result.fail("旧密码不正确"); return Result.fail("旧密码不正确");
} }
workerEntity.setPassword(workerDTO.getPassword()); workerEntity.setPassword(workerDTO.getPassword());
......
...@@ -15,8 +15,6 @@ public class OperationDoDTO extends OperationDoEntity { ...@@ -15,8 +15,6 @@ public class OperationDoDTO extends OperationDoEntity {
private Integer pageSize; private Integer pageSize;
private String robotName; private String robotName;
private String stationName; private String stationName;
private LocalDate startTime;
private LocalDate endTime;
private String workerName; private String workerName;
private String status; private String status;
private String username; private String username;
......
...@@ -16,6 +16,4 @@ public class OperationRecordDTO extends TbOperationRecordEntity { ...@@ -16,6 +16,4 @@ public class OperationRecordDTO extends TbOperationRecordEntity {
private Integer droneId; private Integer droneId;
private String username; private String username;
private String stationName; private String stationName;
private Integer run_log_id;
private Integer operation_job_id;
} }
...@@ -22,9 +22,9 @@ public class OperationDoEntity { ...@@ -22,9 +22,9 @@ public class OperationDoEntity {
@TableField("operation_cycle") @TableField("operation_cycle")
private Integer operationCycle;//运维周期 private Integer operationCycle;//运维周期
@TableField("start_time") @TableField("start_time")
private LocalDate startTime; private Date startTime;
@TableField("end_time") @TableField("end_time")
private LocalDate endTime; private Date endTime;
@TableField("status") @TableField("status")
private String status; private String status;
@TableField("finish_time") @TableField("finish_time")
...@@ -39,5 +39,7 @@ public class OperationDoEntity { ...@@ -39,5 +39,7 @@ public class OperationDoEntity {
private Integer runlogOrOperation; private Integer runlogOrOperation;
@TableField("tb_run_log_id") @TableField("tb_run_log_id")
private Integer tbRunLogId; private Integer tbRunLogId;
@TableField("create_time")
private Date createTime;
} }
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date;
@TableName("tb_operation_item") @TableName("tb_operation_item")
@Data @Data
public class OperationItem { public class OperationItem {
...@@ -15,4 +17,6 @@ public class OperationItem { ...@@ -15,4 +17,6 @@ public class OperationItem {
private String operationItem; private String operationItem;
@TableField("operation_guide") @TableField("operation_guide")
private String operationGuide; private String operationGuide;
@TableField("create_time")
private Date createTime;
} }
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor; ...@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
@TableName("tb_operation_job") @TableName("tb_operation_job")
...@@ -24,9 +26,11 @@ public class OperationJob { ...@@ -24,9 +26,11 @@ public class OperationJob {
@TableField("operation_id") @TableField("operation_id")
private Integer operationId; private Integer operationId;
@TableField("start_time") @TableField("start_time")
private LocalDate startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date startTime;
@TableField("end_time") @TableField("end_time")
private LocalDate endTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date endTime;
@TableField("finish_status") @TableField("finish_status")
private Integer finishStatus; private Integer finishStatus;
@TableField("runlog_or_operation") @TableField("runlog_or_operation")
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -25,13 +26,14 @@ public class TbOperationRecordEntity { ...@@ -25,13 +26,14 @@ public class TbOperationRecordEntity {
@TableField("img") @TableField("img")
private String img; private String img;
@TableField("operation_date")//维保日期 @TableField("operation_date")//维保日期
private LocalDate operationDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date operationDate;
@TableField("operation_job_id") @TableField("operation_job_id")
private Integer operationJobId; private Integer operationJobId;
@TableField("note") @TableField("note")
private String note; private String note;
@TableField("runlog_or_operation") @TableField("runlog_or_operation")
private Integer runLogOrOperation; private Integer runlogOrOperation;
} }
...@@ -5,9 +5,6 @@ import com.platform.annotation.Excel; ...@@ -5,9 +5,6 @@ import com.platform.annotation.Excel;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@Data @Data
......
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date;
@TableName("tb_worker") @TableName("tb_worker")
@Data @Data
public class WorkerEntity { public class WorkerEntity {
...@@ -27,5 +29,7 @@ public class WorkerEntity { ...@@ -27,5 +29,7 @@ public class WorkerEntity {
private Integer type; private Integer type;
@TableField("company") @TableField("company")
private String company; private String company;
@TableField("create_time")
private Date createTime;
} }
package com.example.operation_platform.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
@Data
public class JobVO {
private String robotName;
private String stationName;
private String address;
private String operationType;
private String workerName;
private Integer id;
private Integer robotId;
private Integer droneId;
private String warnMessage;
private Integer runLogId;
private String stationId;
private String itemId;
private String operationItems;
//经维度
private String lon;
private String lat;
private Integer operationId;
private String startTime;
private String endTime;
private Integer finishStatus;
private Integer runlogOrOperation;
private LocalDate lastTime;
}
...@@ -3,10 +3,13 @@ package com.example.operation_platform.model.vo; ...@@ -3,10 +3,13 @@ package com.example.operation_platform.model.vo;
import lombok.Data; import lombok.Data;
import java.time.LocalDate;
@Data @Data
public class MessageNeedDataVo { public class MessageNeedDataVo {
private String stationName; private String stationName;
private String robotName; private String robotName;
private String startTime; private LocalDate startTime;
private String operationType; private String operationType;
private Integer operationId;
} }
...@@ -8,7 +8,6 @@ import java.util.Date; ...@@ -8,7 +8,6 @@ import java.util.Date;
@Data @Data
public class OperationDoVO { public class OperationDoVO {
private Integer id; private Integer id;
private String operationJobId;
private String robotName;//设备名称 private String robotName;//设备名称
private String stationName;//泵站名称 private String stationName;//泵站名称
private String operationType;//维保任务 private String operationType;//维保任务
...@@ -23,7 +22,7 @@ public class OperationDoVO { ...@@ -23,7 +22,7 @@ public class OperationDoVO {
private Integer finishTime;//任务持续时间 private Integer finishTime;//任务持续时间
private String operationItems;//维保项目名 private String operationItems;//维保项目名
private String droneId;//无人机id private String droneId;//无人机id
private String lastTime;//最近维保时间 private String lastTime;//下次维保时间
private String runLogId;//告警日志id private String runLogId;//告警日志id
private String createTime;//计划创建时间 private String createTime;//计划创建时间
private String nearTime;//最近维保时间 private String nearTime;//最近维保时间
......
...@@ -6,6 +6,7 @@ import lombok.Data; ...@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
...@@ -18,14 +19,18 @@ public class OperationJobVO extends OperationJob { ...@@ -18,14 +19,18 @@ public class OperationJobVO extends OperationJob {
private Integer id; private Integer id;
private Integer robotId; private Integer robotId;
private Integer droneId; private Integer droneId;
private LocalDate startTime;
private String warnMessage; private String warnMessage;
private Integer runLogId; private Integer runLogId;
private String stationId; private String stationId;
private String itemId; private String itemId;
private String operationItems; private String operationItems;
private Integer runLogOrOperation;
private LocalDate lastTime;
//经维度 //经维度
private String lon; private String lon;
private String lat; private String lat;
private String startTimeStr;
private String endTimeStr;
} }
package com.example.operation_platform.model.vo; package com.example.operation_platform.model.vo;
import com.example.operation_platform.model.entity.TbOperationRecordEntity; import com.example.operation_platform.model.entity.TbOperationRecordEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -15,12 +16,15 @@ public class OperationRecordVO { ...@@ -15,12 +16,15 @@ public class OperationRecordVO {
private String operationType; private String operationType;
private String img; private String img;
private String workerName; private String workerName;
private LocalDate operationDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date operationDate;
private Integer id; private Integer id;
private String note; private String note;
private String warnMessage; private String warnMessage;
private Integer runLogId; private Integer runLogId;
private Date nearTime; private Date nearTime;
private Integer operationJobId;
private String operationItems;
} }
...@@ -8,5 +8,6 @@ import lombok.EqualsAndHashCode; ...@@ -8,5 +8,6 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class RunLogVO extends RunLogEntity { public class RunLogVO extends RunLogEntity {
private String droneName;
} }
...@@ -3,6 +3,7 @@ package com.example.operation_platform.model.vo; ...@@ -3,6 +3,7 @@ package com.example.operation_platform.model.vo;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
@Data @Data
public class RunLogWarnMessageVO { public class RunLogWarnMessageVO {
...@@ -10,6 +11,6 @@ public class RunLogWarnMessageVO { ...@@ -10,6 +11,6 @@ public class RunLogWarnMessageVO {
private Integer runLogId; private Integer runLogId;
private String robotName; private String robotName;
private String stationName; private String stationName;
private LocalDate startTime; private Date startTime;
private String WarnMessage; private String WarnMessage;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment