订阅消息 初版2

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java

@@ -51,10 +51,8 @@ public class WxSubscribeMessageFormDTO implements Serializable {
     /**
      * 消息时间
      */
-    @NotNull(message = "消息时间不能为空")
+    @NotBlank(message = "消息时间不能为空")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String messageTime;
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date messageTime;
 
     /**
      * 所需下发的订阅模板id

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -96,6 +96,11 @@
             <artifactId>flyway-core</artifactId>
             <!--<version>5.1.1</version>-->
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java

@@ -18,7 +18,7 @@ public interface WxmpMessageConstant {
 
     int USER_REFUSED = 43101;
 
-    String AUTHORIZER_ACCESS_TOKEN = "authorizer_access_token";
+    String AUTHORIZER_ACCESS_TOKEN = "authorizerRefreshToken";
 
     String RESI = "resi";
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java

@@ -162,4 +162,4 @@ public class UserMessageController {
         List<StaffMessageResultDTO> list = userMessageService.queryStaffMessage(formDTO);
         return new Result<List<StaffMessageResultDTO>>().ok(list);
     }
-}
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -44,6 +44,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -264,7 +267,11 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 		wxmpMsgSendRecordEntity.setBehaviorType(msg.getBehaviorType());
 		wxmpMsgSendRecordEntity.setTitle("您有一条" + msg.getBehaviorType());
 		wxmpMsgSendRecordEntity.setMessageContent(msg.getMessageContent());
-		wxmpMsgSendRecordEntity.setMessageTime(msg.getMessageTime());
+		try {
+			wxmpMsgSendRecordEntity.setMessageTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(msg.getMessageTime()));
+		} catch (ParseException e) {
+			wxmpMsgSendRecordEntity.setMessageTime(new Date());
+		}
 		wxmpMsgSendRecordEntity.setResult(status);
 		return wxmpMsgSendRecordEntity;
 	}

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml

@@ -6,7 +6,7 @@
     <select id="getResiSubscribeInfo" parameterType="String" resultType="Integer">
       select
         `count`
-      from WxmpResiUserSubscribe
+      from Wxmp_Resi_User_Subscribe
       where
         del_flag =0
         and customer_id = #{customerId}
@@ -16,7 +16,7 @@
     </select>
 
   <update id="decreaseResiSubscribeCount">
-    update WxmpResiUserSubscribe
+    update Wxmp_Resi_User_Subscribe
     set count = if(count &lt; 1, 0, count - ${num} )
     where
       del_flag =0
@@ -27,7 +27,7 @@
   </update>
 
   <update id="clearResiSubscribeCount" parameterType="String">
-    update WxmpResiUserSubscribe
+    update Wxmp_Resi_User_Subscribe
     set count = 0,
         wx_subscribe_status = 'unsubscribe'
     where

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml

@@ -6,7 +6,7 @@
     <select id="getWorkSubscribeInfo" parameterType="String" resultType="Integer">
       select
         `count`
-      from WxmpWorkUserSubscribe
+      from Wxmp_Work_User_Subscribe
       where
         del_flag =0
         and template_id = #{templateId}
@@ -15,7 +15,7 @@
     </select>
 
     <update id="decreaseWorkSubscribeCount">
-        update WxmpWorkUserSubscribe
+        update Wxmp_Work_User_Subscribe
         set count = if(count &lt; 1, 0, count - ${num} )
         where
           del_flag =0
@@ -25,7 +25,7 @@
           and wx_subscribe_status = 'subscribe'
     </update>
     <update id="clearWorkSubscribeCount" parameterType="String">
-        update WxmpWorkUserSubscribe
+        update Wxmp_Work_User_Subscribe
         set count = 0,
             wx_subscribe_status = 'unsubscribe'
         where