调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwAlarmConfig.java

@@ -10,6 +10,7 @@ import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.msgw.MessageType;
+import cn.com.taiji.core.entity.dict.user.IsEnable;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -44,7 +45,8 @@ public class MsgwAlarmConfig extends StringPropertyUUIDEntity {
 	@NotBlank
 	@Size(max = 100)
 	@Column(name = "STATUS")
-	private String status;//配置状态
+	@Enumerated(EnumType.STRING)
+	private IsEnable status;//配置状态
 	@NotBlank
 	@Size(max = 100)
 	@Column(name = "OPERATION_OPENID")

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwAlarmLog.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.msgw.MessageType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -31,11 +32,12 @@ public class MsgwAlarmLog extends StringPropertyUUIDEntity {
 	@Column(name = "MESSAGE_ID")
 	private String messageId;//主表id
 	@Size(max = 100)
-	@Column(name = "CLIENT_TYPE")
-	private String clientType;//客户端类型
-	@Size(max = 100)
 	@Column(name = "MESSAGE_TYPE")
-	private String messageType;//消息类型
+	@Enumerated(EnumType.STRING)
+	private MessageType messageType;//消息类型
+	@Size(max = 100)
+	@Column(name = "ALARM_CONFIG_ID")
+	private String alarmConfigId;//告警人姓名
 	@Size(max = 100)
 	@Column(name = "STAFF_NAME")
 	private String staffName;//告警人姓名
@@ -44,7 +46,7 @@ public class MsgwAlarmLog extends StringPropertyUUIDEntity {
 	private String mobile;//告警人手机号
 	@Size(max = 1)
 	@Column(name = "SEND_RESULT")
-	private String sendResult;//告警状态
+	private Integer sendResult;//告警状态
 	@Size(max = 225)
 	@Column(name = "ALARM_REASON")
 	private String alarmReason;//告警失败原因

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwClient.java

@@ -9,6 +9,7 @@ import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.msgw.MessageType;
+import cn.com.taiji.core.entity.dict.user.IsEnable;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -39,12 +40,9 @@ public class MsgwClient extends StringPropertyUUIDEntity {
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//客户端id
-	@NotNull
+	@NotBlank
 	@Column(name = "STATUS")
-	private Integer status;//客户端状态
-
-
-
-
+	@Enumerated(EnumType.STRING)
+	private IsEnable status;//客户端状态
 
 }

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwSmsKeyConfig.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.user.IsEnable;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -49,9 +50,10 @@ public class MsgwSmsKeyConfig extends StringPropertyUUIDEntity {
 	@Size(max = 100)
 	@Column(name = "SMS_TYPE_CODE")
 	private String smsTypeCode;//短信类型
-	@NotNull
+	@NotBlank
 	@Column(name = "STATUS")
-	private Integer status;//状态
+	@Enumerated(EnumType.STRING)
+	private IsEnable status;//配置状态
 
 
 

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/msgw/MsgwAlarmConfigRepo.java

@@ -1,8 +1,17 @@
 package cn.com.taiji.core.repo.jpa.msgw;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.dict.msgw.MessageType;
+import cn.com.taiji.core.entity.dict.user.IsEnable;
 import cn.com.taiji.core.entity.msgw.MsgwAlarmConfig;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 public interface MsgwAlarmConfigRepo extends AbstractJpaRepo<MsgwAlarmConfig, String>{
 
+    @Query("from MsgwAlarmConfig where messageType=?1 and status=?2")
+    List<MsgwAlarmConfig> findConfigByCondition(MessageType messageType, IsEnable status);
+
+
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/msgw/MsgwSendDetailsRepo.java

@@ -1,8 +1,16 @@
 package cn.com.taiji.core.repo.jpa.msgw;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.dict.msgw.MessageResult;
 import cn.com.taiji.core.entity.msgw.MsgwSendDetails;
 
 public interface MsgwSendDetailsRepo extends AbstractJpaRepo<MsgwSendDetails, String>{
 
+    @Query("from MsgwSendDetails where applyId=?1 and sendResult=?2")
+    List<MsgwSendDetails> findByApplyIdAndSendResult(String applyId, MessageResult messageResult);
+
 }

gly-base-core/src/test/java/common/TestCodeManager.java

@@ -62,7 +62,7 @@ public class TestCodeManager extends AbstractManager {
         GlobalConfig globalConfig = configBuilder.build();
         /* 给字段映射枚举类型、实体（manyToOne）,如果是字符串，自动生成枚举 */
         HashMap<String, Object> typeNameMap = new HashMap<>();
-        typeNameMap.put("STATUS", EnableFlag.class);
+//        typeNameMap.put("STATUS", EnableFlag.class);
 //        typeNameMap.put("CHARGE_METHOD", ChargeMethod.class);
 //        typeNameMap.put("CARD_TYPE", CardType.class);
 //        typeNameMap.put("OBU_TYPE", ObuType.class);

zhywpt-app-msgw/build.gradle

@@ -9,11 +9,14 @@ dependencies {
     implementation "${groupname}:entity-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
+    implementation "${groupname}:ias-protocol:1.0.0-SNAPSHOT"
     implementation('cn.com.taiji.common:sso-client:2.3.10.7')
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config"
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
+    implementation group: 'com.alibaba', name: 'easyexcel', version: '3.2.1'
+    implementation 'io.minio:minio:8.4.1'
     implementation(group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0') {
 //        exclude group: 'net.bytebuddy',module: 'byte-buddy'
     }

zhywpt-app-msgw/src/main/resources/bootstrap.yml

@@ -31,6 +31,10 @@ spring:
             refresh: true
           - data-id: comm-client.yaml
             refresh: true
+          - data-id: redis.yaml
+            refresh: true
+          - data-id: msgw-config.yaml
+            refresh: true
 server:
   port: 9084
   servlet: