Skip to content

Y
YeeAmosFireAutoSysRoot
Commit a2e8b014 authored by 张森's avatar 张森
Browse files
Options

30545 换流变事故排油相关接口手动合并到dl分支

parent 8ba5d81b
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 30 deletions
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java
View file @ a2e8b014
......@@ -63,6 +63,11 @@ public class Equipment extends BasicEntity {
@Column(name="drain_duration")
private String drainDuration;
/**
* 分类
*/
@Column(name="category")
private String category;
public String getFireTruckRoute() {
return fireTruckRoute;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java
View file @ a2e8b014
......@@ -91,14 +91,16 @@ public class ContingencyPlanController extends BaseController {
@RequestParam(value = "editOrgName", required = false) String editOrgName,
@RequestParam(value = "implementationTimeLeft", required = false) Long implementationTimeLeftStamp,
@RequestParam(value = "implementationTimeRight", required = false) Long implementationTimeRightStamp,
@RequestParam(value = "size") int size) {
@RequestParam(value = "size") int size,
@RequestParam(value = "equipmentId", required = false) String equipmentId,
@RequestParam(value = "category", required = false) String category) {
if (current < 1 || size < 1) {
throw new YeeException("分页参数有误");
}
Date implementationTimeLeft = implementationTimeLeftStamp == null ? null : new Date(implementationTimeLeftStamp);
Date implementationTimeRight = implementationTimeRightStamp == null ? null : new Date(implementationTimeRightStamp);
Page page = new Page(current, size);
return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight));
return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId, category));
}
/**
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java
View file @ a2e8b014
......@@ -38,13 +38,13 @@ public interface PlanDetailMapper {
* 筛选预案获得总数
* @return
*/
Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight);
Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("equipmentId") String equipmentId, @Param("category") String category);
/**
* 筛选预案获得分页记录
* @return
*/
List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size);
List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size, @Param("equipmentId") String equipmentId, @Param("category") String category);
List<String> getRuleIdByEquipment(@Param("id") Long id);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @ a2e8b014
......@@ -39,6 +39,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.component.emq.EmqxListener;
import org.typroject.tyboot.core.foundation.utils.Bean;
......@@ -681,7 +682,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
@Override
public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
implementationTimeRight) {
implementationTimeRight,
String equipmentId, String category) {
List<Long> classifyIdList = new ArrayList<>();
if (classifyId != null) {
Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);
......@@ -690,7 +692,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
allChildren.forEach(e -> classifyIdList.add(e.getId()));
}
}
int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight);
int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId, category);
page.setTotal(total);
long start = (page.getCurrent() - 1) * page.getSize();
if (total == 0) {
......@@ -700,7 +702,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
page.setCurrent(1);
start = 0;
}
List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize());
List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize(), equipmentId, category);
// 查询并插入绑定数据的信息
fillBindingInfo(planList);
page.setRecords(planList);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java
View file @ a2e8b014
......@@ -7,6 +7,7 @@ import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
import com.yeejoin.amos.fas.exception.YeeException;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.HashMap;
......@@ -98,7 +99,7 @@ public interface IContingencyPlanService {
* @param implementationTimeRight 实施时间右界限
* @return Page
*/
Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight);
Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight, String equipmentId, String category);
/**
* 查询预案使用的文档ID
......
YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml
View file @ a2e8b014
......@@ -1018,4 +1018,29 @@
ALTER TABLE `c_plan_classify_tree` ADD COLUMN plan_type varchar(100) NULL COMMENT '分类TYPE';
</sql>
</changeSet>
<changeSet author="keyong" id="1723705299-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="f_equipment" columnName="drain_duration" />
</not>
</preConditions>
<comment>修改f_equipment表结构</comment>
<sql>
ALTER TABLE `f_equipment` ADD COLUMN `drain_duration` double DEFAULT NULL COMMENT '排空时长（分钟）';
</sql>
</changeSet>
<changeSet author="zs" id="20240903-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="f_equipment" columnName="category" />
</not>
</preConditions>
<comment>修改f_equipment表结构</comment>
<sql>
ALTER TABLE `f_equipment` ADD COLUMN `category` varchar(255) DEFAULT NULL COMMENT '分类';
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml
View file @ a2e8b014
......@@ -18,35 +18,43 @@
<select id="filterCount" parameterType="string" resultType="int">
SELECT
count(1)
count(1)
FROM
c_plan_detail cpd
c_plan_detail cpd
left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
left join f_equipment c on c.id = cpe.fire_equipment_id
<where>
<if test="planName != null and planName.length > 0">
AND plan_name LIKE concat('%', #{planName}, '%')
AND cpd.plan_name LIKE concat('%', #{planName}, '%')
</if>
<if test="classifyId != null and classifyId.size > 0">
AND classify_id IN
AND cpd.classify_id IN
<foreach collection="classifyId" separator="," item="cid" open="(" close=")">
#{cid}
</foreach>
</if>
<if test="planRange != null and planRange.size > 0">
AND plan_range IN
AND cpd.plan_range IN
<foreach collection="planRange" separator="," item="pr" open="(" close=")">
#{pr}
</foreach>
</if>
<if test="editOrgName != null and editOrgName.length > 0">
AND edit_org_name LIKE concat('%', #{editOrgName}, '%')
AND cpd.edit_org_name LIKE concat('%', #{editOrgName}, '%')
</if>
<if test="implementationTimeLeft != null">
AND implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
AND cpd.implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
</if>
<if test="implementationTimeRight != null">
AND implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
AND cpd.implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
</if>
<if test="equipmentId != null and equipmentId != ''">
AND cpe.fire_equipment_id = #{equipmentId}
</if>
<if test="category != null and category != ''">
AND c.category = #{category}
</if>
AND is_delete = 0
AND cpd.is_delete = 0
</where>
</select>
......@@ -55,21 +63,21 @@
cpd.id AS id,
cpd.id AS zid,
cpd.create_date createDate
, plan_name planName
, code
, classify_id classifyId
, plan_range planRange
, edit_org_name editOrgName
, edition
, implementation_time implementationTime
, cpd.plan_name planName
, cpd.code
, cpd.classify_id classifyId
, cpd.plan_range planRange
, cpd.edit_org_name editOrgName
, cpd.edition
, cpd.implementation_time implementationTime
, cpd.remark
, status
, creator
, reviser
, update_time updateTime
, org_code orgCode
, cpd.status
, cpd.creator
, cpd.reviser
, cpd.update_time updateTime
, cpd.org_code orgCode
, cpd.is_delete isDelete
, input_time inputTime
, cpd.input_time inputTime
, (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
, (SELECT count(1) FROM c_plan_operation_record cpor WHERE plan_id = cpd.id) executionTimes
,fpp.picture
......@@ -77,6 +85,7 @@
c_plan_detail cpd
left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
left join f_preplan_picture as fpp on fpp.equipment_id = cpe.fire_equipment_id and fpp.`type` =5
left join f_equipment c on c.id = cpe.fire_equipment_id
<where>
<if test="planName != null and planName.length > 0">
AND cpd.plan_name LIKE concat('%', #{planName}, '%')
......@@ -102,6 +111,12 @@
<if test="implementationTimeRight != null">
AND cpd.implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
</if>
<if test="equipmentId != null and equipmentId != ''">
AND cpe.fire_equipment_id = #{equipmentId}
</if>
<if test="category != null and category != ''">
AND c.category = #{category}
</if>
AND cpd.is_delete = 0
</where>
ORDER BY cpd.create_date DESC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment