fix:优化

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TLbtController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.constant.MassageConstants;
 import com.ylx.common.core.domain.R;
-import com.ylx.common.utils.uuid.IdUtils;
+import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.TLbt;
 import com.ylx.massage.service.TLbtService;
 import io.swagger.annotations.Api;
@@ -56,13 +56,13 @@ public class TLbtController {
     @ApiOperation("添加或者更新轮播图")
     public R addOrUpdate(@RequestBody TLbt lbt) {
         try {
-            if (StringUtils.isBlank(lbt.getcId())) {
-                lbt.setcId(IdUtils.fastSimpleUUID());
-            }
-            return R.ok(lbtService.saveOrUpdate(lbt));
+            return R.ok(lbtService.addOrUpdate(lbt));
+        } catch (ServiceException s) {
+            log.error(s.toString());
+            return R.fail(s.getMessage());
         } catch (Exception e) {
-            log.error("addOrUpdate出现异常", e);
-            return R.fail();
+            log.error(e.toString());
+            return R.fail("系统异常");
         }
     }
 
@@ -86,10 +86,15 @@ public class TLbtController {
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ApiOperation("删除轮播图")
     public R del(@RequestBody TLbt tLbt) {
-        TLbt tSpflNew = new TLbt();
-        tSpflNew.setcId(tLbt.getcId());
-        tSpflNew.setnDel(MassageConstants.INTEGER_ONE);
-        return R.ok(lbtService.updateById(tSpflNew));
+        try {
+            return R.ok(lbtService.del(tLbt));
+        } catch (ServiceException s) {
+            log.error(s.toString());
+            return R.fail(s.getMessage());
+        } catch (Exception e) {
+            log.error(e.toString());
+            return R.fail("系统异常");
+        }
     }
 
     @ApiOperation("根据id查询轮播图")

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TXiangmuController.java

@@ -60,7 +60,6 @@ public class TXiangmuController {
     public R saveOrUpdate(@RequestBody TXiangmu xiangmu) {
         try {
             if (StringUtils.isBlank(xiangmu.getcId())) {
-                xiangmu.setcId(IdUtils.fastSimpleUUID());
                 xiangmu.setnSaleNumber(MassageConstants.INTEGER_ZERO);
                 xiangmu.setDtCreateTime(LocalDateTime.now());
             }

nightFragrance-massage/src/main/java/com/ylx/massage/service/TLbtService.java

@@ -13,4 +13,7 @@ import com.ylx.massage.domain.TLbt;
  */
 public interface TLbtService extends IService<TLbt> {
 
+    Boolean addOrUpdate(TLbt lbt);
+
+    Boolean del(TLbt tLbt);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TLbtServiceImpl.java

@@ -1,9 +1,13 @@
 package com.ylx.massage.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.common.constant.MassageConstants;
+import com.ylx.common.exception.ServiceException;
+import com.ylx.common.utils.uuid.IdUtils;
 import com.ylx.massage.domain.TLbt;
 import com.ylx.massage.mapper.TLbtMapper;
 import com.ylx.massage.service.TLbtService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,4 +16,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class TLbtServiceImpl extends ServiceImpl<TLbtMapper, TLbt> implements TLbtService {
 
+    @Override
+    public Boolean addOrUpdate(TLbt lbt) {
+        if (StringUtils.isBlank(lbt.getcId())) {
+            if (StringUtils.isBlank(lbt.getcImgUrl())) {
+                throw new ServiceException("图片不能为空");
+            }
+            if (lbt.getcSort() == null) {
+                throw new ServiceException("序号不能为空");
+            }
+        }
+        return this.saveOrUpdate(lbt);
+    }
+
+    @Override
+    public Boolean del(TLbt tLbt) {
+        if (StringUtils.isBlank(tLbt.getcId())) {
+            throw new ServiceException("ID不能为空");
+        }
+        TLbt tSpflNew = new TLbt();
+        tSpflNew.setcId(tLbt.getcId());
+        tSpflNew.setnDel(MassageConstants.INTEGER_ONE);
+        return this.updateById(tSpflNew);
+    }
 }