|
@@ -2,10 +2,11 @@ package com.ylx.web.controller.massage;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
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.core.domain.R;
|
|
-import com.ylx.common.utils.uuid.IdUtils;
|
|
|
|
|
|
+import com.ylx.common.exception.ServiceException;
|
|
|
|
+import com.ylx.massage.domain.THighlights;
|
|
import com.ylx.massage.domain.TXiangmu;
|
|
import com.ylx.massage.domain.TXiangmu;
|
|
|
|
+import com.ylx.massage.service.THighlightsService;
|
|
import com.ylx.massage.service.TXiangmuService;
|
|
import com.ylx.massage.service.TXiangmuService;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.time.LocalDateTime;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -34,6 +34,10 @@ public class TXiangmuController {
|
|
@Resource
|
|
@Resource
|
|
private TXiangmuService xiangmuService;
|
|
private TXiangmuService xiangmuService;
|
|
|
|
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private THighlightsService highlightsService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取所有项目
|
|
* 获取所有项目
|
|
*
|
|
*
|
|
@@ -59,14 +63,13 @@ public class TXiangmuController {
|
|
@ApiOperation("添加或者更新项目")
|
|
@ApiOperation("添加或者更新项目")
|
|
public R saveOrUpdate(@RequestBody TXiangmu xiangmu) {
|
|
public R saveOrUpdate(@RequestBody TXiangmu xiangmu) {
|
|
try {
|
|
try {
|
|
- if (StringUtils.isBlank(xiangmu.getcId())) {
|
|
|
|
- xiangmu.setnSaleNumber(MassageConstants.INTEGER_ZERO);
|
|
|
|
- xiangmu.setDtCreateTime(LocalDateTime.now());
|
|
|
|
- }
|
|
|
|
- return R.ok(xiangmuService.saveOrUpdate(xiangmu));
|
|
|
|
|
|
+ return R.ok(xiangmuService.addOrUpdate(xiangmu));
|
|
|
|
+ } catch (ServiceException s) {
|
|
|
|
+ log.error(s.toString());
|
|
|
|
+ return R.fail(s.getMessage());
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error("saveOrUpdate", e);
|
|
|
|
- return R.fail();
|
|
|
|
|
|
+ log.error(e.toString());
|
|
|
|
+ return R.fail("系统异常");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -85,6 +88,16 @@ public class TXiangmuController {
|
|
return R.ok(pageSelect);
|
|
return R.ok(pageSelect);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 分页查询数据
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation("根据id查询项目")
|
|
|
|
+ @RequestMapping(value = "/getByid", method = RequestMethod.POST)
|
|
|
|
+ public R getById(@RequestBody TXiangmu xiangmu) {
|
|
|
|
+ return R.ok(xiangmuService.getById(xiangmu.getcId()));
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 删除项目
|
|
* 删除项目
|
|
*
|
|
*
|
|
@@ -96,4 +109,14 @@ public class TXiangmuController {
|
|
public R del(@RequestBody TXiangmu xiangmu) {
|
|
public R del(@RequestBody TXiangmu xiangmu) {
|
|
return R.ok(xiangmuService.removeById(xiangmu));
|
|
return R.ok(xiangmuService.removeById(xiangmu));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 项目两点
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation("项目亮点")
|
|
|
|
+ @RequestMapping(value = "/highlights", method = RequestMethod.GET)
|
|
|
|
+ public R<List<THighlights>> getHighlights() {
|
|
|
|
+ return R.ok(highlightsService.list());
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|