Commit 7b817d2a authored by 王蔡翾's avatar 王蔡翾
Browse files

初始化

parent 42848b59
...@@ -65,6 +65,16 @@ ...@@ -65,6 +65,16 @@
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.6.2</version> <version>1.6.2</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.28</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.3.3</version>
</dependency>
<!-- hutool --> <!-- hutool -->
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
...@@ -93,6 +103,20 @@ ...@@ -93,6 +103,20 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>com.ruzhoukj</groupId>
<artifactId>common-sms</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
......
...@@ -11,6 +11,7 @@ import com.platform.page.TableDataInfo; ...@@ -11,6 +11,7 @@ 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//接口方法返回对象,转换成json文本 @RestController//接口方法返回对象,转换成json文本
@RequestMapping("/guide") @RequestMapping("/guide")
...@@ -27,11 +28,14 @@ public class GuideController extends BaseController { ...@@ -27,11 +28,14 @@ public class GuideController extends BaseController {
return Result.data(guideService.queryByName(name)); return Result.data(guideService.queryByName(name));
} }
@PutMapping//维保类型编辑 @PutMapping//维保类型编辑
public Result<GuideEntity> update(@RequestBody GuideDTO guideDTO) { public Result<GuideVO> update(@RequestBody GuideDTO guideDTO) {
// 调用Service更新 // 调用Service更新
boolean success = guideService.updateById(guideDTO); guideService.updateall(guideDTO);
// 返回操作结果 // 返回操作结果
return toAjax(success); return Result.success("编辑成功");
}
@GetMapping("/all")
public Result<List<GuideVO>> queryAll(GuideDTO guideDTO) {
return Result.data(guideService.queryguidelist(guideDTO));
} }
} }
...@@ -4,7 +4,9 @@ import com.example.operation_platform.model.dto.MessageDTO; ...@@ -4,7 +4,9 @@ import com.example.operation_platform.model.dto.MessageDTO;
import com.example.operation_platform.model.dto.WorkerDTO; import com.example.operation_platform.model.dto.WorkerDTO;
import com.example.operation_platform.model.entity.MessageEntity; import com.example.operation_platform.model.entity.MessageEntity;
import com.example.operation_platform.model.entity.WorkerEntity; import com.example.operation_platform.model.entity.WorkerEntity;
import com.example.operation_platform.model.vo.MessageVO;
import com.example.operation_platform.model.vo.PeopleMessageVO; import com.example.operation_platform.model.vo.PeopleMessageVO;
import com.example.operation_platform.model.vo.RobotAndDrone;
import com.example.operation_platform.service.MessageService; import com.example.operation_platform.service.MessageService;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
...@@ -12,6 +14,7 @@ import com.platform.page.TableDataInfo; ...@@ -12,6 +14,7 @@ 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//接口方法返回对象,转换成json文本 @RestController//接口方法返回对象,转换成json文本
@RequestMapping("/robot") @RequestMapping("/robot")
...@@ -35,13 +38,21 @@ public class MessageController extends BaseController { ...@@ -35,13 +38,21 @@ public class MessageController extends BaseController {
return Result.success("重置成功"); return Result.success("重置成功");
} }
@GetMapping() @GetMapping()
public Result<PeopleMessageVO> queryPeople(@RequestParam(name = "stationId")Long stationId, @RequestParam(name = "robotId") Long robotId) { public Result<PeopleMessageVO> queryPeople(@RequestParam(name = "stationId")Long stationId) {
return Result.data(messageService.queryPeople(stationId,robotId)); return Result.data(messageService.queryPeople(stationId));
} }
@PostMapping("page/message") @PostMapping("page/message")
public TableDataInfo pageMessage(@RequestBody MessageDTO messageDTO) { public TableDataInfo pageMessage(@RequestBody MessageDTO messageDTO) {
startPage(messageDTO.getPageNum(), messageDTO.getPageSize()); startPage(messageDTO.getPageNum(), messageDTO.getPageSize());
return getDataTable(messageService.querymessageList(messageDTO)); return getDataTable(messageService.querymessageList(messageDTO));
} }
@GetMapping("/id")
public Result<MessageVO> queryById(@RequestParam(name = "stationId")String stationId, @RequestParam(name = "robotId",required = false)Long robotId,@RequestParam(name = "droneId",required = false)Long droneId) {
return Result.data(messageService.querypeopleId(stationId,robotId,droneId));
}
@GetMapping("/stationid")
public Result<List<RobotAndDrone>> queryBystationId(@RequestParam(name = "stationId")String stationId) {
return Result.data(messageService.queryrobotBystationId(stationId));
}
} }
package com.example.operation_platform.controller;
import com.example.operation_platform.task.OperationDoTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/task")
public class TaskController {
@Autowired
private OperationDoTask operationDoTask;
@GetMapping("/run-task")
public String runTask() {
operationDoTask.runScheduleOperationJobsNow();
return "定时任务已手动触发";
}
}
...@@ -25,7 +25,19 @@ public class WorkerController extends BaseController { ...@@ -25,7 +25,19 @@ public class WorkerController extends BaseController {
} }
@PostMapping("/save")//人员新增 @PostMapping("/save")//人员新增
public Result save(@RequestBody WorkerDTO workerDTO) { public Result save(@RequestBody WorkerDTO workerDTO) {
return toAjax(workerService.save(workerDTO)); boolean success = workerService.save(workerDTO);
if (success) {
// 获取新插入的 workerId
Integer workerId = workerDTO.getId(); // 假设 workerDTO 中有 id 字段
// 检查 username 是否为空
boolean isUsernameEmpty = workerService.isUsernameEmpty(workerId);
if (isUsernameEmpty)
return Result.fail("账号重复");
else
return Result.success("新增成功");
}
return Result.fail("添加失败");
} }
@PutMapping//人员更新 @PutMapping//人员更新
public Result<WorkerEntity> update(@RequestBody WorkerDTO workerDTO) { public Result<WorkerEntity> update(@RequestBody WorkerDTO workerDTO) {
......
...@@ -22,4 +22,5 @@ public interface GuideMapper extends BaseMapper<GuideEntity> { ...@@ -22,4 +22,5 @@ public interface GuideMapper extends BaseMapper<GuideEntity> {
* @return GuideVO * @return GuideVO
*/ */
List<GuideVO> queryguidelist(GuideDTO guideDTO); List<GuideVO> queryguidelist(GuideDTO guideDTO);
void updateall(GuideDTO guideDTO);
} }
...@@ -5,7 +5,9 @@ import com.example.operation_platform.model.dto.MessageDTO; ...@@ -5,7 +5,9 @@ import com.example.operation_platform.model.dto.MessageDTO;
import com.example.operation_platform.model.entity.MessageEntity; import com.example.operation_platform.model.entity.MessageEntity;
import com.example.operation_platform.model.vo.MessageVO; import com.example.operation_platform.model.vo.MessageVO;
import com.example.operation_platform.model.vo.PeopleMessageVO; import com.example.operation_platform.model.vo.PeopleMessageVO;
import com.example.operation_platform.model.vo.RobotAndDrone;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
...@@ -28,7 +30,7 @@ public interface MessageMapper extends BaseMapper<MessageEntity> { ...@@ -28,7 +30,7 @@ public interface MessageMapper extends BaseMapper<MessageEntity> {
* 人员信息列表 * 人员信息列表
* @param stationId stationId * @param stationId stationId
*/ */
PeopleMessageVO queryPeople(@Param("stationId") Long stationId, @Param("robotId") Long robotId); PeopleMessageVO queryPeople(@Param("stationId") Long stationId);
/** /**
* 查询泵站人员信息列表 * 查询泵站人员信息列表
* *
...@@ -36,5 +38,12 @@ public interface MessageMapper extends BaseMapper<MessageEntity> { ...@@ -36,5 +38,12 @@ public interface MessageMapper extends BaseMapper<MessageEntity> {
* @return List<PeopleMessageVO> * @return List<PeopleMessageVO>
*/ */
List<PeopleMessageVO> querymessageList(MessageDTO messageDTO); List<PeopleMessageVO> querymessageList(MessageDTO messageDTO);
MessageVO querypeopleId(@Param("stationId") String stationId, @Param("robotId") @RequestParam(required = false)Long robotId, @Param("droneId") @RequestParam(required = false) Long droneId);
/*
* 根据泵站id查询智能设备信息
* @param stationId stationId
* @return List<RobotAndDrone>
*/
List<RobotAndDrone> queryrobotBystationId(String stationId);
} }
...@@ -3,7 +3,10 @@ package com.example.operation_platform.mapper; ...@@ -3,7 +3,10 @@ package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.dto.OperationDoDTO; import com.example.operation_platform.model.dto.OperationDoDTO;
import com.example.operation_platform.model.entity.OperationDoEntity; import com.example.operation_platform.model.entity.OperationDoEntity;
import com.example.operation_platform.model.vo.MessageNeedDataVo;
import com.example.operation_platform.model.vo.OperationDoVO; import com.example.operation_platform.model.vo.OperationDoVO;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
public interface OperationDoMapper extends BaseMapper<OperationDoEntity> { public interface OperationDoMapper extends BaseMapper<OperationDoEntity> {
...@@ -20,6 +23,7 @@ public interface OperationDoMapper extends BaseMapper<OperationDoEntity> { ...@@ -20,6 +23,7 @@ public interface OperationDoMapper extends BaseMapper<OperationDoEntity> {
* @return OperationVO * @return OperationVO
*/ */
void stopDo(OperationDoDTO operationDoDTO); void stopDo(OperationDoDTO operationDoDTO);
MessageNeedDataVo querymessage(@Param("id") Integer id);
} }
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.model.vo.OperationItemVO;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
public interface OperationItemMapper extends BaseMapper<OperationItem> { public interface OperationItemMapper extends BaseMapper<OperationItem> {
...@@ -14,4 +16,6 @@ public interface OperationItemMapper extends BaseMapper<OperationItem> { ...@@ -14,4 +16,6 @@ public interface OperationItemMapper extends BaseMapper<OperationItem> {
* @return List<WorkerVO> * @return List<WorkerVO>
*/ */
List<OperationItemVO> queryItemList(OperationItemDTO operationItemDTO); List<OperationItemVO> queryItemList(OperationItemDTO operationItemDTO);
List<OperationItem> queryByIdList(@Param("itemIdList") List<String> itemIdList);
} }
...@@ -12,4 +12,7 @@ public class OperationJobDTO extends OperationJob { ...@@ -12,4 +12,7 @@ public class OperationJobDTO extends OperationJob {
private String stationName; private String stationName;
private String workerName; private String workerName;
private Integer status; private Integer status;
private String operationType;
private Integer finishStatus;
} }
...@@ -9,12 +9,8 @@ import lombok.Data; ...@@ -9,12 +9,8 @@ import lombok.Data;
@TableName("tb_guide") @TableName("tb_guide")
@Data @Data
public class GuideEntity { public class GuideEntity {
@TableId(type = IdType.AUTO)//主键自增 @TableField("robotcontent")
private Integer id; private String robotcontent;
@TableField("name") @TableField("stationcontent")
private String name; private String stationcontent;
@TableField("img")
private String img;
@TableField("content")
private String content;
} }
...@@ -14,11 +14,7 @@ public class MessageEntity { ...@@ -14,11 +14,7 @@ public class MessageEntity {
@TableField("robot_id") @TableField("robot_id")
private Integer robotId; private Integer robotId;
@TableField("station_id") @TableField("station_id")
private Long stationId; private String stationId;
@TableField("people_name")
private String peopleName;
@TableField("phone_number")
private String phoneNumber;
@TableField("software_worker") @TableField("software_worker")
private String softwareWorker; private String softwareWorker;
@TableField("hardware_worker") @TableField("hardware_worker")
...@@ -29,5 +25,7 @@ public class MessageEntity { ...@@ -29,5 +25,7 @@ public class MessageEntity {
private String warnMessage; private String warnMessage;
@TableField("operation_message") @TableField("operation_message")
private String operationMessage; private String operationMessage;
@TableField("drone_id")
private String droneId;
} }
...@@ -17,8 +17,6 @@ public class OperationDoEntity { ...@@ -17,8 +17,6 @@ public class OperationDoEntity {
private String stationId;//泵站Id private String stationId;//泵站Id
@TableField("robot_id") @TableField("robot_id")
private Integer robotId;//机器人Id private Integer robotId;//机器人Id
@TableField("worker_id")
private Integer workerId;//维保人Id
@TableField("operation_type") @TableField("operation_type")
private String operationType;//维保任务 private String operationType;//维保任务
@TableField("operation_cycle") @TableField("operation_cycle")
...@@ -31,8 +29,15 @@ public class OperationDoEntity { ...@@ -31,8 +29,15 @@ public class OperationDoEntity {
private String status; private String status;
@TableField("finish_time") @TableField("finish_time")
private Integer finishTime; private Integer finishTime;
@TableField(exist = false)
private Integer CompletionTime; private Integer CompletionTime;
@TableField("item_id") @TableField("item_id")
private String itemId; private String itemId;
@TableField("drone_id")
private String droneId;
@TableField("runlog_or_operation")
private Integer runlogOrOperation;
@TableField("tb_run_log_id")
private Integer tbRunLogId;
} }
...@@ -29,6 +29,8 @@ public class OperationJob { ...@@ -29,6 +29,8 @@ public class OperationJob {
private LocalDate endTime; private LocalDate endTime;
@TableField("finish_status") @TableField("finish_status")
private Integer finishStatus; private Integer finishStatus;
@TableField("runlog_or_operation")
private Integer runlogOrOperation;
} }
...@@ -6,6 +6,8 @@ import lombok.Data; ...@@ -6,6 +6,8 @@ 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
...@@ -15,13 +17,15 @@ public class UavOperateLogEntity { ...@@ -15,13 +17,15 @@ public class UavOperateLogEntity {
@Id @Id
private String id; private String id;
@Excel(name = "时间")
private Date dataTime; private Date dataTime;
@Excel(name = "内容") @Excel(name = "内容")
private String content; private String content;
@TableField("run_log_id") @TableField(exist = false)
private Integer runLogId; private String dataTimeStr;
// @TableField("run_log_id")
// private Integer runLogId;
} }
...@@ -13,7 +13,7 @@ public class WorkerEntity { ...@@ -13,7 +13,7 @@ public class WorkerEntity {
private Integer id; private Integer id;
@TableField("username") @TableField("username")
private String username; private String username;
@TableField("term") @TableField(exist = false)
private String term; private String term;
@TableField("img") @TableField("img")
private String img; private String img;
......
...@@ -7,8 +7,6 @@ import lombok.EqualsAndHashCode; ...@@ -7,8 +7,6 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class GuideVO extends GuideEntity { public class GuideVO extends GuideEntity {
private Integer id;
private String img;
private String content;
} }
package com.example.operation_platform.model.vo;
import lombok.Data;
@Data
public class MessageNeedDataVo {
private String stationName;
private String robotName;
private String startTime;
private String operationType;
}
...@@ -12,4 +12,16 @@ public class MessageVO { ...@@ -12,4 +12,16 @@ public class MessageVO {
private String address; private String address;
private String stationId; private String stationId;
private String robotId; private String robotId;
private String peopleId;
private String softwareWorker;
private String hardwareWorker;
private String operationWorker;
private String warnMessage;
private String operationMessage;
private String droneId;
private Integer hardwareWorkerId;
private Integer operationWorkerId;
private Integer softwareWorkerId;
private String warnMessageNames;
private String operationMessageNames;
} }
...@@ -8,12 +8,19 @@ import java.util.Date; ...@@ -8,12 +8,19 @@ import java.util.Date;
@Data @Data
public class OperationDoVO { public class OperationDoVO {
private Integer id; private Integer id;
private String robotName; private String robotName;//设备名称
private String stationName; private String stationName;//泵站名称
private String operationType; private String operationType;//维保任务
private LocalDate startTime; private LocalDate startTime;//开始时间
private String workerName; private String workerName;//维保负责人
private Integer operationCycle; private Integer operationCycle;//维保周期
private String status; private String status;//状态
private String stationId;//泵站id
private Integer robotId;//机器人id
private Integer workerId;//维保负责人id
private String itemId;//维保项目id
private Integer finishTime;//任务持续时间
private String operationItems;//维保项目名
private String droneId;//无人机id
private String lastTime;//最近维保时间
} }
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