Merge branch 'dev' of D:\work\GitWorkSpace\ps-inquiry with conflicts.

src/main/java/com/uas/ps/inquiry/CorsConfig.java

@@ -0,0 +1,32 @@
+package com.uas.ps.inquiry;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * @author liusw
+ * @version 2018/1/23 16:53
+ */
+@Configuration
+public class CorsConfig extends WebMvcConfigurerAdapter {
+
+    @Bean
+    public FilterRegistrationBean corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+        source.registerCorsConfiguration("/**", config);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(0);
+        return bean;
+    }
+
+}

src/main/java/com/uas/ps/inquiry/controller/DeadlineTask.java

@@ -109,11 +109,15 @@ public class DeadlineTask {
      */
     private final Long MESSAGE_SENDERENUU = ContextUtils.getBean(AccessConfiguration.class).getSenderEnuu();
 
-    @Scheduled(cron = "0 30 23 ? * *")//每天23:30分执行
+    /**
+     * 每天晚上十一点半对未操作的过期单据，发送消息提醒
+     */
+//    @Scheduled(cron = "0 30 23 ? * *")
     public void execute() {
         List<PublicInquiryItem> d = purcInquiryItemDao.findendDate();
         for (PublicInquiryItem param : d) {
-            final String SMS_TYPE = "SM"; //发送信息
+                //发送信息
+            final String SMS_TYPE = "SM";
             List<MessageModel> models = new ArrayList<MessageModel>();
             String cmpCode = param.getCmpCode();
             String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
@@ -177,7 +181,7 @@ public class DeadlineTask {
     /**
      * 每早9点、14点、17点发送询价通知短信
      */
-    @Scheduled(cron = "0 0 9,14,17 * * ?")
+//    @Scheduled(cron = "0 0 9,14,17 * * ?")
     private void sendMessageTiming() throws Exception {
         Calendar now = Calendar.getInstance();
         Integer hour = now.get(Calendar.HOUR_OF_DAY);
@@ -194,7 +198,6 @@ public class DeadlineTask {
                 reminds = inquiryService.findInquiryRemindGroupByVendUUAndVendUserUU(3);
                 break;
             default:
-                reminds = inquiryService.findInquiryRemindGroupByVendUUAndVendUserUU(5);
                 break;
         }
 

src/main/test/java/com/uas/ps/inquiry/TestInquiry.java

@@ -1,30 +1,73 @@
-package com.uas.ps.inquiry;
-
-import com.uas.ps.inquiry.rabbit.RabbitConstants;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * @author liuam
- * @since 2018/9/12 0012 上午 11:24
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-@Import(ApplicationContextRegister.class)
-public class TestInquiry {
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    @Test
-    public void testRabbitReceive() {
-        Object o = rabbitTemplate.receiveAndConvert(RabbitConstants.INQUIRY_MESSAGE);
-        System.out.println(o);
-    }
-
-}
+//package com.uas.ps.inquiry;
+//
+//import com.uas.ps.inquiry.model.PurcInquiry;
+//import com.uas.ps.inquiry.model.PurcInquiryItem;
+//import com.uas.ps.inquiry.rabbit.RabbitConstants;
+//import com.uas.ps.inquiry.util.FlexJsonUtils;
+//import com.uas.ps.inquiry.util.HttpUtil;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.context.annotation.Import;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import java.util.Date;
+//import java.util.HashSet;
+//import java.util.Set;
+//
+///**
+// * @author liuam
+// * @since 2018/9/12 0012 上午 11:24
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = Application.class)
+//@Import(com.uas.ps.inquiry.ApplicationContextRegister.class)
+//public class TestInquiry {
+//
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
+//
+//    @Test
+//    public void testRabbitReceive() {
+//        Object o = rabbitTemplate.receiveAndConvert(RabbitConstants.INQUIRY_MESSAGE);
+//        System.out.println(o);
+//    }
+//
+//    @Test
+//    public void saveInquiry() throws Exception {
+//        PurcInquiry inquiry = new PurcInquiry();
+//        inquiry.setEndDate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+//        inquiry.setRecorderUU(1000002503L);
+//        inquiry.setAmount(1);
+//        inquiry.setRecorder("董必伟");
+//        inquiry.setEnUU(10041559L);
+//        inquiry.setSourceapp("MALL");
+//        PurcInquiryItem item = new PurcInquiryItem();
+//        item.setCmpCode("HCD89045");
+//        item.setDate(new Date(System.currentTimeMillis()));
+//        item.setUserUU(1000002503L);
+//        item.setProdTitle("测试15");
+//        item.setEndDate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+//        item.setSource("MALL");
+//        item.setSpec("14211");
+//        item.setUserTel("15671616315");
+//        item.setUserName("董必伟");
+//        item.setInbrand("A123 Systems");
+//        Set<PurcInquiryItem> items = new HashSet<>();
+//        items.add(item);
+//        inquiry.setInquiryItems(items);
+//        String res = HttpUtil.doPost("http://10.1.51.82:24002" + "/inquiry/buyer/save",
+//                FlexJsonUtils.toJsonDeep(inquiry));
+//        System.out.println(res);
+//    }
+//
+//    @Test
+//    public void sumPublishWithTime() throws Exception {
+//        Date now = new Date();
+//        HttpUtil.Response res = HttpUtil.sendGetRequest("http://10.1.51.82:24002" + "/inquiry/api/sum/publish/time?time=" + now, null);
+//        System.out.println(res);
+//    }
+//
+//}