guoshilong
2023-05-27 54475b8ff3450db9b78af994a5046279621321df
调度模块、管护模块
14 files added
452 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/controller/ManageProtectRecordController.java 87 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/entity/ManageProtectRecord.java 64 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecord.xml 9 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java 21 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/IManageProtectRecordService.java 20 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java 31 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/controller/SchedulingRecordController.java 84 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/entity/SchedulingRecord.java 49 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecord.xml 9 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java 19 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/ISchedulingRecordService.java 18 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java 25 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/vo/SchedulingRecordVO.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/controller/ManageProtectRecordController.java
New file
@@ -0,0 +1,87 @@
package cn.gistack.sm.manageProtect.controller;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.service.IManageProtectRecordService;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 管护记录表Controller
 * @USER: guoshilong
 * @DATE: 2023/5/27 10:09
 * */
@RestController
@RequestMapping("manageProtectRecord")
@AllArgsConstructor
@Api(value = "管护记录", tags = "管护记录")
public class ManageProtectRecordController extends BladeController {
    private final IManageProtectRecordService manageProtectRecordService;
    @GetMapping("/page")
    @ApiOperation(value = "列表", notes = "传入实体类参数")
    public R<IPage<ManageProtectRecordVO>> pageList(ManageProtectRecordVO manageProtectRecordVO, Query query) {
        IPage<ManageProtectRecordVO> pages = manageProtectRecordService.selectPage(Condition.getPage(query), manageProtectRecordVO);
        return R.data(pages);
    }
    /**
     * 详情
     */
    @GetMapping("/detail")
    @ApiOperation(value = "详情", notes = "传入实体类参数")
    public R<ManageProtectRecord> detail(@RequestParam(name="id",required=true) String id) {
        return R.data(manageProtectRecordService.getById(id));
    }
    /**
     * 新增
     */
    @PostMapping("/save")
    @ApiOperation(value = "新增", notes = "传入实体类参数")
    public R save(@RequestBody ManageProtectRecord manageProtectRecord) {
        return R.data(manageProtectRecordService.save(manageProtectRecord));
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @ApiOperation(value = "修改", notes = "传入实体类参数")
    public R update(@RequestBody ManageProtectRecord manageProtectRecord) {
        return R.data(manageProtectRecordService.updateById(manageProtectRecord));
    }
    /**
     * 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperation(value = "新增或修改", notes = "传入实体类参数")
    public R submit(@RequestBody ManageProtectRecord manageProtectRecord) {
        return R.data(manageProtectRecordService.saveOrUpdate(manageProtectRecord));
    }
    /**
     * 删除
     */
    @PostMapping("/remove")
    @ApiOperation(value = "逻辑删除", notes = "传入实体类参数")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        return R.data(manageProtectRecordService.removeBatchByIds(Func.toLongList(ids)));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/entity/ManageProtectRecord.java
New file
@@ -0,0 +1,64 @@
package cn.gistack.sm.manageProtect.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 管护记录
 * @USER: guoshilong
 * @DATE: 2023/5/27 10:09
 */
@Data
@TableName( value = "SM_MANAGE_PROTECT_RECORD",autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
public class ManageProtectRecord extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 图片数组
     */
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("图片数组")
    private Object[] images;
    /**
     * 视频数组
     */
    @TableField(value = "videos",typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("视频数组")
    private Object[] videos;
    /**
     * 描述信息
     */
    @ApiModelProperty("描述信息")
    private String content;
    /**
     * 管护类型
     */
    @ApiModelProperty("管护类型")
    private String type;
    /**
     * 上报时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("上报时间")
    private String reportTime;
    /**
     * 水库id
     */
    @ApiModelProperty("水库id")
    private String reservoirId;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecord.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.manageProtect.mapper.ManageProtectRecordMapper">
    <select id="selectRecordPage" resultType="cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO">
        SELECT R.* FROM SM_MANAGE_PROTECT_RECORD R
        WHERE R.IS_DELETED = 0
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java
New file
@@ -0,0 +1,21 @@
package cn.gistack.sm.manageProtect.mapper;
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 10:09
 */
public interface ManageProtectRecordMapper extends BaseMapper<ManageProtectRecord> {
    IPage<ManageProtectRecordVO> selectRecordPage(IPage<ManageProtectRecordVO> page, @Param("record") ManageProtectRecordVO manageProtectRecordVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/IManageProtectRecordService.java
New file
@@ -0,0 +1,20 @@
package cn.gistack.sm.manageProtect.service;
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 10:09
 */
public interface IManageProtectRecordService extends BaseService<ManageProtectRecord> {
    IPage<ManageProtectRecordVO> selectPage(IPage<ManageProtectRecordVO> page, ManageProtectRecordVO manageProtectRecordVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java
New file
@@ -0,0 +1,31 @@
package cn.gistack.sm.manageProtect.service.impl;
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.mapper.DangerReportMapper;
import cn.gistack.sm.jcsb.service.IDangerReportService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.mapper.ManageProtectRecordMapper;
import cn.gistack.sm.manageProtect.service.IManageProtectRecordService;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 10:09
 */
@Service
public class ManageProtectRecordServiceImpl extends BaseServiceImpl<ManageProtectRecordMapper, ManageProtectRecord> implements IManageProtectRecordService {
    @Override
    public IPage<ManageProtectRecordVO> selectPage(IPage<ManageProtectRecordVO> page, ManageProtectRecordVO manageProtectRecordVO) {
        return baseMapper.selectRecordPage(page,manageProtectRecordVO);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
New file
@@ -0,0 +1,8 @@
package cn.gistack.sm.manageProtect.vo;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import lombok.Data;
@Data
public class ManageProtectRecordVO extends ManageProtectRecord {
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/controller/SchedulingRecordController.java
New file
@@ -0,0 +1,84 @@
package cn.gistack.sm.schedulingModules.controller;
import cn.gistack.sm.schedulingModules.entity.SchedulingRecord;
import cn.gistack.sm.schedulingModules.service.ISchedulingRecordService;
import cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 调度模块记录表Controller
 * @USER: guoshilong
 * @DATE: 2023/5/27 15:25
 * */
@RestController
@RequestMapping("schedulingRecord")
@AllArgsConstructor
@Api(value = "调度模块记录", tags = "调度模块记录")
public class SchedulingRecordController extends BladeController {
    private final ISchedulingRecordService schedulingRecordService;
    @GetMapping("/page")
    @ApiOperation(value = "列表", notes = "传入实体类参数")
    public R<IPage<SchedulingRecordVO>> pageList(SchedulingRecordVO schedulingRecordVO, Query query) {
        IPage<SchedulingRecordVO> pages = schedulingRecordService.selectPage(Condition.getPage(query), schedulingRecordVO);
        return R.data(pages);
    }
    /**
     * 详情
     */
    @GetMapping("/detail")
    @ApiOperation(value = "详情", notes = "传入实体类参数")
    public R<SchedulingRecord> detail(@RequestParam(name="id",required=true) String id) {
        return R.data(schedulingRecordService.getById(id));
    }
    /**
     * 新增
     */
    @PostMapping("/save")
    @ApiOperation(value = "新增", notes = "传入实体类参数")
    public R save(@RequestBody SchedulingRecord schedulingRecord) {
        return R.data(schedulingRecordService.save(schedulingRecord));
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @ApiOperation(value = "修改", notes = "传入实体类参数")
    public R update(@RequestBody SchedulingRecord schedulingRecord) {
        return R.data(schedulingRecordService.updateById(schedulingRecord));
    }
    /**
     * 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperation(value = "新增或修改", notes = "传入实体类参数")
    public R submit(@RequestBody SchedulingRecord schedulingRecord) {
        return R.data(schedulingRecordService.saveOrUpdate(schedulingRecord));
    }
    /**
     * 删除
     */
    @PostMapping("/remove")
    @ApiOperation(value = "逻辑删除", notes = "传入实体类参数")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        return R.data(schedulingRecordService.removeBatchByIds(Func.toLongList(ids)));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/entity/SchedulingRecord.java
New file
@@ -0,0 +1,49 @@
package cn.gistack.sm.schedulingModules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 调度模块记录表
 * @USER: guoshilong
 * @DATE: 2023/5/27 15:25
 */
@Data
@TableName( value = "SM_SCHEDULING_RECORD",autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
public class SchedulingRecord extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 图片数组
     */
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("图片数组")
    private Object[] images;
    /**
     * 闸门状态
     */
    @ApiModelProperty("闸门状态")
    private String gateStatus;
    /**
     * 描述信息
     */
    @ApiModelProperty("描述信息")
    private String content;
    /**
     * 水库id
     */
    @ApiModelProperty("水库id")
    private String reservoirId;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecord.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.schedulingModules.mapper.SchedulingRecordMapper">
    <select id="selectRecordPage" resultType="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">
        SELECT R.* FROM SM_SCHEDULING_RECORD R
        WHERE R.IS_DELETED = 0
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java
New file
@@ -0,0 +1,19 @@
package cn.gistack.sm.schedulingModules.mapper;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import cn.gistack.sm.schedulingModules.entity.SchedulingRecord;
import cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 15:25
 */
public interface SchedulingRecordMapper extends BaseMapper<SchedulingRecord> {
    IPage<SchedulingRecordVO> selectRecordPage(IPage<SchedulingRecordVO> page, @Param("record") SchedulingRecordVO schedulingRecordVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/ISchedulingRecordService.java
New file
@@ -0,0 +1,18 @@
package cn.gistack.sm.schedulingModules.service;
import cn.gistack.sm.manageProtect.entity.ManageProtectRecord;
import cn.gistack.sm.manageProtect.vo.ManageProtectRecordVO;
import cn.gistack.sm.schedulingModules.entity.SchedulingRecord;
import cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 15:25
 */
public interface ISchedulingRecordService extends BaseService<SchedulingRecord> {
    IPage<SchedulingRecordVO> selectPage(IPage<SchedulingRecordVO> page, SchedulingRecordVO schedulingRecordVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java
New file
@@ -0,0 +1,25 @@
package cn.gistack.sm.schedulingModules.service.impl;
import cn.gistack.sm.schedulingModules.entity.SchedulingRecord;
import cn.gistack.sm.schedulingModules.mapper.SchedulingRecordMapper;
import cn.gistack.sm.schedulingModules.service.ISchedulingRecordService;
import cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: guoshilong
 * @DATE: 2023/5/27 15:25
 */
@Service
public class SchedulingRecordServiceImpl extends BaseServiceImpl<SchedulingRecordMapper, SchedulingRecord> implements ISchedulingRecordService {
    @Override
    public IPage<SchedulingRecordVO> selectPage(IPage<SchedulingRecordVO> page, SchedulingRecordVO schedulingRecordVO) {
        return baseMapper.selectRecordPage(page,schedulingRecordVO);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/vo/SchedulingRecordVO.java
New file
@@ -0,0 +1,8 @@
package cn.gistack.sm.schedulingModules.vo;
import cn.gistack.sm.schedulingModules.entity.SchedulingRecord;
import lombok.Data;
@Data
public class SchedulingRecordVO extends SchedulingRecord {
}