1.调整河北pms国网上送主配网逻辑

2.技术监督调整
2024-03-12 10:38:55 +08:00
parent af4600f0e9
commit 4b09070081
50 changed files with 1058 additions and 564 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsDeptMonitorMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsDeptMonitorMapper.java
@@ -0,0 +1,17 @@
+package com.njcn.process.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.process.pojo.po.ThsDeptAlarm;
+import com.njcn.process.pojo.po.ThsDeptMonitor;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wr
+ * @since 2023-03-10
+ */
+public interface ThsDeptMonitorMapper extends BaseMapper<ThsDeptMonitor> {
+
+}
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsOverRunLogMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsOverRunLogMapper.java
@@ -1,7 +1,7 @@
 package com.njcn.process.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
+import com.njcn.process.pojo.po.ThsOverRunLog;
 import org.apache.ibatis.annotations.Mapper;

 /**
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsSuperviseMapper.java
@@ -3,11 +3,13 @@ package com.njcn.process.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto;
-import com.njcn.prepare.harmonic.pojo.po.ThsSupervise;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo;
+import com.njcn.process.pojo.po.ThsSupervise;
+import com.njcn.process.pojo.vo.SuperviseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+import java.util.List;
+
 /**
 * <p>
 * Mapper 接口
@@ -24,5 +26,8 @@ public interface ThsSuperviseMapper extends BaseMapper<ThsSupervise> {
     * @param superviseDto
     * @return
     */
-    Page<SuperviseVo> querySuperviseList(Page<SuperviseVo> page, @Param("param") SuperviseDto superviseDto);
+    List<SuperviseVo> querySuperviseList(@Param("param") SuperviseDto superviseDto);
+
+
+    Page<SuperviseVo> querySupervisePage(@Param("page")Page<SuperviseVo> page,@Param("param") SuperviseDto superviseDto);
 }
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java
@@ -2,7 +2,7 @@ package com.njcn.process.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.harmonic.pojo.vo.ThsStrategyVo;
-import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
+import com.njcn.process.pojo.param.SuperviseParam;
 import com.njcn.process.pojo.param.StrategyParam;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import org.apache.ibatis.annotations.Param;
@@ -47,6 +47,16 @@ public interface ThsWarnStrategyMapper extends BaseMapper<ThsWarnStrategy> {
     */
    List<String> getMonitorTagDetail(@Param("id") String id);

+
+    /***
+     * 获取监测点
+     * @author wr
+     * @date 2023-03-10 13:46
+     * @param id
+     * @return List<String>
+     */
+    List<String> getMonitorIds(@Param("id") String id);
+
    /**
     * 查询策略的集合
     */
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml
@@ -3,7 +3,31 @@
 <mapper namespace="com.njcn.process.mapper.ThsSuperviseMapper">
    <!--查询技术监督列表-->
    <select id="querySuperviseList" parameterType="com.njcn.prepare.harmonic.pojo.dto.SuperviseDto"
-            resultType="com.njcn.prepare.harmonic.pojo.vo.SuperviseVo">
+            resultType="com.njcn.process.pojo.vo.SuperviseVo">
+        select ts.*,ass.pro_index as deploymentId,exec_index as execId from ths_supervise ts
+        left join ths_flowable_ass ass on ts.sup_index = ass.ths_index
+        where 1=1
+        <if test="param.searchValue != null and param.searchValue != ''">
+            AND ts.name like CONCAT(CONCAT('%', #{param.searchValue}), '%')
+        </if>
+        <if test="param.searchBeginTime != null and param.searchBeginTime != ''">
+            AND DATE_FORMAT(ts.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
+        </if>
+        <if test="param.searchEndTime != null and param.searchEndTime != ''">
+            AND DATE_FORMAT(ts.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{param.searchEndTime}, '%Y-%m-%d')
+        </if>
+        <if test="param.searchState != null">
+            AND ts.progress=#{param.searchState}
+        </if>
+        <if test="param.type != null">
+            AND ts.type=#{param.type}
+        </if>
+        order by ts.create_time desc
+    </select>
+
+
+    <select id="querySupervisePage" parameterType="com.njcn.prepare.harmonic.pojo.dto.SuperviseDto"
+            resultType="com.njcn.process.pojo.vo.SuperviseVo">
        select ts.*,ass.pro_index as deploymentId,exec_index as execId from ths_supervise ts
        left join ths_flowable_ass ass on ts.sup_index = ass.ths_index
        where 1=1
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml
@@ -31,12 +31,19 @@
                column="{id = id}"
                select="com.njcn.process.mapper.ThsWarnStrategyMapper.getStrategyDetail">
        </collection>
+        <collection
+                property="monitorIds"
+                column="{id = id}"
+                select="com.njcn.process.mapper.ThsWarnStrategyMapper.getMonitorIds">
+        </collection>
    </resultMap>
    <select id="selectUpdateStrategy" resultMap="StrategyResultMap">
        SELECT
        ts.Id AS id,
        ts.NAME AS NAME,
        ts.Grade AS grade,
+        ts.dept_id,
+        ts.type,
        ts.Operation AS operation
        FROM
        ths_warn_strategy ts
@@ -52,7 +59,7 @@
        Warn_Id = #{id} and ts.Type=1
    </select>
    <!--查询策略的集合-->
-    <select id="selectStrategyList" parameterType="com.njcn.prepare.harmonic.pojo.param.SuperviseParam"
+    <select id="selectStrategyList" parameterType="com.njcn.process.pojo.param.SuperviseParam"
            resultType="com.njcn.harmonic.pojo.vo.ThsStrategyVo">
        select
        tws.id,
@@ -60,12 +67,9 @@
        tws.grade,
        tws.operation,
        tws.type,
-        Monitor_Id as monitorId,
-        tda.dept_Id as deptId
+        tws.dept_Id as deptId
        from
        ths_warn_strategy tws
-        INNER join ths_dept_alarm tda on
-        tws.Id = tda.Alarm_Id
        <where>
            <choose>
                <when test="param.initType==0">
@@ -76,12 +80,11 @@
                </when>
            </choose>
            <if test="param.deptId !=null and param.deptId !=''">
-                and tda.Dept_Id=#{param.deptId}
+                and tws.Dept_Id=#{param.deptId}
            </if>
            <if test="param.type !=null">
-                and tda.type=#{param.type}
+                and tws.type=#{param.type}
            </if>
-            and tws.Big_Type=1
        </where>
    </select>

@@ -94,4 +97,13 @@
        Warn_Id = #{id} and ts.Type=0
    </select>

+
+    <select id="getMonitorIds" resultType="java.lang.String">
+        SELECT
+        Ass_Id
+        FROM
+        ths_warn_strategy_ass ts
+        WHERE
+        Warn_Id = #{id} and ts.Type=2
+    </select>
 </mapper>