update bug 20230425 v1

dev
hehang 3 years ago
parent 778227899f
commit 6b062c5603
  1. 12
      cjy-project/src/main/java/com/cjy/emergencycommand/controller/AlarmInfoController.java
  2. 12
      cjy-project/src/main/java/com/cjy/emergencycommand/controller/ExerciseInfoController.java
  3. 17
      cjy-project/src/main/java/com/cjy/emergencycommand/controller/OrderInfoController.java
  4. 34
      cjy-project/src/main/java/com/cjy/emergencycommand/domain/dto/OrderInfoDTO.java
  5. 9
      cjy-project/src/main/java/com/cjy/emergencycommand/domain/vo/AcceptAlarmVO.java
  6. 9
      cjy-project/src/main/java/com/cjy/emergencycommand/domain/vo/AlarmOrderDetailVO.java
  7. 10
      cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml
  8. 4
      ruoyi-ui/vue.config.js

@ -84,8 +84,10 @@ public class AlarmInfoController extends BaseController {
* 获取警情信息
*/
// @PreAuthorize("@ss.hasPermi('emergencyCommand:alarm:waring')")
@GetMapping("/getWaringDetail")
public AjaxResult getWaringDetail(AlarmInfo alarmInfo) {
@GetMapping("/getWaringDetail/{id}")
public AjaxResult getWaringDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAlarmInfoDetail(alarmInfo));
}
@ -94,8 +96,10 @@ public class AlarmInfoController extends BaseController {
* 获取接警信息
*/
// @PreAuthorize("@ss.hasPermi('emergencyCommand:alarm:accept')")
@GetMapping("/getAcceptDetail")
public AjaxResult getAcceptDetail(AlarmInfo alarmInfo) {
@GetMapping("/getAcceptDetail/{id}")
public AjaxResult getAcceptDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAcceptDetail(alarmInfo));
}

@ -88,8 +88,10 @@ public class ExerciseInfoController extends BaseController {
* 获取警情信息
*/
@PreAuthorize("@ss.hasPermi('emergencyCommand:exercise:waring')")
@GetMapping("/getWaringDetail")
public AjaxResult getWaringDetail(AlarmInfo alarmInfo) {
@GetMapping("/getWaringDetail/{id}")
public AjaxResult getWaringDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAlarmInfoDetail(alarmInfo));
}
@ -98,8 +100,10 @@ public class ExerciseInfoController extends BaseController {
* 获取接警信息
*/
@PreAuthorize("@ss.hasPermi('emergencyCommand:exercise:accept')")
@GetMapping("/getAcceptDetail")
public AjaxResult getAcceptDetail(AlarmInfo alarmInfo) {
@GetMapping("/getAcceptDetail/{id}")
public AjaxResult getAcceptDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAcceptDetail(alarmInfo));
}

@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -84,9 +83,11 @@ public class OrderInfoController extends BaseController {
/**
* 获取警情信息
*/
@PreAuthorize("@ss.hasPermi('emergencyCommand:order:waring')")
@GetMapping("/getWaringDetail")
public AjaxResult getWaringDetail(AlarmInfo alarmInfo) {
// @PreAuthorize("@ss.hasPermi('emergencyCommand:order:waring')")
@GetMapping("/getWaringDetail/{id}")
public AjaxResult getWaringDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAlarmInfoDetail(alarmInfo));
}
@ -94,9 +95,11 @@ public class OrderInfoController extends BaseController {
/**
* 获取接警信息
*/
@PreAuthorize("@ss.hasPermi('emergencyCommand:order:accept')")
@GetMapping("/getAcceptDetail")
public AjaxResult getAcceptDetail(AlarmInfo alarmInfo) {
// @PreAuthorize("@ss.hasPermi('emergencyCommand:order:accept')")
@GetMapping("/getAcceptDetail/{id}")
public AjaxResult getAcceptDetail(@PathVariable Long id) {
AlarmInfo alarmInfo = new AlarmInfo();
alarmInfo.setId(id);
alarmInfo.setOrganCode(getUserOrganCode());
return AjaxResult.success(alarmInfoService.selectAcceptDetail(alarmInfo));
}

@ -17,18 +17,6 @@ public class OrderInfoDTO extends AlarmInfoDTO {
@Excel(name = "紧急程度id")
private String gradeId;
/**
* 状态1 待接警 2 接警 3 处警 4 结警 5 归档 6 无效告警
*/
@Excel(name = "状态:1 待接警 2 接警 3 处警 4 结警 5 归档 6 无效告警")
private String status;
/**
* 事件分类
*/
@Excel(name = "事件分类")
private String classificationEventCode;
/**
* 事件等级
*/
@ -39,30 +27,16 @@ public class OrderInfoDTO extends AlarmInfoDTO {
public String toString() {
return "OrderInfoDTO{" +
"gradeId='" + gradeId + '\'' +
", status='" + status + '\'' +
", classificationEventCode='" + classificationEventCode + '\'' +
", eventGradeId='" + eventGradeId + '\'' +
'}';
}
@Override
public String getStatus() {
return status;
}
@Override
public void setStatus(String status) {
this.status = status;
public String getGradeId() {
return gradeId;
}
@Override
public String getClassificationEventCode() {
return classificationEventCode;
}
@Override
public void setClassificationEventCode(String classificationEventCode) {
this.classificationEventCode = classificationEventCode;
public void setGradeId(String gradeId) {
this.gradeId = gradeId;
}
public String getEventGradeId() {

@ -73,6 +73,7 @@ public class AcceptAlarmVO {
*/
@Excel(name = "描述")
private String description;
private String status;
@Override
public String toString() {
@ -91,6 +92,14 @@ public class AcceptAlarmVO {
'}';
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Long getId() {
return id;
}

@ -13,6 +13,7 @@ public class AlarmOrderDetailVO extends AlarmInfoDetailVO{
* 事件分类
*/
private String classificationEventCode;
private String status;
/**
* 事件等级
@ -120,6 +121,14 @@ public class AlarmOrderDetailVO extends AlarmInfoDetailVO{
'}';
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getContactUser() {
return contactUser;
}

@ -195,8 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null">and t1.create_time >= #{startTime}</if>
<if test="endTime != null">and t1.create_time &lt;= #{endTime}</if>
<if test="alarmSource != null and alarmSource != ''">alarm_source = #{alarmSource},</if>
<if test="classification_event_code != null">and t6.code = #{classificationEventCode}</if>
<if test="event_grade_id != null">and t1.event_grade_id = #{eventGradeId}</if>
<if test="classificationEventCode != null">and t6.code = #{classificationEventCode}</if>
<if test="eventGradeId != null">and t1.event_grade_id = #{eventGradeId}</if>
</where>
</select>
<select id="selectExerciseInfoListByCondition" resultType="com.cjy.emergencycommand.domain.vo.OrderInfoVO">
@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="alarmStatisticsBySource" resultType="com.cjy.emergencycommand.domain.vo.AlarmStatisticsVO">
SELECT t1.name,COUNT(t2.id) as value FROM ec_classification_config t1
LEFT JOIN ec_alarm_info t2 ON t1.`code` = t2.alarm_source AND t2.del_flag !=2 AND t2.organ_code = #{organCode} AND t2.create_time >CURRENT_DATE()
WHERE t1.type = 3 AND t1.del_flag !=2
WHERE t1.type != 2 AND t1.del_flag !=2
GROUP BY t1.code,t1.name,t1.id
ORDER BY t1.id
</select>
@ -353,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.classification_event_code as classificationEventCode,t1.event_grade_id as eventGradeId,
t1.principal_user_id AS principalUserId,t1.waring_feedback AS waringFeedback,
t1.scheduling_id AS schedulingId,t1.multimedia_scheduling_type AS multimediaSchedulingType,
t1.multimedia_scheduling_id AS multimediaSchedulingId
t1.multimedia_scheduling_id AS multimediaSchedulingId,t1.status
from ec_alarm_info t1
LEFT JOIN ec_classification_config t2 ON t1.alarm_source = t2.code AND t2.type = 3
LEFT JOIN sys_dict_data t4 ON t1.grade_id = t4.dict_value AND t4.dict_type = 'urgency_grade'
@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t1.id, t1.create_time as createTime ,t2.name as alarmSourceName,
t1.alarm_code as alarmCode,t4.dict_label as gradeName,t3.name as classificationDataName,
t1.contact_user as contactUser,t1.phone as phone,
t1.title,t1.longitude,t1.latitude
t1.title,t1.longitude,t1.latitude,t1.status
from ec_alarm_info t1
LEFT JOIN ec_classification_config t2 ON t1.alarm_source = t2.code AND t2.type = 3
LEFT JOIN ec_classification_data_config t3 ON t1.classification_data_code = t3.code

@ -35,8 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
// target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
// target: `http://192.168.0.229:8080/`,//用户名:admin 密码Cjy@123abc
changeOrigin: true,
pathRewrite: {

Loading…
Cancel
Save