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

初始化

parent 7b817d2a
...@@ -37,9 +37,9 @@ public class MessageController extends BaseController { ...@@ -37,9 +37,9 @@ public class MessageController extends BaseController {
messageService.resetmessage(messageDTO); messageService.resetmessage(messageDTO);
return Result.success("重置成功"); return Result.success("重置成功");
} }
@GetMapping() @PostMapping("/phone/number")
public Result<PeopleMessageVO> queryPeople(@RequestParam(name = "stationId")Long stationId) { public Result<PeopleMessageVO> queryPeople(@RequestBody MessageDTO messageDTO) {
return Result.data(messageService.queryPeople(stationId)); return Result.data(messageService.queryPeople(messageDTO));
} }
@PostMapping("page/message") @PostMapping("page/message")
public TableDataInfo pageMessage(@RequestBody MessageDTO messageDTO) { public TableDataInfo pageMessage(@RequestBody MessageDTO messageDTO) {
...@@ -54,5 +54,9 @@ public class MessageController extends BaseController { ...@@ -54,5 +54,9 @@ public class MessageController extends BaseController {
public Result<List<RobotAndDrone>> queryBystationId(@RequestParam(name = "stationId")String stationId) { public Result<List<RobotAndDrone>> queryBystationId(@RequestParam(name = "stationId")String stationId) {
return Result.data(messageService.queryrobotBystationId(stationId)); return Result.data(messageService.queryrobotBystationId(stationId));
} }
@GetMapping("/username")
public Result<List<MessageVO>> queryByworker(@RequestParam(name = "username")String username) {
return Result.data(messageService.querystationByworker(username));
}
} }
...@@ -46,4 +46,5 @@ public class OperationDoController extends BaseController { ...@@ -46,4 +46,5 @@ public class OperationDoController extends BaseController {
} }
} }
...@@ -35,5 +35,10 @@ public class OperationItemController extends BaseController { ...@@ -35,5 +35,10 @@ public class OperationItemController extends BaseController {
operationItemService.removeById(itemId); operationItemService.removeById(itemId);
return Result.data(null); return Result.data(null);
} }
@GetMapping()//项目详情
public Result<OperationItem> queryById(@RequestParam(name = "itemId") String itemId) {
OperationItem operationItem = operationItemService.getById(itemId);
return Result.data(operationItem);
}
} }
...@@ -28,5 +28,15 @@ public class OperationJobController extends BaseController { ...@@ -28,5 +28,15 @@ public class OperationJobController extends BaseController {
public Result save(@RequestBody OperationJobDTO operationJobDTO) { public Result save(@RequestBody OperationJobDTO operationJobDTO) {
return toAjax(operationJobService.save(operationJobDTO)); return toAjax(operationJobService.save(operationJobDTO));
} }
@PostMapping("page/date")
public TableDataInfo pageByDate(@RequestBody OperationJobDTO operationJobDTO) {
startPage(operationJobDTO.getPageNum(), operationJobDTO.getPageSize());
return getDataTable(operationJobService.queryJobListByDate(operationJobDTO));
}
@PostMapping("page/all")
public TableDataInfo pageAll(@RequestBody OperationJobDTO operationJobDTO) {
startPage(operationJobDTO.getPageNum(), operationJobDTO.getPageSize());
return getDataTable(operationJobService.queryAllJobList(operationJobDTO));
}
} }
...@@ -28,11 +28,15 @@ public class OperationRecordController extends BaseController { ...@@ -28,11 +28,15 @@ public class OperationRecordController extends BaseController {
public Result save(@RequestBody OperationRecordDTO operationRecordDTO) { public Result save(@RequestBody OperationRecordDTO operationRecordDTO) {
return toAjax(tbOperationRecordService.save(operationRecordDTO)); return toAjax(tbOperationRecordService.save(operationRecordDTO));
} }
@GetMapping() @GetMapping()//没用到,不必理会
public Result<List<OperationRecordVO>> queryrecordListById(@RequestParam(name = "stationId")Long stationId, @RequestParam(name = "robotId") Long robotId) { public Result<List<OperationRecordVO>> queryrecordListById(@RequestParam(name = "stationId")String stationId, @RequestParam(name = "robotId") Long robotId) {
return Result.data(tbOperationRecordService.queryrecordListById(stationId,robotId)); return Result.data(tbOperationRecordService.queryrecordListById(stationId,robotId));
} }
@PostMapping("/page/run")
public TableDataInfo pageRun(@RequestBody OperationRecordDTO operationRecordDTO) {
startPage(operationRecordDTO.getPageNum(), operationRecordDTO.getPageSize());
return getDataTable(tbOperationRecordService.queryRunLogRecordList(operationRecordDTO));
}
} }
...@@ -34,4 +34,5 @@ public class RunLogController extends BaseController { ...@@ -34,4 +34,5 @@ public class RunLogController extends BaseController {
public void download(@PathVariable("id") String id, HttpServletResponse response) { public void download(@PathVariable("id") String id, HttpServletResponse response) {
runLogService.download(id,response); runLogService.download(id,response);
} }
} }
...@@ -28,9 +28,9 @@ public interface MessageMapper extends BaseMapper<MessageEntity> { ...@@ -28,9 +28,9 @@ public interface MessageMapper extends BaseMapper<MessageEntity> {
void resetmessage(MessageDTO messageDTO); void resetmessage(MessageDTO messageDTO);
/* /*
* 人员信息列表 * 人员信息列表
* @param stationId stationId * @param messageDTO messageDTO
*/ */
PeopleMessageVO queryPeople(@Param("stationId") Long stationId); PeopleMessageVO queryPeople(MessageDTO messageDTO);
/** /**
* 查询泵站人员信息列表 * 查询泵站人员信息列表
* *
...@@ -46,4 +46,11 @@ public interface MessageMapper extends BaseMapper<MessageEntity> { ...@@ -46,4 +46,11 @@ public interface MessageMapper extends BaseMapper<MessageEntity> {
* @return List<RobotAndDrone> * @return List<RobotAndDrone>
*/ */
List<RobotAndDrone> queryrobotBystationId(String stationId); List<RobotAndDrone> queryrobotBystationId(String stationId);
/**
* 根据username查询关联站点
*
* @param username username
* @return List<RobotAndDrone>
*/
List<MessageVO> querystationByworker(String username);
} }
...@@ -18,4 +18,12 @@ public interface OperationItemMapper extends BaseMapper<OperationItem> { ...@@ -18,4 +18,12 @@ public interface OperationItemMapper extends BaseMapper<OperationItem> {
List<OperationItemVO> queryItemList(OperationItemDTO operationItemDTO); List<OperationItemVO> queryItemList(OperationItemDTO operationItemDTO);
List<OperationItem> queryByIdList(@Param("itemIdList") List<String> itemIdList); List<OperationItem> queryByIdList(@Param("itemIdList") List<String> itemIdList);
/**
* 根据itemId查询维保项目
*
* @param itemIdList itemIdList
* @return List<OperationItemVO>
*/
List<OperationItemVO> queryByItemId(String itemIdList);
} }
...@@ -14,4 +14,16 @@ public interface OperationJobMapper extends BaseMapper<OperationJob> { ...@@ -14,4 +14,16 @@ public interface OperationJobMapper extends BaseMapper<OperationJob> {
* @return * @return
*/ */
List<OperationJobVO> queryJobList(OperationJobDTO operationJobDTO); List<OperationJobVO> queryJobList(OperationJobDTO operationJobDTO);
/**
* 根据日期查询任务列表
* @param operationJobDTO
* @return
*/
List<OperationJobVO> queryJobListByDate(OperationJobDTO operationJobDTO);
/**
* 展示所有任务,告警优先展示,finish_status=1为告警,=0为维保
* @param operationJobDTO
* @return
*/
List<OperationJobVO> queryAllJobList(OperationJobDTO operationJobDTO);
} }
...@@ -20,6 +20,11 @@ public interface TbOperationRecordMapper extends BaseMapper<TbOperationRecordEnt ...@@ -20,6 +20,11 @@ public interface TbOperationRecordMapper extends BaseMapper<TbOperationRecordEnt
* @param operationRecordDTO operationRecordDTO * @param operationRecordDTO operationRecordDTO
* @return List<OperationRecordVO> * @return List<OperationRecordVO>
*/ */
List<OperationRecordVO> queryrecordListById(long stationId,long robotId); List<OperationRecordVO> queryrecordListById(String stationId,long robotId);
/*运行异常维保记录
* @param operationRecordDTO operationRecordDTO
* @return List<OperationRecordVO>
*/
List<OperationRecordVO> queryRunLogRecordList(OperationRecordDTO operationRecordDTO);
} }
...@@ -19,4 +19,6 @@ public class OperationDoDTO extends OperationDoEntity { ...@@ -19,4 +19,6 @@ public class OperationDoDTO extends OperationDoEntity {
private LocalDate endTime; private LocalDate endTime;
private String workerName; private String workerName;
private String status; private String status;
private String username;
private Integer id;
} }
...@@ -3,6 +3,9 @@ import com.example.operation_platform.model.entity.OperationJob; ...@@ -3,6 +3,9 @@ import com.example.operation_platform.model.entity.OperationJob;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.naming.ldap.PagedResultsControl;
import java.time.LocalDate;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class OperationJobDTO extends OperationJob { public class OperationJobDTO extends OperationJob {
...@@ -14,5 +17,10 @@ public class OperationJobDTO extends OperationJob { ...@@ -14,5 +17,10 @@ public class OperationJobDTO extends OperationJob {
private Integer status; private Integer status;
private String operationType; private String operationType;
private Integer finishStatus; private Integer finishStatus;
private String username;
private LocalDate date;
private Integer year;
private Integer month;
private Integer stationId;
} }
...@@ -13,5 +13,6 @@ public class OperationRecordDTO extends TbOperationRecordEntity { ...@@ -13,5 +13,6 @@ public class OperationRecordDTO extends TbOperationRecordEntity {
private Integer pageSize; private Integer pageSize;
private Integer robotId; private Integer robotId;
private Long stationId; private Long stationId;
private Integer droneId;
} }
...@@ -24,10 +24,6 @@ public class TbOperationRecordEntity { ...@@ -24,10 +24,6 @@ public class TbOperationRecordEntity {
@TableField("img") @TableField("img")
private String img; private String img;
@TableField("worker_id")
private String workerId;
@TableField("operation_date")//维保日期 @TableField("operation_date")//维保日期
private LocalDate operationDate; private LocalDate operationDate;
@TableField("operation_job_id") @TableField("operation_job_id")
......
...@@ -25,7 +25,7 @@ public class UavOperateLogEntity { ...@@ -25,7 +25,7 @@ public class UavOperateLogEntity {
@TableField(exist = false) @TableField(exist = false)
private String dataTimeStr; private String dataTimeStr;
// @TableField("run_log_id") @TableField("run_log_id")
// private Integer runLogId; private Integer runLogId;
} }
...@@ -18,7 +18,7 @@ public class MessageVO { ...@@ -18,7 +18,7 @@ public class MessageVO {
private String operationWorker; private String operationWorker;
private String warnMessage; private String warnMessage;
private String operationMessage; private String operationMessage;
private String droneId; private Integer droneId;
private Integer hardwareWorkerId; private Integer hardwareWorkerId;
private Integer operationWorkerId; private Integer operationWorkerId;
private Integer softwareWorkerId; private Integer softwareWorkerId;
......
...@@ -9,7 +9,7 @@ public class PeopleMessageVO { ...@@ -9,7 +9,7 @@ public class PeopleMessageVO {
private String softwareWorker; private String softwareWorker;
private String hardwareWorker; private String hardwareWorker;
private String operationWorker; private String operationWorker;
private Long peopleNumber; private Long phoneNumber;
private Long softwareNumber; private Long softwareNumber;
private Long hardwareNumber; private Long hardwareNumber;
private Long operationNumber; private Long operationNumber;
......
...@@ -30,8 +30,9 @@ public interface MessageService extends IService<MessageEntity> { ...@@ -30,8 +30,9 @@ public interface MessageService extends IService<MessageEntity> {
* 根据泵站查询人员信息列表 * 根据泵站查询人员信息列表
* @param stationId stationId * @param stationId stationId
*/ */
PeopleMessageVO queryPeople(Long stationId); PeopleMessageVO queryPeople(MessageDTO messageDTO);
/** /**
*
* 查询泵站人员信息列表 * 查询泵站人员信息列表
* *
* @param messageDTO messageDTO * @param messageDTO messageDTO
...@@ -45,4 +46,11 @@ public interface MessageService extends IService<MessageEntity> { ...@@ -45,4 +46,11 @@ public interface MessageService extends IService<MessageEntity> {
* @return List<MessageVO> * @return List<MessageVO>
*/ */
List<RobotAndDrone> queryrobotBystationId(String stationId); List<RobotAndDrone> queryrobotBystationId(String stationId);
/**
* 根据username查询关联站点
*
* @param username username
* @return List<RobotAndDrone>
*/
List<MessageVO> querystationByworker(String username);
} }
...@@ -7,4 +7,5 @@ import java.util.List; ...@@ -7,4 +7,5 @@ import java.util.List;
public interface OperateLogService { public interface OperateLogService {
List<UavOperateLogEntity> queryListByRunLogId(String id); List<UavOperateLogEntity> queryListByRunLogId(String id);
} }
...@@ -24,4 +24,11 @@ public interface OperationItemService extends IService<OperationItem> { ...@@ -24,4 +24,11 @@ public interface OperationItemService extends IService<OperationItem> {
* @return List<OperationItem> * @return List<OperationItem>
*/ */
List<OperationItem> queryByIdList(List<String> strings); List<OperationItem> queryByIdList(List<String> strings);
/**
* 根据itemId查询维保项目
*
* @param itemIdList itemIdList
* @return List<OperationItemVO>
*/
List<OperationItemVO> queryByItemId(String itemIdList);
} }
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