xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Mail_activityExService.java

+package cn.ibizlab.businesscentral.core.extensions.service;
+
+import cn.ibizlab.businesscentral.core.odoo_mail.service.impl.Mail_activityServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.businesscentral.core.odoo_mail.domain.Mail_activity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Primary;
+import java.util.*;
+
+/**
+ * 实体[活动] 自定义服务对象
+ */
+@Slf4j
+@Primary
+@Service("Mail_activityExService")
+public class Mail_activityExService extends Mail_activityServiceImpl {
+
+    @Override
+    protected Class currentModelClass() {
+        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
+    }
+
+    /**
+     * 自定义行为[Action_done]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Mail_activity action_done(Mail_activity et) {
+        return super.action_done(et);
+    }
+}
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/client/mail_activityFallback.java

@@ -64,6 +64,10 @@ public class mail_activityFallback implements mail_activityFeignClient{
 
 
 
+    public Mail_activity action_done( Long id, Mail_activity mail_activity){
+            return null;
+     }
+
     public Boolean checkKey(Mail_activity mail_activity){
             return false;
      }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/client/mail_activityFeignClient.java

@@ -60,6 +60,10 @@ public interface mail_activityFeignClient {
     Mail_activity getDraft();
 
 
+    @RequestMapping(method = RequestMethod.POST, value = "/mail_activities/{id}/action_done")
+    Mail_activity action_done(@PathVariable("id") Long id,@RequestBody Mail_activity mail_activity);
+
+
     @RequestMapping(method = RequestMethod.POST, value = "/mail_activities/checkkey")
     Boolean checkKey(@RequestBody Mail_activity mail_activity);
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/service/IMail_activityService.java

@@ -34,6 +34,7 @@ public interface IMail_activityService extends IService<Mail_activity>{
     void removeBatch(Collection<Long> idList) ;
     Mail_activity get(Long key) ;
     Mail_activity getDraft(Mail_activity et) ;
+    Mail_activity action_done(Mail_activity et) ;
     boolean checkKey(Mail_activity et) ;
     boolean save(Mail_activity et) ;
     void saveBatch(List<Mail_activity> list) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_mail/service/impl/Mail_activityServiceImpl.java

@@ -163,6 +163,13 @@ public class Mail_activityServiceImpl extends EBSServiceImpl<Mail_activityMapper
         return et;
     }
 
+    @Override
+    @Transactional
+    public Mail_activity action_done(Mail_activity et) {
+        //自定义代码
+        return et;
+    }
+
     @Override
     public boolean checkKey(Mail_activity et) {
         return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Mail_activityResource.java

@@ -115,6 +115,17 @@ public class Mail_activityResource {
         return ResponseEntity.status(HttpStatus.OK).body(mail_activityMapping.toDto(mail_activityService.getDraft(new Mail_activity())));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Mail_activity-Action_done-all')")
+    @ApiOperation(value = "完成", tags = {"活动" },  notes = "完成")
+	@RequestMapping(method = RequestMethod.POST, value = "/mail_activities/{mail_activity_id}/action_done")
+    public ResponseEntity<Mail_activityDTO> action_done(@PathVariable("mail_activity_id") Long mail_activity_id, @RequestBody Mail_activityDTO mail_activitydto) {
+        Mail_activity domain = mail_activityMapping.toDomain(mail_activitydto);
+        domain.setId(mail_activity_id);
+        domain = mail_activityService.action_done(domain);
+        mail_activitydto = mail_activityMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(mail_activitydto);
+    }
+
     @ApiOperation(value = "检查活动", tags = {"活动" },  notes = "检查活动")
 	@RequestMapping(method = RequestMethod.POST, value = "/mail_activities/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody Mail_activityDTO mail_activitydto) {