zhoufan %!s(int64=2) %!d(string=hace) años
padre
commit
237cbbacda

+ 14 - 14
webapidemo-api/src/main/java/com/example/controller/call/BlacklistController.java

@@ -30,12 +30,12 @@ public class BlacklistController extends BaseController {
30 30
     @GetMapping
31 31
     public AjaxResult getList(Blacklist input, PageInput pageInput) {
32 32
         LambdaQueryWrapper<Blacklist> qw = new LambdaQueryWrapper();
33
-        qw.eq(input.getBlack_id() != null && input.getBlack_id() > 0, Blacklist::getBlack_id, input.getBlack_id());
34
-        qw.eq(input.getCall_id() != null && input.getCall_id() > 0, Blacklist::getCall_id, input.getCall_id());
35
-        qw.like(!StringHelper.isEmpty(input.getCall_number()), Blacklist::getCall_number, input.getCall_number());
36
-        qw.eq(input.getBlack_type() != null && input.getBlack_type() > 0, Blacklist::getBlack_type, input.getBlack_type());
37
-        qw.eq(input.getStart_time() != null , Blacklist::getStart_time, input.getStart_time());
38
-        qw.eq(input.getEnd_time() != null , Blacklist::getEnd_time, input.getEnd_time());
33
+        qw.eq(input.getBlackId() != null && input.getBlackId() > 0, Blacklist::getBlackId, input.getBlackId());
34
+        qw.eq(input.getCallId() != null && input.getCallId() > 0, Blacklist::getCallId, input.getCallId());
35
+        qw.like(!StringHelper.isEmpty(input.getCallNumber()), Blacklist::getCallNumber, input.getCallNumber());
36
+        qw.eq(input.getBlackType() != null && input.getBlackType() > 0, Blacklist::getBlackType, input.getBlackType());
37
+        qw.eq(input.getStartTime() != null , Blacklist::getStartTime, input.getStartTime());
38
+        qw.eq(input.getEndTime() != null , Blacklist::getEndTime, input.getEndTime());
39 39
         qw.like(!StringHelper.isEmpty(input.getRemark()), Blacklist::getRemark, input.getRemark());
40 40
         Page<Blacklist> page = GetPage(pageInput);
41 41
         if (page != null) {
@@ -58,14 +58,14 @@ public class BlacklistController extends BaseController {
58 58
     @PostMapping
59 59
     public AjaxResult add(@RequestBody Blacklist input) {
60 60
         LambdaQueryWrapper<Blacklist> qw = new LambdaQueryWrapper();
61
-        qw.eq( Blacklist::getCall_number, input.getCall_number());
61
+        qw.eq( Blacklist::getCallNumber, input.getCallNumber());
62 62
         if(blacklistService.getCount(qw)>0){
63 63
             return Error("此号码已经存在");
64 64
         }
65 65
 
66
-        input.setCreate_by(CurrentUser().getUser_name());
67
-        input.setCreate_time(new Date());
68
-        input.setDel_flag("0");
66
+        input.setCreateBy(CurrentUser().getUser_name());
67
+        input.setCreateTime(new Date());
68
+        input.setDelFlag("0");
69 69
         boolean result = blacklistService.insert(input);
70 70
         if (result) {
71 71
             return Success("成功");
@@ -79,14 +79,14 @@ public class BlacklistController extends BaseController {
79 79
     @PutMapping
80 80
     public AjaxResult edit(@RequestBody Blacklist input)  {
81 81
         LambdaQueryWrapper<Blacklist> qw = new LambdaQueryWrapper();
82
-        qw.ne( Blacklist::getBlack_id, input.getBlack_id());
83
-        qw.eq( Blacklist::getCall_number, input.getCall_number());
82
+        qw.ne( Blacklist::getBlackId, input.getBlackId());
83
+        qw.eq( Blacklist::getCallNumber, input.getCallNumber());
84 84
         if(blacklistService.getCount(qw)>0){
85 85
             return Error("此号码已经存在");
86 86
         }
87 87
 
88
-        input.setUpdate_by(CurrentUser().getUser_name());
89
-        input.setUpdate_time(new Date());
88
+        input.setUpdateBy(CurrentUser().getUser_name());
89
+        input.setUpdateTime(new Date());
90 90
         boolean result = blacklistService.update(input);
91 91
         if (result) {
92 92
             return Success("成功");

+ 6 - 8
webapidemo-api/src/main/java/com/example/controller/call/ExtensionController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.example.controller.BaseController;
7
-import com.example.entity.database.call.Blacklist;
8 7
 import com.example.entity.database.call.Extension;
9 8
 import com.example.entity.input.PageInput;
10 9
 import com.example.model.AjaxResult;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
17 16
 import org.springframework.beans.factory.annotation.Autowired;
18 17
 import org.springframework.web.bind.annotation.*;
19 18
 import java.util.Arrays;
20
-import java.util.Date;
21 19
 
22 20
 @Api(value = "分机归属地表",tags = "分机归属地表")
23 21
 @RestController
@@ -31,9 +29,9 @@ public class ExtensionController extends BaseController {
31 29
     @GetMapping
32 30
     public AjaxResult getList(Extension input, PageInput pageInput) {
33 31
         LambdaQueryWrapper<Extension> qw = new LambdaQueryWrapper();
34
-        qw.eq(input.getExtension_id() != null && input.getExtension_id() > 0, Extension::getExtension_id, input.getExtension_id());
35
-        qw.like(!StringHelper.isEmpty(input.getExtension_prefix()), Extension::getExtension_prefix, input.getExtension_prefix());
36
-        qw.like(!StringHelper.isEmpty(input.getLocation_name()), Extension::getLocation_name, input.getLocation_name());
32
+        qw.eq(input.getExtensionId() != null && input.getExtensionId() > 0, Extension::getExtensionId, input.getExtensionId());
33
+        qw.like(!StringHelper.isEmpty(input.getExtensionPrefix()), Extension::getExtensionPrefix, input.getExtensionPrefix());
34
+        qw.like(!StringHelper.isEmpty(input.getLocationName()), Extension::getLocationName, input.getLocationName());
37 35
         Page<Extension> page = GetPage(pageInput);
38 36
         if (page != null) {
39 37
             IPage<Extension> iPage = extensionService.getListPage(page, qw);
@@ -55,7 +53,7 @@ public class ExtensionController extends BaseController {
55 53
     @PostMapping
56 54
     public AjaxResult add(@RequestBody Extension input) {
57 55
         LambdaQueryWrapper<Extension> qw = new LambdaQueryWrapper();
58
-        qw.eq( Extension::getExtension_prefix, input.getExtension_prefix());
56
+        qw.eq( Extension::getExtensionPrefix, input.getExtensionPrefix());
59 57
         if(extensionService.getCount(qw)>0){
60 58
             return Error("此号码已经存在");
61 59
         }
@@ -73,8 +71,8 @@ public class ExtensionController extends BaseController {
73 71
     @PutMapping
74 72
     public AjaxResult edit(@RequestBody Extension input)  {
75 73
         LambdaQueryWrapper<Extension> qw = new LambdaQueryWrapper();
76
-        qw.ne(Extension::getExtension_id,input.getExtension_id());
77
-        qw.eq( Extension::getExtension_prefix, input.getExtension_prefix());
74
+        qw.ne(Extension::getExtensionId,input.getExtensionId());
75
+        qw.eq( Extension::getExtensionPrefix, input.getExtensionPrefix());
78 76
         if(extensionService.getCount(qw)>0){
79 77
             return Error("此号码已经存在");
80 78
         }

+ 13 - 14
webapidemo-api/src/main/java/com/example/controller/call/GroupController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.example.controller.BaseController;
7 7
 import com.example.entity.database.call.Group;
8
-import com.example.entity.database.call.Mobile;
9 8
 import com.example.entity.input.PageInput;
10 9
 import com.example.model.AjaxResult;
11 10
 import com.example.service.call.IGroupService;
@@ -31,11 +30,11 @@ public class GroupController extends BaseController {
31 30
     @GetMapping
32 31
     public AjaxResult getList(Group input, PageInput pageInput) {
33 32
         LambdaQueryWrapper<Group> qw = new LambdaQueryWrapper();
34
-        qw.eq(input.getGroup_id() != null && input.getGroup_id() > 0, Group::getGroup_id, input.getGroup_id());
35
-        qw.like(!StringHelper.isEmpty(input.getGroup_code()), Group::getGroup_code, input.getGroup_code());
36
-        qw.like(!StringHelper.isEmpty(input.getGroup_name()), Group::getGroup_name, input.getGroup_name());
37
-        qw.like(!StringHelper.isEmpty(input.getCallout_prefix_in()), Group::getCallout_prefix_in, input.getCallout_prefix_in());
38
-        qw.like(!StringHelper.isEmpty(input.getCallout_prefix_out()), Group::getCallout_prefix_out, input.getCallout_prefix_out());
33
+        qw.eq(input.getGroupId() != null && input.getGroupId() > 0, Group::getGroupId, input.getGroupId());
34
+        qw.like(!StringHelper.isEmpty(input.getGroupCode()), Group::getGroupCode, input.getGroupCode());
35
+        qw.like(!StringHelper.isEmpty(input.getGroupName()), Group::getGroupName, input.getGroupName());
36
+        qw.like(!StringHelper.isEmpty(input.getCalloutPrefixIn()), Group::getCalloutPrefixIn, input.getCalloutPrefixIn());
37
+        qw.like(!StringHelper.isEmpty(input.getCalloutPrefixOut()), Group::getCalloutPrefixOut, input.getCalloutPrefixOut());
39 38
         qw.like(!StringHelper.isEmpty(input.getRemark()), Group::getRemark, input.getRemark());
40 39
 
41 40
         Page<Group> page = GetPage(pageInput);
@@ -59,14 +58,14 @@ public class GroupController extends BaseController {
59 58
     @PostMapping
60 59
     public AjaxResult add(@RequestBody Group input) {
61 60
         LambdaQueryWrapper<Group> qw = new LambdaQueryWrapper();
62
-        qw.eq( Group::getGroup_code, input.getGroup_code());
61
+        qw.eq( Group::getGroupCode, input.getGroupCode());
63 62
         if(groupService.getCount(qw)>0){
64 63
             return Error("此编码已经存在");
65 64
         }
66 65
 
67
-        input.setCreate_by(CurrentUser().getUser_name());
68
-        input.setCreate_time(new Date());
69
-        input.setDel_flag("0");
66
+        input.setCreateBy(CurrentUser().getUser_name());
67
+        input.setCreateTime(new Date());
68
+        input.setDelFlag("0");
70 69
         boolean result = groupService.insert(input);
71 70
         if (result) {
72 71
             return Success("成功");
@@ -80,13 +79,13 @@ public class GroupController extends BaseController {
80 79
     @PutMapping
81 80
     public AjaxResult edit(@RequestBody Group input)  {
82 81
         LambdaQueryWrapper<Group> qw = new LambdaQueryWrapper();
83
-        qw.ne( Group::getGroup_id, input.getGroup_id());
84
-        qw.eq( Group::getGroup_code, input.getGroup_code());
82
+        qw.ne( Group::getGroupId, input.getGroupId());
83
+        qw.eq( Group::getGroupCode, input.getGroupCode());
85 84
         if(groupService.getCount(qw)>0){
86 85
             return Error("此编码已经存在");
87 86
         }
88
-        input.setUpdate_by(CurrentUser().getUser_name());
89
-        input.setUpdate_time(new Date());
87
+        input.setUpdateBy(CurrentUser().getUser_name());
88
+        input.setUpdateTime(new Date());
90 89
         boolean result = groupService.update(input);
91 90
         if (result) {
92 91
             return Success("成功");

+ 9 - 16
webapidemo-api/src/main/java/com/example/controller/call/IvrWordController.java

@@ -30,21 +30,14 @@ public class IvrWordController extends BaseController {
30 30
     @GetMapping
31 31
     public AjaxResult getList(IvrWord input, PageInput pageInput) {
32 32
         LambdaQueryWrapper<IvrWord> qw = new LambdaQueryWrapper();
33
-        qw.eq(input.getWord_id() != null && input.getWord_id() > 0, IvrWord::getWord_id, input.getWord_id());
33
+        qw.eq(input.getWordId() != null && input.getWordId() > 0, IvrWord::getWordId, input.getWordId());
34 34
         qw.like(!StringHelper.isEmpty(input.getTitle()), IvrWord::getTitle, input.getTitle());
35 35
         qw.like(!StringHelper.isEmpty(input.getContent()), IvrWord::getContent, input.getContent());
36
-        qw.like(!StringHelper.isEmpty(input.getFile_path()), IvrWord::getFile_path, input.getFile_path());
36
+        qw.like(!StringHelper.isEmpty(input.getFilePath()), IvrWord::getFilePath, input.getFilePath());
37 37
         qw.eq(input.getType() != null && input.getType() > 0, IvrWord::getType, input.getType());
38
-        qw.eq(input.getStart_time() != null , IvrWord::getStart_time, input.getStart_time());
39
-        qw.eq(input.getEnd_time() != null , IvrWord::getEnd_time, input.getEnd_time());
38
+        qw.eq(input.getStartTime() != null , IvrWord::getStartTime, input.getStartTime());
39
+        qw.eq(input.getEndTime() != null , IvrWord::getEndTime, input.getEndTime());
40 40
         qw.like(!StringHelper.isEmpty(input.getRemark()), IvrWord::getRemark, input.getRemark());
41
-        qw.like(!StringHelper.isEmpty(input.getDel_flag()), IvrWord::getDel_flag, input.getDel_flag());
42
-        qw.like(!StringHelper.isEmpty(input.getCreate_by()), IvrWord::getCreate_by, input.getCreate_by());
43
-        qw.eq(input.getCreate_time() != null , IvrWord::getCreate_time, input.getCreate_time());
44
-        qw.like(!StringHelper.isEmpty(input.getUpdate_by()), IvrWord::getUpdate_by, input.getUpdate_by());
45
-        qw.eq(input.getUpdate_time() != null , IvrWord::getUpdate_time, input.getUpdate_time());
46
-        qw.like(!StringHelper.isEmpty(input.getDel_by()), IvrWord::getDel_by, input.getDel_by());
47
-        qw.eq(input.getDel_time() != null , IvrWord::getDel_time, input.getDel_time());
48 41
         Page<IvrWord> page = GetPage(pageInput);
49 42
         if (page != null) {
50 43
             IPage<IvrWord> iPage = ivrwordService.getListPage(page, qw);
@@ -65,9 +58,9 @@ public class IvrWordController extends BaseController {
65 58
     @Log(title = "新增ivr文字文件表",businessType = BusinessType.INSERT)
66 59
     @PostMapping
67 60
     public AjaxResult add(@RequestBody IvrWord input) {
68
-        input.setCreate_by(CurrentUser().getUser_name());
69
-        input.setCreate_time(new Date());
70
-        input.setDel_flag("0");
61
+        input.setCreateBy(CurrentUser().getUser_name());
62
+        input.setCreateTime(new Date());
63
+        input.setDelFlag("0");
71 64
         boolean result = ivrwordService.insert(input);
72 65
         if (result) {
73 66
             return Success("成功");
@@ -80,8 +73,8 @@ public class IvrWordController extends BaseController {
80 73
     @Log(title = "编辑ivr文字文件表",businessType = BusinessType.UPDATE)
81 74
     @PutMapping
82 75
     public AjaxResult edit(@RequestBody IvrWord input)  {
83
-        input.setUpdate_by(CurrentUser().getUser_name());
84
-        input.setUpdate_time(new Date());
76
+        input.setUpdateBy(CurrentUser().getUser_name());
77
+        input.setUpdateTime(new Date());
85 78
         boolean result = ivrwordService.update(input);
86 79
         if (result) {
87 80
             return Success("成功");

+ 8 - 9
webapidemo-api/src/main/java/com/example/controller/call/MobileController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.example.controller.BaseController;
7
-import com.example.entity.database.call.Extension;
8 7
 import com.example.entity.database.call.Mobile;
9 8
 import com.example.entity.input.PageInput;
10 9
 import com.example.model.AjaxResult;
@@ -30,11 +29,11 @@ public class MobileController extends BaseController {
30 29
     @GetMapping
31 30
     public AjaxResult getList(Mobile input, PageInput pageInput) {
32 31
         LambdaQueryWrapper<Mobile> qw = new LambdaQueryWrapper();
33
-        qw.eq(input.getMobile_id() != null && input.getMobile_id() > 0, Mobile::getMobile_id, input.getMobile_id());
34
-        qw.like(!StringHelper.isEmpty(input.getMobile_prefix()), Mobile::getMobile_prefix, input.getMobile_prefix());
35
-        qw.like(!StringHelper.isEmpty(input.getLocation_code()), Mobile::getLocation_code, input.getLocation_code());
36
-        qw.like(!StringHelper.isEmpty(input.getLocation_name()), Mobile::getLocation_name, input.getLocation_name());
37
-        qw.like(!StringHelper.isEmpty(input.getCard_name()), Mobile::getCard_name, input.getCard_name());
32
+        qw.eq(input.getMobileId() != null && input.getMobileId() > 0, Mobile::getMobileId, input.getMobileId());
33
+        qw.like(!StringHelper.isEmpty(input.getMobilePrefix()), Mobile::getMobilePrefix, input.getMobilePrefix());
34
+        qw.like(!StringHelper.isEmpty(input.getLocationCode()), Mobile::getLocationCode, input.getLocationCode());
35
+        qw.like(!StringHelper.isEmpty(input.getLocationName()), Mobile::getLocationName, input.getLocationName());
36
+        qw.like(!StringHelper.isEmpty(input.getCardName()), Mobile::getCardName, input.getCardName());
38 37
         Page<Mobile> page = GetPage(pageInput);
39 38
         if (page != null) {
40 39
             IPage<Mobile> iPage = mobileService.getListPage(page, qw);
@@ -56,7 +55,7 @@ public class MobileController extends BaseController {
56 55
     @PostMapping
57 56
     public AjaxResult add(@RequestBody Mobile input) {
58 57
         LambdaQueryWrapper<Mobile> qw = new LambdaQueryWrapper();
59
-        qw.eq( Mobile::getMobile_prefix, input.getMobile_prefix());
58
+        qw.eq( Mobile::getMobilePrefix, input.getMobilePrefix());
60 59
         if(mobileService.getCount(qw)>0){
61 60
             return Error("此号码已经存在");
62 61
         }
@@ -73,8 +72,8 @@ public class MobileController extends BaseController {
73 72
     @PutMapping
74 73
     public AjaxResult edit(@RequestBody Mobile input)  {
75 74
         LambdaQueryWrapper<Mobile> qw = new LambdaQueryWrapper();
76
-        qw.ne(Mobile::getMobile_id,input.getMobile_id());
77
-        qw.eq(Mobile::getMobile_prefix, input.getMobile_prefix());
75
+        qw.ne(Mobile::getMobileId,input.getMobileId());
76
+        qw.eq(Mobile::getMobilePrefix, input.getMobilePrefix());
78 77
         if(mobileService.getCount(qw)>0){
79 78
             return Error("此号码已经存在");
80 79
         }

+ 32 - 32
webapidemo-api/src/main/java/com/example/controller/call/RecordController.java

@@ -29,40 +29,40 @@ public class RecordController extends BaseController {
29 29
     @GetMapping
30 30
     public AjaxResult getList(Record input, PageInput pageInput) {
31 31
         LambdaQueryWrapper<Record> qw = new LambdaQueryWrapper();
32
-        qw.eq(input.getRecord_id() != null && input.getRecord_id() > 0, Record::getRecord_id, input.getRecord_id());
32
+        qw.eq(input.getRecordId() != null && input.getRecordId() > 0, Record::getRecordId, input.getRecordId());
33 33
         qw.like(!StringHelper.isEmpty(input.getUuid()), Record::getUuid, input.getUuid());
34
-        qw.like(!StringHelper.isEmpty(input.getBase_number()), Record::getBase_number, input.getBase_number());
35
-        qw.like(!StringHelper.isEmpty(input.getCall_id()), Record::getCall_id, input.getCall_id());
36
-        qw.like(!StringHelper.isEmpty(input.getCall_number()), Record::getCall_number, input.getCall_number());
37
-        qw.eq(input.getCall_type() != null && input.getCall_type() > 0, Record::getCall_type, input.getCall_type());
38
-        qw.eq(input.getCall_state() != null && input.getCall_state() > 0, Record::getCall_state, input.getCall_state());
39
-        qw.eq(input.getDeal_type() != null && input.getDeal_type() > 0, Record::getDeal_type, input.getDeal_type());
40
-        qw.eq(input.getBegin_time() != null , Record::getBegin_time, input.getBegin_time());
41
-        qw.eq(input.getIvr_start_time() != null , Record::getIvr_start_time, input.getIvr_start_time());
42
-        qw.eq(input.getIvr_end_time() != null , Record::getIvr_end_time, input.getIvr_end_time());
43
-        qw.eq(input.getIvr_long_time() != null && input.getIvr_long_time() > 0, Record::getIvr_long_time, input.getIvr_long_time());
44
-        qw.eq(input.getWait_start_time() != null , Record::getWait_start_time, input.getWait_start_time());
45
-        qw.eq(input.getWait_end_time() != null , Record::getWait_end_time, input.getWait_end_time());
46
-        qw.eq(input.getWait_long_time() != null && input.getWait_long_time() > 0, Record::getWait_long_time, input.getWait_long_time());
47
-        qw.eq(input.getRing_start_time() != null , Record::getRing_start_time, input.getRing_start_time());
48
-        qw.eq(input.getRing_end_time() != null , Record::getRing_end_time, input.getRing_end_time());
49
-        qw.eq(input.getRing_long_time() != null && input.getRing_long_time() > 0, Record::getRing_long_time, input.getRing_long_time());
50
-        qw.eq(input.getTalk_start_time() != null , Record::getTalk_start_time, input.getTalk_start_time());
51
-        qw.eq(input.getTalk_end_time() != null , Record::getTalk_end_time, input.getTalk_end_time());
52
-        qw.eq(input.getTalk_long_time() != null && input.getTalk_long_time() > 0, Record::getTalk_long_time, input.getTalk_long_time());
53
-        qw.eq(input.getEnd_time() != null , Record::getEnd_time, input.getEnd_time());
54
-        qw.eq(input.getLong_time() != null && input.getLong_time() > 0, Record::getLong_time, input.getLong_time());
55
-        qw.eq(input.getGroup_id() != null && input.getGroup_id() > 0, Record::getGroup_id, input.getGroup_id());
56
-        qw.eq(input.getUser_id() != null && input.getUser_id() > 0, Record::getUser_id, input.getUser_id());
57
-        qw.like(!StringHelper.isEmpty(input.getUser_code()), Record::getUser_code, input.getUser_code());
58
-        qw.like(!StringHelper.isEmpty(input.getUser_name()), Record::getUser_name, input.getUser_name());
59
-        qw.like(!StringHelper.isEmpty(input.getUser_ext()), Record::getUser_ext, input.getUser_ext());
60
-        qw.like(!StringHelper.isEmpty(input.getFile_path()), Record::getFile_path, input.getFile_path());
34
+        qw.like(!StringHelper.isEmpty(input.getBaseNumber()), Record::getBaseNumber, input.getBaseNumber());
35
+        qw.like(!StringHelper.isEmpty(input.getCallId()), Record::getCallId, input.getCallId());
36
+        qw.like(!StringHelper.isEmpty(input.getCallNumber()), Record::getCallNumber, input.getCallNumber());
37
+        qw.eq(input.getCallType() != null && input.getCallType() > 0, Record::getCallType, input.getCallType());
38
+        qw.eq(input.getCallState() != null && input.getCallState() > 0, Record::getCallState, input.getCallState());
39
+        qw.eq(input.getDealType() != null && input.getDealType() > 0, Record::getDealType, input.getDealType());
40
+        qw.eq(input.getBeginTime() != null , Record::getBeginTime, input.getBeginTime());
41
+        qw.eq(input.getIvrStartTime() != null , Record::getIvrStartTime, input.getIvrStartTime());
42
+        qw.eq(input.getIvrEndTime() != null , Record::getIvrEndTime, input.getIvrEndTime());
43
+        qw.eq(input.getIvrLongTime() != null && input.getIvrLongTime() > 0, Record::getIvrLongTime, input.getIvrLongTime());
44
+        qw.eq(input.getWaitStartTime() != null , Record::getWaitStartTime, input.getWaitStartTime());
45
+        qw.eq(input.getWaitEndTime() != null , Record::getWaitEndTime, input.getWaitEndTime());
46
+        qw.eq(input.getWaitLongTime() != null && input.getWaitLongTime() > 0, Record::getWaitLongTime, input.getWaitLongTime());
47
+        qw.eq(input.getRingStartTime() != null , Record::getRingStartTime, input.getRingStartTime());
48
+        qw.eq(input.getRingEndTime() != null , Record::getRingEndTime, input.getRingEndTime());
49
+        qw.eq(input.getRingLongTime() != null && input.getRingLongTime() > 0, Record::getRingLongTime, input.getRingLongTime());
50
+        qw.eq(input.getTalkStartTime() != null , Record::getTalkStartTime, input.getTalkStartTime());
51
+        qw.eq(input.getTalkEndTime() != null , Record::getTalkEndTime, input.getTalkEndTime());
52
+        qw.eq(input.getTalkLongTime() != null && input.getTalkLongTime() > 0, Record::getTalkLongTime, input.getTalkLongTime());
53
+        qw.eq(input.getEndTime() != null , Record::getEndTime, input.getEndTime());
54
+        qw.eq(input.getLongTime() != null && input.getLongTime() > 0, Record::getLongTime, input.getLongTime());
55
+        qw.eq(input.getGroupId() != null && input.getGroupId() > 0, Record::getGroupId, input.getGroupId());
56
+        qw.eq(input.getUserId() != null && input.getUserId() > 0, Record::getUserId, input.getUserId());
57
+        qw.like(!StringHelper.isEmpty(input.getUserCode()), Record::getUserCode, input.getUserCode());
58
+        qw.like(!StringHelper.isEmpty(input.getUserName()), Record::getUserName, input.getUserName());
59
+        qw.like(!StringHelper.isEmpty(input.getUserExt()), Record::getUserExt, input.getUserExt());
60
+        qw.like(!StringHelper.isEmpty(input.getFilePath()), Record::getFilePath, input.getFilePath());
61 61
         qw.eq(input.getMyd() != null && input.getMyd() > 0, Record::getMyd, input.getMyd());
62
-        qw.eq(input.getBusiness_type() != null && input.getBusiness_type() > 0, Record::getBusiness_type, input.getBusiness_type());
63
-        qw.eq(input.getAction_id() != null && input.getAction_id() > 0, Record::getAction_id, input.getAction_id());
64
-        qw.eq(input.getAction_type() != null && input.getAction_type() > 0, Record::getAction_type, input.getAction_type());
65
-        qw.like(!StringHelper.isEmpty(input.getWorkorder_id()), Record::getWorkorder_id, input.getWorkorder_id());
62
+        qw.eq(input.getBusinessType() != null && input.getBusinessType() > 0, Record::getBusinessType, input.getBusinessType());
63
+        qw.eq(input.getActionId() != null && input.getActionId() > 0, Record::getActionId, input.getActionId());
64
+        qw.eq(input.getActionType() != null && input.getActionType() > 0, Record::getActionType, input.getActionType());
65
+        qw.like(!StringHelper.isEmpty(input.getWorkorderId()), Record::getWorkorderId, input.getWorkorderId());
66 66
         Page<Record> page = GetPage(pageInput);
67 67
         if (page != null) {
68 68
             IPage<Record> iPage = recordService.getListPage(page, qw);

+ 28 - 13
webapidemo-entity/src/main/java/com/example/entity/database/call/Blacklist.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,44 +17,58 @@ public class Blacklist {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long black_id;
20
+    @TableField("black_id")
21
+    private Long blackId;
20 22
     /** 会话id */
21 23
     @ApiModelProperty("会话id")
22
-    private Long call_id;
24
+    @TableField("call_id")
25
+    private Long callId;
23 26
     /** 来电号码 */
24 27
     @ApiModelProperty("来电号码")
25
-    private String call_number;
28
+    @TableField("call_number")
29
+    private String callNumber;
26 30
     /** 类型1时间段2永久 */
27 31
     @ApiModelProperty("类型1时间段2永久")
28
-    private Long black_type;
32
+    @TableField("black_type")
33
+    private Long blackType;
29 34
     /** 开始时间 */
30 35
     @ApiModelProperty("开始时间")
31
-    private Date start_time;
36
+    @TableField("start_time")
37
+    private Date startTime;
32 38
     /** 结束时间 */
33 39
     @ApiModelProperty("结束时间")
34
-    private Date end_time;
40
+    @TableField("end_time")
41
+    private Date endTime;
35 42
     /** 备注 */
36 43
     @ApiModelProperty("备注")
44
+    @TableField("remark")
37 45
     private String remark;
38 46
     /** 删除标志(0代表存在 2代表删除) */
39 47
     @ApiModelProperty("删除标志(0代表存在 2代表删除)")
40
-    private String del_flag;
48
+    @TableField("del_flag")
49
+    private String delFlag;
41 50
     /** 创建者 */
42 51
     @ApiModelProperty("创建者")
43
-    private String create_by;
52
+    @TableField("create_by")
53
+    private String createBy;
44 54
     /** 创建时间 */
45 55
     @ApiModelProperty("创建时间")
46
-    private Date create_time;
56
+    @TableField("create_time")
57
+    private Date createTime;
47 58
     /** 更新者 */
48 59
     @ApiModelProperty("更新者")
49
-    private String update_by;
60
+    @TableField("update_by")
61
+    private String updateBy;
50 62
     /** 更新时间 */
51 63
     @ApiModelProperty("更新时间")
52
-    private Date update_time;
64
+    @TableField("update_time")
65
+    private Date updateTime;
53 66
     /** 删除者 */
54 67
     @ApiModelProperty("删除者")
55
-    private String del_by;
68
+    @TableField("del_by")
69
+    private String delBy;
56 70
     /** 删除时间 */
57 71
     @ApiModelProperty("删除时间")
58
-    private Date del_time;
72
+    @TableField("del_time")
73
+    private Date delTime;
59 74
 }

+ 7 - 3
webapidemo-entity/src/main/java/com/example/entity/database/call/Extension.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,11 +17,14 @@ public class Extension {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long extension_id;
20
+    @TableField("extension_id")
21
+    private Long extensionId;
20 22
     /** 分机号前缀 */
21 23
     @ApiModelProperty("分机号前缀")
22
-    private String extension_prefix;
24
+    @TableField("extension_prefix")
25
+    private String extensionPrefix;
23 26
     /** 归属地 */
24 27
     @ApiModelProperty("归属地")
25
-    private String location_name;
28
+    @TableField("location_name")
29
+    private String locationName;
26 30
 }

+ 26 - 12
webapidemo-entity/src/main/java/com/example/entity/database/call/Group.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,41 +17,54 @@ public class Group {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long group_id;
20
+    @TableField("group_id")
21
+    private Long groupId;
20 22
     /** 坐席组编码 */
21 23
     @ApiModelProperty("坐席组编码")
22
-    private String group_code;
24
+    @TableField("group_code")
25
+    private String groupCode;
23 26
     /** 坐席组名称 */
24 27
     @ApiModelProperty("坐席组名称")
25
-    private String group_name;
28
+    @TableField("group_name")
29
+    private String groupName;
26 30
     /** 本地外呼前缀 */
27 31
     @ApiModelProperty("本地外呼前缀")
28
-    private String callout_prefix_in;
32
+    @TableField("callout_prefix_in")
33
+    private String calloutPrefixIn;
29 34
     /** 外地外呼前缀 */
30 35
     @ApiModelProperty("外地外呼前缀")
31
-    private String callout_prefix_out;
36
+    @TableField("callout_prefix_out")
37
+    private String calloutPrefixOut;
32 38
     /** 备注 */
33 39
     @ApiModelProperty("备注")
40
+    @TableField("remark")
34 41
     private String remark;
35 42
     /** 删除标志(0代表存在 2代表删除) */
36 43
     @ApiModelProperty("删除标志(0代表存在 2代表删除)")
37
-    private String del_flag;
44
+    @TableField("del_flag")
45
+    private String delFlag;
38 46
     /** 创建者 */
39 47
     @ApiModelProperty("创建者")
40
-    private String create_by;
48
+    @TableField("create_by")
49
+    private String createBy;
41 50
     /** 创建时间 */
42 51
     @ApiModelProperty("创建时间")
43
-    private Date create_time;
52
+    @TableField("create_time")
53
+    private Date createTime;
44 54
     /** 更新者 */
45 55
     @ApiModelProperty("更新者")
46
-    private String update_by;
56
+    @TableField("update_by")
57
+    private String updateBy;
47 58
     /** 更新时间 */
48 59
     @ApiModelProperty("更新时间")
49
-    private Date update_time;
60
+    @TableField("update_time")
61
+    private Date updateTime;
50 62
     /** 删除者 */
51 63
     @ApiModelProperty("删除者")
52
-    private String del_by;
64
+    @TableField("del_by")
65
+    private String delBy;
53 66
     /** 删除时间 */
54 67
     @ApiModelProperty("删除时间")
55
-    private Date del_time;
68
+    @TableField("del_time")
69
+    private Date delTime;
56 70
 }

+ 27 - 11
webapidemo-entity/src/main/java/com/example/entity/database/call/IvrWord.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,47 +17,62 @@ public class IvrWord {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long word_id;
20
+    @TableField("word_id")
21
+    private Long wordId;
20 22
     /** 标题 */
21 23
     @ApiModelProperty("标题")
24
+    @TableField("title")
22 25
     private String title;
23 26
     /** 内容 */
24 27
     @ApiModelProperty("内容")
28
+    @TableField("content")
25 29
     private String content;
26 30
     /** 语音文件路径 */
27 31
     @ApiModelProperty("语音文件路径")
28
-    private String file_path;
32
+    @TableField("file_path")
33
+    private String filePath;
29 34
     /** 类型1文字2路径 */
30 35
     @ApiModelProperty("类型1文字2路径")
36
+    @TableField("type")
31 37
     private Long type;
32 38
     /** 开始时间 */
33 39
     @ApiModelProperty("开始时间")
34
-    private Date start_time;
40
+    @TableField("start_time")
41
+    private Date startTime;
35 42
     /** 结束时间 */
36 43
     @ApiModelProperty("结束时间")
37
-    private Date end_time;
44
+    @TableField("end_time")
45
+    private Date endTime;
38 46
     /** 备注 */
39 47
     @ApiModelProperty("备注")
48
+    @TableField("remark")
40 49
     private String remark;
41 50
     /** 删除标志(0代表存在 2代表删除) */
42 51
     @ApiModelProperty("删除标志(0代表存在 2代表删除)")
43
-    private String del_flag;
52
+    @TableField("del_flag")
53
+    private String delFlag;
44 54
     /** 创建者 */
45 55
     @ApiModelProperty("创建者")
46
-    private String create_by;
56
+    @TableField("create_by")
57
+    private String createBy;
47 58
     /** 创建时间 */
48 59
     @ApiModelProperty("创建时间")
49
-    private Date create_time;
60
+    @TableField("create_time")
61
+    private Date createTime;
50 62
     /** 更新者 */
51 63
     @ApiModelProperty("更新者")
52
-    private String update_by;
64
+    @TableField("update_by")
65
+    private String updateBy;
53 66
     /** 更新时间 */
54 67
     @ApiModelProperty("更新时间")
55
-    private Date update_time;
68
+    @TableField("update_time")
69
+    private Date updateTime;
56 70
     /** 删除者 */
57 71
     @ApiModelProperty("删除者")
58
-    private String del_by;
72
+    @TableField("del_by")
73
+    private String delBy;
59 74
     /** 删除时间 */
60 75
     @ApiModelProperty("删除时间")
61
-    private Date del_time;
76
+    @TableField("del_time")
77
+    private Date delTime;
62 78
 }

+ 11 - 5
webapidemo-entity/src/main/java/com/example/entity/database/call/Mobile.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,17 +17,22 @@ public class Mobile {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long mobile_id;
20
+    @TableField("mobile_id")
21
+    private Long mobileId;
20 22
     /** 手机号前七位 */
21 23
     @ApiModelProperty("手机号前七位")
22
-    private String mobile_prefix;
24
+    @TableField("mobile_prefix")
25
+    private String mobilePrefix;
23 26
     /** 归属地区号 */
24 27
     @ApiModelProperty("归属地区号")
25
-    private String location_code;
28
+    @TableField("location_code")
29
+    private String locationCode;
26 30
     /** 归属地 */
27 31
     @ApiModelProperty("归属地")
28
-    private String location_name;
32
+    @TableField("location_name")
33
+    private String locationName;
29 34
     /** 卡名称 */
30 35
     @ApiModelProperty("卡名称")
31
-    private String card_name;
36
+    @TableField("card_name")
37
+    private String cardName;
32 38
 }

+ 67 - 32
webapidemo-entity/src/main/java/com/example/entity/database/call/Record.java

@@ -3,6 +3,7 @@ package com.example.entity.database.call;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.baomidou.mybatisplus.annotation.TableField;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
8 9
 import lombok.Data;
@@ -16,104 +17,138 @@ public class Record {
16 17
     /** 自增id */
17 18
     @ApiModelProperty("自增id")
18 19
     @TableId(type = IdType.AUTO)
19
-    private Long record_id;
20
+    @TableField("record_id")
21
+    private Long recordId;
20 22
     /** freeswitchID */
21 23
     @ApiModelProperty("freeswitchID")
24
+    @TableField("uuid")
22 25
     private String uuid;
23 26
     /** 底号 */
24 27
     @ApiModelProperty("底号")
25
-    private String base_number;
28
+    @TableField("base_number")
29
+    private String baseNumber;
26 30
     /** 呼叫编号 */
27 31
     @ApiModelProperty("呼叫编号")
28
-    private String call_id;
32
+    @TableField("call_id")
33
+    private String callId;
29 34
     /** 来电号码 */
30 35
     @ApiModelProperty("来电号码")
31
-    private String call_number;
36
+    @TableField("call_number")
37
+    private String callNumber;
32 38
     /** 呼叫类型,0呼入1呼出 */
33 39
     @ApiModelProperty("呼叫类型,0呼入1呼出")
34
-    private Long call_type;
40
+    @TableField("call_type")
41
+    private Long callType;
35 42
     /** 呼叫状态,0未接通1已接通 */
36 43
     @ApiModelProperty("呼叫状态,0未接通1已接通")
37
-    private Long call_state;
44
+    @TableField("call_state")
45
+    private Long callState;
38 46
     /** 处理方式,0IVR1骚扰2自助3值班4留言5振铃6人工 */
39 47
     @ApiModelProperty("处理方式,0IVR1骚扰2自助3值班4留言5振铃6人工")
40
-    private Long deal_type;
48
+    @TableField("deal_type")
49
+    private Long dealType;
41 50
     /** 开始时间 */
42 51
     @ApiModelProperty("开始时间")
43
-    private Date begin_time;
52
+    @TableField("begin_time")
53
+    private Date beginTime;
44 54
     /** ivr开始时间 */
45 55
     @ApiModelProperty("ivr开始时间")
46
-    private Date ivr_start_time;
56
+    @TableField("ivr_start_time")
57
+    private Date ivrStartTime;
47 58
     /** ivr结束时间 */
48 59
     @ApiModelProperty("ivr结束时间")
49
-    private Date ivr_end_time;
60
+    @TableField("ivr_end_time")
61
+    private Date ivrEndTime;
50 62
     /** IVR时长(s) */
51 63
     @ApiModelProperty("IVR时长(s)")
52
-    private Long ivr_long_time;
64
+    @TableField("ivr_long_time")
65
+    private Long ivrLongTime;
53 66
     /** 排队开始时间 */
54 67
     @ApiModelProperty("排队开始时间")
55
-    private Date wait_start_time;
68
+    @TableField("wait_start_time")
69
+    private Date waitStartTime;
56 70
     /** 排队结束时间 */
57 71
     @ApiModelProperty("排队结束时间")
58
-    private Date wait_end_time;
72
+    @TableField("wait_end_time")
73
+    private Date waitEndTime;
59 74
     /** 排队时长 */
60 75
     @ApiModelProperty("排队时长")
61
-    private Long wait_long_time;
76
+    @TableField("wait_long_time")
77
+    private Long waitLongTime;
62 78
     /** 振铃开始时间 */
63 79
     @ApiModelProperty("振铃开始时间")
64
-    private Date ring_start_time;
80
+    @TableField("ring_start_time")
81
+    private Date ringStartTime;
65 82
     /** 振铃结束时间 */
66 83
     @ApiModelProperty("振铃结束时间")
67
-    private Date ring_end_time;
84
+    @TableField("ring_end_time")
85
+    private Date ringEndTime;
68 86
     /** 振铃时长(s) */
69 87
     @ApiModelProperty("振铃时长(s)")
70
-    private Long ring_long_time;
88
+    @TableField("ring_long_time")
89
+    private Long ringLongTime;
71 90
     /** 通话开始时间 */
72 91
     @ApiModelProperty("通话开始时间")
73
-    private Date talk_start_time;
92
+    @TableField("talk_start_time")
93
+    private Date talkStartTime;
74 94
     /** 通话结束时间 */
75 95
     @ApiModelProperty("通话结束时间")
76
-    private Date talk_end_time;
96
+    @TableField("talk_end_time")
97
+    private Date talkEndTime;
77 98
     /** 通话时长(s) */
78 99
     @ApiModelProperty("通话时长(s)")
79
-    private Long talk_long_time;
100
+    @TableField("talk_long_time")
101
+    private Long talkLongTime;
80 102
     /** 结束时间 */
81 103
     @ApiModelProperty("结束时间")
82
-    private Date end_time;
104
+    @TableField("end_time")
105
+    private Date endTime;
83 106
     /** 总时长(s) */
84 107
     @ApiModelProperty("总时长(s)")
85
-    private Long long_time;
108
+    @TableField("long_time")
109
+    private Long longTime;
86 110
     /** 坐席组 */
87 111
     @ApiModelProperty("坐席组")
88
-    private Long group_id;
112
+    @TableField("group_id")
113
+    private Long groupId;
89 114
     /** 坐席id */
90 115
     @ApiModelProperty("坐席id")
91
-    private Long user_id;
116
+    @TableField("user_id")
117
+    private Long userId;
92 118
     /** 坐席工号 */
93 119
     @ApiModelProperty("坐席工号")
94
-    private String user_code;
120
+    @TableField("user_code")
121
+    private String userCode;
95 122
     /** 坐席姓名 */
96 123
     @ApiModelProperty("坐席姓名")
97
-    private String user_name;
124
+    @TableField("user_name")
125
+    private String userName;
98 126
     /** 坐席分机号 */
99 127
     @ApiModelProperty("坐席分机号")
100
-    private String user_ext;
128
+    @TableField("user_ext")
129
+    private String userExt;
101 130
     /** 录音路径 */
102 131
     @ApiModelProperty("录音路径")
103
-    private String file_path;
132
+    @TableField("file_path")
133
+    private String filePath;
104 134
     /** 满意度,1非常满意2基本满意3不满意 */
105 135
     @ApiModelProperty("满意度,1非常满意2基本满意3不满意")
136
+    @TableField("myd")
106 137
     private Long myd;
107 138
     /** IVR中选择的业务类型 */
108 139
     @ApiModelProperty("IVR中选择的业务类型")
109
-    private Long business_type;
140
+    @TableField("business_type")
141
+    private Long businessType;
110 142
     /** 区别正常呼入呼出、转移、三方通话 */
111 143
     @ApiModelProperty("区别正常呼入呼出、转移、三方通话")
112
-    private Long action_id;
144
+    @TableField("action_id")
145
+    private Long actionId;
113 146
     /** 1正常呼入呼出2转移3三方通话 */
114 147
     @ApiModelProperty("1正常呼入呼出2转移3三方通话")
115
-    private Long action_type;
148
+    @TableField("action_type")
149
+    private Long actionType;
116 150
     /** 工单号 */
117 151
     @ApiModelProperty("工单号")
118
-    private String workorder_id;
152
+    @TableField("workorder_id")
153
+    private String workorderId;
119 154
 }