From 46ba34b6f3909f6c9b57363adfeb3cca2e5d6fc3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 25 Oct 2023 16:04:31 +0800
Subject: [PATCH] 大坝监测上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java | 17 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java | 43 ++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java | 79 +++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml | 27 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java | 13 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java | 15 +++
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java | 10 ++
8 files changed, 206 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index 066103a..a79e260 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -166,6 +166,8 @@
userInfo.getDetail().set("resIds",attRes.getData());
}
+ //返回手机号
+ userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));
String deptStr = "";
if (userInfo.getUser().getDeptId().indexOf(",") > 0){
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
new file mode 100644
index 0000000..463f5d7
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
@@ -0,0 +1,79 @@
+package cn.gistack.sm.jcsb.controller;
+
+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.service.IDbReportService;
+import cn.gistack.sm.jcsb.vo.DangerReportVO;
+import cn.gistack.sm.jcsb.vo.DbReportVO;
+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;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION: 监测上报Controller
+ * @USER: aix
+ * @DATE: 2023/5/18 17:51
+ */
+@RestController
+@RequestMapping("dbReport")
+@AllArgsConstructor
+@Api(value = "大坝监测上报", tags = "大坝监测上报")
+public class DbReportController extends BladeController {
+
+ private final IDbReportService dbReportService;
+
+ @GetMapping("/page")
+ @ApiOperation(value = "列表", notes = "传入实体类参数")
+ public R<IPage<DbReportVO>> pageList(DbReportVO dbReport, Query query) {
+ IPage<DbReportVO> page = dbReportService.selectPage(Condition.getPage(query),dbReport);
+ return R.data(page);
+ }
+
+ /**
+ * 修改
+ */
+ @PostMapping("/update")
+ @ApiOperation(value = "修改", notes = "传入实体类参数")
+ public R update(@RequestBody DbReport dbReport) {
+ return R.data(dbReportService.updateById(dbReport));
+ }
+
+ /**
+ * 新增
+ */
+ @PostMapping("/save")
+ @ApiOperation(value = "新增", notes = "传入dbReport")
+ public R save(@RequestBody DbReport dbReport) {
+ return R.data(dbReportService.save(dbReport));
+ }
+
+ /**
+ * 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperation(value = "新增或修改", notes = "传入实体类参数")
+ public R submit(@RequestBody DbReport dbReport) {
+ return R.data(dbReportService.saveOrUpdate(dbReport));
+ }
+
+ /**
+ * 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperation(value = "逻辑删除", notes = "传入实体类参数")
+ public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ return R.data(dbReportService.removeBatchByIds(Func.toLongList(ids)));
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
new file mode 100644
index 0000000..179bcac
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
@@ -0,0 +1,43 @@
+package cn.gistack.sm.jcsb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 大坝监测上报实体类
+ */
+@Data
+@TableName(value = "SM_DB_REPORT")
+@EqualsAndHashCode(callSuper = true)
+public class DbReport extends BaseEntity {
+
+ // 水库名称
+ private String reservoirName;
+
+ //水库id
+ private String reservoirId;
+
+ //测站类型
+ private String type;
+
+ //测站id
+ private String stationId;
+
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recordTime;
+
+ //监测值
+ private String val;
+
+ //描述
+ private String description;
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
new file mode 100644
index 0000000..06ce28c
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
@@ -0,0 +1,13 @@
+package cn.gistack.sm.jcsb.mapper;
+
+import cn.gistack.sm.jcsb.entity.DbReport;
+import cn.gistack.sm.jcsb.vo.DbReportVO;
+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 DbReportMapper extends BaseMapper<DbReport> {
+ List<DbReportVO> getPage(@Param("page") IPage<DbReportVO> page, @Param("db") DbReportVO dbReport);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
new file mode 100644
index 0000000..c064777
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
@@ -0,0 +1,27 @@
+<?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.jcsb.mapper.DbReportMapper">
+
+
+ <select id="getPage" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+ SELECT sdr.*,acb."cd_nm" as stationName FROM SM_DB_REPORT sdr
+ LEFT JOIN SJZT_MD."att_cd_base" acb ON sdr.reservoir_id = acb."res_cd" and sdr.station_id = acb."cd"
+ WHERE 1=1
+ <if test="db.reservoirName != null and db.reservoirName !='' ">
+ AND sdr.reservoir_name LIKE CONCAT('%',#{db.reservoirName},'%')
+ </if>
+ <if test="db.reservoirId != null and db.reservoirId !='' ">
+ AND sdr.reservoir_id = #{db.reservoirId}
+ </if>
+ <if test="db.stationId != null and db.station !='' ">
+ AND sdr.station_id = #{db.stationId}
+ </if>
+ <if test="db.startTime !=null and db.startTime !=''">
+ AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') >= #{db.startTime}
+ </if>
+ <if test="db.endTime !=null and db.endTime !=''">
+ AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') <= #{db.endTime}
+ </if>
+ ORDER BY sdr.create_time DESC
+ </select>
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java
new file mode 100644
index 0000000..68d9c38
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java
@@ -0,0 +1,10 @@
+package cn.gistack.sm.jcsb.service;
+
+import cn.gistack.sm.jcsb.entity.DbReport;
+import cn.gistack.sm.jcsb.vo.DbReportVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IDbReportService extends BaseService<DbReport> {
+ IPage<DbReportVO> selectPage(IPage<DbReportVO> page, DbReportVO dbReport);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
new file mode 100644
index 0000000..5799545
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
@@ -0,0 +1,17 @@
+package cn.gistack.sm.jcsb.service.impl;
+
+import cn.gistack.sm.jcsb.entity.DbReport;
+import cn.gistack.sm.jcsb.mapper.DbReportMapper;
+import cn.gistack.sm.jcsb.service.IDbReportService;
+import cn.gistack.sm.jcsb.vo.DbReportVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DbReportServiceImpl extends BaseServiceImpl<DbReportMapper, DbReport> implements IDbReportService {
+ @Override
+ public IPage<DbReportVO> selectPage(IPage<DbReportVO> page, DbReportVO dbReport) {
+ return page.setRecords(baseMapper.getPage(page,dbReport));
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java
new file mode 100644
index 0000000..5303dd3
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java
@@ -0,0 +1,15 @@
+package cn.gistack.sm.jcsb.vo;
+
+import cn.gistack.sm.jcsb.entity.DbReport;
+import lombok.Data;
+
+@Data
+public class DbReportVO extends DbReport {
+
+ private String startTime;
+
+ private String endTime;
+
+ //测站名称
+ private String stationName;
+}
--
Gitblit v1.9.3