gonglilong
2024-08-21 c255bb5a16be10ea21c345b57ed1421d73f2d5c2
新增类型极值接口  部门加个字段
2 files modified
4 files added
163 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Dept.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java 27 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/ExtremumDO.java 73 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/ExtremumMapper.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IExtremumService.java 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/ExtremumServiceImpl.java 35 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Dept.java
@@ -110,6 +110,12 @@
    @ApiModelProperty(value = "区划名称")
    private String adCode;
    /**
     * 工程区划
     */
    @ApiModelProperty(value = "工程区划")
    private String sgCode;
    private String adGrad;
    private String resGuid;
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
@@ -3,9 +3,12 @@
import cn.gistack.sm.jcsb.entity.DbReport;
import cn.gistack.sm.jcsb.entity.DbReport;
import cn.gistack.sm.jcsb.entity.DeviceReport;
import cn.gistack.sm.jcsb.entity.ExtremumDO;
import cn.gistack.sm.jcsb.service.IDbReportService;
import cn.gistack.sm.jcsb.service.IExtremumService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DbReportVO;
import cn.gistack.sm.sg.DO.SgDeviceDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +36,7 @@
public class DbReportController extends BladeController {
    private final IDbReportService dbReportService;
    private final IExtremumService extremumService;
    @GetMapping("/page")
    @ApiOperation(value = "列表", notes = "传入实体类参数")
    public R<IPage<DbReportVO>> pageList(DbReportVO dbReport, Query query) {
@@ -83,4 +86,26 @@
    public R getLatestList(DbReportVO dbReport){
        return R.data(dbReportService.getLatestList(dbReport));
    }
    /**
     * 新增或修改 类型极值
     */
    @PostMapping("/addExtremum")
    @ApiOperation(value = "新增或修改类型极值", notes = "传入实体类参数")
    public R submit(@RequestBody ExtremumDO extremumDO) {
        if(extremumDO!=null&&extremumDO.getId()!=null){
            return R.data(extremumService.updateById(extremumDO));
        }
        return R.data(extremumService.saveOrUpdate(extremumDO));
    }
    @GetMapping(value = "/getExtremum")
    public R getExtremumList(@RequestParam(name="skId",required=true) String skId,String type) {
        List<ExtremumDO> page = extremumService.getExtremumList(skId,type);
        return R.data(page);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/ExtremumDO.java
New file
@@ -0,0 +1,73 @@
package cn.gistack.sm.jcsb.entity;
import cn.gistack.sm.sg.DO.SgGxStepDO;
import com.baomidou.mybatisplus.annotation.IdType;
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 lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
 * <p>
 * 类型极值
 * </p>
 *
 * @author shenyijian
 * @since 2024-06-13 11:51:20
 */
@Data
@TableName("SM_EXTREMUM")
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ExtremumDO implements Serializable {
    private static final long serialVersionUID = 1L;
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 类型
     */
    private String type;
    /**
     * y左极值
     */
    private String lMax;
    /**
     * y右极值
     */
    private String rMax;
    /**
     *
     * 水库id
     */
    private String skId;
    /**
     * 人员id
     */
    private String userId;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date time;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/ExtremumMapper.java
New file
@@ -0,0 +1,8 @@
package cn.gistack.sm.jcsb.mapper;
import cn.gistack.sm.jcsb.entity.ExtremumDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ExtremumMapper extends BaseMapper<ExtremumDO> {
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IExtremumService.java
New file
@@ -0,0 +1,14 @@
package cn.gistack.sm.jcsb.service;
import cn.gistack.sm.jcsb.entity.ExtremumDO;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
public interface IExtremumService extends IService<ExtremumDO> {
    List<ExtremumDO> getExtremumList(String skId, String type);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/ExtremumServiceImpl.java
New file
@@ -0,0 +1,35 @@
package cn.gistack.sm.jcsb.service.impl;
import cn.gistack.sm.jcsb.entity.DbReport;
import cn.gistack.sm.jcsb.entity.ExtremumDO;
import cn.gistack.sm.jcsb.mapper.DbReportMapper;
import cn.gistack.sm.jcsb.mapper.ExtremumMapper;
import cn.gistack.sm.jcsb.service.IDbReportService;
import cn.gistack.sm.jcsb.service.IExtremumService;
import cn.gistack.sm.jcsb.vo.DbReportVO;
import cn.gistack.sm.sg.DO.SgDeviceDO;
import cn.gistack.sm.sg.mapper.SgDeviceMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class ExtremumServiceImpl extends ServiceImpl<ExtremumMapper, ExtremumDO> implements IExtremumService {
    @Override
    public List<ExtremumDO> getExtremumList(String skId, String type) {
        QueryWrapper<ExtremumDO> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("SK_ID", skId);
        queryWrapper.eq(!StringUtils.isEmpty(type),"TYPE", type);
        return baseMapper.selectList(queryWrapper);
    }
}