skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
@@ -1,12 +1,15 @@ package cn.gistack.sm.jcsb.entity; 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.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.springblade.core.tenant.mp.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; @@ -14,9 +17,9 @@ import java.util.Date; @Data @TableName("JCSB_DEVICE_REPORT") @TableName(value = "SM_DEVICE_REPORT",autoResultMap = true) @EqualsAndHashCode(callSuper = true) public class DeviceReport extends TenantEntity{ public class DeviceReport extends BaseEntity { private static final long serialVersionUID = 1L; /** @@ -38,45 +41,21 @@ private String deviceType; /** * 雨量 * 水库id */ @ApiModelProperty("雨量") private String rainfall; @ApiModelProperty("水库id") private String resGuid; /** * 水位 * 水库名称 */ @ApiModelProperty("水位") private String waterLevel; @ApiModelProperty("水库名称") private String resName; /** * 流量 * 巡查现场图片 */ @ApiModelProperty("流量") private String flow; /** * 蓄水量 */ @ApiModelProperty("蓄水量") private String waterStorage; /** * 比讯限 */ @ApiModelProperty("比讯限") private String specificFloodLimit; /** * 时段雨量 */ @ApiModelProperty("时段雨量") private String temporalRainfall; /** * 记录时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date recordTime; @ApiModelProperty("图片") @TableField(value = "images",typeHandler = FastjsonTypeHandler.class) private Object[] images; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/controller/PanoramaController.java
New file @@ -0,0 +1,113 @@ package cn.gistack.sm.panorama.controller; import cn.gistack.sm.panorama.entity.Panorama; import cn.gistack.sm.panorama.service.IPanoramaService; import cn.gistack.sm.panorama.vo.PanoramaVO; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.*; import java.util.Arrays; /** * @Description: 巡查设置 */ @Slf4j @Api(tags="全景") @RestController @RequestMapping("/panorama/panorama") @AllArgsConstructor public class PanoramaController extends BladeController { private IPanoramaService panoramaService; /** * 分页列表查询 */ @ApiOperation(value="全景-分页列表查询", notes="全景-分页列表查询") @GetMapping(value = "/page") public R<IPage<PanoramaVO>> queryPageList(PanoramaVO panorama, Query query) { IPage<PanoramaVO> pageList = panoramaService.selectPage(Condition.getPage(query),panorama); return R.data(pageList); } /** * 添加 * * @param panorama * @return */ @ApiOperation(value="全景-添加", notes="全景-添加") @PostMapping(value = "/add") public R add(@RequestBody PanoramaVO panorama) { return R.data(panoramaService.save(panorama)); } /** * 编辑 * * @param panorama * @return */ @ApiOperation(value="全景-编辑", notes="全景-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public R edit(@RequestBody PanoramaVO panorama) { return R.data(panoramaService.updateById(panorama)); } /** * 通过id删除 * * @param id * @return */ @ApiOperation(value="全景-通过id删除", notes="全景-通过id删除") @PostMapping(value = "/delete") public R delete(@RequestParam(name="id",required=true) String id) { return R.data(panoramaService.removeById(id)); } /** * 批量删除 * * @param ids * @return */ @ApiOperation(value="全景-批量删除", notes="全景-批量删除") @PostMapping(value = "/deleteBatch") public R deleteBatch(@RequestParam(name="ids",required=true) String ids) { return R.data(this.panoramaService.removeByIds(Arrays.asList(ids.split(",")))); } /** * 通过id查询 * * @param id * @return */ @ApiOperation(value="全景-通过id查询", notes="全景-通过id查询") @GetMapping(value = "/queryById") public R queryById(@RequestParam(name="id",required=true) String id) { return R.data(panoramaService.getById(id)); } /** * 详情 * * @return */ @ApiOperation(value="全景-详情", notes="全景-详情") @GetMapping(value = "/getDetail") public R getDetail(Panorama panorama){ Panorama one = panoramaService.getOne(Condition.getQueryWrapper(panorama)); return R.data(one); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/entity/Panorama.java
New file @@ -0,0 +1,45 @@ package cn.gistack.sm.panorama.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springblade.core.mp.base.BaseEntity; /** * 报汛上报记录处理 */ @Data @TableName( value = "SM_PANORAMA") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value="SM_PANORAMA对象", description="全景表") public class Panorama extends BaseEntity { /** * 水库id */ @ApiModelProperty("水库id") private String resGuid; /** * 水库id */ @ApiModelProperty("水库名称") private String resName; /** * 全景名称 */ @ApiModelProperty("全景名称") private String name; /** * 链接地址 */ @ApiModelProperty("链接地址") private String url; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/mapper/PanoramaMapper.java
New file @@ -0,0 +1,13 @@ package cn.gistack.sm.panorama.mapper; import cn.gistack.sm.panorama.entity.Panorama; import cn.gistack.sm.panorama.vo.PanoramaVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; public interface PanoramaMapper extends BaseMapper<Panorama> { List<PanoramaVO> selectMyPage(IPage<PanoramaVO> page, @Param("vo") PanoramaVO panorama); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/mapper/PanoramaMapper.xml
New file @@ -0,0 +1,16 @@ <?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.panorama.mapper.PanoramaMapper"> <select id="selectMyPage" resultType="cn.gistack.sm.panorama.vo.PanoramaVO"> SELECT * FROM SM_PANORAMA SP WHERE SP.IS_DELETED = 0 <if test="vo.resName !=null and vo.resName !=''"> AND SP.res_name LIKE CONCAT('%',#{vo.resName},'%') </if> <if test="vo.resGuid !=null and vo.resGuid !=''"> AND SP.res_guid = #{vo.resGuid} </if> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/service/IPanoramaService.java
New file @@ -0,0 +1,10 @@ package cn.gistack.sm.panorama.service; import cn.gistack.sm.panorama.entity.Panorama; import cn.gistack.sm.panorama.vo.PanoramaVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; public interface IPanoramaService extends BaseService<Panorama> { IPage<PanoramaVO> selectPage(IPage<PanoramaVO> page, PanoramaVO panorama); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/service/impl/PanoramaServiceImpl.java
New file @@ -0,0 +1,17 @@ package cn.gistack.sm.panorama.service.impl; import cn.gistack.sm.panorama.entity.Panorama; import cn.gistack.sm.panorama.mapper.PanoramaMapper; import cn.gistack.sm.panorama.service.IPanoramaService; import cn.gistack.sm.panorama.vo.PanoramaVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; @Service public class PanoramaServiceImpl extends BaseServiceImpl<PanoramaMapper, Panorama> implements IPanoramaService { @Override public IPage<PanoramaVO> selectPage(IPage<PanoramaVO> page, PanoramaVO panorama) { return page.setRecords(baseMapper.selectMyPage(page,panorama)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/panorama/vo/PanoramaVO.java
New file @@ -0,0 +1,8 @@ package cn.gistack.sm.panorama.vo; import cn.gistack.sm.panorama.entity.Panorama; import lombok.Data; @Data public class PanoramaVO extends Panorama { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -11,7 +11,7 @@ </if> </select> <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase"> SELECT "guid","code","name","ad_guid","eng_scal" FROM "att_res_base" SELECT "guid","code","name","ad_guid","eng_scal","res_loc" FROM "att_res_base" WHERE "is_deleted"=0 AND "ad_guid" LIKE CONCAT('%',#{obj.code},'%') <if test="obj.name !=null and obj.name !=''">