skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/fegin/INkyClient.java
@@ -42,6 +42,8 @@ String UPDATE_ALARM_GET_STATUS= API_PREFIX + "updateAlarmGetStatus"; String FINISH_TASK = API_PREFIX + "finishTask"; /** * 获取arima预测结果 * @param type @@ -92,4 +94,7 @@ @PostMapping(UPDATE_ALARM_GET_STATUS) Boolean updateStatus(@RequestBody AlarmGet alarmGet); @GetMapping(FINISH_TASK) Boolean finishTask(@RequestParam("taskId") String taskId); } skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/fegin/INkyClientFallback.java
@@ -61,5 +61,10 @@ return null; } @Override public Boolean finishTask(String taskId) { return null; } } skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java
@@ -9,6 +9,7 @@ import cn.gistack.nky.vo.AlarmGetVO; import cn.gistack.nky.vo.PageVO; import cn.gistack.sm.patrol.feign.PatrolTaskClient; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -138,4 +139,19 @@ public Boolean updateStatus(AlarmGet alarmGet) { return alarmGetService.updateById(alarmGet); } @Override @GetMapping(FINISH_TASK) public Boolean finishTask(String taskId) { AlarmGet alarmGet = alarmGetService.getOne(new QueryWrapper<AlarmGet>().eq("TASK_ID", taskId)); if (alarmGet != null){ //设置预警为已处理 alarmGet.setStatus("1"); Boolean aBoolean = updateStatus(alarmGet); return aBoolean; } return false; } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -5,6 +5,7 @@ import cn.gistack.flow.core.feign.IFlowClient; import cn.gistack.flow.core.utils.FlowUtil; import cn.gistack.flow.core.utils.TaskUtil; import cn.gistack.nky.fegin.INkyClient; import cn.gistack.sm.patrol.entity.PatrolRecord; import cn.gistack.sm.patrol.entity.PatrolReport; import cn.gistack.sm.patrol.entity.PatrolTask; @@ -18,6 +19,7 @@ import cn.gistack.sm.patrol.vo.PatrolTaskReport; import cn.gistack.sm.patrol.vo.PatrolTaskVO; import cn.gistack.sm.patrol.vo.TaskStatusCount; import cn.gistack.sm.sjztmd.service.IWaterDataTermitesService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.log.exception.ServiceException; @@ -46,6 +48,8 @@ private final IFlowClient flowClient; private final IPatrolRecordService patrolRecordService; private final IPatrolReportService patrolReportService; private final INkyClient nkyClient; private final IWaterDataTermitesService waterDataTermitesService; /** * 自定义分页查询 @@ -160,6 +164,15 @@ //保存上报 //停用 // saveReport(patrolTask); //查监测预警表，看是否有这个任务，有的话修改任务状态 Boolean finishDamTask = nkyClient.finishTask(patrolTask.getId().toString()); if (!finishDamTask){ //查白蚁表，看是否有这个任务，有的话修改任务状态 Boolean finishTermitesTask = waterDataTermitesService.finishTask(patrolTask.getId().toString()); } return baseMapper.updateById(patrolTask) >0; }else { return false; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/WaterDataTermitesController.java
New file @@ -0,0 +1,37 @@ package cn.gistack.sm.sjztmd.controller; import cn.gistack.nky.entity.AlarmGet; import cn.gistack.sm.sjztmd.entity.WaterDataTermites; import cn.gistack.sm.sjztmd.service.IWaterDataTermitesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Slf4j @Api(tags = "白蚁监测数据") @RestController @RequestMapping("/sjztmd/waterDataTermites") @AllArgsConstructor public class WaterDataTermitesController { private final IWaterDataTermitesService waterDataTermitesService; /** * 状态修改 * @param waterDataTermites * @return */ @PostMapping("/updateStatus") @ApiOperation(value = "白蚁-状态修改", notes = "白蚁-白蚁状态修改") public R updateStatus(WaterDataTermites waterDataTermites){ return R.data(waterDataTermitesService.updateStatus(waterDataTermites)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/WaterDataTermites.java
New file @@ -0,0 +1,135 @@ package cn.gistack.sm.sjztmd.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * 白蚁数据监测实体类 * * @author Chill */ @Data @TableName("\"water_data_termites\"") @ApiModel(value = "行政区划对象", description = "行政区划对象") public class WaterDataTermites implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") @TableField("\"id\"") @TableId("\"id\"") private Integer id; /** * 中心站地址 */ @ApiModelProperty(value = "中心站地址") @TableField("\"station_id\"") private Integer stationId; /** * * 站点名称 */ @ApiModelProperty(value = "站点名称") @TableField("\"station_name\"") private String stationName; /** * 设备id */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "设备id") @TableField("\"device_id\"") private Integer deviceId; /** * 设备名称 */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "设备名称") @TableField("\"device_name\"") private String deviceName; /** * 设备编码 */ @ApiModelProperty(value = "设备编码") @TableField("\"mn_no\"") private String mnNo; /** * 白蚁蚁情状态,有白蚁入侵为1 */ @ApiModelProperty(value = "白蚁蚁情状态,有白蚁入侵为1") @TableField("\"status\"") private Integer status; /** * 白蚁设备电量 */ @ApiModelProperty(value = "白蚁设备电量") @TableField("\"electricity\"") private Integer electricity; /** * 白蚁设备安装的点位顺序 */ @ApiModelProperty(value = "白蚁设备安装的点位顺序") @TableField("\"order\"") private Integer order; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") @TableField("\"created_at\"") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createdAt; /** * 观测时间 */ @ApiModelProperty(value = "观测时间") @TableField("\"ob_time\"") private String obTime; /** * 观测时间2 */ @ApiModelProperty(value = "观测时间2") @TableField("\"ob_date\"") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date obDate; /** * 处置状态(1、已处置；2、未处置；9、处理中) */ @ApiModelProperty(value = "处置状态(1、已处置；2、未处置；9、处理中)") @TableField("\"task_status\"") private String taskStatus; /** * 任务id */ @ApiModelProperty(value = "任务id") @TableField("\"task_id\"") private String taskId; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/WaterDataTermitesMapper.java
New file @@ -0,0 +1,14 @@ package cn.gistack.sm.sjztmd.mapper; import cn.gistack.sm.sjztmd.entity.TbResStagCapDisc; import cn.gistack.sm.sjztmd.entity.WaterDataTermites; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; public interface WaterDataTermitesMapper extends BaseMapper<WaterDataTermites> { WaterDataTermites getByTaskId(@Param("taskId") String taskId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/WaterDataTermitesMapper.xml
New file @@ -0,0 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <mapper namespace="cn.gistack.sm.sjztmd.mapper.WaterDataTermitesMapper"> <!--namespace根据自己需要创建的的mapper的路径和名称填写--> <select id="getByTaskId" resultType="cn.gistack.sm.sjztmd.entity.WaterDataTermites"> SELECT "id","task_status","task_id" FROM SJZT_ODS."water_data_termites" WHERE "task_id" = #{taskId} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IWaterDataTermitesService.java
New file @@ -0,0 +1,10 @@ package cn.gistack.sm.sjztmd.service; import cn.gistack.sm.sjztmd.entity.WaterDataTermites; import com.baomidou.mybatisplus.extension.service.IService; public interface IWaterDataTermitesService extends IService<WaterDataTermites> { Boolean updateStatus(WaterDataTermites waterDataTermites); Boolean finishTask(String taskId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/WaterDataTermitesServiceImpl.java
New file @@ -0,0 +1,30 @@ package cn.gistack.sm.sjztmd.service.impl; import cn.gistack.nky.entity.AlarmGet; import cn.gistack.sm.sjztmd.entity.WaterDataTermites; import cn.gistack.sm.sjztmd.mapper.WaterDataTermitesMapper; import cn.gistack.sm.sjztmd.service.IWaterDataTermitesService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service public class WaterDataTermitesServiceImpl extends ServiceImpl<WaterDataTermitesMapper,WaterDataTermites> implements IWaterDataTermitesService { @Override public Boolean updateStatus(WaterDataTermites waterDataTermites) { return updateById(waterDataTermites); } @Override public Boolean finishTask(String taskId) { WaterDataTermites waterDataTermites = baseMapper.getByTaskId(taskId); if (waterDataTermites != null){ //设置预警为已处理 waterDataTermites.setTaskStatus("1"); Boolean aBoolean = updateStatus(waterDataTermites); return aBoolean; } return false; } }
