fix: NPE

src/main/java/cn/com/poc/timbre/service/BizVoiceTimbreService.java

 package cn.com.poc.timbre.service;
 
-import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.poc.timbre.entity.BizVoiceTimbreEntity;
+import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.yict.framemax.data.model.PagingInfo;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface BizVoiceTimbreService extends BaseService {
 
-    BizVoiceTimbreEntity get(java.lang.Integer id) throws Exception;
-
     BizVoiceTimbreEntity getByTimbreId(java.lang.String timbreId);
 
     List<BizVoiceTimbreEntity> findByExample(BizVoiceTimbreEntity example, PagingInfo pagingInfo) throws Exception;
-
-    BizVoiceTimbreEntity save(BizVoiceTimbreEntity entity) throws Exception;
-
-    BizVoiceTimbreEntity update(BizVoiceTimbreEntity entity) throws Exception;
-
-    void deletedById(java.lang.Integer id) throws Exception;
-
 }
\ No newline at end of file

src/main/java/cn/com/poc/timbre/service/impl/BizVoiceTimbreServiceImpl.java

@@ -26,18 +26,6 @@ public class BizVoiceTimbreServiceImpl extends BaseServiceImpl
     @Resource
     private BizVoiceTimbreRepository repository;
 
-    public BizVoiceTimbreEntity get(java.lang.Integer id) throws Exception {
-        Assert.notNull(id);
-        BizVoiceTimbreModel model = this.repository.get(id);
-        if (model == null) {
-            return null;
-        }
-        if ("Y".equals(model.getIsDeleted())) {
-            return null;
-        }
-        return BizVoiceTimbreConvert.modelToEntity(model);
-    }
-
     @Override
     public BizVoiceTimbreEntity getByTimbreId(String timbreId)  {
         BizVoiceTimbreModel bizVoiceTimbreModel = new BizVoiceTimbreModel();
@@ -50,6 +38,7 @@ public class BizVoiceTimbreServiceImpl extends BaseServiceImpl
         return null;
     }
 
+    @Override
     public List<BizVoiceTimbreEntity> findByExample(BizVoiceTimbreEntity example, PagingInfo pagingInfo) throws Exception {
         List<BizVoiceTimbreEntity> result = new ArrayList<BizVoiceTimbreEntity>();
         BizVoiceTimbreModel model = new BizVoiceTimbreModel();
@@ -63,70 +52,4 @@ public class BizVoiceTimbreServiceImpl extends BaseServiceImpl
         }
         return result;
     }
-
-    public BizVoiceTimbreEntity save(BizVoiceTimbreEntity entity) throws Exception {
-        Assert.notNull(entity);
-        entity.setId(null);
-        entity.setIsDeleted("N");
-        BizVoiceTimbreModel model = BizVoiceTimbreConvert.entityToModel(entity);
-        BizVoiceTimbreModel saveModel = this.repository.save(model);
-        return BizVoiceTimbreConvert.modelToEntity(saveModel);
-    }
-
-    public BizVoiceTimbreEntity update(BizVoiceTimbreEntity entity) throws Exception {
-        Assert.notNull(entity);
-        Assert.notNull(entity.getId(), "update pk can not be null");
-        BizVoiceTimbreModel model = this.repository.get(entity.getId());
-
-        if (entity.getTimbreId() != null) {
-            model.setTimbreId(entity.getTimbreId());
-        }
-        if (entity.getLanguage() != null) {
-            model.setLanguage(entity.getLanguage());
-        }
-        if (entity.getTimbreName() != null) {
-            model.setTimbreName(entity.getTimbreName());
-        }
-        if (entity.getTimbreNameEn() != null) {
-            model.setTimbreNameEn(entity.getTimbreNameEn());
-        }
-        if (entity.getTimbreNameTw() != null) {
-            model.setTimbreNameTw(entity.getTimbreNameTw());
-        }
-        if (entity.getVoiceUrl() != null) {
-            model.setVoiceUrl(entity.getVoiceUrl());
-        }
-        if (entity.getIsDeleted() != null) {
-            model.setIsDeleted(entity.getIsDeleted());
-        }
-        if (entity.getCreator() != null) {
-            model.setCreator(entity.getCreator());
-        }
-        if (entity.getCreatedTime() != null) {
-            model.setCreatedTime(entity.getCreatedTime());
-        }
-        if (entity.getModifier() != null) {
-            model.setModifier(entity.getModifier());
-        }
-        if (entity.getModifiedTime() != null) {
-            model.setModifiedTime(entity.getModifiedTime());
-        }
-        if (entity.getSysVersion() != null) {
-            model.setSysVersion(entity.getSysVersion());
-        }
-        BizVoiceTimbreModel saveModel = this.repository.save(model);
-        return BizVoiceTimbreConvert.modelToEntity(saveModel);
-    }
-
-    public void deletedById(java.lang.Integer id) throws Exception {
-        Assert.notNull(id);
-        BizVoiceTimbreModel model = this.repository.get(id);
-        if (model != null) {
-            if ("N".equals(model.getIsDeleted())) {
-                model.setIsDeleted("Y");
-                this.repository.save(model);
-            }
-        }
-    }
-
 }
\ No newline at end of file

src/main/java/cn/com/poc/user/service/impl/BizMemberInfoServiceImpl.java

@@ -104,7 +104,7 @@ public class BizMemberInfoServiceImpl extends BaseServiceImpl
             bizMemberInfoModel.setEmail(memberInfoEntity.getEmail());
         }
         if (StringUtils.isNotBlank(memberInfoEntity.getRemark())) {
-            if (memberInfoEntity.getNickName().length() > 200) {
+            if (memberInfoEntity.getRemark().length() > 200) {
                 throw new I18nMessageException("exception/remark.max.len");
             }
             bizMemberInfoModel.setRemark(memberInfoEntity.getRemark());

src/test/java/cn/com/poc/timbre/rest/BizVoiceTimbreRestTest.java

@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-
 public class BizVoiceTimbreRestTest {
     MockedStatic<Context> mockedContext;
     @Mock

src/test/java/cn/com/poc/timbre/service/BizVoiceTimbreServiceTest.java

+package cn.com.poc.timbre.service;
+
+
+import cn.com.poc.common.constant.CommonConstant;
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.timbre.entity.BizVoiceTimbreEntity;
+import cn.com.yict.framemax.core.spring.SingleContextInitializer;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(initializers = SingleContextInitializer.class)
+@WebAppConfiguration
+public class BizVoiceTimbreServiceTest {
+
+    @Resource
+    private BizVoiceTimbreService bizVoiceTimbreService;
+
+
+    @Test
+    public void getByTimbreIdTest() {
+        BizVoiceTimbreEntity bizVoiceTimbreEntity = bizVoiceTimbreService.getByTimbreId("101019");
+        System.out.println(JsonUtils.serialize(bizVoiceTimbreEntity));
+        // 获取不存在
+        System.out.println(JsonUtils.serialize(bizVoiceTimbreService.getByTimbreId("1")));
+    }
+
+
+    @Test
+    public void findByExampleTest() throws Exception {
+        BizVoiceTimbreEntity bizVoiceTimbreEntity = new BizVoiceTimbreEntity();
+        bizVoiceTimbreEntity.setIsDeleted(CommonConstant.YOrN.N);
+        List<BizVoiceTimbreEntity> entities = bizVoiceTimbreService.findByExample(bizVoiceTimbreEntity, new PagingInfo(10, 1));
+        System.out.println(JsonUtils.listToJson(entities));
+    }
+
+}