diff --git a/ruoyi-common/src/test/java/OkhttpTest.java b/ruoyi-common/src/test/java/OkhttpTest.java index 83ffe792..a05780f9 100644 --- a/ruoyi-common/src/test/java/OkhttpTest.java +++ b/ruoyi-common/src/test/java/OkhttpTest.java @@ -1,3 +1,4 @@ +import com.ruoyi.common.utils.uuid.IdUtils; import com.zc.common.core.httpclient.OkHttp; import com.zc.common.core.httpclient.exception.HttpException; import com.zc.common.core.httpclient.request.RequestParams; @@ -172,4 +173,10 @@ public class OkhttpTest { }); // 请求方法 } + @Test + public void aaa(){ + String uuid = IdUtils.fastSimpleUUID(); + System.out.println(uuid.length()); + System.out.println(uuid); + } } diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java index 14e5c63c..b7b52bd0 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java @@ -29,6 +29,7 @@ import com.ruoyi.common.core.domain.BaseEntity; @NoArgsConstructor public class DcEvent extends BaseEntity { private static final long serialVersionUID = 1L; + private static final long event_state = 0L; /** * 事件编号 */ diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index ae94903b..8380fcb5 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -1,5 +1,6 @@ package com.zc.business.service.impl; +import java.awt.*; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,6 +106,7 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; //设置事件Id UUID无下划线格式32 String uuid = IdUtils.fastSimpleUUID(); dcEvent.setId(uuid); + dcEvent.setEventState(0L); //获取部门信息 dcEvent.setDeptId(SecurityUtils.getDeptId()); dcEvent.setCreateTime(DateUtils.getNowDate()); diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index 8269b757..bb4e6d2b 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -581,7 +581,6 @@ and event_state = #{eventState} and start_time BETWEEN #{startTime} and #{endTime} -