优化代码

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

@@ -48,13 +48,23 @@ public class AreaController {
         return R.ok(this.areaService.page(page, new QueryWrapper<>(area)));
     }
 
+    /**
+     * 按层级查询
+     * @param area
+     * @return R
+     */
     @GetMapping("/select")
     @ApiOperation("按层级查询")
     public R select(Area area) {
-        LambdaQueryWrapper<Area> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(null != area.getLevel(),Area::getLevel, area.getLevel())
-                .eq(StringUtils.isNotBlank(area.getParentCode()),Area::getParentCode, area.getParentCode());
-        return R.ok(this.areaService.list(objectLambdaQueryWrapper));
+        try {
+            LambdaQueryWrapper<Area> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            objectLambdaQueryWrapper.eq(null != area.getLevel(),Area::getLevel, area.getLevel())
+                    .eq(StringUtils.isNotBlank(area.getParentCode()),Area::getParentCode, area.getParentCode());
+            return R.ok(this.areaService.list(objectLambdaQueryWrapper));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
     /**

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

@@ -16,6 +16,7 @@ import com.ylx.massage.service.TFareFreeRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
@@ -57,15 +58,20 @@ public class TFareSettingController extends BaseController {
     }
 
     /**
-     * 通过主键查询单条数据
+     * 通过主键查询车费设置详情
      *
      * @param id 主键
-     * @return 单条数据
+     * @return 车费设置详情
      */
     @GetMapping("{id}")
-    @ApiOperation("查询单条数据")
+    @ApiOperation("车费设置详情")
     public R selectOne(@PathVariable Serializable id) {
-        return R.ok(this.tFareSettingService.getById(id));
+        try {
+            return R.ok(this.tFareSettingService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -77,7 +83,12 @@ public class TFareSettingController extends BaseController {
     @PostMapping("add")
     @ApiOperation("新增数据")
     public R insert(@RequestBody TFareSetting tFareSetting) {
-        return R.ok(this.tFareSettingService.add(tFareSetting));
+        try {
+            return R.ok(this.tFareSettingService.add(tFareSetting));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -108,7 +119,7 @@ public class TFareSettingController extends BaseController {
      * 支持新增和修改操作
      * - 如果传入id则修改
      * - 如果不传id则新增
-     *
+     * <p>
      * 业务流程：
      * 1. 接收前端传递的免车费规则参数
      * 2. 调用服务层保存方法（自动判断新增或修改）
@@ -144,7 +155,7 @@ public class TFareSettingController extends BaseController {
     @ApiOperation("禁用（启用）免车费规则")
     public R disableFareFreeRule(@RequestBody DisableFareFreeRuleVo disableFareFreeRuleVo) {
         try {
-            boolean success = fareFreeRuleService.disableFareFreeRule(disableFareFreeRuleVo.getOpenId(),disableFareFreeRuleVo.getEnable());
+            boolean success = fareFreeRuleService.disableFareFreeRule(disableFareFreeRuleVo.getOpenId(), disableFareFreeRuleVo.getEnable());
             return success ? R.ok() : R.fail("操作失败");
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -88,8 +88,9 @@ public class TLbtController {
     public R<Page<TLbt>> selectSpfl(Page<TLbt> page, TLbt lbt) {
         try {
             LambdaQueryWrapper<TLbt> tLbtLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            tLbtLambdaQueryWrapper.like(StringUtils.isNotBlank(lbt.getTitle()), TLbt::getTitle, lbt.getTitle())
-                    .orderByAsc(TLbt::getSort);
+            tLbtLambdaQueryWrapper.like(StringUtils.isNotBlank(lbt.getTitle()), TLbt::getTitle, lbt.getTitle()).orderByAsc(TLbt::getSort);
+            //查询条件添加显示状态
+            tLbtLambdaQueryWrapper.eq(lbt.getStatus() != null, TLbt::getStatus, lbt.getStatus());
             // 获取查询返回结果
             Page<TLbt> pageSelect = lbtService.page(page, tLbtLambdaQueryWrapper);
             return R.ok(pageSelect);

nightFragrance-admin/src/main/resources/application-dev.yml

@@ -302,6 +302,12 @@ hPercent:
 amap:
   apiKey: 5457092e6c62b83c1b2e45dbe973d858
 
+## 阿里云
+aliyun:
+  api:
+    access-key-id: LTAI5tPMfiyeXCfJ2nYhx5zp
+    access-key-secret: VWP8tw3uGlKkxCbCH8ZzTrYVRsWvxj
+
 remote:
   # 用户中心
   user-center:

nightFragrance-common/src/main/java/com/ylx/common/core/domain/model/aliyun/SendSmsEnum.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum SendSmsEnum {
 
-    SMS_220650024("SMS_220650024", "广誉源", "验证码短信");
+    SMS_220650024("SMS_220650024", "山西掌柜鼎科技", "验证码短信");
 
     private final String code;
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Area.java

@@ -33,10 +33,15 @@ public class Area extends Model<Area> {
     @ApiModelProperty("名称")
     private String name;
 
-    //父级编码，0为顶级
+    /**
+     * 父级编码，0为顶级
+     */
     @ApiModelProperty("父级编码，0为顶级")
     private String parentCode;
-    //数据层级
+
+    /**
+     * 数据层级
+     */
     @ApiModelProperty("数据层级")
     private Integer level;
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TFareSetting.java

@@ -1,80 +1,109 @@
 package com.ylx.massage.domain;
-
-
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-
 /**
  * 车费设置表(TFareSetting)表实体类
  *
  * @author makejava
  * @since 2024-08-22 17:41:00
  */
-
-@SuppressWarnings("serial")
 @Data
 @ApiModel(value = "TFareSetting", description = "车费设置")
 @TableName("t_fare_setting")
-public class TFareSetting extends Model<TFareSetting> {
-    //主键
+public class TFareSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
     @ApiModelProperty("主键")
+    @TableId
     private String id;
-    //日间起步价
-    @ApiModelProperty("日间起步价")
+
+    /**
+     * 白天起步价
+     */
+    @ApiModelProperty("白天起步价")
     private BigDecimal daytimeBaseFare;
-    //日间起步距离（公里）
-    @ApiModelProperty("起步距离（公里）")
+
+    /**
+     * 白天起步距离（公里）
+     */
+    @ApiModelProperty("白天起步距离（公里）")
     private BigDecimal daytimeBaseDistance;
-    //日间超出起步价后每公里费用
-    @ApiModelProperty("超出起步价后每公里费用")
+
+    /**
+     * 白天超出起步价后每公里费用
+     */
+    @ApiModelProperty("白天超出起步价后每公里费用")
     private BigDecimal daytimeAdditionalFarePer;
-    //夜间起步价
+
+    /**
+     * 夜间起步价
+     */
     @ApiModelProperty("夜间起步价")
     private BigDecimal nightBaseFare;
-    //夜间起步距离（公里）
+
+    /**
+     * 夜间起步距离（公里）
+     */
     @ApiModelProperty("夜间起步距离（公里）")
     private BigDecimal nightBaseDistance;
-    //夜间超出起步价后每公里费用
+
+    /**
+     * 夜间超出起步价后每公里费用
+     */
     @ApiModelProperty("夜间超出起步价后每公里费用")
     private BigDecimal nightAdditionalFarePer;
-    //是否启用0否 1是
+
+    /**
+     * 是否启用0否 1是
+     */
     @ApiModelProperty("是否启用0否 1是")
     private Integer enable;
-    //城市编码
+
+    /**
+     * 城市编码
+     */
     @ApiModelProperty("城市编码")
     private String cityCode;
-    //城市名称
+
+    /**
+     * 城市名称
+     */
     @ApiModelProperty("城市名称")
     private String cityName;
-    //系统创建时间
+
+    /**
+     * 系统创建时间
+     */
     @ApiModelProperty("系统创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
-    //系统修改时间
+
+    /**
+     * 系统修改时间
+     */
     @ApiModelProperty("系统修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
-    //是否删除0否1是
+
+    /**
+     * 是否删除0否1是
+     */
     @ApiModelProperty("是否删除0否1是")
     @TableLogic
     private Integer isDelete;
 
-
-
-    /**
-     * 获取主键值
-     *
-     * @return 主键值
-     */
-    @Override
-    public Serializable pkVal() {
-        return this.id;
-    }
 }
 

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

@@ -12,7 +12,12 @@ import com.ylx.massage.domain.vo.TFareSettingVo;
  */
 public interface TFareSettingService extends IService<TFareSetting> {
 
-    TFareSetting add(TFareSetting tFareSetting);
+    /**
+     * 新增车费设置数据
+     * @param tFareSetting
+     * @return boolean
+     */
+    boolean add(TFareSetting tFareSetting);
 
     TFareSetting updateFareSetting(TFareSetting tFareSetting);
 

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

@@ -38,8 +38,9 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
 
     @Autowired
     private ISysDictTypeService dictTypeService;
+
     @Override
-    public TFareSetting add(TFareSetting tFareSetting) {
+    public boolean add(TFareSetting tFareSetting) {
         //判断部门重复设置
         if (tFareSetting.getEnable().equals(MassageConstants.INTEGER_ONE)) {
             LambdaQueryWrapper<TFareSetting> tFareSettingLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -47,11 +48,14 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
                     .eq(TFareSetting::getEnable, MassageConstants.INTEGER_ONE);
             List<TFareSetting> fareSettings = this.list(tFareSettingLambdaQueryWrapper);
             if (!Collections.isEmpty(fareSettings)) {
-                throw new ServiceException("该部门已有启用的设置");
+                throw new ServiceException("该城市已有启用的设置");
             }
         }
-        this.save(tFareSetting);
-        return tFareSetting;
+        boolean save = this.save(tFareSetting);
+        if(!save){
+            throw new ServiceException("新增失败");
+        }
+        return save;
     }
 
     @Override

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

@@ -64,10 +64,26 @@ public class TLbtServiceImpl extends ServiceImpl<TLbtMapper, TLbt> implements TL
 
     @Override
     public Boolean del(TLbt tLbt) {
+        if (tLbt == null) {
+            throw new ServiceException("参数不能为空");
+        }
         if (StringUtils.isBlank(tLbt.getId())) {
             throw new ServiceException("ID不能为空");
         }
-        return this.removeById(tLbt.getId());
+
+        TLbt exists = baseMapper.selectLbtById(tLbt.getId());
+        if (exists == null) {
+            throw new ServiceException("轮播图不存在");
+        }
+        if (Integer.valueOf(STATUS_SHOW).equals(exists.getStatus())) {
+            throw new ServiceException("当前banner已显示，不可删除！");
+        }
+
+        boolean removed = this.removeById(tLbt.getId());
+        if (!removed) {
+            throw new ServiceException("轮播图删除失败");
+        }
+        return true;
     }
 
     @Override