Browse Source

消息工具类修改

dongbw 8 years ago
parent
commit
a6aeda5733

+ 3 - 2
src/main/java/com/uas/platform/b2b/ps/MessageUtils.java

@@ -12,6 +12,7 @@ import com.uas.platform.b2b.temporary.model.MessageModel;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 import org.springframework.ui.ModelMap;
 
 
@@ -47,6 +48,7 @@ public class MessageUtils {
 //        params.put("pageParams", FlexJsonUtils.toJsonDeep(pageParams));
 //        params.put("pageParams", FlexJsonUtils.toJsonDeep(pageParams));
         params.put("page", pageParams.getPage());
         params.put("page", pageParams.getPage());
         params.put("count", pageParams.getCount());
         params.put("count", pageParams.getCount());
+        params.put("sorting", pageParams.getSorting());
         params.put("isRead", isRead);
         params.put("isRead", isRead);
         if (null != keyword && !"".equals(keyword)) {
         if (null != keyword && !"".equals(keyword)) {
             params.put("keyword", keyword);
             params.put("keyword", keyword);
@@ -98,8 +100,7 @@ public class MessageUtils {
      */
      */
     public static ModelMap setReadByBatch(List<Long> ids) throws Exception {
     public static ModelMap setReadByBatch(List<Long> ids) throws Exception {
         ModelMap map = new ModelMap();
         ModelMap map = new ModelMap();
-        String idString = ids.toString().replace("[", "");
-        idString = idString.replace("]", "");
+        String idString = StringUtils.join(ids, ",");
         HashMap<String, Object> params = new HashMap<>();
         HashMap<String, Object> params = new HashMap<>();
         params.put("receiverUu", SystemSession.getUser().getUserUU());
         params.put("receiverUu", SystemSession.getUser().getUserUU());
         params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
         params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());

+ 2 - 2
src/main/resources/dev/sys.properties

@@ -11,7 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 
 #product service url
 #product service url
-productServiceUrl=http://218.17.158.219:24000
+productServiceUrl=http://218.17.158.219:24000/
 
 
 #inquiry service url
 #inquiry service url
-inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceUrl=http://218.17.158.219:24000/

+ 3 - 2
src/main/resources/prod/message.properties

@@ -12,5 +12,6 @@ msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
 messageUrl=http://message.ubtob.com/sms/send
 
 
-#todo Ö®ºóÐÞ¸ÄΪÕýʽµØÖ·
-messagePublicServiceDevUrl=http://218.17.158.219:24000/message
+messagePublicServiceDevUrl=http://10.10.100.23:24000
+#wangyc localhost
+#messagePublicServiceDevUrl=http://192.168.253.131:20000

+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -1095,7 +1095,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             page: 1,
             page: 1,
             count: 5,
             count: 5,
             sorting: {
             sorting: {
-                'id': 'desc'
+                'createTime': 'desc'
             }
             }
         }, {
         }, {
             total: 0,
             total: 0,