消息提醒

yifu-msg/yifu-msg-api/src/main/java/com/yifu/cloud/plus/v1/msg/entity/MsgInfo.java

@@ -28,15 +28,16 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import java.time.LocalDateTime;
+
 /**
  * @author fxj
  * @date 2023-06-01 10:41:25
  */
 @Data
 @TableName("msg_info")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "EKP 消息提醒")
-public class MsgInfo extends BaseEntity {
+public class MsgInfo {
 
 	/**
 	 * id
@@ -95,4 +96,6 @@ public class MsgInfo extends BaseEntity {
 	@Schema(description = "提醒人")
 	private String alertUser;
 
+	private LocalDateTime createTime;
+
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/constant/MesConstants.java

@@ -10,13 +10,10 @@ import org.springframework.stereotype.Component;
  * @Description
  * @Version 1.0
  */
-@Component
-@PropertySource("classpath:application.yml")
-@ConfigurationProperties(value = "ekp", ignoreInvalidFields = false)
 public interface MesConstants {
 	/**
 	 * 項目订单URL
 	**/
-	String orderUrl ="";
+	String orderUrl ="http://36.7.147.19:28080/sys/modeling/main/modelingAppView.do?method=modelView&listviewId=185943766d6e9ff50d8fea1414eaf460&fdId=";
 
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java

@@ -84,7 +84,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 					if (Common.isNotNull(save)){
 						save.setCreateTime(LocalDateTime.now());
 						save.setUrl(MesConstants.orderUrl+vo.getOrderId());
-						save.setUrl(vo.getAlertUser());
+						save.setAlertUser(vo.getAlertUser());
 						baseMapper.insert(save);
 						log.error(JSON.toJSONString(save));
 					}
@@ -96,7 +96,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 						save.setCreateTime(LocalDateTime.now());
 						save.setUrl(MesConstants.orderUrl+save.getOrderId());
 						save.setAlertType(CommonConstants.TWO_STRING);
-						save.setUrl(vo.getAlertUser());
+						save.setAlertUser(vo.getAlertUser());
 						baseMapper.insert(save);
 						log.error(JSON.toJSONString(save));
 					}

yifu-msg/yifu-msg-biz/src/main/resources/application.yml

@@ -64,6 +64,3 @@ springdoc:
     - group: mail
       #按包路径匹配
       packagesToScan: com.yifu.cloud.plus.v1.msg.controller
\ No newline at end of file
-
-ekp:
-  orderUrl: http://36.7.147.19:28080/sys/modeling/main/modelingAppView.do?method=modelView&listviewId=185943766d6e9ff50d8fea1414eaf460&fdId=
\ No newline at end of file

yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml

@@ -93,10 +93,10 @@
 
 	<select id="getMsgByOrderId" resultMap="msgInfoMap">
 		SELECT
-			p.fd_name alertUser,
-			a.fd_3ac901c5184274  orderNo,
-			a.fd_id  orderId,
-			'0' as alertType
+			p.fd_name ALERT_USER,
+			a.fd_3ac901c5184274  ORDER_NO,
+			a.fd_id  ORDER_ID,
+			'0' as ALERT_TYPE
 		FROM
 			ekp_ea33075576149bb8a4f5 a
 				LEFT JOIN sys_org_element p on a.fd_3b0aff6781fa86 = p.fd_id