skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -19,7 +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 cn.gistack.sm.sjztmd.service.IYwTermitesTaskService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.log.exception.ServiceException; @@ -28,16 +28,12 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.net.http.HttpRequest; import java.util.*; import java.util.stream.Collectors; import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX; @@ -49,7 +45,7 @@ private final IPatrolRecordService patrolRecordService; private final IPatrolReportService patrolReportService; private final INkyClient nkyClient; private final IWaterDataTermitesService waterDataTermitesService; private final IYwTermitesTaskService waterDataTermitesService; /** * 自定义分页查询 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/WaterDataTermitesController.java
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/YwTermitesTaskController.java
New file @@ -0,0 +1,47 @@ package cn.gistack.sm.sjztmd.controller; import cn.gistack.sm.sjztmd.entity.YwTermitesTask; import cn.gistack.sm.sjztmd.service.IYwTermitesTaskService; 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/ywTermitesTask") @AllArgsConstructor public class YwTermitesTaskController { private final IYwTermitesTaskService ywTermitesTaskService; /** * 状态修改 * @param ywTermitesTask * @return */ @PostMapping("/updateStatus") @ApiOperation(value = "白蚁-状态修改", notes = "白蚁-白蚁状态修改") public R updateStatus(YwTermitesTask ywTermitesTask){ return R.data(ywTermitesTaskService.updateStatus(ywTermitesTask)); } /** * 白蚁关联任务 * @param ywTermitesTask * @return */ @PostMapping("/createTask") @ApiOperation(value = "白蚁-状态修改", notes = "白蚁-白蚁状态修改") public R createTask(YwTermitesTask ywTermitesTask){ return R.status(ywTermitesTaskService.createTask(ywTermitesTask)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/WaterDataTermites.java
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/YwTermitesTask.java
New file @@ -0,0 +1,67 @@ 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("\"yw_termites_task\"") @ApiModel(value = "白蚁任务关联", description = "白蚁任务关联") public class YwTermitesTask implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") @TableField("\"guid\"") @TableId("\"guid\"") private String guid; /** * 测站id */ @ApiModelProperty(value = "测站id") @TableField("\"device_id\"") private String deviceId; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") @TableField("\"create_time\"") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 处置状态(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
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwTermitesTaskMapper.java
New file @@ -0,0 +1,11 @@ package cn.gistack.sm.sjztmd.mapper; import cn.gistack.sm.sjztmd.entity.YwTermitesTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; public interface YwTermitesTaskMapper extends BaseMapper<YwTermitesTask> { YwTermitesTask getByTaskId(@Param("taskId") String taskId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwTermitesTaskMapper.xml
File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/WaterDataTermitesMapper.xml @@ -1,9 +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"> <mapper namespace="cn.gistack.sm.sjztmd.mapper.YwTermitesTaskMapper"> <!--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 id="getByTaskId" resultType="cn.gistack.sm.sjztmd.entity.YwTermitesTask"> SELECT "guid","task_status","task_id" FROM SJZT_MD."yw_termites_task" WHERE "task_id" = #{taskId} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IWaterDataTermitesService.java
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwTermitesTaskService.java
New file @@ -0,0 +1,12 @@ package cn.gistack.sm.sjztmd.service; import cn.gistack.sm.sjztmd.entity.YwTermitesTask; import com.baomidou.mybatisplus.extension.service.IService; public interface IYwTermitesTaskService extends IService<YwTermitesTask> { Boolean updateStatus(YwTermitesTask ywTermitesTask); Boolean finishTask(String taskId); Boolean createTask(YwTermitesTask ywTermitesTask); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/WaterDataTermitesServiceImpl.java
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwTermitesTaskTaskServiceImpl.java
New file @@ -0,0 +1,36 @@ package cn.gistack.sm.sjztmd.service.impl; import cn.gistack.sm.sjztmd.entity.YwTermitesTask; import cn.gistack.sm.sjztmd.mapper.YwTermitesTaskMapper; import cn.gistack.sm.sjztmd.service.IYwTermitesTaskService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service public class YwTermitesTaskTaskServiceImpl extends ServiceImpl<YwTermitesTaskMapper, YwTermitesTask> implements IYwTermitesTaskService { @Override public Boolean updateStatus(YwTermitesTask ywTermitesTask) { return updateById(ywTermitesTask); } @Override public Boolean finishTask(String taskId) { YwTermitesTask ywTermitesTask = baseMapper.getByTaskId(taskId); if (ywTermitesTask != null){ //设置预警为已处理 ywTermitesTask.setTaskStatus("1"); Boolean aBoolean = updateStatus(ywTermitesTask); return aBoolean; } return false; } @Override public Boolean createTask(YwTermitesTask ywTermitesTask) { //创建任务，默认为处理中 ywTermitesTask.setTaskStatus("9"); boolean save = save(ywTermitesTask); return save; } }
