新需求

src/main/java/com/huiju/estateagents/controller/TaOfficeContactController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,21 +82,36 @@ public class TaOfficeContactController extends BaseController {
 
     /**
      * 保存对象
-     * @param taOfficeContact 实体对象
      * @return
      */
-    @RequestMapping(value="/office/taOfficeContact",method= RequestMethod.POST)
-    public ResponseBean taOfficeContactAdd(@RequestBody TaOfficeContact taOfficeContact, HttpServletRequest request, HttpServletResponse response){
-        response.setHeader("Access-Control-Allow-Origin","*");
-        response.setHeader("Access-Control-Allow-Methods","*");
+    @RequestMapping(value="/official/taOfficeContact",method= RequestMethod.POST)
+    public ResponseBean taOfficeContactAdd(HttpServletRequest request, HttpServletResponse response){
+        TaOfficeContact taOfficeContact = new TaOfficeContact();
+        //跨域请求，*代表允许全部类型
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        //允许请求方式
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        //用来指定本次预检请求的有效期，单位为秒，在此期间不用发出另一条预检请求
+        response.setHeader("Access-Control-Max-Age", "3600");
+        //请求包含的字段内容，如有多个可用哪个逗号分隔如下
+        response.setHeader("Access-Control-Allow-Headers", "content-type,x-requested-with,Authorization, x-ui-request,lang");
+        //访问控制允许凭据，true为允许
+        response.setHeader("Access-Control-Allow-Credentials", "true");
         ResponseBean responseBean = new ResponseBean();
         try {
+            Map<String, String[]> parameterMap = request.getParameterMap();
 
             // 主键格式 20200611001  日期 + 数字,  数字 3 位, 前面补 0
             String today = DateUtils.todayCompact();
             Integer no = dbUtils.nextVal(SEQ_PREFIX + "-" + today);
             taOfficeContact.setSerialNo(StringUtils.lpad(no.toString(), "0", 3));
-
+            taOfficeContact.setCompany(request.getParameter("company"));
+            taOfficeContact.setCreateDate(LocalDateTime.now());
+            taOfficeContact.setDemand(request.getParameter("demand"));
+            taOfficeContact.setEmail(request.getParameter("email"));
+            taOfficeContact.setName(request.getParameter("name"));
+            taOfficeContact.setPhone(request.getParameter("phone"));
+            taOfficeContact.setStatus(CommConstant.STATUS_NORMAL);
             if (iTaOfficeContactService.save(taOfficeContact)){
                 responseBean.addSuccess(taOfficeContact);
             }else {
@@ -110,13 +127,21 @@ public class TaOfficeContactController extends BaseController {
 
     /**
      * 保存对象
-     * @param taOfficeContact 实体对象
+     *
      * @return
      */
-    @RequestMapping(value="/office/taOfficeContact",method= RequestMethod.OPTIONS)
-    public ResponseBean taOfficeContactOptions(@RequestBody TaOfficeContact taOfficeContact, HttpServletRequest request, HttpServletResponse response){
-        response.setHeader("Access-Control-Allow-Origin","*");
-        response.setHeader("Access-Control-Allow-Methods","*");
+    @RequestMapping(value="/official/taOfficeContact",method= RequestMethod.OPTIONS)
+    public ResponseBean taOfficeContactOptions(HttpServletRequest request, HttpServletResponse response){
+        //跨域请求，*代表允许全部类型
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        //允许请求方式
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        //用来指定本次预检请求的有效期，单位为秒，在此期间不用发出另一条预检请求
+        response.setHeader("Access-Control-Max-Age", "3600");
+        //请求包含的字段内容，如有多个可用哪个逗号分隔如下
+        response.setHeader("Access-Control-Allow-Headers", "content-type,x-requested-with,Authorization, x-ui-request,lang");
+        //访问控制允许凭据，true为允许
+        response.setHeader("Access-Control-Allow-Credentials", "true");
         response.setCharacterEncoding("utf-8");
 
         return ResponseBean.success("success");

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -9,7 +9,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -54,7 +53,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

src/main/java/com/huiju/estateagents/job/OrgOrderTimeJob.java

@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -32,7 +31,7 @@ public class OrgOrderTimeJob extends BaseController {
     /**
      * 处理过期订单
      */
-    @Scheduled(cron = "0 0/5 * * * ?")
+//    @Scheduled(cron = "0 0/5 * * * ?")
     private void dealExpireOrder() {
         logger.info("处理过期订单 定时任务开始");