调整消息保存关于用户部分验证

src/main/java/com/uas/ps/message/domain/ApiModel/MessageModel.java

@@ -12,6 +12,10 @@ public class MessageModel{
      * 消息内容
      */
     private String content;
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      * 消息接收者uu
      */

src/main/java/com/uas/ps/message/domain/Message.java

@@ -47,6 +47,12 @@ public class Message implements Serializable {
     @Column(name = "ms_content")
     private String content;
 
+    /**
+     * 备注
+     */
+    @Column(name = "ms_remark")
+    private String remark;
+
     /**
      * 消息接受者json信息
      */
@@ -168,6 +174,14 @@ public class Message implements Serializable {
         this.content = content;
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Long getReceiverUu() {
         return receiverUu;
     }

src/main/java/com/uas/ps/message/service/impl/MessageServiceImpl.java

@@ -138,33 +138,23 @@ public class MessageServiceImpl implements MessageService {
             }
 
             // 发送人
-            Object sender = jsonObject.get("sender");
-            if (StringUtils.isEmpty(sender)) {
-                throw new ParameterMissingException("发送人为空");
+            Object senderUu = jsonObject.get("senderUu");
+            Object senderEnuu = jsonObject.get("senderEnuu");
+            if (StringUtils.isEmpty(senderUu) || StringUtils.isEmpty(senderEnuu)) {
+                throw new ParameterMissingException("发送人信息为空");
             } else {
-                User senderUser = FastjsonUtils.fromJson(String.valueOf(sender), User.class);
-                if (senderUser.getUserUU() == null || senderUser.getEnterprise() == null
-                    || senderUser.getEnterprise().getUu() == null) {
-                    throw new ParameterMissingException("发送人为空");
-                } else {
-                    message.setSenderUu(senderUser.getUserUU());
-                    message.setSenderEnuu(senderUser.getEnterprise().getUu());
-                }
+                message.setSenderUu(Long.valueOf(String.valueOf(senderUu)));
+                message.setSenderEnuu(Long.valueOf(String.valueOf(senderEnuu)));
             }
 
             // 接收人
-            Object receiver = jsonObject.get("receiver");
-            if (StringUtils.isEmpty(receiver)) {
-                throw new ParameterMissingException("接收人为空");
+            Object receiverUu = jsonObject.get("receiverUu");
+            Object receiverEnuu = jsonObject.get("receiverEnuu");
+            if (StringUtils.isEmpty(receiverUu) || StringUtils.isEmpty(receiverEnuu)) {
+                throw new ParameterMissingException("接收人信息为空");
             } else {
-                User receiverUser = FastjsonUtils.fromJson(String.valueOf(sender), User.class);
-                if (receiverUser.getUserUU() == null || receiverUser.getEnterprise() == null
-                    || receiverUser.getEnterprise().getUu() == null) {
-                    throw new ParameterMissingException("接收人为空");
-                } else {
-                    message.setReceiverUu(receiverUser.getUserUU());
-                    message.setReceiverEnuu(receiverUser.getEnterprise().getUu());
-                }
+                message.setReceiverUu(Long.valueOf(String.valueOf(receiverUu)));
+                message.setReceiverEnuu(Long.valueOf(String.valueOf(receiverEnuu)));
             }
 
             // 发送应用
@@ -174,7 +164,7 @@ public class MessageServiceImpl implements MessageService {
             } else {
                 App app = appDao.findByName(String.valueOf(produceApp));
                 if (app == null) {
-                    throw new ParameterMissingException("发送应用为空");
+                    throw new ParameterMissingException("发送应用不存在");
                 }
                 message.setProducerApp(app.getId());
             }
@@ -196,7 +186,7 @@ public class MessageServiceImpl implements MessageService {
                         throw new ParameterMissingException("接收应用为空");
                     } else {
                         // 取出通过逗号拼接的接收应用
-                        String[] consumers = StringUtils.split(String.valueOf(consumerApp), SplitChar.COMMA);
+                        String[] consumers = String.valueOf(consumerApp).split(SplitChar.COMMA);
                         if (consumers.length < 1) {
                             throw new ParameterMissingException("接收应用为空");
                         }
@@ -204,6 +194,9 @@ public class MessageServiceImpl implements MessageService {
                         Set<App> consumerApps = new HashSet<>();
                         for (String consumer : consumers) {
                             App app = appDao.findByName(consumer);
+                            if (app == null) {
+                                throw new ParameterMissingException("接收应用不存在");
+                            }
                             consumerApps.add(app);
                         }
 
@@ -215,16 +208,22 @@ public class MessageServiceImpl implements MessageService {
 
             // 消息类型（暂时未定）
             Object type = jsonObject.get("type");
-            if (type != null && !StringUtils.isEmpty(type)) {
+            if (!StringUtils.isEmpty(type)) {
                 message.setType(String.valueOf(type));
             }
 
             // 推送类型
             Object smsType = jsonObject.get("smsType");
-            if (smsType != null && !StringUtils.isEmpty(smsType)) {
-                message.setSmsType(String.valueOf(smsType));
-            } else {
+            if (StringUtils.isEmpty(smsType)) {
                 message.setSmsType(SMSType.DONT_SEND);
+            } else {
+                message.setSmsType(String.valueOf(smsType));
+            }
+
+            // 备注
+            Object remark = jsonObject.get("remark");
+            if (!StringUtils.isEmpty(remark)) {
+                message.setRemark(String.valueOf(remark));
             }
 
             message.setIsRead(Constant.NO);
@@ -329,7 +328,6 @@ public class MessageServiceImpl implements MessageService {
                 ResponseWrap res = HttpUtil.doPost(PROD_URL, params);
                 if (!res.isSuccess()) {
                     throw new Exception(res.getContent());
-                } else {
                 }
             } catch (Exception e) {
                 e.printStackTrace();