From e9de50a667ede509b1b5b01e641d8fb83d338dd4 Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Sun, 28 Mar 2021 23:41:31 +0800 Subject: [PATCH] add deelte cdr --- .../CallDetailRecordController.java | 11 ++++++ .../cms/service/CallDetailRecordService.java | 10 +++--- .../impl/CallDetailRecordServiceImpl.java | 4 +-- web/cms/app/components/delete-btn.js | 35 ------------------- web/cms/app/components/delete-button.js | 28 +++++---------- .../app/templates/call-detail-record/list.hbs | 13 +++++++ .../app/templates/components/delete-btn.hbs | 1 - .../templates/components/delete-button.hbs | 2 +- 8 files changed, 40 insertions(+), 64 deletions(-) delete mode 100644 web/cms/app/components/delete-btn.js delete mode 100644 web/cms/app/templates/components/delete-btn.hbs diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java index 9610a391..fe395979 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java @@ -10,6 +10,7 @@ import java.util.function.BiFunction; import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import org.apache.commons.lang3.StringUtils; +import javax.validation.constraints.NotNull; import com.pudonghot.yo.util.PhoneNumberUtils; import com.wacai.tigon.web.annotation.ListApi; import com.wacai.tigon.web.controller.ArgQuery; @@ -26,6 +27,8 @@ import com.wacai.tigon.web.controller.BaseQueryController; import org.springframework.validation.annotation.Validated; import com.pudonghot.yo.cms.service.CallDetailRecordService; import com.pudonghot.yo.cellphone.privacy.NumberPrivacyUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import static com.pudonghot.yo.model.domain.CallDetailRecord.*; @@ -122,6 +125,14 @@ public class CallDetailRecordController return ((CallDetailRecordService) queryService).accountReport(form.copy(new ReqCallDetailRecordAccountReport())); } + @PostMapping("/delete") + public void delete( + @NotNull + @RequestParam("id") + final Integer id) { + ((CallDetailRecordService) queryService).delete(id); + } + /** * {@inheritDoc} */ diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/CallDetailRecordService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/CallDetailRecordService.java index c2a3a7dc..cc409183 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/CallDetailRecordService.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/CallDetailRecordService.java @@ -1,17 +1,17 @@ package com.pudonghot.yo.cms.service; +import java.util.List; +import com.wacai.tigon.service.BaseQueryService; +import com.wacai.tigon.service.BaseDeleteService; +import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.dbobject.CallDetailReport; import com.pudonghot.yo.model.request.ReqCallDetailRecordAccountReport; -import com.wacai.tigon.service.BaseQueryService; -import com.pudonghot.yo.model.domain.CallDetailRecord; - -import java.util.List; /** * @author Donghuang * @date Oct 21, 2020 21:10:19 */ -public interface CallDetailRecordService extends BaseQueryService { +public interface CallDetailRecordService extends BaseQueryService, BaseDeleteService { /** * account report diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CallDetailRecordServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CallDetailRecordServiceImpl.java index 0c657161..033fb4a6 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CallDetailRecordServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CallDetailRecordServiceImpl.java @@ -7,7 +7,7 @@ import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.mapper.CallDetailRecordMapper; import com.pudonghot.yo.model.dbobject.CallDetailReport; import com.pudonghot.yo.cms.service.CallDetailRecordService; -import com.wacai.tigon.service.support.BaseQueryServiceSupport; +import com.wacai.tigon.service.support.BaseCrudServiceSupport; import com.pudonghot.yo.model.request.ReqCallDetailRecordAccountReport; /** @@ -17,7 +17,7 @@ import com.pudonghot.yo.model.request.ReqCallDetailRecordAccountReport; @Slf4j @Service public class CallDetailRecordServiceImpl - extends BaseQueryServiceSupport + extends BaseCrudServiceSupport implements CallDetailRecordService{ /** diff --git a/web/cms/app/components/delete-btn.js b/web/cms/app/components/delete-btn.js deleted file mode 100644 index 726abbfe..00000000 --- a/web/cms/app/components/delete-btn.js +++ /dev/null @@ -1,35 +0,0 @@ -import Ember from 'ember'; - -import BaseComponent from './basic-component'; - -export default BaseComponent.extend({ - tagName: 'a', - attributeBindings: ['title'], - 'data-rel': 'tooltip', - enabled: Ember.computed.alias('model.active'), - title: 'Delete', - 'icon-size-class': 'bigger-120', - didReceiveAttrs() { - let me = this; - me._super(...arguments); - if (me.get('icon-only')) { - me.set('icon-size-class', 'bigger-130'); - me.set('classNameBindings', ['red']); - } - else { - me.set('classNameBindings', - ['btn-danger', - 'icon-only::btn', - 'icon-only::btn-xs']); - } - }, - click() { - let me = this; - me.dialog.confirm('确认要删除吗？', () => { - me.get('service').del(me.get('model')).then(() => { - me.get('route.controller.model.data').removeObject(me.get('model')); - me.decrementProperty('route.controller.model.total'); - }); - }); - } -}); diff --git a/web/cms/app/components/delete-button.js b/web/cms/app/components/delete-button.js index 9cc821b6..1d5c7d70 100644 --- a/web/cms/app/components/delete-button.js +++ b/web/cms/app/components/delete-button.js @@ -12,10 +12,9 @@ export default BasicComponent.extend({ 'icon-size-class': 'bigger-120', 'data-rel': 'tooltip', 'data-original-title': alias('title'), - 'operate-reason': false, 'icon-only': alias('iconOnly'), didReceiveAttrs() { - let me = this; + const me = this; if (me.get('icon-only')) { me.set('icon-size-class', 'bigger-130'); me.set('classNameBindings', ['red']); @@ -28,25 +27,14 @@ export default BasicComponent.extend({ } }, click() { - let me = this; - if (me.get('operate-reason')) { - me.get('dialog').prompt('请输入删除原因（必填）', reason => { - const model = me.get('model'); - me.get('service').del(model).then(() => { - me.get('operationLog').createLog( - me.get('routeName'), '删除', model, reason); - me.get('route.controller.model.data').removeObject(model); - }); - }); - } - else { + const me = this; + me.get('dialog').confirm('确认要删除吗？', () => { const model = me.get('model'); - me.get('dialog').confirm('确认要删除吗？', () => { - me.get('service').del(model).then(() => { - me.get('route.controller.model.data').removeObject(model); - me.decrementProperty('route.controller.model.total'); - }); + me.get('service').del(model).then(() => { + me.get('route.controller.model.data').removeObject(model); + me.decrementProperty('route.controller.model.total'); + me.get('message').alert('删除成功'); }); - } + }); } }); diff --git a/web/cms/app/templates/call-detail-record/list.hbs b/web/cms/app/templates/call-detail-record/list.hbs index 4f5d5957..8da0c0e3 100644 --- a/web/cms/app/templates/call-detail-record/list.hbs +++ b/web/cms/app/templates/call-detail-record/list.hbs @@ -120,6 +120,12 @@ 录音 + {{#has-perm 'PERM_VIEW_CALL_DETAIL_RECORD_DELETE'}} + + + 管理 + + {{/has-perm}} @@ -176,6 +182,13 @@ {{/if}} + {{#has-perm 'PERM_VIEW_CALL_DETAIL_RECORD_DELETE'}} + +
+ {{delete-button model=it}} +
+ + {{/has-perm}} {{/each}} diff --git a/web/cms/app/templates/components/delete-btn.hbs b/web/cms/app/templates/components/delete-btn.hbs deleted file mode 100644 index 3a9566f6..00000000 --- a/web/cms/app/templates/components/delete-btn.hbs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/web/cms/app/templates/components/delete-button.hbs b/web/cms/app/templates/components/delete-button.hbs index a2f21d87..f4f8282d 100644 --- a/web/cms/app/templates/components/delete-button.hbs +++ b/web/cms/app/templates/components/delete-button.hbs @@ -1 +1 @@ - +