* bug

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

@@ -1,35 +0,0 @@
-package com.huiju.estateagents.job;
-
-import com.huiju.estateagents.sample.service.ITaNoticeService;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-/**
- * 开屏通知定时任务
- */
-@Slf4j
-@Component
-@Configuration
-@EnableScheduling
-public class NoticeTimeJob {
-
-    @Autowired
-    private ITaNoticeService taNoticeService;
-
-    /**
-     * 自动下架已过期的开屏通知
-     */
-    @Scheduled(cron = "* * */6 * * ?")
-    public void updateStatusByInvalidTime() {
-        log.info("updateStatusByInvalidTime 定时任务 开始");
-
-        Integer result = taNoticeService.updateStatusByInvalidTime();
-
-        log.info("updateStatusByInvalidTime 定时任务 结束,共更新{}条数据", result);
-    }
-
-}

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
@@ -112,9 +113,10 @@ public class TaH5SampleController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/taH5Sample", method = RequestMethod.POST)
-    public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample) {
+    public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taH5Sample.setAddUser(getUserId(request));
             if (iTaH5SampleService.save(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
             } else {
@@ -161,9 +163,12 @@ public class TaH5SampleController extends BaseController {
      */
     @RequestMapping(value = "/taH5Sample/{id}", method = RequestMethod.PUT)
     public ResponseBean taH5SampleUpdate(@PathVariable Integer id,
-                                         @RequestBody TaH5Sample taH5Sample) {
+                                         @RequestBody TaH5Sample taH5Sample,
+                                         HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
             } else {
@@ -249,11 +254,12 @@ public class TaH5SampleController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/channel/h5Sample/add", method = RequestMethod.POST)
-    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample) {
+    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<String> tags = taH5Sample.getTags();
             taH5Sample.setTag(String.join(",", tags));
+            taH5Sample.setAddUser(getUserId(request));
             taH5Sample.setCreateDate(LocalDateTime.now());
             if (iTaH5SampleService.save(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
@@ -314,7 +320,7 @@ public class TaH5SampleController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/channel/update/h5Sample/{id}", method = RequestMethod.PUT)
-    public ResponseBean updateTaH5Sample(@PathVariable Integer id, @RequestBody TaH5Sample taH5Sample) {
+    public ResponseBean updateTaH5Sample(@PathVariable Integer id, @RequestBody TaH5Sample taH5Sample,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taH5Sample.setSampleId(id);
@@ -327,6 +333,8 @@ public class TaH5SampleController extends BaseController {
             QueryWrapper<TaSampleContact> taSampleContactQueryWrapper = new QueryWrapper<>();
             taSampleContactQueryWrapper.eq("sample_id", id);
             iTaSampleContactService.remove(taSampleContactQueryWrapper);
+            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
                 taContactList.forEach(e -> {
@@ -354,7 +362,7 @@ public class TaH5SampleController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/channel/put/h5Sample/{id}", method = RequestMethod.PUT)
-    public ResponseBean putTaH5Sample(@PathVariable Integer id) {
+    public ResponseBean putTaH5Sample(@PathVariable Integer id,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //查看是否有关联的需求单
@@ -366,6 +374,8 @@ public class TaH5SampleController extends BaseController {
                 return ResponseBean.error("存在关联的需求单，删除失败！", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
             taH5Sample.setStatus(CommConstant.STATUS_DELETE);
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);