张延森 5 years ago
parent
commit
a6db0a2d39

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/StatisticalController.java View File

78
      */
78
      */
79
     @GetMapping(value = "/admin/selectEventAll")
79
     @GetMapping(value = "/admin/selectEventAll")
80
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
80
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
81
-                                              @RequestParam(required = false) Integer personId) {
81
+                                              @RequestParam(required = false) String personId) {
82
         return iStatisticalService.selectEventAll(event, personId);
82
         return iStatisticalService.selectEventAll(event, personId);
83
     }
83
     }
84
 
84
 

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java View File

27
  * @since 2019-08-06
27
  * @since 2019-08-06
28
  */
28
  */
29
 @RestController
29
 @RestController
30
-@RequestMapping("/")
30
+@RequestMapping("/api")
31
 public class TdBizEventController extends BaseController {
31
 public class TdBizEventController extends BaseController {
32
 
32
 
33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventController.class);
33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventController.class);
42
      * @param pageSize
42
      * @param pageSize
43
      * @return
43
      * @return
44
      */
44
      */
45
-    @RequestMapping(value="/tdBizEvent",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
46
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
         ResponseBean responseBean = new ResponseBean();
48
         ResponseBean responseBean = new ResponseBean();

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.java View File

27
  * @since 2019-08-06
27
  * @since 2019-08-06
28
  */
28
  */
29
 @RestController
29
 @RestController
30
-@RequestMapping("/")
30
+@RequestMapping("/api")
31
 public class TdBizEventTypeController extends BaseController {
31
 public class TdBizEventTypeController extends BaseController {
32
 
32
 
33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventTypeController.class);
33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventTypeController.class);
42
      * @param pageSize
42
      * @param pageSize
43
      * @return
43
      * @return
44
      */
44
      */
45
-    @RequestMapping(value="/tdBizEventType",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/tdBizEventType",method= RequestMethod.GET)
46
     public ResponseBean tdBizEventTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean tdBizEventTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
47
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
         ResponseBean responseBean = new ResponseBean();
48
         ResponseBean responseBean = new ResponseBean();

+ 0
- 5
src/main/java/com/huiju/estateagents/entity/TdBizEvent.java View File

54
      */
54
      */
55
     private LocalDateTime createDate;
55
     private LocalDateTime createDate;
56
 
56
 
57
-    private String typeId;
58
-
59
-    private String typeName;
60
-
61
-
62
 }
57
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java View File

44
      */
44
      */
45
     @ResultType(TaPersonVisitRecord.class)
45
     @ResultType(TaPersonVisitRecord.class)
46
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
46
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
47
-    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") Integer personId);
47
+    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId);
48
 
48
 
49
 }
49
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IStatisticalService.java View File

84
      * @param personId
84
      * @param personId
85
      * @return
85
      * @return
86
      */
86
      */
87
-    ResponseBean selectEventAll(String event, Integer personId);
87
+    ResponseBean selectEventAll(String event, String personId);
88
 
88
 
89
     /**
89
     /**
90
      * 转换率 统计
90
      * 转换率 统计

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java View File

187
     }
187
     }
188
 
188
 
189
     @Override
189
     @Override
190
-    public ResponseBean selectEventAll(String event, Integer personId) {
190
+    public ResponseBean selectEventAll(String event, String personId) {
191
         ResponseBean responseBean = new ResponseBean();
191
         ResponseBean responseBean = new ResponseBean();
192
 
192
 
193
         List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);
193
         List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);