修改迁移逻辑

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -405,6 +405,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(result));
   }
 
+
+
   @RequestMapping("/contact/update/contact")
   public JsonResult updateContact(@RequestParam Long contactId, @RequestParam(required = false) String name,
                                   @RequestParam(required = false) String phoneNo,
@@ -414,10 +416,7 @@ public class InnerController implements IBaseController {
       return JsonResult.buildErrorStateResult("参数不合法", null);
     }
 
-    Contact contact = contactService.findById(contactId);
-    if (null == contact) {
-      return JsonResult.buildErrorStateResult("修改联系人不存在", null);
-    }
+
     if (StringUtils.isEmpty(name) && StringUtils.isEmpty(phoneNo) ){
       return JsonResult.buildErrorStateResult("修改联系人修改条件不能都为空", null);
     }
@@ -430,19 +429,11 @@ public class InnerController implements IBaseController {
     if(StringUtils.isEmpty(reason)){
       return JsonResult.buildErrorStateResult("修改原因不能为空", null);
     }
-    if (null != name) {
-      contact.setName(name);
-    }
-    if (null != phoneNo) {
-      contact.setPhoneNo(phoneNo);
-    }
-    if (null != relation) {
-      contact.setRelation(relation);
+    Contact contact = contactService.findById(contactId);
+    if (null == contact) {
+      return JsonResult.buildErrorStateResult("修改联系人不存在", null);
     }
-    LOGGER.info("修改前联系人信息:{}",contact);
-    Timestamp now = new Timestamp(System.currentTimeMillis());
-    contact.setUpdateAt(now);
-    contact = contactService.save(contact);
+    contact = contactService.saveContact(name, phoneNo, relation, contact);
     String ip= IPUtil.getRemoteIP(request);
     LOGGER.info("修改后联系人信息:{},修改原因：{},操作ip:{}",contact,reason,ip);
 
@@ -451,6 +442,7 @@ public class InnerController implements IBaseController {
 
 
 
+
   private void convertContactList(Long userId, List<Contact> contacts, Timestamp now) {
     for (Contact c : contacts) {
       c.setId(null);

src/main/java/cn/quantgroup/xyqb/service/user/IContactService.java

 package cn.quantgroup.xyqb.service.user;
 
+import cn.quantgroup.user.enums.Relation;
 import cn.quantgroup.xyqb.entity.Contact;
 
 import java.util.List;
@@ -14,4 +15,6 @@ public interface IContactService {
 
   List<Contact> save(List<Contact> contacts);
   Contact save(Contact contact);
+
+  Contact saveContact(String name, String phoneNo, Relation relation, Contact contact);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
+import cn.quantgroup.user.enums.Relation;
+import cn.quantgroup.xyqb.controller.external.user.InnerController;
 import cn.quantgroup.xyqb.entity.Contact;
 import cn.quantgroup.xyqb.repository.IContactRepository;
 import cn.quantgroup.xyqb.service.user.IContactService;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -15,7 +19,7 @@ import java.util.List;
  */
 @Service
 public class ContactServiceImpl implements IContactService {
-
+  private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ContactServiceImpl.class);
   @Autowired
   private IContactRepository contactRepository;
 
@@ -42,5 +46,20 @@ public class ContactServiceImpl implements IContactService {
     return contactRepository.save(contact);
   }
 
-
+  public Contact saveContact(String name, String phoneNo, Relation relation, Contact contact) {
+    if (null != name) {
+      contact.setName(name);
+    }
+    if (null != phoneNo) {
+      contact.setPhoneNo(phoneNo);
+    }
+    if (null != relation) {
+      contact.setRelation(relation);
+    }
+    LOGGER.info("修改前联系人信息:{}",contact);
+    Timestamp now = new Timestamp(System.currentTimeMillis());
+    contact.setUpdateAt(now);
+    contact = save(contact);
+    return contact;
+  }
 }