数据提交

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java

@@ -79,18 +79,8 @@ public class ReflectHelper {
         Method m = setMethods.get(property.toLowerCase());
         if (m != null) {
             try {
-                // 获取属性的类型
-                Class<?> parameterType = m.getParameterTypes()[0];
-                // 判断属性类型是否为int
-                if (parameterType.equals(int.class) || parameterType.equals(Integer.class)) {
-                    // 将object参数转换为int类型
-                    int value = Integer.parseInt(object.toString());
-                    // 调用目标类的setter函数
-                    m.invoke(obj, value);
-                } else {
-                    // 调用目标类的setter函数
-                    m.invoke(obj, object);
-                }
+                // 调用目标类的setter函数
+                m.invoke(obj, object);
                 return true;
             } catch (Exception ex) {
                 log.info("invoke getter on " + property + " error: " + ex.toString());

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/SecurityConfig.java

@@ -0,0 +1,23 @@
+package org.jeecg.config.shiro;
+
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http
+                .csrf().disable()
+                .authorizeRequests()
+                .antMatchers("/**").permitAll()
+                .and()
+                .httpBasic().disable()
+                .formLogin().disable();
+    }
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -88,16 +88,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/user/querySysUser", "anon");//根据手机号获取用户信息
         filterChainDefinitionMap.put("/sys/user/phoneVerification", "anon");//用户忘记密码验证手机号
         filterChainDefinitionMap.put("/sys/user/passwordChange", "anon");//用户更改密码
-
-
-        filterChainDefinitionMap.put("/newWarn/warnHistory/page_new", "anon");//测试！！
-
-        filterChainDefinitionMap.put("/ginger/newParameterWarning", "anon");//测试！！
-        filterChainDefinitionMap.put("/RealTimeZj/getCondition", "anon");//测试！！
-        filterChainDefinitionMap.put("/RealTimeZj/getList", "anon");//测试！！
-        filterChainDefinitionMap.put("/RealTimeZj/getMotion", "anon");//测试！！
-        filterChainDefinitionMap.put("/newWarn/**", "anon");//测试！！
-
         filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
         filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token
         filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
@@ -148,8 +138,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/**/demo1.html", "anon");
 
 
-        //性能监控
-//        filterChainDefinitionMap.put("/actuator/**", "anon");
+        //性能监控  TODO 存在安全漏洞泄露TOEKN（durid连接池也有）
+        filterChainDefinitionMap.put("/actuator/**", "anon");
 
 
         // 添加自己的过滤器并且取名为jwt
@@ -170,8 +160,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/warning/**", "anon");
         filterChainDefinitionMap.put("/test/**", "anon");
         filterChainDefinitionMap.put("/wsTest/**", "anon");
+
+        filterChainDefinitionMap.put("/wsTest/**", "anon");
         // <!-- 过滤链定义，从上向下顺序执行，一般将/**放在最为下边
-        filterChainDefinitionMap.put("/**", "jwt");
+        /*filterChainDefinitionMap.put("/warning/comprehensiveLog/**", "jwt");*/
 
         // 未授权界面返回JSON
         shiroFilterFactoryBean.setUnauthorizedUrl("/sys/common/403");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java

@@ -1,17 +1,20 @@
 package org.jeecg.modules.cas.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jasig.cas.client.validation.Assertion;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.base.service.BaseCommonService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,12 +35,16 @@ public class CasClientController {
 
     @Value("${wellbore.redirect-cas-url}")
     private String redirectCasUrl;
+
+    @Resource
+    private BaseCommonService baseCommonService;
     /**
      * @param request
      * @param response
      * @return
      * @throws Exception
      */
+    @ApiOperation("登录接口")
     @GetMapping("/validateLogin")
     public Object validateLogin(HttpServletRequest request,
                                 HttpServletResponse response) throws Exception {
@@ -48,17 +55,22 @@ public class CasClientController {
             if (StringUtils.isEmpty(principal)) {
                 throw new Exception("No principal was found in the response from the CAS server.");
             }
+            log.info("重定向地址:{}",redirectUrl);
+            baseCommonService.addLog("用户名: " + principal + ",登录成功！", CommonConstant.LOG_TYPE_1, null);
             response.sendRedirect(redirectUrl);
         } catch (Exception e) {
             //e.printStackTrace();
             result.error500(e.getMessage());
         }
+
+        log.info("Rest api login out.{}",result);
         return new HttpEntity<>(result);
     }
 
     @GetMapping("/redirect")
     public void redirectIframe(HttpServletRequest request,
                                HttpServletResponse response) throws Exception {
+        log.info("重定向地址:{}",redirectCasUrl);
         response.sendRedirect(redirectCasUrl);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/dataVue/task/jhWarnTimeJob.java

@@ -63,7 +63,7 @@ public class jhWarnTimeJob implements Job {
             return;
         }
         log.info(String.format("    时间:" + org.jeecg.common.util.DateUtils.getTimestamp()));
-        warnLogService.updateAjhWarnInfo();;
+       // warnLogService.updateAjhWarnInfo();;
 //        String warningSql = "select count(1) as COUNT,MAX(WARN_TIME) as TIME,JH from WARN_HISTORY where 0=0  GROUP BY JH order by TIME desc";
 //        List<Map<String, Object>> warnQuery = iLtdSourceService.querySql(warningSql,null);
        // List<WarnLogStatisticsDto> warnLogCount = getWarnLogCount();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/entity/WellDrilling.java

@@ -0,0 +1,559 @@
+package org.jeecg.modules.newWarning.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * LTD录井数据实体类
+ * @author Zhao RenJi
+ */
+@Data
+public class WellDrilling implements Serializable {
+
+    /**
+     *井号
+     */
+    private String jh;
+
+    private String tid;
+
+    @TableId
+    private String time;
+
+    private BigDecimal id;
+
+    /**
+     *井深
+     */
+    private BigDecimal depth;
+
+    /**
+     *垂直井深
+     */
+    private BigDecimal vdepth;
+
+    /**
+     *状态
+     */
+    private BigDecimal stat;
+
+    /**
+     *迟到时间
+     */
+    private BigDecimal lagtime;
+
+    /**
+     *迟到泵冲
+     */
+    private BigDecimal lagstrokes;
+
+    /**
+     *迟到井深
+     */
+    private BigDecimal lagdepth;
+
+    /**
+     *钻头位置
+     */
+    private BigDecimal bitdepth;
+
+    /**
+     *井底上空
+     */
+    private BigDecimal bitoff;
+
+    /**
+     *方入
+     */
+    private BigDecimal kellyin;
+
+    /**
+     *大钩高度
+     */
+    private BigDecimal hkh;
+
+    /**
+     *大钩速度
+     */
+    private BigDecimal hks;
+
+    /**
+     *大钩负荷
+     */
+    private BigDecimal woh;
+
+    /**
+     *计算大钩负荷
+     */
+    private BigDecimal wohCalc;
+
+    /**
+     *钻具视重
+     */
+    private BigDecimal floatWeight;
+
+    /**
+     *转盘转速
+     */
+    private BigDecimal rpm;
+
+    /**
+     *瞬间钻时
+     */
+    private BigDecimal ropInst;
+
+    /**
+     *上米钻时
+     */
+    private BigDecimal ropMavg;
+
+    /**
+     *钻压
+     */
+    private BigDecimal wob;
+
+    /**
+     *扭矩
+     */
+    private BigDecimal torque;
+
+    /**
+     *顶驱扭矩
+     */
+    private BigDecimal tdTorque;
+
+    /**
+     *立管压力
+     */
+    private BigDecimal spp;
+
+    /**
+     *套管压力
+     */
+    private BigDecimal whp;
+
+    /**
+     *1#泵冲
+     */
+    private BigDecimal pump1;
+
+    /**
+     *2#泵冲
+     */
+    private BigDecimal pump2;
+
+    /**
+     *3#泵冲
+     */
+    private BigDecimal pump3;
+
+    /**
+     *总泵冲
+     */
+    private BigDecimal pumptotal;
+
+    /**
+     *泵冲1累计数
+     */
+    private BigDecimal strokes1;
+
+    /**
+     *泵冲2累计数
+     */
+    private BigDecimal strokes2;
+
+    /**
+     *泵冲3累计数
+     */
+    private BigDecimal strokes3;
+
+    /**
+     *总泵冲累计数
+     */
+    private BigDecimal strokestotal;
+
+    /**
+     *瞬间钻速
+     */
+    private BigDecimal vopInst;
+
+    /**
+     *上米钻速
+     */
+    private BigDecimal vopMavg;
+
+    /**
+     *入口流量
+     */
+    private BigDecimal flowin;
+
+    /**
+     *出口流量
+     */
+    private BigDecimal flowout;
+
+    /**
+     *出口流量% 百分比
+     */
+    private BigDecimal flowoutpercent;
+
+    /**
+     *入口密度
+     */
+    private BigDecimal mwin;
+
+    /**
+     *出口密度
+     */
+    private BigDecimal mwout;
+
+    /**
+     *入口温度
+     */
+    private BigDecimal tempin;
+
+    /**
+     *出口温度
+     */
+    private BigDecimal tempout;
+
+    /**
+     *入口电导
+     */
+    private BigDecimal condin;
+
+    /**
+     *出口电导
+     */
+    private BigDecimal condout;
+
+    /**
+     *当量密度
+     */
+    private BigDecimal ecd;
+
+    /**
+     *1#池体积
+     */
+    private BigDecimal pit1;
+
+    /**
+     *2#池体积
+     */
+    private BigDecimal pit2;
+
+    /**
+     *3#池体积
+     */
+    private BigDecimal pit3;
+
+    /**
+     *4#池体积
+     */
+    private BigDecimal pit4;
+
+    /**
+     *5#池体积
+     */
+    private BigDecimal pit5;
+
+    /**
+     *6#池体积
+     */
+    private BigDecimal pit6;
+
+    /**
+     *7#池体积
+     */
+    private BigDecimal pit7;
+
+    /**
+     *8#池体积
+     */
+    private BigDecimal pit8;
+
+    /**
+     *9#池体积
+     */
+    private BigDecimal pit9;
+
+    /**
+     *10#池体积
+     */
+    private BigDecimal pit10;
+
+    /**
+     *11#池体积
+     */
+    private BigDecimal pit11;
+
+    /**
+     *12#池体积
+     */
+    private BigDecimal pit12;
+
+    /**
+     *起下钻池体积
+     */
+    private BigDecimal triptandvol;
+
+    /**
+     *活动池体积
+     */
+    private BigDecimal actpittotal;
+
+    /**
+     *总池体积
+     */
+    private BigDecimal pittotal;
+
+    /**
+     *泥浆溢漏
+     */
+    private BigDecimal gainlossvol;
+
+    /**
+     *甲烷
+     */
+    private BigDecimal c1;
+
+    /**
+     *乙烷
+     */
+    private BigDecimal c2;
+
+    /**
+     *丙烷
+     */
+    private BigDecimal c3;
+
+    /**
+     *异丁烷
+     */
+    private BigDecimal ic4;
+
+    /**
+     *正丁烷
+     */
+    private BigDecimal nc4;
+
+    /**
+     *异戊烷
+     */
+    private BigDecimal ic5;
+
+    /**
+     *正戊烷
+     */
+    private BigDecimal nc5;
+
+    /**
+     *新戊烷
+     */
+    private BigDecimal ec5;
+
+    /**
+     *异己烷
+     */
+    private BigDecimal ic6;
+
+    /**
+     *正己烷
+     */
+    private BigDecimal nc6;
+
+    /**
+     *总烃
+     */
+    private BigDecimal tg;
+
+    /**
+     *二氧化碳
+     */
+    private BigDecimal co2;
+
+    /**
+     *氢气
+     */
+    private BigDecimal h2;
+
+    /**
+     *硫化氢1
+     */
+    private BigDecimal h2s1;
+
+    /**
+     *硫化氢2
+     */
+    private BigDecimal h2s2;
+
+    /**
+     *硫化氢3
+     */
+    private BigDecimal h2s3;
+
+    /**
+     *硫化氢4
+     */
+    private BigDecimal h2s4;
+
+    /**
+     *硫化氢5
+     */
+    private BigDecimal h2s5;
+
+    /**
+     *硫化氢6
+     */
+    private BigDecimal h2s6;
+
+    /**
+     *硫化氢7
+     */
+    private BigDecimal h2s7;
+
+    /**
+     *硫化氢8
+     */
+    private BigDecimal h2s8;
+
+    /**
+     *钻具总长
+     */
+    private BigDecimal stringlen;
+
+    /**
+     *当前单根
+     */
+    private BigDecimal curpipe;
+
+    /**
+     *钻头序号
+     */
+    private BigDecimal bitno;
+
+    /**
+     *钻头尺寸
+     */
+    private BigDecimal bitsize;
+
+    /**
+     *钻头类型
+     */
+    private BigDecimal bittype;
+
+    /**
+     *钻头进尺
+     */
+    private BigDecimal bitrun;
+
+    /**
+     *钻头入井时间
+     */
+    private BigDecimal bittime;
+
+    /**
+     *纯钻时间
+     */
+    private BigDecimal bitdrilltime;
+
+    /**
+     *钻进成本
+     */
+    private BigDecimal bitcost;
+
+    /**
+     *钻井天数
+     */
+    private BigDecimal totaldays;
+
+    /**
+     *已提下立柱数
+     */
+    private BigDecimal standsdone;
+
+    /**
+     *未提下立柱数
+     */
+    private BigDecimal standstogo;
+
+    /**
+     *提钻超拉
+     */
+    private BigDecimal tripoverpull;
+
+    /**
+     *DC指数
+     */
+    private BigDecimal dc;
+
+    /**
+     *Sigma指数
+     */
+    private BigDecimal sigma;
+
+    private BigDecimal free95;
+
+    private BigDecimal free96;
+
+    private BigDecimal free97;
+
+    private BigDecimal free98;
+
+    private BigDecimal free99;
+
+    private BigDecimal free100;
+
+    private BigDecimal free101;
+
+    private BigDecimal free102;
+
+    private BigDecimal free103;
+
+    private BigDecimal free104;
+
+    private BigDecimal free105;
+
+    private BigDecimal free106;
+
+    private BigDecimal free107;
+
+    private BigDecimal free108;
+
+    private BigDecimal free109;
+
+    private BigDecimal free110;
+
+    private BigDecimal free111;
+
+    private BigDecimal free112;
+
+    private BigDecimal free113;
+
+    private BigDecimal free114;
+
+    private BigDecimal free115;
+
+    private BigDecimal free116;
+
+    private BigDecimal free117;
+
+    private BigDecimal free118;
+
+    private BigDecimal free119;
+
+    private BigDecimal free120;
+
+    /**
+     * 工况
+     */
+    private String operatingMode;
+
+    /**
+     * 动作
+     */
+    private String motion;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/mapper/WellDrillingMapper.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.newWarning.mapper;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.jeecg.modules.newWarning.entity.TabQi;
+import org.jeecg.modules.newWarning.entity.WellDrilling;
+
+import java.util.List;
+
+@DS("yjDataSource")
+@Mapper
+public interface WellDrillingMapper extends BaseMapper<WellDrilling> {
+
+    @Select({"select table_name from USER_TABLES"})
+    List<String> tableNames();
+
+    @Select(" select * from "+"\"${jhTableName}\""+"  ${ew.customSqlSegment} ")
+    List<WellDrilling> selectListOrcale(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+
+    /**
+     * @param jhTableName
+     * @param motion
+     * @param operatingMode
+     * @param queryWrapper
+     */
+    @Update("UPDATE "+"\"${jhTableName}\""+"  SET motion="+"'${motion}'"+",operating_mode="+"'${operatingMode}'"+"  ${ew.customSqlSegment}")
+    void updateByTimeOrcale(@Param("jhTableName")String jhTableName,@Param("motion")String motion,
+                            @Param("operatingMode")String operatingMode,@Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+
+    @Select("select * from  \"\"${jhTableName}\"\"  ${ew.customSqlSegment}")
+    List<WellDrilling> selectList(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+
+    @Select("select * from  \"\"${jhTableName}\"\" ${ew.customSqlSegment}")
+    Page<WellDrilling> selectListPage(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper, Page<WellDrilling> page);
+
+    @Select("select * from  \"\"${jhTableName}\"\"  ${ew.customSqlSegment} Limit #{page},#{pageNo}")
+    List<WellDrilling> selectListP(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper,@Param("page")Integer page,@Param("pageNo")Integer pageNo);
+
+    @Select("select * from  \"${jhTableName}\"  ${ew.customSqlSegment} LIMIT 1")
+    WellDrilling selectOne(@Param("jhTableName")String jhTableName,@Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+
+    @Select("select * from   (select * from \"${jhTableName}\"  order by time desc ) where  rownum<2")
+    WellDrilling selectOneOrcale(@Param("jhTableName")String jhTableName);
+
+    @Select("select * from ( select * from  \"${jhTableName}\"  ${ew.customSqlSegment} )  where rownum<4 ")
+    List<WellDrilling> selectListPOrcale(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+
+    @Select("select * from   (select * from \"${jhTableName}\"  ${ew.customSqlSegment} ) where  rownum<2")
+    WellDrilling selectWOneOrcale(@Param("jhTableName")String jhTableName, @Param("ew") QueryWrapper<WellDrilling> queryWrapper);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/mapper/xml/WellDrillingMapper.xml

@@ -0,0 +1,4 @@
+<?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="org.jeecg.modules.newWarning.mapper.WellDrillingMapper">
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/HookLoadWarnLogService.java

@@ -24,4 +24,6 @@ public interface HookLoadWarnLogService extends IService<HookLoadWarnLog> {
     List<WarnLogComprehensiveDto> getWarnLogList(@Param("params") HashMap<String, Object> params);
 
     List<WarnLogStatisticsDto> getWarnLogCount(WarnLogCountParams params);
+
+    Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/PumpingPressureWarnLogService.java

@@ -20,4 +20,6 @@ public interface PumpingPressureWarnLogService extends IService<PumpingPressureW
     List<WarnLogComprehensiveDto> getWarnLogList(@Param("params") HashMap<String, Object> params);
 
     List<WarnLogStatisticsDto> getWarnLogCount(WarnLogCountParams params);
+
+    Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/TorqueWarnLogService.java

@@ -20,4 +20,6 @@ public interface TorqueWarnLogService extends IService<TorqueWarnLog> {
     List<WarnLogComprehensiveDto> getWarnLogList(@Param("params") HashMap<String, Object> params);
 
     List<WarnLogStatisticsDto> getWarnLogCount(WarnLogCountParams params);
+
+    Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/TotalPoolVolumeWarnLogService.java

@@ -19,4 +19,6 @@ public interface TotalPoolVolumeWarnLogService extends IService<TotalPoolVolumeW
     List<WarnLogComprehensiveDto> getWarnLogList(@Param("params") HashMap<String, Object> params);
 
     List<WarnLogStatisticsDto> getWarnLogCount(WarnLogCountParams params);
+
+    Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime,String type);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/WellDrillingService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.newWarning.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.newWarning.entity.WellDrilling;
+
+public interface WellDrillingService extends IService<WellDrilling> {
+    WellDrilling selectOneOrcale(String tableName);
+
+    String getTableCode(String AJH);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/impl/HookLoadWarnLogServiceImpl.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.newWarning.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.modules.newWarning.dto.WarnLogComprehensiveDto;
 import org.jeecg.modules.newWarning.dto.WarnLogStatisticsDto;
 import org.jeecg.modules.newWarning.entity.HookLoadWarnLog;
@@ -17,7 +14,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author 费玉泉
@@ -43,6 +39,15 @@ public class HookLoadWarnLogServiceImpl extends ServiceImpl<HookLoadWarnLogMappe
         return baseMapper.getWarnLogCount(wrapper);
     }
 
+    @Override
+    public Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime){
+        QueryWrapper<HookLoadWarnLog> wrapper=new QueryWrapper<>();
+        wrapper.lambda().eq(HookLoadWarnLog::getJh, jh);
+        wrapper.apply("warn_time>=to_date({0},'yyyy-mm-dd hh24:mi:ss')", startTime);
+        wrapper.apply("warn_time <= to_date({0},'yyyy-mm-dd hh24:mi:ss')", endTime);
+        return this.count(wrapper);
+    }
+
 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/impl/PumpingPressureWarnLogServiceImpl.java

@@ -32,6 +32,15 @@ public class PumpingPressureWarnLogServiceImpl extends ServiceImpl<PumpingPressu
         QueryWrapper<WarnLogCountParams> wrapper=new QueryWrapper<>();
         return baseMapper.getWarnLogCount(wrapper);
     }
+
+    @Override
+    public Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime){
+        QueryWrapper<PumpingPressureWarnLog> wrapper=new QueryWrapper<>();
+        wrapper.lambda().eq(PumpingPressureWarnLog::getJh, jh);
+        wrapper.apply("warn_time>=to_date({0},'yyyy-mm-dd hh24:mi:ss')", startTime);
+        wrapper.apply("warn_time <= to_date({0},'yyyy-mm-dd hh24:mi:ss')", endTime);
+        return this.count(wrapper);
+    }
 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/impl/TorqueWarnLogServiceImpl.java

@@ -32,6 +32,15 @@ public class TorqueWarnLogServiceImpl extends ServiceImpl<TorqueWarnLogMapper, T
         QueryWrapper<WarnLogCountParams> wrapper=new QueryWrapper<>();
         return baseMapper.getWarnLogCount(wrapper);
     }
+
+    @Override
+    public Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime){
+        QueryWrapper<TorqueWarnLog> wrapper=new QueryWrapper<>();
+        wrapper.lambda().eq(TorqueWarnLog::getJh, jh);
+        wrapper.apply("warn_start_time >= to_date({0},'yyyy-mm-dd hh24:mi:ss')", startTime);
+        wrapper.apply("warn_start_time <= to_date({0},'yyyy-mm-dd hh24:mi:ss')", endTime);
+        return this.count(wrapper);
+    }
 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/impl/TotalPoolVolumeWarnLogServiceImpl.java

@@ -32,6 +32,16 @@ public class TotalPoolVolumeWarnLogServiceImpl extends ServiceImpl<TotalPoolVolu
         QueryWrapper<WarnLogCountParams> wrapper=new QueryWrapper<>();
         return baseMapper.getWarnLogCount(wrapper);
     }
+
+    @Override
+    public Integer getWarnCountByJhAndDate(String jh, String startTime, String endTime,String type){
+        QueryWrapper<TotalPoolVolumeWarnLog> wrapper=new QueryWrapper<>();
+        wrapper.lambda().eq(TotalPoolVolumeWarnLog::getJh, jh);
+        wrapper.lambda().eq(TotalPoolVolumeWarnLog::getTotalWarnType, type);
+        wrapper.apply("warn_time >= to_date({0},'yyyy-mm-dd hh24:mi:ss')", startTime);
+        wrapper.apply("warn_time <= to_date({0},'yyyy-mm-dd hh24:mi:ss')", endTime);
+        return this.count(wrapper);
+    }
 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/newWarning/service/impl/WellDrillingServiceImpl.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.newWarning.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.newWarning.entity.WellDrilling;
+import org.jeecg.modules.newWarning.mapper.WellDrillingMapper;
+import org.jeecg.modules.newWarning.service.WellDrillingService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @author Zhao RenJi
+ */
+@Service
+public class WellDrillingServiceImpl extends ServiceImpl<WellDrillingMapper, WellDrilling> implements WellDrillingService {
+    @Resource
+    private WellDrillingMapper mapper;
+
+    @Override
+    public WellDrilling selectOneOrcale(String tableName) {
+        return mapper.selectOneOrcale(tableName);
+    }
+
+    /**
+     * 根据井号名称获得表代码
+     *
+     * @param AJH
+     * @return
+     */
+    @Override
+    public String getTableCode(String AJH) {
+        //井号预处理
+        String s = AJH.replace('-', '_').toUpperCase();
+        return "LTD_" + s ;
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/warningThreshold/entity/YjRealTimeLog.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.warningThreshold.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import oracle.sql.DATE;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/warningThreshold/service/impl/YjWohWarnValueServiceImpl.java

@@ -63,4 +63,7 @@ public class YjWohWarnValueServiceImpl extends ServiceImpl<YjWohWarnValueMapper,
     public void saveOrUpd(YjWohWarnValue model){
         this.saveOrUpdate(model);
     }
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/controller/YjComprehensiveLogController.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.yjComprehensiveLog.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveLog;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveRealLog;
+import org.jeecg.modules.yjComprehensiveLog.model.YjJhComprehensiveCountModel;
+import org.jeecg.modules.yjComprehensiveLog.service.YjComprehensiveLogService;
+import org.jeecg.modules.yjComprehensiveLog.service.YjComprehensiveRealLogService;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 配置 前端控制器
+ * <p>
+ *
+ * @Author:
+ */
+@RestController
+@RequestMapping("/warning/comprehensiveLog")
+@Slf4j
+public class YjComprehensiveLogController {
+
+
+    @Resource
+    private YjComprehensiveLogService comprehensiveLogService;
+
+    /**
+     * 根据时间获取单独井的各类预警数据
+     *
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @param jh 井号
+     * @return YjJhComprehensiveCountModel
+     */
+    @GetMapping("/getWarnCountByJhAndDate")
+    public Result<?> getWarnCountByJhAndDate( @RequestParam(name="startDate")String startDate, @RequestParam(name="endDate") String endDate,
+                               @RequestParam(name="jh") String jh){
+        YjJhComprehensiveCountModel res = comprehensiveLogService.getWarnCountByJhAndDate(startDate, endDate,jh);
+        return Result.OK(res);
+    }
+
+    /**
+     * 根据不同的时间类型查询预警日志数据
+     * @param endDate 结束时间
+     * @param jh 井号
+     * @param dateType 时间类型
+     * @param warnType 预警类型
+     * @return List<YjComprehensiveLog>
+     */
+    @GetMapping("/getLogByJh")
+    public Result<?> getLogByJh( @RequestParam(name="endDate")String endDate,@RequestParam(name="jh") String jh, @RequestParam(name="dateType")String dateType,
+                                 @RequestParam(name="warnType") String warnType){
+        List<YjComprehensiveLog> res = comprehensiveLogService.getLogByJh(endDate, jh,dateType,warnType);
+        return Result.OK(res);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/controller/YjComprehensiveRealLogController.java

@@ -0,0 +1,84 @@
+package org.jeecg.modules.yjComprehensiveLog.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveRealLog;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveRealLogModel;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveSumModel;
+import org.jeecg.modules.yjComprehensiveLog.service.YjComprehensiveRealLogService;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 配置 前端控制器
+ * <p>
+ *
+ * @Author:
+ */
+@RestController
+@RequestMapping("/warning/comprehensiveRealLog")
+@Slf4j
+public class YjComprehensiveRealLogController {
+
+    @Resource
+    private YjComprehensiveRealLogService comprehensiveRealLogService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param param
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping("/queryPage")
+    public Result<IPage<YjComprehensiveRealLog>> queryPage(YjComprehensiveRealLog param, @RequestParam(name="pageNo", defaultValue="1")Integer pageNo,
+                                                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req){
+        IPage<YjComprehensiveRealLog> res = comprehensiveRealLogService.queryPage(param, pageNo, pageSize, req);
+        return Result.OK(res);
+    }
+
+    /**
+     * 获取当前最新的风险数据
+     *
+     * @return
+     */
+    @GetMapping("/queryRealList")
+    public Result<?> queryRealList(){
+        List<YjComprehensiveRealLogModel> res = comprehensiveRealLogService.queryRealList();
+        return Result.OK(res);
+    }
+
+
+    /**
+     * 获取各类风险统计数量
+     *
+     * @return
+     */
+    @GetMapping("/getRiskCount")
+    public Result<?> getRiskCount(){
+        List<YjComprehensiveSumModel> res = comprehensiveRealLogService.getRiskCount();
+        return Result.OK(res);
+    }
+
+    /**
+     * 根据井号获取当前井最新工况及风险
+     * @param jh
+     * @return
+     */
+    @GetMapping("/getRealDataByJh")
+    public Result<?> getRealDataByJh(@RequestParam("jh") String jh){
+        List<YjComprehensiveRealLog> res = comprehensiveRealLogService.getRealTimeLogByJh(jh);
+        return Result.OK(res);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/entity/YjComprehensiveLog.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.yjComprehensiveLog.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 综合异常日志信息;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@TableName("yj_comprehensive_log")
+@Data
+public class YjComprehensiveLog implements Serializable{
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+    /**
+     * 井号
+     */
+    private String jh;
+    /**
+     * 预警时间
+     */
+    private String warnTime;
+    /**
+     * 预警类别:卡钻、溢流、井漏
+     */
+    private String warnType;
+    /**
+     * 预警内容
+     */
+    private String warnContent;
+    /**
+     * 预警级别
+     */
+    private BigDecimal warnLevel;
+    /**
+     * 预警段工况
+     */
+    private String workingCondition;
+
+    /**
+     * 预警段动作
+     */
+    private String motion;
+
+    /**
+     * 井深
+     */
+    private BigDecimal depth;
+    /**
+     * 起点时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/entity/YjComprehensiveRealLog.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.yjComprehensiveLog.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 综合异常日志实时信息;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@TableName("yj_comprehensive_real_log")
+@Data
+public class YjComprehensiveRealLog implements Serializable{
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+    /**
+     * 井号
+     */
+    private String jh;
+    /**
+     * 预警时间
+     */
+    private String warnTime;
+    /**
+     * 预警类别:卡钻、溢流、井漏
+     */
+    private String warnType;
+    /**
+     * 预警内容
+     */
+    private String warnContent;
+    /**
+     * 预警级别
+     */
+    private BigDecimal warnLevel;
+    /**
+     * 预警点工况
+     */
+    private String workingCondition;
+
+    /**
+     * 井深
+     */
+    private String motion;
+
+    /**
+     * 预警段工况
+     */
+    private BigDecimal depth;
+    /**
+     * 起点时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/mapper/YjComprehensiveLogMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.yjComprehensiveLog.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveLog;
+
+/**
+ * 综合异常日志信息;(yj_comprehensive_log)表数据库访问层
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@Mapper
+public interface YjComprehensiveLogMapper  extends BaseMapper<YjComprehensiveLog> {
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/mapper/YjComprehensiveRealLogMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.yjComprehensiveLog.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveRealLog;
+
+/**
+ * 综合异常日志信息;(yj_comprehensive_log)表数据库访问层
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@Mapper
+public interface YjComprehensiveRealLogMapper extends BaseMapper<YjComprehensiveRealLog> {
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/mapper/xml/YjComprehensiveLogMapper.xml

@@ -0,0 +1,6 @@
+<?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="org.jeecg.modules.yjComprehensiveLog.mapper.YjComprehensiveLogMapper">
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/mapper/xml/YjComprehensiveRealLogMapper.xml

@@ -0,0 +1,6 @@
+<?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="org.jeecg.modules.yjComprehensiveLog.mapper.YjComprehensiveRealLogMapper">
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/model/YjComprehensiveRealLogModel.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.yjComprehensiveLog.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class YjComprehensiveRealLogModel implements Serializable {
+
+    /**
+     * 井号
+     */
+    private String jh;
+    /**
+     * 预警时间
+     */
+    private String warnTime;
+    /**
+     * 预警内容
+     */
+    private String warnContent;
+    /**
+     * 卡钻风险
+     */
+    private BigDecimal qzfx;
+    /**
+     * 井漏风险
+     */
+    private BigDecimal jlfx;
+    /**
+     * 溢流风险
+     */
+    private BigDecimal ylfx;
+    /**
+     * 预警点工况
+     */
+    private String workingCondition;
+
+    /**
+     * 井深
+     */
+    private String motion;
+
+    /**
+     * 预警段工况
+     */
+    private BigDecimal depth;
+    /**
+     * 起点时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/model/YjComprehensiveSumModel.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.yjComprehensiveLog.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class YjComprehensiveSumModel  implements Serializable {
+
+    private String warnType;
+
+    private Integer gfxCount;
+
+    private Integer zfxCount;
+
+    private Integer dfxCount;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/model/YjJhComprehensiveCountModel.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.yjComprehensiveLog.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class YjJhComprehensiveCountModel  implements Serializable {
+
+    private String jh;
+
+    private BigDecimal gzCount;
+
+    private BigDecimal njCount;
+
+    private BigDecimal byCount;
+
+    private BigDecimal jlCount;
+
+    private BigDecimal ylCount;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/service/YjComprehensiveLogService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.yjComprehensiveLog.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveLog;
+import org.jeecg.modules.yjComprehensiveLog.model.YjJhComprehensiveCountModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+public interface YjComprehensiveLogService extends IService<YjComprehensiveLog> {
+
+    YjJhComprehensiveCountModel getWarnCountByJhAndDate(String startDate, String endDate, String jh);
+
+    List<YjComprehensiveLog> getLogByJh(String endDate, String jh, String dateType, String warnType);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/service/YjComprehensiveRealLogService.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.yjComprehensiveLog.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveLog;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveRealLog;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveRealLogModel;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveSumModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+public interface YjComprehensiveRealLogService extends IService<YjComprehensiveRealLog> {
+    List<YjComprehensiveRealLog> getRealTimeLogByJh(String jh);
+
+    IPage<YjComprehensiveRealLog> queryPage(YjComprehensiveRealLog param, Integer pageNo,
+                                        Integer pageSize, HttpServletRequest req);
+
+    List<YjComprehensiveRealLogModel> queryRealList();
+
+    List<YjComprehensiveSumModel> getRiskCount();
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/service/impl/YjComprehensiveLogServiceImpl.java

@@ -0,0 +1,126 @@
+package org.jeecg.modules.yjComprehensiveLog.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.newWarning.entity.WellDrilling;
+import org.jeecg.modules.newWarning.service.*;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveLog;
+import org.jeecg.modules.yjComprehensiveLog.mapper.YjComprehensiveLogMapper;
+import org.jeecg.modules.yjComprehensiveLog.model.YjJhComprehensiveCountModel;
+import org.jeecg.modules.yjComprehensiveLog.service.YjComprehensiveLogService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+
+/**
+ * 综合异常日志信息;(yj_comprehensive_log)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@Service
+@Slf4j
+public class YjComprehensiveLogServiceImpl extends ServiceImpl<YjComprehensiveLogMapper, YjComprehensiveLog> implements YjComprehensiveLogService {
+
+    @Resource
+    private HookLoadWarnLogService hookLoadWarnLogService;
+
+    @Resource
+    private PumpingPressureWarnLogService pumpingPressureWarnLogService;
+
+    @Resource
+    private TorqueWarnLogService torqueWarnLogService;
+
+    @Resource
+    private TotalPoolVolumeWarnLogService totalPoolVolumeWarnLogService;
+
+    @Resource
+    private WellDrillingService wellDrillingService;
+
+
+
+    /**
+     * 根据时间获取单独井的各类预警数据
+     * @param startDate
+     * @param endDate
+     * @param jh
+     */
+    @Override
+    public YjJhComprehensiveCountModel getWarnCountByJhAndDate(String startDate, String endDate, String jh){
+        YjJhComprehensiveCountModel  res =new YjJhComprehensiveCountModel();
+        Integer gzCount = hookLoadWarnLogService.getWarnCountByJhAndDate(jh,startDate, endDate);
+
+        Integer byCount =  pumpingPressureWarnLogService.getWarnCountByJhAndDate(jh,startDate,endDate);
+
+        Integer njCount = torqueWarnLogService.getWarnCountByJhAndDate(jh,startDate,endDate);
+
+        Integer jlCount = totalPoolVolumeWarnLogService.getWarnCountByJhAndDate(jh, startDate, endDate, "井漏");
+
+        Integer ylCount = totalPoolVolumeWarnLogService.getWarnCountByJhAndDate(jh,startDate,endDate,"溢流");
+        res.setJh(jh);
+        res.setGzCount(BigDecimal.valueOf(gzCount));
+        res.setByCount(BigDecimal.valueOf(byCount));
+        res.setNjCount(BigDecimal.valueOf(njCount));
+        res.setJlCount(BigDecimal.valueOf(jlCount));
+        res.setYlCount(BigDecimal.valueOf(ylCount));
+        return res;
+    }
+
+    /**
+     * 根据不同的时间类型查询预警日志数据
+     * @param endDate
+     * @param jh
+     * @param dateType
+     * @param warnType
+     * @return
+     */
+    @Override
+    public List<YjComprehensiveLog> getLogByJh(String endDate, String jh, String dateType, String warnType){
+        QueryWrapper<YjComprehensiveLog> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(YjComprehensiveLog::getJh, jh)
+                .eq(YjComprehensiveLog::getWarnType, warnType).orderByAsc(YjComprehensiveLog::getWarnTime);
+        // 日期范围查询逻辑
+        LocalDate endDateLocal = LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String startStr ="";
+        String endStr ="";
+        switch (dateType) {
+            case "1": // 当天数据
+                String dateStr = endDateLocal.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                startStr=dateStr;
+                endStr=dateStr;
+                break;
+
+            case "2": { // 本周数据
+                LocalDate monday = endDateLocal.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+                LocalDate sunday = endDateLocal.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+                startStr = monday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                 endStr = sunday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                break;
+            }
+
+            case "3": { // 当月数据
+                LocalDate firstDay = endDateLocal.with(TemporalAdjusters.firstDayOfMonth());
+                LocalDate lastDay = endDateLocal.with(TemporalAdjusters.lastDayOfMonth());
+                 startStr = firstDay.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                 endStr = lastDay.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                break;
+            }
+            default:
+                throw new IllegalArgumentException("无效的dateType参数");
+        }
+
+        log.info("查询井号:{},预警类别:{},开始时间：{}，结束时间：{}",jh,warnType,startStr,endStr);
+        wrapper.apply("TO_DATE(SUBSTR(warn_time, 1, 19), 'yyyy-MM-dd HH24:mi:ss') >= to_date({0},'yyyy-mm-dd hh24:mi:ss')",startStr+" 00:00:00").
+                apply("TO_DATE(SUBSTR(warn_time, 1, 19), 'yyyy-MM-dd HH24:mi:ss') <= to_date({0},'yyyy-mm-dd hh24:mi:ss')",endStr+" 23:59:59");
+        return this.list(wrapper);
+    }
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/yjComprehensiveLog/service/impl/YjComprehensiveRealLogServiceImpl.java

@@ -0,0 +1,155 @@
+package org.jeecg.modules.yjComprehensiveLog.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.yjComprehensiveLog.entity.YjComprehensiveRealLog;
+import org.jeecg.modules.yjComprehensiveLog.mapper.YjComprehensiveRealLogMapper;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveRealLogModel;
+import org.jeecg.modules.yjComprehensiveLog.model.YjComprehensiveSumModel;
+import org.jeecg.modules.yjComprehensiveLog.service.YjComprehensiveRealLogService;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+/**
+ * 综合异常日志信息;(yj_comprehensive_log)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2025-4-9
+ */
+@Service
+public class YjComprehensiveRealLogServiceImpl extends ServiceImpl<YjComprehensiveRealLogMapper, YjComprehensiveRealLog> implements YjComprehensiveRealLogService {
+
+
+    @Override
+    public List<YjComprehensiveRealLog> getRealTimeLogByJh(String jh) {
+        QueryWrapper<YjComprehensiveRealLog> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(YjComprehensiveRealLog::getJh,jh);
+        List<YjComprehensiveRealLog> list = this.list(wrapper);
+        return list;
+    }
+
+    /**
+     * 分页查询
+     * @param param
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @Override
+    public IPage<YjComprehensiveRealLog> queryPage(YjComprehensiveRealLog param, Integer pageNo,
+                                               Integer pageSize, HttpServletRequest req){
+        QueryWrapper<YjComprehensiveRealLog> queryWrapper = QueryGenerator.initQueryWrapper(param, req.getParameterMap());
+        Page<YjComprehensiveRealLog> page = new Page<YjComprehensiveRealLog>(pageNo, pageSize);
+        return this.page(page, queryWrapper);
+    }
+
+    /**
+     * 获取当前最新的风险数据
+     * @return
+     */
+    @Override
+    public List<YjComprehensiveRealLogModel> queryRealList() {
+        List<YjComprehensiveRealLogModel> res=new ArrayList<>();
+        List<YjComprehensiveRealLog> list = this.list();
+        if(!list.isEmpty()){
+            Map<String, List<YjComprehensiveRealLog>> groupedMap = list.stream()
+                    .collect(Collectors.groupingBy(YjComprehensiveRealLog::getJh));
+            groupedMap.forEach((jh, logList) -> {
+                YjComprehensiveRealLogModel model = new YjComprehensiveRealLogModel();
+                model.setJh(jh);
+                model.setWarnTime(logList.get(0).getWarnTime());
+                model.setWorkingCondition(logList.get(0).getWorkingCondition());
+                model.setMotion(logList.get(0).getMotion());
+                model.setDepth(logList.get(0).getDepth());
+                model.setStartTime(logList.get(0).getStartTime());
+                model.setEndTime(logList.get(0).getEndTime());
+                logList.forEach(item->{
+                    switch (item.getWarnType()){
+                        case "井漏":
+                            model.setJlfx(item.getWarnLevel());
+                            break;
+                        case "溢流":
+                            model.setYlfx(item.getWarnLevel());
+                            break;
+                        case "卡钻":
+                            model.setQzfx(item.getWarnLevel());
+                            break;
+                        default:
+                            break;
+                    }
+                });
+                res.add(model);
+            });
+        }
+
+        return res.stream()
+                .sorted((o1, o2) -> {
+                    int p1 = getModelPriority(o1);
+                    int p2 = getModelPriority(o2);
+                    return Integer.compare(p2, p1); // 倒序排列
+                })
+                .collect(Collectors.toList());
+    }
+
+    private int getModelPriority(YjComprehensiveRealLogModel model) {
+        if (model.getQzfx() != null) return 3; // 卡钻最高优先级
+        if (model.getJlfx() != null) return 2;  // 井漏次之
+        if (model.getYlfx() != null) return 1;  // 溢流最低
+        return 0; // 无风险类型
+    }
+    /**
+     * 获取各类风险统计数量
+     * @return
+     */
+    @Override
+    public List<YjComprehensiveSumModel> getRiskCount(){
+        List<YjComprehensiveSumModel> res=new ArrayList<>();
+        List<YjComprehensiveRealLog> list = this.list();
+        if(list.isEmpty()){
+            return res ;
+        }
+        Map<String, List<YjComprehensiveRealLog>> groupedMap = list.stream()
+                .collect(Collectors.groupingBy(YjComprehensiveRealLog::getWarnType));
+        groupedMap.forEach((key,value)->{
+            YjComprehensiveSumModel resModel=new YjComprehensiveSumModel();
+            String warnType=key;
+            resModel.setWarnType(key);
+            Integer dfxCount = resModel.getDfxCount();
+            Integer zfxCount =resModel.getZfxCount();
+            Integer gfxCount =resModel.getGfxCount();
+            AtomicReference<Integer> dfxInt= new AtomicReference<>(0);
+            AtomicReference<Integer> zfxInt= new AtomicReference<>(0);
+            AtomicReference<Integer> gfxInt= new AtomicReference<>(0);
+            value.forEach(item->{
+                BigDecimal warnLevel = item.getWarnLevel();
+                if(warnLevel.compareTo(BigDecimal.ZERO) >= 0 && warnLevel.compareTo(new BigDecimal(50)) < 0) {
+                    dfxInt.getAndSet(dfxInt.get() + 1);
+                } else if(warnLevel.compareTo(new BigDecimal(50)) >= 0 && warnLevel.compareTo(new BigDecimal(80)) < 0) {
+                    zfxInt.getAndSet(zfxInt.get() + 1);
+                } else if(warnLevel.compareTo(new BigDecimal(80)) >= 0 && warnLevel.compareTo(new BigDecimal(100)) <= 0) {
+                    gfxInt.getAndSet(gfxInt.get() + 1);
+                }
+            });
+            // 最后设置统计结果
+            resModel.setDfxCount(dfxInt.get());
+            resModel.setZfxCount(zfxInt.get());
+            resModel.setGfxCount(gfxInt.get());
+            res.add(resModel);
+        });
+        return res;
+    }
+
+
+
+
+}

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 server:
   port: 8090
-  #port: 8777
+  #  port: 8777
   tomcat:
     max-swallow-size: -1
   error:
@@ -8,8 +8,8 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /jtznyj
-    session:0
+    context-path: /
+    session:
       tracking-modes: cookie
   compression:
     enabled: true
@@ -21,7 +21,10 @@ management:
     web:
       exposure:
         include: metrics,httptrace
-
+security:
+  user:
+    name: admin
+    password: admin
 spring:
   servlet:
     multipart:
@@ -43,7 +46,7 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #设置自动启动，默认为 true
-    auto-startup: false
+    auto-startup: true
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -131,45 +134,38 @@ spring:
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: jtznyj
           password: jtznyj#2021
         chartDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46/jt
           username: jtgcyth2018
           password: Sljtyw_2018
         fzqkDataSource2021:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: zjfzqk
           password: zjfzqk@2019
         zjyDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: zjycs
           password: Zjy_2019
         ljrbDataSource2021:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
-          url: jdbc:oracle:thin:@//10.66.116.46/JT_ZJ
+          url: jdbc:oracle:thin:@//10.66.116.46/jt_zj
           username: wlwmro
           password: Wlw_2020
         yjDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_LJ
           username: 'tj_zjgc'
-          password: zjgc@2024
+          password: ZjgcTJ#zjgc@2024
+
   #redis 配置
   redis:
     database: 0
@@ -181,7 +177,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password:
+    password: #YjJcfuwu@2025  #123
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
@@ -196,7 +192,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -286,7 +282,7 @@ cas:
   validation-type: CAS
   use-session: true
   skip-ticket-validation: true
-  client-host-url: http://localhost:8090/
+  client-host-url: https://10.68.224.124:8081/
 #Mybatis输出sql日志
 logging:
   level:
@@ -349,7 +345,8 @@ third-app:
       agent-id: ??
 wellbore:
   auth-url-base: http://10.68.224.14:8081/vs-sicp-authm-rest/authm/ws/rest/
-  redirect-url: http://localhost:3000
-  redirect-cas-url: http://localhost:3000
+  redirect-cas-url: http://10.68.224.14:8800/cas/login?service=https%3A%2F%2F10.68.224.124%3A8081%2Fsys%2Fcas%2Fclient%2FvalidateLogin
+  redirect-url: https://10.68.224.124:8081/
+
 allowed:
-  servernames: 127.0.0.1:8081,localhost:8777,10.68.224.124:8081,10.68.224.124,localhost,127.0.0.1
+  servernames: 127.0.0.1:8081,localhost:8090,10.68.224.124:8081,10.68.224.124,localhost,127.0.0.1

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -134,45 +134,37 @@ spring:
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: jtznyj
           password: jtznyj#2021
         chartDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46/jt
           username: jtgcyth2018
           password: Sljtyw_2018
         fzqkDataSource2021:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: zjfzqk
           password: zjfzqk@2019
         zjyDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_ZJ
           username: zjycs
           password: Zjy_2019
         ljrbDataSource2021:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46/jt_zj
           username: wlwmro
           password: Wlw_2020
         yjDataSource:
-          validationQuery: SELECT 1 FROM DUAL
           driver-class-name: oracle.jdbc.OracleDriver
           url: jdbc:oracle:thin:@//10.66.116.46:1521/JT_LJ
           username: 'tj_zjgc'
-          password: zjgc@2024
+          password: ZjgcTJ#zjgc@2024
   #redis 配置
   redis:
     database: 0
@@ -184,7 +176,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: 123
+    password: #YjJcfuwu@2025  #123
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
@@ -354,5 +346,6 @@ wellbore:
   auth-url-base: http://10.68.224.14:8081/vs-sicp-authm-rest/authm/ws/rest/
   redirect-cas-url: http://10.68.224.14:8800/cas/login?service=https%3A%2F%2F10.68.224.124%3A8081%2Fsys%2Fcas%2Fclient%2FvalidateLogin
   redirect-url: https://10.68.224.124:8081/
+
 allowed:
   servernames: 127.0.0.1:8081,localhost:8090,10.68.224.124:8081,10.68.224.124,localhost,127.0.0.1