2026-1.22 新增不均匀沉降-改自表面位移

eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/BjyCjDataController.java

+package me.zhengjie.gemho.controller.data;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import me.zhengjie.gemho.service.data.BjyCjDataService;
+import me.zhengjie.gemho.service.data.DmDataService;
+import me.zhengjie.gemho.util.PageResult;
+import me.zhengjie.gemho.util.RealVo;
+import me.zhengjie.gemho.x_datavo.DataVo;
+import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
+import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+
+/**
+ * <p>
+ * 内部位移数据 前端控制器
+ * </p>
+ *
+ * @author llj
+ * @since 2022-01-05
+ */
+@Api(tags = "数据管理: e.getMessage()")
+@RestController
+@RequestMapping("data/bjycj")
+public class BjyCjDataController {
+    @Autowired
+    private BjyCjDataService bjycjDataService;
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
+
+
+
+
+    /**
+     * 获取内部位移的历史数据
+     *
+     * @param dataQueryCriteria
+     * @return
+     */
+    @ApiOperation("获取内部位移的历史数据")
+    @GetMapping("history")
+    public ResponseEntity<Object> gethistory(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
+        try {
+            HashMap<String, Object> map = bjycjDataService.pageall(dataQueryCriteria, request);
+            return new ResponseEntity<>(new PageResult().success(map), HttpStatus.OK);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return new ResponseEntity<>(new PageResult().failed(), HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    @ApiOperation(value = "图标历史")
+    @GetMapping("imghistory")
+    public ResponseEntity<Object> imgList(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
+        ImgDataVo dbData = bjycjDataService.imgList(dataQueryCriteria, request);
+        return new ResponseEntity<>(new PageResult().success(dbData), HttpStatus.OK);
+    }
+
+    @ApiOperation(value = "导出excel")
+    @GetMapping("download")
+    public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
+        bjycjDataService.download(response, dataQueryCriteria, request);
+    }
+
+}
+

eladmin-system/src/main/java/me/zhengjie/gemho/mapper/data/BjyCjDataMapper.java

+package me.zhengjie.gemho.mapper.data;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import me.zhengjie.gemho.entity.data.DmData;
+import me.zhengjie.gemho.entity.data.MpData;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 内部位移数据 Mapper 接口
+ * </p>
+ *
+ * @author llj
+ * @since 2022-01-05
+ */
+
+@Mapper
+public interface BjyCjDataMapper extends BaseMapper<MpData> {
+	Page<MpData> pageall(@Param("page") Page<MpData> page, @Param("ew") QueryWrapper<MpData> queryWrapper);
+	@Select("SELECT a.disp_x as dispx ,a.disp_y as dispy,a.disp_h as disph ,a.time as time FROM  `tb_mp_data`   a  join(select max(time) as time ,sensorid from tb_mp_data  GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid where a.sensorid=#{deviceid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')")
+	List<MpData> dealmonth(String deviceid, String start, String end);
+
+	@Select(value = "select  b.eqdanwei as eqdanwei,b.equipno equipno,b.equipname as sensorname,a.disp_x as disp_x , a.disp_y as disp_y  ,a.disp_h as disp_h ,DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_mp_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_mp_data  GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid  where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC")
+	List<HashMap<String, Object>> real(String tailingid);
+}

eladmin-system/src/main/java/me/zhengjie/gemho/service/data/BjyCjDataService.java

+package me.zhengjie.gemho.service.data;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import me.zhengjie.gemho.entity.data.DmData;
+import me.zhengjie.gemho.entity.data.MpData;
+import me.zhengjie.gemho.x_datavo.DataVo;
+import me.zhengjie.gemho.x_datavo.RealDataVo;
+import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
+import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 内部位移数据 服务类
+ * </p>
+ *
+ * @author llj
+ * @since 2022-01-05
+ */
+public interface BjyCjDataService extends IService<MpData> {
+
+    /**
+     * 实时数据
+     *
+     * @return
+     */
+    List<RealDataVo> real(String equipno, HttpServletRequest request);
+
+    List<RealDataVo> real(String equipno, HttpServletRequest request,String tailInfoNo);
+    /**
+     * 分页历史
+     *
+     * @param dataQueryCriteria
+     * @param request
+     * @return
+     */
+    HashMap<String, Object> pageall(DataQueryCriteria dataQueryCriteria, HttpServletRequest request);
+
+    /**
+     * 图表数据
+     *
+     * @param dataQueryCriteria
+     * @param request
+     * @return
+     */
+    ImgDataVo imgList(DataQueryCriteria dataQueryCriteria, HttpServletRequest request);
+
+
+    void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request);
+}
+

eladmin-system/src/main/resources/config/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       connectionProperties: druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3310}/${DB_NAME:zhonghe}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true&requireSSL=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:ak}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true&requireSSL=false
       username: ${DB_USER:root}
       #password: ${DB_PWD:jinghe2021//}
       password: ${DB_PWD:jinghe2023}

eladmin-system/src/main/resources/config/application.yml

@@ -5,7 +5,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
@@ -28,9 +28,9 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:0}
-    host: ${REDIS_HOST:8.142.46.126}
-    port: ${REDIS_PORT:6379}
-    password: ${REDIS_PWD:}
+    host: ${REDIS_HOST:127.0.0.1}
+    port: ${REDIS_PORT:6399}
+    password: ${REDIS_PWD:R#9Xz&2Lp$Wq8v!u}
     #连接超时时间
     timeout: 5000
 

eladmin-system/src/main/resources/mapper/data/BjyCjDataMapper.xml

+<?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="me.zhengjie.gemho.mapper.data.BjyCjDataMapper">
+
+    <!-- MpData实体类的resultMap -->
+    <resultMap id="MpDataResultMap" type="me.zhengjie.gemho.entity.data.MpData">
+        <!-- 主键字段 -->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        
+        <!-- 基本字段 -->
+        <result column="sensorid" property="sensorid" jdbcType="VARCHAR"/>
+        <result column="sensorname" property="sensorname" jdbcType="VARCHAR"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+        
+        <!-- 位移相关字段 -->
+        <result column="disp_x" property="dispx" jdbcType="VARCHAR"/>
+        <result column="disp_y" property="dispy" jdbcType="VARCHAR"/>
+        <result column="disp_h" property="disph" jdbcType="VARCHAR"/>
+        
+        <!-- 速度相关字段 -->
+        <result column="velocity_x" property="velocityx" jdbcType="VARCHAR"/>
+        <result column="velocity_y" property="velocityy" jdbcType="VARCHAR"/>
+        <result column="velocity_h" property="velocityh" jdbcType="VARCHAR"/>
+        
+        <!-- 加速度相关字段 -->
+        <result column="acceler_x" property="accelerx" jdbcType="VARCHAR"/>
+        <result column="acceler_y" property="accelery" jdbcType="VARCHAR"/>
+        <result column="acceler_h" property="accelerh" jdbcType="VARCHAR"/>
+        
+        <!-- 其他测量字段 -->
+        <result column="azimuth" property="azimuth" jdbcType="VARCHAR"/>
+        <result column="vds" property="vds" jdbcType="VARCHAR"/>
+        <result column="ads" property="ads" jdbcType="VARCHAR"/>
+        <result column="vdh" property="vdh" jdbcType="VARCHAR"/>
+        <result column="adh" property="adh" jdbcType="VARCHAR"/>
+        
+        <!-- 时间戳字段 -->
+        <result column="createtime" property="createtime" jdbcType="TIMESTAMP"/>
+        <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
+        
+        <!-- 状态字段 -->
+        <result column="datasource" property="datasource" jdbcType="INTEGER"/>
+        <result column="state" property="state" jdbcType="INTEGER"/>
+        <result column="bjjb" property="bjjb" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="pageall" resultMap="MpDataResultMap">
+        select *
+        from tb_mp_data a  join
+        tb_drybeachequipinfor as b
+        on a.sensorid=b.equipno and b.devicetype='20'
+            ${ew.customSqlSegment}
+    </select>
+</mapper>
\ No newline at end of file