险情上报

guoshilong

2023-05-19 f3592b4751f6ec88c2dfae39c006a8ceeaa67180

险情上报

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java

@@ -3,22 +3,23 @@
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.entity.DeviceReport;
import cn.gistack.sm.jcsb.service.IDangerReportService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import cn.gistack.system.user.entity.User;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
@@ -43,13 +44,56 @@
        return R.data(pagelist);
    }

    @GetMapping("/all")
    @ApiOperation(value = "列表", notes = "传入实体类参数")
    public R getAll(DangerReport dangerReport) {
        List<DangerReportVO> list = dangerReportService.getAll(dangerReport);
        return R.data(list);
    }

    /**
     * 详情
     */
    @GetMapping("/detail")
    @ApiOperation(value = "详情", notes = "传入notice")
    @ApiOperation(value = "详情", notes = "传入实体类参数")
    public R<DangerReport> detail(@RequestParam(name="id",required=true) String id) {
        return R.data(dangerReportService.getById(id));
    }

    /**
     * 新增
     */
    @PostMapping("/save")
    @ApiOperation(value = "新增", notes = "传入实体类参数")
    public R save(@RequestBody DangerReport dangerReport) {
        return R.data(dangerReportService.save(dangerReport));
    }

    /**
     * 修改
     */
    @PostMapping("/update")
    @ApiOperation(value = "修改", notes = "传入实体类参数")
    public R update(@RequestBody DangerReport dangerReport) {
        return R.data(dangerReportService.updateById(dangerReport));
    }

    /**
     * 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperation(value = "新增或修改", notes = "传入实体类参数")
    public R submit(@RequestBody DangerReport dangerReport) {
        return R.data(dangerReportService.saveOrUpdate(dangerReport));
    }

    /**
     * 删除
     */
    @PostMapping("/remove")
    @ApiOperation(value = "逻辑删除", notes = "传入实体类参数")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        return R.data(dangerReportService.removeBatchByIds(Func.toLongList(ids)));
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DangerReport.java

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

/**
@@ -18,13 +19,13 @@
@Data
@TableName( value = "SM_DANGER_REPORT",autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
public class DangerReport extends TenantEntity {
public class DangerReport extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * 图片数组
     */
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
    @TableField(value = "images",typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("图片数组")
    private Object[] images;

@@ -43,7 +44,7 @@
    /**
     * 图片数组
     */
    @TableField(value = "to_images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
    @TableField(value = "to_images",typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("处理图片")
    private Object[] toImages;

@@ -59,4 +60,9 @@
    @ApiModelProperty("类型（0：险情上报）")
    private String type;

    /**
     * 水库id
     */
    @ApiModelProperty("水库id")
    private String reservoirId;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java

@@ -1,7 +1,12 @@
package cn.gistack.sm.jcsb.mapper;

import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
@@ -10,4 +15,5 @@
 * @DATE: 2023/5/18 17:45
 */
public interface DangerReportMapper  extends BaseMapper<DangerReport> {
    List<DangerReportVO> getAll(@Param("dangerReport") DangerReport dangerReport);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml

@@ -2,4 +2,34 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.jcsb.mapper.DangerReportMapper">

    <resultMap id="vo" type="cn.gistack.sm.jcsb.vo.DangerReportVO">
        <id property="id" column="id"/>
        <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result property="desinfo" column="desinfo"/>
        <result property="type" column="type"/>
        <result property="toUser" column="to_user"/>
        <result property="toImages" column="to_images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result property="toDesinfo" column="to_desinfo"/>
        <result property="status" column="status"/>
        <result property="createTime" column="create_time"/>
        <result property="createUser" column="create_user"/>
        <result property="createDept" column="create_dept"/>
        <result property="updateUser" column="update_user"/>
        <result property="updateTime" column="update_time"/>
        <result property="isDeleted" column="is_deleted"/>
        <result property="reservoirId" column="reservoir_id"/>
        <result property="reservoirName" column="reservoirName"/>
    </resultMap>

    <select id="getAll" resultMap="vo">
        SELECT SDR.*,arb."name" reservoirName FROM SM_DANGER_REPORT SDR
        LEFT JOIN "SJZT_MD"."att_res_base" arb ON arb."guid" = SDR.RESERVOIR_ID
        WHERE SDR.IS_DELETED = 0
        <if test="dangerReport.toUser !=null and dangerReport.toUser !=''">
            AND SDR.TO_USER = #{dangerReport.toUser}
        </if>
        <if test="dangerReport.status !=null and dangerReport.status !=''">
            AND SDR.status = #{dangerReport.status}
        </if>
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java

@@ -1,7 +1,11 @@
package cn.gistack.sm.jcsb.service;

import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import org.springblade.core.mp.base.BaseService;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
@@ -10,4 +14,5 @@
 * @DATE: 2023/5/18 17:47
 */
public interface IDangerReportService extends BaseService<DangerReport> {
    List<DangerReportVO> getAll(DangerReport dangerReport);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java

@@ -3,8 +3,12 @@
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.jcsb.vo.DeviceReportVO;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
@@ -15,4 +19,8 @@
@Service
public class DangerReportServiceImpl extends BaseServiceImpl<DangerReportMapper, DangerReport> implements IDangerReportService {

    @Override
    public List<DangerReportVO> getAll(DangerReport dangerReport) {
        return baseMapper.getAll(dangerReport);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java

New file
@@ -0,0 +1,9 @@
package cn.gistack.sm.jcsb.vo;

import cn.gistack.sm.jcsb.entity.DangerReport;
import lombok.Data;

@Data
public class DangerReportVO extends DangerReport {
    private String reservoirName;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java

@@ -73,7 +73,7 @@
            List<User> userList = userClient.userInfoByPhone("000000", person.getUserPhone()).getData();
            if (userList.size() > 0) {
                Map<Object, Object> map = new HashMap<>();
                map.put("value", userList.get(0).getId());
                map.put("value", userList.get(0).getId().toString());
                map.put("name", userList.get(0).getName());
                resList.add(map);
            }